Commit d8b0352f authored by 和慭琛's avatar 和慭琛

第二轮提测

parent c869735d
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
<view class="locationTitleView"> <view class="locationTitleView">
<image class="locationIcon" :src="icon_location" mode=""></image> <image class="locationIcon" :src="icon_location" mode=""></image>
<text class="locationTitle">定位位置</text> <text class="locationTitle">定位位置</text>
<text class="itemRedStar">*</text>
</view> </view>
<view class="locationRightView"> <view class="locationRightView">
<text class="reLocationTitle">重新定位</text> <text class="reLocationTitle">重新定位</text>
...@@ -87,12 +86,10 @@ ...@@ -87,12 +86,10 @@
</view> </view>
<view class="bottomView"> <view class="bottomView">
<view class="bottomLeftView" @click="recordClick()"> <view class="bottomLeftView" @click="recordClick()">
<!--text class="u-font-28 Gray666">查看历史订单</text-->
<image class="mineIcon" :src="icon_mine" mode=""></image> <image class="mineIcon" :src="icon_mine" mode=""></image>
<text class="mineText">我的</text> <text class="mineText">我的</text>
</view> </view>
<!--@click="confirmClick()"--> <view class="bottomRightView" @click='confirmClick()'>
<view class="bottomRightView" @click='confirmClick()' >
<text class="u-font-32 whiteColor">立即下单</text> <text class="u-font-32 whiteColor">立即下单</text>
</view> </view>
</view> </view>
...@@ -128,7 +125,8 @@ ...@@ -128,7 +125,8 @@
icon_agree_yes:'', icon_agree_yes:'',
icon_agree_no:'', icon_agree_no:'',
icon_top:'', icon_top:'',
icon_mine:'' icon_mine:'',
TimeID:-1
} }
}, },
...@@ -149,6 +147,7 @@ ...@@ -149,6 +147,7 @@
onShow() { onShow() {
//this.getWorkerType() //this.getWorkerType()
//this.getPerson() //this.getPerson()
this.isClean = true
this.checkClean() this.checkClean()
//getApp().initAPIneedToken //getApp().initAPIneedToken
...@@ -156,6 +155,7 @@ ...@@ -156,6 +155,7 @@
methods: { methods: {
nameInput(e){ nameInput(e){
this.name = e.detail.value
// console.log('联系人 监听:') // console.log('联系人 监听:')
// console.log(e.detail.value) // console.log(e.detail.value)
// console.log('name:') // console.log('name:')
...@@ -210,110 +210,157 @@ ...@@ -210,110 +210,157 @@
//勾选点击 //勾选点击
agreeClick: function (isAgree) { agreeClick: function (isAgree) {
this.isAgree = !isAgree
console.log(this.isAgree) clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => {
this.isAgree = !isAgree
console.log(this.isAgree)
}, 1000);
}, },
//服务协议 点击 //服务协议 点击
protocolClick: function () { protocolClick: function () {
console.log('服务协议 点击')
uni.showLoading({ clearTimeout(this.TimeID);
title:'加载中' this.TimeID = setTimeout(() => {
})
uni.downloadFile({ console.log('服务协议 点击')
url: 'https://system.dev.banshouhui.com/pdfjs/web/用户注册协议.pdf', uni.showLoading({
success: (res) => { title:'加载中'
uni.hideLoading() })
if (res.statusCode === 200) { //https://system.dev.banshouhui.com/pdfjs/web/用户注册协议.pdf
uni.showLoading({ uni.downloadFile({
title:'打开中' url: getApp().globalData.domain_Name +'/pdfjs/web/用户注册协议.pdf',
}) success: (res) => {
console.log('下载成功'); uni.hideLoading()
var filePath = res.tempFilePath; if (res.statusCode === 200) {
uni.openDocument({ uni.showLoading({
filePath:filePath, title:'打开中'
success() { })
uni.hideLoading() console.log('下载成功');
console.log('打开成功'); var filePath = res.tempFilePath;
}, uni.openDocument({
fail() { filePath:filePath,
uni.hideLoading() success() {
uni.showToast({ uni.hideLoading()
icon:'none', console.log('打开成功');
title:'打开失败' },
}) fail() {
} uni.hideLoading()
uni.showToast({
icon:'none',
title:'打开失败'
})
}
})
}
},
fail(res) {
console.log('打开服务协议失败')
console.log(res)
uni.hideLoading()
uni.showToast({
icon:'none',
title:'打开服务协议失败'
}) })
}
});
} }, 1000);
},
fail() {
uni.hideLoading()
uni.showToast({
icon:'none',
title:'打开服务协议失败'
})
}
});
}, },
//查看历史订单 //查看历史订单
recordClick: function () { recordClick: function () {
if(!getApp().globalData.token){ clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => {
if(!getApp().globalData.token){
uni.navigateTo({
url: '/pages/login/wxlogin'
})
return
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/login/wxlogin' url: '/pages/index/record'
}) })
return
} },
1000);
uni.navigateTo({
url: '/pages/index/record'
})
}, },
//立即下单 //立即下单
confirmClick: function () { confirmClick: function () {
console.log('立即下单')
console.log(getApp().globalData.token)
this.checkAllInput()
if(this.isAllInput==false){ clearTimeout(this.TimeID);
uni.showToast({ this.TimeID = setTimeout(() => {
icon:'none',
title:'请填写所有必填项' console.log('立即下单')
}) console.log(getApp().globalData.token)
return
} this.checkAllInput()
if(this.isAgree==false){ if(this.isAllInput==false){
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:'请阅读并同意服务协议' title:'请填写所有必填项'
}) })
return return
} }
if(this.isAgree==false){
uni.showToast({
icon:'none',
title:'请阅读并同意服务协议'
})
return
}
if(!getApp().globalData.token){
uni.navigateTo({
url:'/pages/login/wxlogin'
})
return
}
//this.showSubscribeModal()
this.createAppletsOrder()
if(!getApp().globalData.token){ }, 1000);
uni.navigateTo({
url:'/pages/login/wxlogin'
})
return
}
//this.showSubscribeModal()
this.createAppletsOrder()
}, },
//非空判断 //非空判断
checkAllInput: function () { checkAllInput: function () {
console.log('下单前的 联系人:'+this.name+'字符串长度:'+this.name.length)
console.log('下单前的 联系人电话:'+this.phone)
console.log('下单前的 地址:'+this.address)
console.log('下单前的 产品类型:'+this.activeProduct)
console.log('下单前的 服务类型:'+this.activeService)
console.log('下单前的 服务需求:'+this.demandContent)
if(this.name.length>0 if(this.name.length>0
&& this.phone.length>0 && this.phone.length>0
//&& this.location.length>0 //&& this.location.length>0
...@@ -323,16 +370,7 @@ ...@@ -323,16 +370,7 @@
&& this.demandContent.length>0){ && this.demandContent.length>0){
this.isAllInput = true this.isAllInput = true
} }
/*
this.name = '',
this.phone = '',
this.location = '',
this.address = '',
this.activeProduct = '',
this.activeService = '',
this.demandContent= '',
this.isAgree = false,
*/
}, },
...@@ -919,6 +957,13 @@ ...@@ -919,6 +957,13 @@
height: 168rpx; height: 168rpx;
} }
.uButton{
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
}
</style> </style>
...@@ -73,7 +73,8 @@ ...@@ -73,7 +73,8 @@
activeTop:0, activeTop:0,
unfinishList:[], unfinishList:[],
finishList:[], finishList:[],
icon_noData:'' icon_noData:'',
TimeID:-1
} }
}, },
onLoad() { onLoad() {
...@@ -205,18 +206,31 @@ ...@@ -205,18 +206,31 @@
//详情点击 //详情点击
itemClick: function (item) { itemClick: function (item) {
uni.navigateTo({ clearTimeout(this.TimeID);
url: '/pages/take/detail' this.TimeID = setTimeout(() => {
+'?orderId='+item.orderId uni.navigateTo({
+'&isBottomShow='+false, url: '/pages/take/detail'
}) +'?orderId='+item.orderId
+'&isBottomShow='+false,
})
}, 1000);
}, },
bottomClick: function (item) { bottomClick: function (item) {
uni.navigateTo({
url: '/pages/take/index', clearTimeout(this.TimeID);
}) this.TimeID = setTimeout(() => {
uni.navigateTo({
url: '/pages/take/index',
})
}, 1000);
}, },
...@@ -232,7 +246,6 @@ ...@@ -232,7 +246,6 @@
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
......
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
return { return {
activeService:'家电服务', activeService:'家电服务',
count:'3', count:'3',
phone:'400-8834-123' phone:'400-8834-123',
TimeID:-1
} }
}, },
onLoad(e) { onLoad(e) {
...@@ -65,25 +66,90 @@ ...@@ -65,25 +66,90 @@
//订阅公众号 点击 //订阅公众号 点击
noticeClick: function () { noticeClick: function () {
this.showSubscribeModal()
}, },
showSubscribeModal: function (){
let that = this
uni.showModal({
title:'提示',
content:'为更好的追踪工单实时状态,服务号需要在您的下单时向您发送消息',
confirmText:'同意',
cancelText:'拒绝',
success(res) {
if (res.confirm) {
//调用订阅消息
console.log('用户点击 确定');
//调用订阅
that.getSubSubscribeMessage();
}else if (res.cancel) {
console.log('用户点击 拒绝');
}
}
})
},
//获取消息订阅信息
getSubSubscribeMessage: function (){
let that = this
uni.requestSubscribeMessage({
tmplIds: ['3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU'],
success (res) {
console.log('请求订阅信息 成功:')
console.log(res)
uni.showToast({
icon:'none',
title:'订阅成功'
})
//this.createAppletsOrder()
},
fail (res){
console.log('请求订阅信息 失败:')
console.log(res)
}
})
},
//下单记录 点击 //下单记录 点击
recordClick: function () { recordClick: function () {
uni.navigateTo({ clearTimeout(this.TimeID);
url: '/pages/index/record' this.TimeID = setTimeout(() => {
}) uni.navigateTo({
url: '/pages/index/record'
})
}, 1000);
}, },
//再下一单 点击 //再下一单 点击
oneMoreClick: function () { oneMoreClick: function () {
let pages = getCurrentPages(); clearTimeout(this.TimeID);
let prevPage = pages[pages.length - 2]; //上一个页面 this.TimeID = setTimeout(() => {
prevPage.$vm.isClean = true; let pages = getCurrentPages();
uni.navigateBack({ let prevPage = pages[pages.length - 2]; //上一个页面
prevPage.$vm.isClean = true;
}) uni.navigateBack({
})
}, 1000);
}, },
} }
} }
...@@ -133,7 +199,6 @@ ...@@ -133,7 +199,6 @@
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
isNewUser:false, isNewUser:false,
unionID:'', unionID:'',
openID:'', openID:'',
icon_notice:'' icon_notice:'',
TimeID:-1
} }
}, },
onLoad() { onLoad() {
...@@ -39,46 +40,28 @@ ...@@ -39,46 +40,28 @@
//用户授权得到用户的信息 //用户授权得到用户的信息
getUserInfo: async function(e) { getUserInfo: async function(e) {
// this.getSSOID() clearTimeout(this.TimeID);
// return this.TimeID = setTimeout(() => {
console.log('获取用户信息')
console.log(e.detail.userInfo)
console.log('获取用户信息')
console.log(e.detail.userInfo)
if (e.detail.errMsg == 'getUserInfo:fail auth deny') {
//this.$u.toast('未授权');
uni.showModal({
title: '授权失败',
content: '请允许获取用户信息的授权',
showCancel: false
});
} else {
this.getCode() if (e.detail.errMsg == 'getUserInfo:fail auth deny') {
/*
try {
let code = await this.getCode();
let rawData = e.detail
let data = {
code: code,
nickname: rawData.userInfo.nickName,
avatar: rawData.userInfo.avatarUrl,
encryptedData: rawData.encryptedData,
iv: rawData.iv
}
this.getUsersByCode(code) uni.showModal({
//this.getUnionID(code) title: '授权失败',
//this.toLogin(data); content: '请允许获取用户信息的授权',
showCancel: false
});
} else {
this.getCode()
} catch (e) {
this.$u.toast(e);
} }
*/
}, 1000);
}
}, },
...@@ -210,19 +193,26 @@ ...@@ -210,19 +193,26 @@
//获取用户手机号 //获取用户手机号
getPhoneNumber: async function(e) { getPhoneNumber: async function(e) {
console.log('获取用户手机号') clearTimeout(this.TimeID);
console.log(e.detail) this.TimeID = setTimeout(() => {
console.log('获取用户手机号')
console.log(e.detail)
if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {
//this.$u.toast('未授权');
uni.showModal({
title: '授权失败',
content: '请允许获取用户信息的授权',
showCancel: false
});
} else {
this.findByMobile(e)
}
}, 1000);
if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {
//this.$u.toast('未授权');
uni.showModal({
title: '授权失败',
content: '请允许获取用户信息的授权',
showCancel: false
});
} else {
this.findByMobile(e)
}
}, },
...@@ -415,7 +405,6 @@ ...@@ -415,7 +405,6 @@
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
......
This diff is collapsed.
...@@ -168,6 +168,7 @@ ...@@ -168,6 +168,7 @@
orderServiceType:'', orderServiceType:'',
orderInfo:{}, orderInfo:{},
currentIndex:0, currentIndex:0,
TimeID:-1,
//产品规格 相关 //产品规格 相关
is_SPECIFICATIONS_picker_show:false, is_SPECIFICATIONS_picker_show:false,
...@@ -326,7 +327,7 @@ ...@@ -326,7 +327,7 @@
}else{ }else{
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:res.errMsg title:'获取完工页详情失败'
}) })
...@@ -338,6 +339,10 @@ ...@@ -338,6 +339,10 @@
uni.hideLoading() uni.hideLoading()
console.log('获取完工页详情 失败') console.log('获取完工页详情 失败')
console.log(e) console.log(e)
uni.showToast({
icon:'none',
title:'获取完工页详情失败'
})
} }
}) })
}, },
...@@ -405,121 +410,130 @@ ...@@ -405,121 +410,130 @@
//点击类 事件处理 //点击类 事件处理
clickTypeClick: function (item,ikey) { clickTypeClick: function (item,ikey) {
console.log('点击类 点击')
console.log(ikey)
console.log(item.fieldsTitle)
console.log(item.fieldsType)
//开关类Cell clearTimeout(this.TimeID);
//服务措施 SERVICE_MEASURES this.TimeID = setTimeout(() => {
if(item.fieldsType == 'SERVICE_MEASURES'){
} console.log('点击类 点击')
console.log(ikey)
//点击类Cell console.log(item.fieldsTitle)
//产品规格 SPECIFICATIONS: console.log(item.fieldsType)
//产品型号 PRODUCT_NUMBER
//机器条码 MACHINE_CODE
//日期 DATE
//服务措施 SERVICE_MEASURES
//网页 WEBPAGE (海尔需求 新增 网页类型)
//单选 RADIO (后新增)
//多选 CHECKBOX (后新增)
//RADIO_BIG (后新增)
//CHECKBOX_BIG (后新增)
//产品规格 SPECIFICATIONS:
if(item.fieldsType == 'SPECIFICATIONS'){
this.getSPECIFICATIONSinfo()
}
//产品型号 PRODUCT_NUMBER
if(item.fieldsType == 'PRODUCT_NUMBER'){
this.getPRODUCT_NUMBERinfo()
}
//机器条码 MACHINE_CODE
if(item.fieldsType == 'MACHINE_CODE'){
this.scanCode(item,ikey)
}
//日期 DATE
if(item.fieldsType == 'DATE'){
this.selectDate(item,ikey)
}
//服务措施 SERVICE_MEASURES
if(item.fieldsType == 'SERVICE_MEASURES'){
this.goToMeasure(item,ikey)
}
//网页 WEBPAGE (海尔需求 新增 网页类型)
if(item.fieldsType == 'WEBPAGE'){
} //开关类Cell
//服务措施 SERVICE_MEASURES
//单选 RADIO (后新增) if(item.fieldsType == 'SERVICE_MEASURES'){
if(item.fieldsType == 'RADIO'){
}
} //点击类Cell
//产品规格 SPECIFICATIONS:
//多选 CHECKBOX (后新增) //产品型号 PRODUCT_NUMBER
if(item.fieldsType == 'CHECKBOX'){ //机器条码 MACHINE_CODE
//日期 DATE
//服务措施 SERVICE_MEASURES
//网页 WEBPAGE (海尔需求 新增 网页类型)
//单选 RADIO (后新增)
//多选 CHECKBOX (后新增)
//RADIO_BIG (后新增)
//CHECKBOX_BIG (后新增)
} //产品规格 SPECIFICATIONS:
if(item.fieldsType == 'SPECIFICATIONS'){
//RADIO_BIG (后新增) this.getSPECIFICATIONSinfo()
if(item.fieldsType == 'RADIO_BIG'){ }
} //产品型号 PRODUCT_NUMBER
if(item.fieldsType == 'PRODUCT_NUMBER'){
//CHECKBOX_BIG (后新增) this.getPRODUCT_NUMBERinfo()
if(item.fieldsType == 'CHECKBOX_BIG'){ }
//机器条码 MACHINE_CODE
if(item.fieldsType == 'MACHINE_CODE'){
this.scanCode(item,ikey)
}
//日期 DATE
if(item.fieldsType == 'DATE'){
this.selectDate(item,ikey)
}
//服务措施 SERVICE_MEASURES
if(item.fieldsType == 'SERVICE_MEASURES'){
this.goToMeasure(item,ikey)
}
//网页 WEBPAGE (海尔需求 新增 网页类型)
if(item.fieldsType == 'WEBPAGE'){
}
//单选 RADIO (后新增)
if(item.fieldsType == 'RADIO'){
}
//多选 CHECKBOX (后新增)
if(item.fieldsType == 'CHECKBOX'){
}
//RADIO_BIG (后新增)
if(item.fieldsType == 'RADIO_BIG'){
}
//CHECKBOX_BIG (后新增)
if(item.fieldsType == 'CHECKBOX_BIG'){
}
/*
//开关类Cell
//服务措施 SERVICE_MEASURES
//点击类Cell
//产品规格 SPECIFICATIONS:
//产品型号 PRODUCT_NUMBER
//机器条码 MACHINE_CODE
//日期 DATE
//服务措施 SERVICE_MEASURES
//网页 WEBPAGE (海尔需求 新增 网页类型)
//单选 RADIO (后新增)
//多选 CHECKBOX (后新增)
//RADIO_BIG (后新增)
//CHECKBOX_BIG (后新增)
//机器条码Cell
//机器条码 MACHINE_CODE
//输入栏类Cell
//整数 INTEGER
//金额 DECIMAL
//小数(保留两位小数) DOUBLE
//字符串(单行) STRING
//文件 FILE (后新增)
//安装卡号 ICN (后新增)
//配件Cell
//PARTS
//照片Cell
//PHOTOS
//服务内容Cell
//文本(多行) TEXT
*/
}
/*
//开关类Cell
//服务措施 SERVICE_MEASURES
//点击类Cell
//产品规格 SPECIFICATIONS:
//产品型号 PRODUCT_NUMBER
//机器条码 MACHINE_CODE
//日期 DATE
//服务措施 SERVICE_MEASURES
//网页 WEBPAGE (海尔需求 新增 网页类型)
//单选 RADIO (后新增)
//多选 CHECKBOX (后新增)
//RADIO_BIG (后新增)
//CHECKBOX_BIG (后新增)
//机器条码Cell }, 1000);
//机器条码 MACHINE_CODE
//输入栏类Cell
//整数 INTEGER
//金额 DECIMAL
//小数(保留两位小数) DOUBLE
//字符串(单行) STRING
//文件 FILE (后新增)
//安装卡号 ICN (后新增)
//配件Cell
//PARTS
//照片Cell
//PHOTOS
//服务内容Cell
//文本(多行) TEXT
*/
}, },
...@@ -802,15 +816,20 @@ ...@@ -802,15 +816,20 @@
//照片 点击 //照片 点击
photoClick: function (item,ikey) { photoClick: function (item,ikey) {
console.log('照片点击') clearTimeout(this.TimeID);
console.log(item) this.TimeID = setTimeout(() => {
console.log(ikey) console.log('照片点击')
console.log(item)
console.log(ikey)
if(ikey == 0){
this.addPhoto()
}else{
this.previewImage(ikey)
}
}, 1000);
if(ikey == 0){
this.addPhoto()
}else{
this.previewImage(ikey)
}
}, },
//照片预览 //照片预览
...@@ -1068,11 +1087,17 @@ ...@@ -1068,11 +1087,17 @@
confirmClick: function () { confirmClick: function () {
console.log('确认完工 点击')
//this.photoUpload() clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => {
console.log('确认完工 点击')
//this.photoUpload()
this.checkAllRequired()
}, 1000);
this.checkAllRequired()
}, },
......
...@@ -133,7 +133,8 @@ ...@@ -133,7 +133,8 @@
//{title:'已完成',type:5}, //{title:'已完成',type:5},
], ],
currentOrderType: 0, currentOrderType: 0,
currentOrderTypeTitle:'全部' currentOrderTypeTitle:'全部',
TimeID:-1
} }
}, },
...@@ -142,6 +143,14 @@ ...@@ -142,6 +143,14 @@
this.icon_noData = getApp().globalData.icon_noData this.icon_noData = getApp().globalData.icon_noData
//this.getToken() //this.getToken()
this.datetime = this.getTime()
console.log('当前时间:'+this.datetime)
var yuyueDate = this.formatDate(1608249600000)
console.log('预约时间:'+yuyueDate)
}, },
onShow() { onShow() {
...@@ -295,9 +304,9 @@ ...@@ -295,9 +304,9 @@
//getApp().globalData.workOrderList //getApp().globalData.workOrderList
//获取工单列表 //获取工单列表
getOrderList: function (type) { getOrderList: function (type) {
uni.showLoading({ // uni.showLoading({
title:'加载中' // title:'加载中'
}) // })
uni.request({ uni.request({
url: getApp().globalData.domain_Name url: getApp().globalData.domain_Name
+'/wxh-worker-rest/rest/order/revision/applets/' +'/wxh-worker-rest/rest/order/revision/applets/'
...@@ -306,7 +315,7 @@ ...@@ -306,7 +315,7 @@
data: { data: {
type:type, type:type,
pageNumber:0, pageNumber:0,
pageSize:10, pageSize:20,
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
...@@ -364,61 +373,57 @@ ...@@ -364,61 +373,57 @@
}, },
itemClick: function (item) { itemClick: function (item) {
console.log(item.statusText)
console.log(item.orderId)
if(this.activeTop==0){//抢单市场 clearTimeout(this.TimeID);
if(item.statusText=='待抢单'){ this.TimeID = setTimeout(() => {
/* console.log(item.statusText)
contactName:'', console.log(item.orderId)
contactMobilephone:'', if(this.activeTop==0){//抢单市场
contactAddress:'', if(item.statusText=='待抢单'){
inGuaranteePeriodText:'',
orderServiceType:'',
brandName:'',
categoryName:'',
statusText:'',
serviceContent:'',
createDatetime:'',
*/
uni.navigateTo({
url: '/pages/take/rob'
+'?orderId='+item.orderId
+'&contactName='+item.contactName
+'&contactMobilephone='+item.contactMobilephone
+'&contactAddress='+item.contactAddress
+'&inGuaranteePeriodText='+item.inGuaranteePeriodText
+'&orderServiceType='+item.orderServiceType
+'&brandName='+item.brandName
+'&categoryName='+item.categoryName
+'&statusText='+item.statusText
+'&serviceContent='+item.serviceContent
+'&createDatetime='+item.createDatetime
uni.navigateTo({
url: '/pages/take/rob'
+'?orderId='+item.orderId
+'&contactName='+item.contactName
+'&contactMobilephone='+item.contactMobilephone
+'&contactAddress='+item.contactAddress
+'&inGuaranteePeriodText='+item.inGuaranteePeriodText
+'&orderServiceType='+item.orderServiceType
+'&brandName='+item.brandName
+'&categoryName='+item.categoryName
+'&statusText='+item.statusText
+'&serviceContent='+item.serviceContent
+'&createDatetime='+item.createDatetime
})
}else{
uni.navigateTo({
url: '/pages/take/detail'
+'?orderId='+item.orderId
+'$isBottomShow='+false,
})
}
}
if(this.activeTop==1){
uni.navigateTo({
url: '/pages/take/detail'
+'?orderId='+item.orderId,
}) })
}else{ }
if(this.activeTop==2){
uni.navigateTo({ uni.navigateTo({
url: '/pages/take/detail' url: '/pages/take/detail'
+'?orderId='+item.orderId +'?orderId='+item.orderId,
+'$isBottomShow='+false,
}) })
} }
}
if(this.activeTop==1){ }, 1000);
uni.navigateTo({
url: '/pages/take/detail'
+'?orderId='+item.orderId,
})
}
if(this.activeTop==2){
uni.navigateTo({
url: '/pages/take/detail'
+'?orderId='+item.orderId,
})
}
}, },
...@@ -437,15 +442,23 @@ ...@@ -437,15 +442,23 @@
//时间选择器 选择 //时间选择器 选择
onSelected: function (e) {//选择 onSelected: function (e) {//选择
this.showPicker = false;
if(e) { clearTimeout(this.TimeID);
this[this.type] = e.value; this.TimeID = setTimeout(() => {
this.showPicker = false;
if(e) {
this[this.type] = e.value;
this.bookPost(e.value) this.bookPost(e.value)
//选择的值 //选择的值
console.log('value => '+ e.value); console.log('value => '+ e.value);
//原始的Date对象 //原始的Date对象
console.log('date => ' + e.date); console.log('date => ' + e.date);
} }
}, 1000);
}, },
//预约请求 //预约请求
...@@ -487,6 +500,7 @@ ...@@ -487,6 +500,7 @@
icon:'none', icon:'none',
title:'预约成功' title:'预约成功'
}) })
console.log('是不是预约成功了?')
that.getOrderList(0) that.getOrderList(0)
}else{ }else{
uni.showToast({ uni.showToast({
...@@ -510,7 +524,7 @@ ...@@ -510,7 +524,7 @@
//时间戳转换成日期时间 //时间戳转换成日期时间
formatDate: function(value) { formatDate: function(value) {
var date = new Date(); var date = new Date();
//date.setTime(value); date.setTime(value);
var month = date.getMonth() + 1; var month = date.getMonth() + 1;
var hours = date.getHours(); var hours = date.getHours();
if (hours < 10) if (hours < 10)
...@@ -521,7 +535,23 @@ ...@@ -521,7 +535,23 @@
var time = date.getFullYear() + "-" + month + "-" + date.getDate() + var time = date.getFullYear() + "-" + month + "-" + date.getDate() +
" " + hours + ":" + minutes; " " + hours + ":" + minutes;
return time; return time;
} },
//获取当前时间
getTime:function(){
var date = new Date(),
year = date.getFullYear(),
month = date.getMonth() + 1,
day = date.getDate(),
hour = date.getHours() < 10 ? "0" + date.getHours() : date.getHours(),
minute = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
second = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
month >= 1 && month <= 9 ? (month = "0" + month) : "";
day >= 0 && day <= 9 ? (day = "0" + day) : "";
var timer = year + '/' + month + '/' + day + ' ' + hour + ':' + minute + ':' + second;
return timer;
},
......
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
statusText:'', statusText:'',
serviceContent:'', serviceContent:'',
createDatetime:'', createDatetime:'',
TimeID:-1
} }
}, },
...@@ -211,8 +212,15 @@ ...@@ -211,8 +212,15 @@
}, },
robClick: function (item) { robClick: function (item) {
console.log('抢单 点击')
this.checkUserStatus() clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => {
console.log('抢单 点击')
this.checkUserStatus()
}, 1000);
}, },
...@@ -338,20 +346,26 @@ ...@@ -338,20 +346,26 @@
//确认按钮 //确认按钮
modalConfirm: function (data) { modalConfirm: function (data) {
//1不是师傅 clearTimeout(this.TimeID);
if(data==1){ this.TimeID = setTimeout(() => {
this.enterNow() //1不是师傅
} if(data==1){
this.enterNow()
}
//2没有认证通过
if(data==2){
this.completeNow()
}
//3技能不匹配
if(data==3){
//this.completeNow()
this.contactService()
}
//2没有认证通过 }, 1000);
if(data==2){
this.completeNow()
}
//3技能不匹配
if(data==3){
this.contactService()
}
}, },
//立即入驻 //立即入驻
...@@ -411,15 +425,21 @@ ...@@ -411,15 +425,21 @@
icon:'none', icon:'none',
title:'抢单成功' title:'抢单成功'
}) })
uni.navigateBack({})
uni.navigateTo({
url: '/pages/take/detail'
+'?orderId='+this.orderId,
})
}else{ }else{
// uni.showToast({ // uni.showToast({
// icon:'none', // icon:'none',
// title:res.data.message // title:res.data.message
// }) // })
console.log('抢单不为200时候')
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:res.message title:res.data.message
}) })
...@@ -443,7 +463,7 @@ ...@@ -443,7 +463,7 @@
//时间戳转换成日期时间 //时间戳转换成日期时间
formatDate: function(value) { formatDate: function(value) {
var date = new Date(); var date = new Date();
//date.setTime(value); date.setTime(value);
var month = date.getMonth() + 1; var month = date.getMonth() + 1;
var hours = date.getHours(); var hours = date.getHours();
if (hours < 10) if (hours < 10)
......
<template> <template>
<view class=""> <view class="">
<web-view src="https://system.banshouhui.com/weixiuapp/site/index.html#/?pioneerId=40"></web-view> <web-view :src="webUrl"></web-view>
</view> </view>
</template> </template>
...@@ -8,13 +8,15 @@ ...@@ -8,13 +8,15 @@
export default { export default {
data() { data() {
return { return {
activeService:'家电服务', webUrl:''
count:'3',
phone:'400-8834-123'
} }
}, },
onLoad(e) { onLoad(e) {
//https://system.banshouhui.com/weixiuapp/site/index.html#/?pioneerId=40
this.webUrl = getApp().globalData.domain_Name
+ '/weixiuapp/site/index.html#/?pioneerId=40'
console.log(this.webUrl)
}, },
methods: { methods: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment