Skip to content

T
take_order
Commit 32b684f2 authored by 和慭琛's avatar 和慭琛
Browse files
Options

1.0.0 正式环境 提交审核版本

parent 6ce387b0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 386 additions and 365 deletions
take-order/App.vue
View file @ 32b684f2
...@@ -14,8 +14,11 @@ ...@@ -14,8 +14,11 @@
//https://system.banshouhui.com //https://system.banshouhui.com
//https://system.dev.banshouhui.com //https://system.dev.banshouhui.com
//正式环境
domain_Name: 'https://system.banshouhui.com',
//测试环境 //测试环境
domain_Name: 'https://system.dev.banshouhui.com', //domain_Name: 'https://system.dev.banshouhui.com',
//http://192.168.0.208:8192 //http://192.168.0.208:8192
//小青本地环境 //小青本地环境
...@@ -101,12 +104,12 @@ ...@@ -101,12 +104,12 @@
uni.getStorage({ uni.getStorage({
key: 'token', key: 'token',
success: function (res) { success: function (res) {
console.log('本地获取token成功') // console.log('本地获取token成功')
console.log(res.data); // console.log(res.data);
that.globalData.token = res.data that.globalData.token = res.data
that.initAPIneedToken() that.initAPIneedToken()
console.log('当前token',that.token) // console.log('当前token',that.token)
} }
}) })
...@@ -117,7 +120,7 @@ ...@@ -117,7 +120,7 @@
}, },
onShow: function() { onShow: function() {
console.log('App Show') //console.log('App Show')
...@@ -142,38 +145,38 @@ ...@@ -142,38 +145,38 @@
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502 //RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
///* ///*
if(this.globalData.token){ if(this.globalData.token){
console.log('initAPIneedToken') //console.log('initAPIneedToken')
//下单模块-- //下单模块--
//立即下单 //立即下单
this.globalData.createAppletsOrder = '/wxh-worker-rest/rest/order/revision/applets/' this.globalData.createAppletsOrder = '/wxh-worker-rest/rest/order/revision/applets/'
+this.globalData.token+'/order/createAppletsOrder', +this.globalData.token+'/order/createAppletsOrder',
console.log('立即下单'+this.globalData.createAppletsOrder) //console.log('立即下单'+this.globalData.createAppletsOrder)
//下单列表 //下单列表
this.globalData.createOrderList = '/wxh-worker-rest/rest/order/revision/applets/' this.globalData.createOrderList = '/wxh-worker-rest/rest/order/revision/applets/'
+this.globalData.token+'/order/customer' +this.globalData.token+'/order/customer'
console.log('下单列表'+this.globalData.createOrderList) //console.log('下单列表'+this.globalData.createOrderList)
//接单模块-- //接单模块--
//抢单广场 //抢单广场
this.globalData.grabbing = '/wxh-worker-rest/rest/order/revision/applets/' this.globalData.grabbing = '/wxh-worker-rest/rest/order/revision/applets/'
+this.globalData.token+'/order/grabbing' +this.globalData.token+'/order/grabbing'
console.log('抢单广场'+this.globalData.grabbing) //console.log('抢单广场'+this.globalData.grabbing)
//检查抢单用户状态 //检查抢单用户状态
this.globalData.checkRobStatus = '/wxh-worker-rest/rest/order/revision/applets/' this.globalData.checkRobStatus = '/wxh-worker-rest/rest/order/revision/applets/'
+this.globalData.token+'/order/check', +this.globalData.token+'/order/check',
console.log('检查抢单用户状态'+this.globalData.checkRobStatus) //console.log('检查抢单用户状态'+this.globalData.checkRobStatus)
//工单列表 //工单列表
this.globalData.workOrderList = '/wxh-worker-rest/rest/order/revision/applets/' this.globalData.workOrderList = '/wxh-worker-rest/rest/order/revision/applets/'
+this.globalData.token+'/order/worker', +this.globalData.token+'/order/worker',
console.log('工单列表'+this.globalData.workOrderList) //console.log('工单列表'+this.globalData.workOrderList)
//工单详情 //工单详情
this.globalData.workOrderDetail = '/wxh-worker-rest/rest/order/revision/applets/' this.globalData.workOrderDetail = '/wxh-worker-rest/rest/order/revision/applets/'
+this.globalData.token+'/order/detail', +this.globalData.token+'/order/detail',
console.log('工单详情'+this.globalData.workOrderDetail) //console.log('工单详情'+this.globalData.workOrderDetail)
//预约 V2 //预约 V2
this.globalData.orderReserve = '/wxh-worker-rest/rest/project/order/reserve/' this.globalData.orderReserve = '/wxh-worker-rest/rest/project/order/reserve/'
+ this.globalData.token, + this.globalData.token,
console.log('预约 V2'+this.globalData.orderReserve) //console.log('预约 V2'+this.globalData.orderReserve)
//工单完工 //工单完工
this.globalData.configCompletion = '' this.globalData.configCompletion = ''
///wxh-worker-rest/rest/config/RTOKEN222bdab78b0d2a74f159b640df53180772813250/completion/11885887?inGuaranteePeriod=true ///wxh-worker-rest/rest/config/RTOKEN222bdab78b0d2a74f159b640df53180772813250/completion/11885887?inGuaranteePeriod=true
......
take-order/pages.json
View file @ 32b684f2
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
*/ */
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
......
take-order/pages/index/index.vue
View file @ 32b684f2
...@@ -243,10 +243,10 @@ ...@@ -243,10 +243,10 @@
let that = this let that = this
uni.chooseLocation({ uni.chooseLocation({
success: function (res) { success: function (res) {
console.log('位置名称：' + res.name); // console.log('位置名称：' + res.name);
console.log('详细地址：' + res.address); // console.log('详细地址：' + res.address);
console.log('纬度：' + res.latitude); // console.log('纬度：' + res.latitude);
console.log('经度：' + res.longitude); // console.log('经度：' + res.longitude);
that.isClean = false that.isClean = false
that.location = res.name that.location = res.name
that.address = res.address that.address = res.address
...@@ -262,13 +262,13 @@ ...@@ -262,13 +262,13 @@
//产品类型 点击 //产品类型 点击
productTypeClick: function (item) { productTypeClick: function (item) {
this.activeProduct = item.title this.activeProduct = item.title
console.log(item.title) // console.log(item.title)
}, },
//服务类型 点击 //服务类型 点击
serviceTypeClick: function (item) { serviceTypeClick: function (item) {
this.activeService = item.title this.activeService = item.title
console.log(item.title) // console.log(item.title)
}, },
//勾选点击 //勾选点击
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
this.TimeID = setTimeout(() => { this.TimeID = setTimeout(() => {
*/ */
this.isAgree = !isAgree this.isAgree = !isAgree
console.log(this.isAgree) // console.log(this.isAgree)
/* /*
}, 1000); }, 1000);
*/ */
...@@ -294,8 +294,8 @@ ...@@ -294,8 +294,8 @@
uni.getStorage({ uni.getStorage({
key: 'protocolPath', key: 'protocolPath',
success: function (res) { success: function (res) {
console.log('本地获取 服务协议路径 成功') // console.log('本地获取 服务协议路径 成功')
console.log(res.data); // console.log(res.data);
that.openProtocol(res.data) that.openProtocol(res.data)
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
clearTimeout(this.TimeID); clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => { this.TimeID = setTimeout(() => {
*/ */
console.log('服务协议 点击') // console.log('服务协议 点击')
let that = this let that = this
uni.showLoading({ uni.showLoading({
title:'加载中' title:'加载中'
...@@ -333,14 +333,14 @@ ...@@ -333,14 +333,14 @@
title:'打开中' title:'打开中'
}) })
console.log('下载成功'); //console.log('下载成功');
that.saveProtocolPath(res.tempFilePath) that.saveProtocolPath(res.tempFilePath)
} }
}, },
fail(res) { fail(res) {
console.log('打开服务协议失败') //console.log('打开服务协议失败')
console.log(res) //console.log(res)
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
key: 'protocolPath', key: 'protocolPath',
data: filePath, data: filePath,
success: function (e) { success: function (e) {
console.log('保存 服务协议 成功'+e); //console.log('保存 服务协议 成功'+e);
that.openProtocol(filePath) that.openProtocol(filePath)
} }
}); });
...@@ -469,8 +469,8 @@ ...@@ -469,8 +469,8 @@
this.TimeID = setTimeout(() => { this.TimeID = setTimeout(() => {
*/ */
console.log('立即下单') //console.log('立即下单')
console.log(getApp().globalData.token) //console.log(getApp().globalData.token)
this.checkAllInput() this.checkAllInput()
...@@ -514,12 +514,12 @@ ...@@ -514,12 +514,12 @@
//非空判断 //非空判断
checkAllInput: function () { checkAllInput: function () {
this.isAllInput = false this.isAllInput = false
console.log('下单前的 联系人：'+this.name+'字符串长度:'+this.name.length) //console.log('下单前的 联系人：'+this.name+'字符串长度:'+this.name.length)
console.log('下单前的 联系人电话：'+this.phone+'字符串长度:'+this.phone.length) //console.log('下单前的 联系人电话：'+this.phone+'字符串长度:'+this.phone.length)
console.log('下单前的 地址：'+this.address+'字符串长度:'+this.address.length) //console.log('下单前的 地址：'+this.address+'字符串长度:'+this.address.length)
console.log('下单前的 产品类型：'+this.activeProduct+'字符串长度:'+this.activeProduct.length) //console.log('下单前的 产品类型：'+this.activeProduct+'字符串长度:'+this.activeProduct.length)
console.log('下单前的 服务类型：'+this.activeService+'字符串长度:'+this.activeService.length) //console.log('下单前的 服务类型：'+this.activeService+'字符串长度:'+this.activeService.length)
console.log('下单前的 服务需求：'+this.demandContent+'字符串长度:'+this.demandContent.length) //console.log('下单前的 服务需求：'+this.demandContent+'字符串长度:'+this.demandContent.length)
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
...@@ -535,13 +535,13 @@ ...@@ -535,13 +535,13 @@
//客户报单接口 //客户报单接口
createAppletsOrder: async function() { createAppletsOrder: async function() {
console.log('是否已填所有必填项：'+this.isAllInput) //console.log('是否已填所有必填项：'+this.isAllInput)
console.log('联系人：'+this.name) //console.log('联系人：'+this.name)
console.log('联系电话：'+this.phone) //console.log('联系电话：'+this.phone)
console.log('地址：'+this.address) //console.log('地址：'+this.address)
console.log('品类：'+this.activeProduct) //console.log('品类：'+this.activeProduct)
console.log('服务类型：'+this.activeService) //console.log('服务类型：'+this.activeService)
console.log('服务备注：'+this.demandContent) //console.log('服务备注：'+this.demandContent)
uni.showLoading({ uni.showLoading({
title:'请稍候' title:'请稍候'
}) })
...@@ -571,8 +571,8 @@ ...@@ -571,8 +571,8 @@
}, },
success: (res) => { success: (res) => {
console.log('客户报单接口 成功') //console.log('客户报单接口 成功')
console.log(res) //console.log(res)
uni.hideLoading() uni.hideLoading()
if(res.statusCode==401){ if(res.statusCode==401){
...@@ -609,8 +609,8 @@ ...@@ -609,8 +609,8 @@
icon:'none', icon:'none',
title:'下单失败' title:'下单失败'
}) })
console.log('客户报单接口 失败') //console.log('客户报单接口 失败')
console.log(e) //console.log(e)
} }
}) })
}, },
...@@ -625,11 +625,11 @@ ...@@ -625,11 +625,11 @@
success(res) { success(res) {
if (res.confirm) { if (res.confirm) {
//调用订阅消息 //调用订阅消息
console.log('用户点击 确定'); //console.log('用户点击 确定');
//调用订阅 //调用订阅
that.getSubSubscribeMessage(); that.getSubSubscribeMessage();
}else if (res.cancel) { }else if (res.cancel) {
console.log('用户点击 拒绝'); //console.log('用户点击 拒绝');
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/success'+'?activeService='+that.activeService url: '/pages/index/success'+'?activeService='+that.activeService
}) })
...@@ -650,8 +650,8 @@ ...@@ -650,8 +650,8 @@
'3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU', '3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU',
'3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU'], '3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU'],
success (res) { success (res) {
console.log('请求订阅信息 成功：') //console.log('请求订阅信息 成功：')
console.log(res) //console.log(res)
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/success'+'?activeService='+that.activeService url: '/pages/index/success'+'?activeService='+that.activeService
...@@ -660,8 +660,8 @@ ...@@ -660,8 +660,8 @@
}, },
fail (res){ fail (res){
console.log('请求订阅信息 失败：') //console.log('请求订阅信息 失败：')
console.log(res) //console.log(res)
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/success'+'?activeService='+that.activeService url: '/pages/index/success'+'?activeService='+that.activeService
}) })
...@@ -686,8 +686,8 @@ ...@@ -686,8 +686,8 @@
let pages = getCurrentPages(); let pages = getCurrentPages();
let currPage = pages[pages.length-1]; let currPage = pages[pages.length-1];
console.log('是否清除：') //console.log('是否清除：')
console.log(currPage.data.isClean) //console.log(currPage.data.isClean)
if (currPage.data.isClean == true){//这就是传递的参数 if (currPage.data.isClean == true){//这就是传递的参数
this.name = '', this.name = '',
this.phone = '', this.phone = '',
...@@ -815,7 +815,7 @@ ...@@ -815,7 +815,7 @@
} }
.borderBottom{ .borderBottom{
border-bottom: 2rpx solid #CCCCCC; border-bottom: 1rpx solid #CCCCCC;
} }
.itemTitle { .itemTitle {
......
take-order/pages/index/protocol.vue
View file @ 32b684f2
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
onLoad(e) { onLoad(e) {
if(e && e.activeService && e.activeService.length>0){ if(e && e.activeService && e.activeService.length>0){
console.log(e.activeService) //console.log(e.activeService)
this.activeService = e.activeService this.activeService = e.activeService
} }
}, },
......
take-order/pages/index/record.vue
View file @ 32b684f2
...@@ -122,8 +122,8 @@ ...@@ -122,8 +122,8 @@
await uni.getStorage({ await uni.getStorage({
key: 'token', key: 'token',
success: function (res) { success: function (res) {
console.log('本地获取token成功') //console.log('本地获取token成功')
console.log(res.data); // console.log(res.data);
getApp().globalData.token = res.data getApp().globalData.token = res.data
that.createOrderList() that.createOrderList()
...@@ -162,8 +162,8 @@ ...@@ -162,8 +162,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('获取下单列表 成功') // console.log('获取下单列表 成功')
console.log(res) // console.log(res)
if(res.statusCode==401){ if(res.statusCode==401){
uni.navigateTo({ uni.navigateTo({
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
} }
if(res.data.code==200){ if(res.data.code==200){
console.log('code=200') // console.log('code=200')
this.handleList(res) this.handleList(res)
}else{ }else{
...@@ -193,8 +193,8 @@ ...@@ -193,8 +193,8 @@
icon:'none', icon:'none',
title:'获取下单列表失败' title:'获取下单列表失败'
}) })
console.log('获取下单列表 失败') // console.log('获取下单列表 失败')
console.log(e) // console.log(e)
} }
}) })
}, },
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
//未完工 //未完工
if(this.activeTop == 0){ if(this.activeTop == 0){
console.log('未完工') //console.log('未完工')
if(this.unfinishList && this.unfinishList.length==0){ if(this.unfinishList && this.unfinishList.length==0){
this.unfinishList = res.data.data.list this.unfinishList = res.data.data.list
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
} }
//已完工 //已完工
if(this.activeTop == 1){ if(this.activeTop == 1){
console.log('已完工') // console.log('已完工')
if(this.finishList && this.finishList.length==0){ if(this.finishList && this.finishList.length==0){
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
//拨打电话 //拨打电话
callClick: function (phone) { callClick: function (phone) {
console.log(phone) //console.log(phone)
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: phone phoneNumber: phone
}); });
......
take-order/pages/index/success.vue
View file @ 32b684f2
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
</view> </view>
<view class="bigView"> <view class="bigView">
<text class="u-font-36 u-p-b-10">已发给</text> <text class="u-font-36 u-p-b-10">已发给</text>
<text class="countText u-p-l-20 u-p-r-20" v-if="count<21">{{count}}</text> <text class="countText u-p-l-20 u-p-r-20" v-if="!isOver20">{{count}}</text>
<text class="countText u-p-l-20 u-p-r-20" v-if=" count>20 || count == 20 ">20+</text> <text class="countText u-p-l-20 u-p-r-20" v-if="isOver20">20+</text>
<text class="u-font-36 u-p-b-10">位师傅</text> <text class="u-font-36 u-p-b-10">位师傅</text>
</view> </view>
<!--view class="textBackView height_92 u-m-t-80 u-row"> <!--view class="textBackView height_92 u-m-t-80 u-row">
...@@ -46,13 +46,14 @@ ...@@ -46,13 +46,14 @@
activeService:'家电服务', activeService:'家电服务',
count:3, count:3,
phone:'400-8834-123', phone:'400-8834-123',
TimeID:-1 TimeID:-1,
isOver20:false
} }
}, },
onLoad(e) { onLoad(e) {
if(e && e.activeService && e.activeService.length>0){ if(e && e.activeService && e.activeService.length>0){
console.log(e.activeService) //console.log(e.activeService)
this.activeService = e.activeService this.activeService = e.activeService
} }
...@@ -60,7 +61,7 @@ ...@@ -60,7 +61,7 @@
}, },
onBackPress() { onBackPress() {
console.log('返回按钮') //console.log('返回按钮')
this.oneMoreClick() this.oneMoreClick()
}, },
...@@ -79,21 +80,22 @@ ...@@ -79,21 +80,22 @@
let that = this let that = this
var addCount = this.getRandomNumberByRange(1,3) var addCount = this.getRandomNumberByRange(1,3)
//Math.random(1,3).toFixed(0) //Math.random(1,3).toFixed(0)
console.log('每10秒加一次') // console.log('每10秒加一次')
console.log('加之前的addCount') // console.log('加之前的addCount')
console.log(addCount) // console.log(addCount)
console.log('加之前的this.count') // console.log('加之前的this.count')
console.log(this.count) // console.log(this.count)
this.count = this.count + addCount this.count = this.count + addCount
if(this.count >= 20){ if(this.count >= 20){
console.log('大于20了') this.isOver20 = true
console.log('加之后的this.count') // console.log('大于20了')
console.log(this.count) // console.log('加之后的this.count')
// console.log(this.count)
}else{ }else{
console.log('没大于20') // console.log('没大于20')
console.log('加之后的this.count') // console.log('加之后的this.count')
console.log(this.count) // console.log(this.count)
setTimeout(function() { setTimeout(function() {
that.addCount() that.addCount()
}, 10000); }, 10000);
...@@ -257,9 +259,9 @@ ...@@ -257,9 +259,9 @@
.topView{ .topView{
background-color: #FFFFFF; background-color: #FFFFFF;
width: 100%; width: 100%;
height: 386rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-bottom: 110rpx;
} }
.textBackView{ .textBackView{
......
take-order/pages/login/wxlogin.vue
View file @ 32b684f2
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
this.icon_notice = getApp().globalData.icon_auth_notice this.icon_notice = getApp().globalData.icon_auth_notice
this.icon_auth_notice_new = getApp().globalData.icon_auth_notice_new this.icon_auth_notice_new = getApp().globalData.icon_auth_notice_new
//this.domain_name = getApp().globalData.domain_Name //this.domain_name = getApp().globalData.domain_Name
console.log('当前域名：'+this.domain_name) //console.log('当前域名：'+this.domain_name)
}, },
methods: { methods: {
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
clearTimeout(this.TimeID); clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => { this.TimeID = setTimeout(() => {
console.log('获取用户信息') //console.log('获取用户信息')
console.log(e.detail.userInfo) //console.log(e.detail.userInfo)
if (e.detail.errMsg == 'getUserInfo:fail auth deny') { if (e.detail.errMsg == 'getUserInfo:fail auth deny') {
...@@ -106,9 +106,9 @@ ...@@ -106,9 +106,9 @@
//通过code获取用户信息（新接口） //通过code获取用户信息（新接口）
getUsersByCode: async function(code) { getUsersByCode: async function(code) {
console.log('通过code获取用户信息 请求接口：') //console.log('通过code获取用户信息 请求接口：')
console.log(getApp().globalData.domain_Name //console.log(getApp().globalData.domain_Name
+getApp().globalData.getUsersByCode) //+getApp().globalData.getUsersByCode)
uni.showLoading({ uni.showLoading({
title:'加载中' title:'加载中'
}) })
...@@ -122,8 +122,8 @@ ...@@ -122,8 +122,8 @@
code: code, code: code,
}, },
success: (res) => { success: (res) => {
console.log('通过code获取用户信息（新接口） 成功') //console.log('通过code获取用户信息（新接口） 成功')
console.log(res) //console.log(res)
if(res.data.code==200){ if(res.data.code==200){
this.unionID = res.data.data.user.unionid this.unionID = res.data.data.user.unionid
...@@ -158,8 +158,8 @@ ...@@ -158,8 +158,8 @@
}, },
fail: (e) => { fail: (e) => {
console.log('通过code获取用户信息（新接口） 失败') //console.log('通过code获取用户信息（新接口） 失败')
console.log(e) //console.log(e)
}, },
complete() { complete() {
uni.hideLoading() uni.hideLoading()
...@@ -169,12 +169,12 @@ ...@@ -169,12 +169,12 @@
//用户信息存本地 //用户信息存本地
saveUserInfo: async function(res) { saveUserInfo: async function(res) {
console.log('用户信息存本地 token:' +res.data.data.token); //console.log('用户信息存本地 token:' +res.data.data.token);
uni.setStorage({ uni.setStorage({
key: 'token', key: 'token',
data: res.data.data.token, data: res.data.data.token,
success: function (e) { success: function (e) {
console.log('保存token 成功'+e); //console.log('保存token 成功'+e);
} }
}); });
...@@ -197,8 +197,8 @@ ...@@ -197,8 +197,8 @@
clearTimeout(this.TimeID); clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => { this.TimeID = setTimeout(() => {
console.log('获取用户手机号') //console.log('获取用户手机号')
console.log(e.detail) //console.log(e.detail)
if (e.detail.errMsg == 'getPhoneNumber:fail user deny') { if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {
//this.$u.toast('未授权'); //this.$u.toast('未授权');
...@@ -237,8 +237,8 @@ ...@@ -237,8 +237,8 @@
'Content-Type': 'application/x-www-form-urlencoded' 'Content-Type': 'application/x-www-form-urlencoded'
}, },
success: (res) => { success: (res) => {
console.log('通过手机号获取用户信息 成功') //console.log('通过手机号获取用户信息 成功')
console.log(res) //console.log(res)
if(res.data.code==200){ if(res.data.code==200){
uni.showToast({ uni.showToast({
...@@ -259,8 +259,8 @@ ...@@ -259,8 +259,8 @@
}, },
fail: (e) => { fail: (e) => {
console.log('通过code获取用户信息（新接口） 失败') //console.log('通过code获取用户信息（新接口） 失败')
console.log(e) //console.log(e)
}, },
complete() { complete() {
uni.hideLoading() uni.hideLoading()
......
take-order/pages/take/detail.vue
View file @ 32b684f2
...@@ -138,9 +138,7 @@ ...@@ -138,9 +138,7 @@
return { return {
orderId:'', orderId:'',
orderInfo:{}, orderInfo:{},
photoList:[ photoList:[],
{image:''},{image:''},{image:''},{image:''},
],
domain_name:'', domain_name:'',
bottomTitle:'', bottomTitle:'',
isBottomShow:true, isBottomShow:true,
...@@ -183,7 +181,7 @@ ...@@ -183,7 +181,7 @@
} }
this.datetime = this.getTime() this.datetime = this.getTime()
console.log('当前时间：'+this.datetime) //console.log('当前时间：'+this.datetime)
...@@ -218,8 +216,8 @@ ...@@ -218,8 +216,8 @@
await uni.getStorage({ await uni.getStorage({
key: 'token', key: 'token',
success: function (res) { success: function (res) {
console.log('本地获取token成功') //console.log('本地获取token成功')
console.log(res.data); //console.log(res.data);
getApp().globalData.token = res.data getApp().globalData.token = res.data
that.getOrderDetail() that.getOrderDetail()
...@@ -240,9 +238,9 @@ ...@@ -240,9 +238,9 @@
//getApp().globalData.workOrderDetail //getApp().globalData.workOrderDetail
//获取工单详情 //获取工单详情
getOrderDetail: function () { getOrderDetail: function () {
console.log('获取工单详情:') //console.log('获取工单详情:')
console.log(getApp().globalData.domain_Name //console.log(getApp().globalData.domain_Name
+getApp().globalData.workOrderDetail) // +getApp().globalData.workOrderDetail)
uni.showLoading({ uni.showLoading({
title:'加载中' title:'加载中'
...@@ -258,8 +256,8 @@ ...@@ -258,8 +256,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('获取工单详情 成功') // console.log('获取工单详情 成功')
console.log(res) // console.log(res)
if(res.statusCode==401){ if(res.statusCode==401){
uni.navigateTo({ uni.navigateTo({
...@@ -288,8 +286,8 @@ ...@@ -288,8 +286,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('获取工单详情 失败') // console.log('获取工单详情 失败')
console.log(e) // console.log(e)
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:'获取工单详情失败' title:'获取工单详情失败'
...@@ -300,14 +298,14 @@ ...@@ -300,14 +298,14 @@
//照片 点击 //照片 点击
photoClick: function (item,ikey) { photoClick: function (item,ikey) {
console.log('照片 点击') // console.log('照片 点击')
console.log(item) // console.log(item)
console.log(ikey) // console.log(ikey)
clearTimeout(this.TimeID); clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => { this.TimeID = setTimeout(() => {
console.log('照片点击') // console.log('照片点击')
console.log(item) // console.log(item)
console.log(ikey) // console.log(ikey)
this.previewImage(item,ikey) this.previewImage(item,ikey)
...@@ -317,7 +315,7 @@ ...@@ -317,7 +315,7 @@
//照片预览 //照片预览
previewImage: function(item,ikey){ previewImage: function(item,ikey){
console.log('照片预览') //console.log('照片预览')
uni.previewImage({ uni.previewImage({
urls: [item], urls: [item],
current:ikey-1 current:ikey-1
...@@ -339,14 +337,28 @@ ...@@ -339,14 +337,28 @@
adjustPhotoList: function (images) { adjustPhotoList: function (images) {
var photoArray = images.split(',') var photoArray = images.split(',')
var newPhotoArray = [] var newPhotoArray = []
console.log('photoArray个数：' + photoArray.length)
photoArray.forEach(item => {
var lastOne = photoArray.length - 1
for (let i = 0; i < photoArray.length; i++) {
var item = photoArray[i]
var imageURL = getApp().globalData.domain_Name + '/wxh-sts-rest' + item var imageURL = getApp().globalData.domain_Name + '/wxh-sts-rest' + item
newPhotoArray.push(imageURL) console.log('imageURL：' + imageURL)
})
if(i != lastOne){
newPhotoArray.push(imageURL)
}
}
// photoArray.forEach(item => {
// var imageURL = getApp().globalData.domain_Name + '/wxh-sts-rest' + item
// console.log('imageURL：' + imageURL)
// newPhotoArray.push(imageURL)
// })
this.photoList = newPhotoArray this.photoList = newPhotoArray
console.log('照片数组：') //console.log('照片数组：')
console.log(this.photoList) //console.log(this.photoList)
}, },
phoneCallClick: function (phone) { phoneCallClick: function (phone) {
...@@ -356,7 +368,7 @@ ...@@ -356,7 +368,7 @@
}, },
bookClick: function () { bookClick: function () {
console.log('预约点击') //console.log('预约点击')
this.type = 'datetime' this.type = 'datetime'
this.showPicker = true; this.showPicker = true;
this.value = this['datetime']; this.value = this['datetime'];
...@@ -364,7 +376,7 @@ ...@@ -364,7 +376,7 @@
//时间选择器 选择 //时间选择器 选择
onShowDatePicker: function (type,item){//显示 onShowDatePicker: function (type,item){//显示
console.log('当前工单ID：'+item.orderId) //console.log('当前工单ID：'+item.orderId)
this.orderId = item.orderId this.orderId = item.orderId
this.type = type; this.type = type;
this.showPicker = true; this.showPicker = true;
...@@ -383,9 +395,9 @@ ...@@ -383,9 +395,9 @@
this[this.type] = e.value; 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); }, 1000);
...@@ -401,7 +413,7 @@ ...@@ -401,7 +413,7 @@
dateTime = dateTime.replace("/","-") dateTime = dateTime.replace("/","-")
dateTime = dateTime.replace("/","-") dateTime = dateTime.replace("/","-")
//2020/12/25 15:00:12 //2020/12/25 15:00:12
console.log('预约请求 dateTime'+dateTime) //console.log('预约请求 dateTime'+dateTime)
let that = this let that = this
uni.showLoading({ uni.showLoading({
title:'加载中' title:'加载中'
...@@ -423,8 +435,8 @@ ...@@ -423,8 +435,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('预约请求 成功') //console.log('预约请求 成功')
console.log(res) //console.log(res)
if(res.statusCode==200){ if(res.statusCode==200){
uni.showToast({ uni.showToast({
...@@ -445,8 +457,8 @@ ...@@ -445,8 +457,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('预约请求 失败') //console.log('预约请求 失败')
console.log(e) //console.log(e)
} }
}) })
}, },
...@@ -458,7 +470,7 @@ ...@@ -458,7 +470,7 @@
clearTimeout(this.TimeID); clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => { this.TimeID = setTimeout(() => {
console.log('退单点击') //console.log('退单点击')
this.isCancelShow = true this.isCancelShow = true
...@@ -471,9 +483,9 @@ ...@@ -471,9 +483,9 @@
//退单原因 确认选择 //退单原因 确认选择
cancelReasonOnConfirm(res,type){ cancelReasonOnConfirm(res,type){
this.result=res; this.result=res;
console.log('退单原因 确认选择') // console.log('退单原因 确认选择')
console.log(res.result) // console.log(res.result)
console.log(res.value) // console.log(res.value)
this.cancelPost(res.result) this.cancelPost(res.result)
...@@ -482,7 +494,7 @@ ...@@ -482,7 +494,7 @@
//退单原因 取消选择 //退单原因 取消选择
cancelReasonOnCancel(){ cancelReasonOnCancel(){
console.log('退单原因 取消选择') //console.log('退单原因 取消选择')
}, },
//退单请求 //退单请求
...@@ -506,8 +518,8 @@ ...@@ -506,8 +518,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('退单 成功') // console.log('退单 成功')
console.log(res) // console.log(res)
if(res.data.code==200){ if(res.data.code==200){
uni.showToast({ uni.showToast({
...@@ -532,8 +544,8 @@ ...@@ -532,8 +544,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('退单 失败') // console.log('退单 失败')
console.log(e) // console.log(e)
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:'退单失败', title:'退单失败',
...@@ -595,8 +607,8 @@ ...@@ -595,8 +607,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('接单请求 成功') // console.log('接单请求 成功')
console.log(res) // console.log(res)
if(res.statusCode==200){ if(res.statusCode==200){
uni.showToast({ uni.showToast({
...@@ -621,8 +633,8 @@ ...@@ -621,8 +633,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('接单请求 失败') // console.log('接单请求 失败')
console.log(e) // console.log(e)
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:'接单请求失败' title:'接单请求失败'
......
take-order/pages/take/finish.vue
View file @ 32b684f2
This diff is collapsed.
take-order/pages/take/index.vue
View file @ 32b684f2
...@@ -190,10 +190,10 @@ ...@@ -190,10 +190,10 @@
//this.getToken() //this.getToken()
this.datetime = this.getTime() this.datetime = this.getTime()
console.log('当前时间：'+this.datetime) //console.log('当前时间：'+this.datetime)
var yuyueDate = this.formatDate(1608249600000) var yuyueDate = this.formatDate(1608249600000)
console.log('预约时间：'+yuyueDate) //console.log('预约时间：'+yuyueDate)
}, },
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
}, },
onPullDownRefresh() { onPullDownRefresh() {
console.log('onPullDownRefresh') //console.log('onPullDownRefresh')
let that = this let that = this
setTimeout(function() { setTimeout(function() {
that.getData() that.getData()
...@@ -220,11 +220,11 @@ ...@@ -220,11 +220,11 @@
//底部加载更多 //底部加载更多
onReachBottom() { onReachBottom() {
console.log('onReachBottom') //console.log('onReachBottom')
let that = this let that = this
setTimeout(function() { setTimeout(function() {
that.pageNumber = that.pageNumber + 1 that.pageNumber = that.pageNumber + 1
console.log('底部加载更多 pageNumber'+ that.pageNumber) //console.log('底部加载更多 pageNumber'+ that.pageNumber)
that.getData() that.getData()
}, 1000); }, 1000);
...@@ -239,8 +239,8 @@ ...@@ -239,8 +239,8 @@
await uni.getStorage({ await uni.getStorage({
key: 'token', key: 'token',
success: function (res) { success: function (res) {
console.log('本地获取token成功') // console.log('本地获取token成功')
console.log(res.data); // console.log(res.data);
getApp().globalData.token = res.data getApp().globalData.token = res.data
that.getData() that.getData()
...@@ -297,9 +297,9 @@ ...@@ -297,9 +297,9 @@
//工单类型 选择 //工单类型 选择
typeItemClick: function(item){ typeItemClick: function(item){
this.isOrderTypeShow = false this.isOrderTypeShow = false
console.log('工单类型 选择') // console.log('工单类型 选择')
console.log(item.title) // console.log(item.title)
console.log(item.type) // console.log(item.type)
this.currentOrderTypeTitle = item.title this.currentOrderTypeTitle = item.title
this.currentOrderType = item.type this.currentOrderType = item.type
...@@ -313,9 +313,9 @@ ...@@ -313,9 +313,9 @@
//工单类型切换 确认选择 //工单类型切换 确认选择
orderTypeOnConfirm(res,type){ orderTypeOnConfirm(res,type){
this.result=res; this.result=res;
console.log('工单类型切换 确认选择') // console.log('工单类型切换 确认选择')
console.log(res.result) // console.log(res.result)
console.log(res.value) // console.log(res.value)
this.currentOrderTypeTitle = res.result this.currentOrderTypeTitle = res.result
this.currentOrderType = res.value this.currentOrderType = res.value
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
//产品规格 取消选择 //产品规格 取消选择
orderTypeOnCancel(){ orderTypeOnCancel(){
console.log('工单类型切换 取消选择') //console.log('工单类型切换 取消选择')
}, },
//获取数据 //获取数据
...@@ -393,9 +393,9 @@ ...@@ -393,9 +393,9 @@
success: (res) => { success: (res) => {
that.isLoading = false that.isLoading = false
uni.hideLoading() uni.hideLoading()
console.log('获取抢单广场列表 成功') // console.log('获取抢单广场列表 成功')
console.log(res.statusCode) // console.log(res.statusCode)
console.log(res) // console.log(res)
if(res.statusCode==401){ if(res.statusCode==401){
uni.navigateTo({ uni.navigateTo({
...@@ -422,8 +422,8 @@ ...@@ -422,8 +422,8 @@
fail: (e) => { fail: (e) => {
that.isLoading = false that.isLoading = false
uni.hideLoading() uni.hideLoading()
console.log('获取抢单广场列表 失败') // console.log('获取抢单广场列表 失败')
console.log(e) // console.log(e)
} }
}) })
}, },
...@@ -441,11 +441,11 @@ ...@@ -441,11 +441,11 @@
// }) // })
}else{ }else{
var newList = this.grabList; var newList = this.grabList;
console.log('前 newList:') // console.log('前 newList:')
console.log(newList) // console.log(newList)
newList = newList.concat(res.data.data.list) newList = newList.concat(res.data.data.list)
console.log('后 newList:') // console.log('后 newList:')
console.log(newList) // console.log(newList)
this.grabList = newList this.grabList = newList
} }
...@@ -472,8 +472,8 @@ ...@@ -472,8 +472,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('获取工单列表 成功') // console.log('获取工单列表 成功')
console.log(res) // console.log(res)
if(res.statusCode == 403){ if(res.statusCode == 403){
this.noDataTitle = '您没有权限操作' this.noDataTitle = '您没有权限操作'
...@@ -501,8 +501,8 @@ ...@@ -501,8 +501,8 @@
icon:'none', icon:'none',
title:'获取工单列表失败' title:'获取工单列表失败'
}) })
console.log('获取工单列表 失败') // console.log('获取工单列表 失败')
console.log(e) // console.log(e)
} }
}) })
}, },
...@@ -512,7 +512,7 @@ ...@@ -512,7 +512,7 @@
//已完工 //已完工
if(type == 5){ if(type == 5){
console.log('已完工') //console.log('已完工')
this.totalRight = res.data.data.total this.totalRight = res.data.data.total
...@@ -534,7 +534,7 @@ ...@@ -534,7 +534,7 @@
} }
}else{ }else{
console.log('中间') //console.log('中间')
this.totalMid = res.data.data.total this.totalMid = res.data.data.total
...@@ -563,14 +563,14 @@ ...@@ -563,14 +563,14 @@
bookClick: function (item) { bookClick: function (item) {
console.log(item.address) //console.log(item.address)
this.type = 'datetime' this.type = 'datetime'
this.showPicker = true; this.showPicker = true;
this.value = this['datetime']; this.value = this['datetime'];
}, },
callClick: function (phone) { callClick: function (phone) {
console.log(phone) //console.log(phone)
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: phone phoneNumber: phone
}); });
...@@ -582,8 +582,8 @@ ...@@ -582,8 +582,8 @@
clearTimeout(this.TimeID); clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => { this.TimeID = setTimeout(() => {
*/ */
console.log(item.statusText) //console.log(item.statusText)
console.log(item.orderId) //console.log(item.orderId)
if(this.activeTop==0){//抢单市场 if(this.activeTop==0){//抢单市场
if(item.statusText=='待抢单'){ if(item.statusText=='待抢单'){
...@@ -642,7 +642,7 @@ ...@@ -642,7 +642,7 @@
//时间选择器 选择 //时间选择器 选择
onShowDatePicker: function (type,item){//显示 onShowDatePicker: function (type,item){//显示
console.log('当前工单ID：'+item.orderId) //console.log('当前工单ID：'+item.orderId)
this.orderId = item.orderId this.orderId = item.orderId
this.type = type; this.type = type;
this.showPicker = true; this.showPicker = true;
...@@ -662,9 +662,9 @@ ...@@ -662,9 +662,9 @@
this[this.type] = e.value; 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); }, 1000);
...@@ -681,7 +681,7 @@ ...@@ -681,7 +681,7 @@
dateTime = dateTime.replace("/","-") dateTime = dateTime.replace("/","-")
dateTime = dateTime.replace("/","-") dateTime = dateTime.replace("/","-")
//2020/12/25 15:00:12 //2020/12/25 15:00:12
console.log('预约请求 dateTime'+dateTime) //console.log('预约请求 dateTime'+dateTime)
uni.showLoading({ uni.showLoading({
title:'加载中' title:'加载中'
}) })
...@@ -703,8 +703,8 @@ ...@@ -703,8 +703,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('预约请求 成功') //console.log('预约请求 成功')
console.log(res) //console.log(res)
if(res.statusCode==200){ if(res.statusCode==200){
uni.showToast({ uni.showToast({
...@@ -731,8 +731,8 @@ ...@@ -731,8 +731,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('预约请求 失败') //console.log('预约请求 失败')
console.log(e) //console.log(e)
} }
}) })
}, },
......
take-order/pages/take/measure.vue
View file @ 32b684f2
...@@ -78,9 +78,9 @@ ...@@ -78,9 +78,9 @@
//选项点击 //选项点击
itemClick: function (side,item) { itemClick: function (side,item) {
console.log('item 点击') // console.log('item 点击')
console.log(side) // console.log(side)
console.log(item) // console.log(item)
//左边 现象 //左边 现象
if(side == 0){ if(side == 0){
...@@ -130,8 +130,8 @@ ...@@ -130,8 +130,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('获取 故障现象 成功') // console.log('获取 故障现象 成功')
console.log(res) // console.log(res)
if(res.statusCode==200){ if(res.statusCode==200){
this.leftList = res.data this.leftList = res.data
...@@ -149,8 +149,8 @@ ...@@ -149,8 +149,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('获取 故障现象 失败') // console.log('获取 故障现象 失败')
console.log(e) // console.log(e)
} }
}) })
}, },
...@@ -178,8 +178,8 @@ ...@@ -178,8 +178,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('获取 查询故障现象 关联的 故障原因 成功') // console.log('获取 查询故障现象 关联的 故障原因 成功')
console.log(res) // console.log(res)
if(res.statusCode==200){ if(res.statusCode==200){
this.midList = res.data this.midList = res.data
...@@ -198,8 +198,8 @@ ...@@ -198,8 +198,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('获取 查询故障现象 关联的 故障原因 失败') // console.log('获取 查询故障现象 关联的 故障原因 失败')
console.log(e) // console.log(e)
} }
}) })
}, },
...@@ -227,8 +227,8 @@ ...@@ -227,8 +227,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('获取 查询故障原因 关联的 服务措施详情以及价格 成功') // console.log('获取 查询故障原因 关联的 服务措施详情以及价格 成功')
console.log(res) // console.log(res)
if(res.statusCode==200){ if(res.statusCode==200){
this.rightList = res.data this.rightList = res.data
...@@ -247,8 +247,8 @@ ...@@ -247,8 +247,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('获取 查询故障原因 关联的 服务措施详情以及价格 失败') // console.log('获取 查询故障原因 关联的 服务措施详情以及价格 失败')
console.log(e) // console.log(e)
} }
}) })
}, },
...@@ -277,8 +277,8 @@ ...@@ -277,8 +277,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('最终请求 成功') // console.log('最终请求 成功')
console.log(res) // console.log(res)
if(res.statusCode==200){ if(res.statusCode==200){
...@@ -302,8 +302,8 @@ ...@@ -302,8 +302,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('最终请求 失败') // console.log('最终请求 失败')
console.log(e) // console.log(e)
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:'最终请求失败' title:'最终请求失败'
......
take-order/pages/take/rob.vue
View file @ 32b684f2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<view class="nameView"> <view class="nameView">
<text class="titleText">联系人：</text> <text class="titleText">联系人：</text>
<text class="contentText u-m-l-10" v-if="orderInfo.contactName">{{orderInfo.contactName}}</text> <text class="contentText u-m-l-10" v-if="orderInfo.contactName">{{orderInfo.contactName}}</text>
<text class="contentText u-m-l-20 underLine" v-if="orderInfo.contactMobilephone">{{orderInfo.contactMobilephone}}</text> <text class="contentText u-m-l-20" v-if="orderInfo.contactMobilephone">{{orderInfo.contactMobilephone}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
this.orderId = e.orderId this.orderId = e.orderId
} }
this.getTopInfo(e) //this.getTopInfo(e)
//this.orderId ='10704469' //this.orderId ='10704469'
this.icon_rob = getApp().globalData.icon_rob this.icon_rob = getApp().globalData.icon_rob
this.icon_close = getApp().globalData.icon_close this.icon_close = getApp().globalData.icon_close
...@@ -120,8 +120,8 @@ ...@@ -120,8 +120,8 @@
await uni.getStorage({ await uni.getStorage({
key: 'token', key: 'token',
success: function (res) { success: function (res) {
console.log('抢单页面 本地获取token成功') // console.log('抢单页面 本地获取token成功')
console.log(res.data); // console.log(res.data);
getApp().globalData.token = res.data getApp().globalData.token = res.data
//that.getData() //that.getData()
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('获取 抢单详情 成功 成功') // console.log('获取 抢单详情 成功 成功')
console.log(res) // console.log(res)
if(res.data.code==200){ if(res.data.code==200){
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
}else{ }else{
console.log('获取 抢单详情 不为200时候') //console.log('获取 抢单详情 不为200时候')
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:res.data.message title:res.data.message
...@@ -182,8 +182,8 @@ ...@@ -182,8 +182,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('获取 抢单详情 失败') // console.log('获取 抢单详情 失败')
console.log(e) // console.log(e)
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:'获取抢单详情失败' title:'获取抢单详情失败'
...@@ -265,8 +265,8 @@ ...@@ -265,8 +265,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('获取工单详情 成功') // console.log('获取工单详情 成功')
console.log(res) // console.log(res)
if(res.data.code==200){ if(res.data.code==200){
this.orderInfo = res.data.data this.orderInfo = res.data.data
...@@ -283,8 +283,8 @@ ...@@ -283,8 +283,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('获取工单详情 失败') // console.log('获取工单详情 失败')
console.log(e) // console.log(e)
} }
}) })
}, },
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
clearTimeout(this.TimeID); clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => { this.TimeID = setTimeout(() => {
console.log('抢单 点击') //console.log('抢单 点击')
this.checkUserStatus() this.checkUserStatus()
}, 1000); }, 1000);
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
//getApp().globalData.checkRobStatus //getApp().globalData.checkRobStatus
//检查用户状态 //检查用户状态
checkUserStatus: function (item) { checkUserStatus: function (item) {
console.log('检查用户状态') //console.log('检查用户状态')
uni.showLoading({ uni.showLoading({
title:'加载中' title:'加载中'
}) })
...@@ -321,8 +321,8 @@ ...@@ -321,8 +321,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('检查用户状态 成功') // console.log('检查用户状态 成功')
console.log(res) // console.log(res)
if(res.data.code==200){ if(res.data.code==200){
this.checkShowModal(res.data.data) this.checkShowModal(res.data.data)
...@@ -343,8 +343,8 @@ ...@@ -343,8 +343,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('检查用户状态 失败') // console.log('检查用户状态 失败')
console.log(e) // console.log(e)
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:res.data.message title:res.data.message
...@@ -357,8 +357,8 @@ ...@@ -357,8 +357,8 @@
//判断状态显示弹窗 //判断状态显示弹窗
//0 通过 1不是师傅 2没有认证通过 3技能不匹配 //0 通过 1不是师傅 2没有认证通过 3技能不匹配
checkShowModal: function (data) { checkShowModal: function (data) {
console.log('判断状态显示弹窗') // console.log('判断状态显示弹窗')
console.log(data) // console.log(data)
var content = '' var content = ''
var confirmText = '' var confirmText = ''
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
//立即入驻 //立即入驻
enterNow: function () { enterNow: function () {
console.log('立即入驻') //console.log('立即入驻')
uni.navigateTo({ uni.navigateTo({
url:'/pages/take/web' url:'/pages/take/web'
}) })
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
//立即完善 //立即完善
completeNow: function () { completeNow: function () {
console.log('立即完善') //console.log('立即完善')
uni.navigateTo({ uni.navigateTo({
url:'/pages/take/web' url:'/pages/take/web'
}) })
...@@ -467,7 +467,7 @@ ...@@ -467,7 +467,7 @@
//联系客服 //联系客服
contactService: function () { contactService: function () {
console.log('联系客服') //console.log('联系客服')
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber:'4008834123' phoneNumber:'4008834123'
}) })
...@@ -482,7 +482,7 @@ ...@@ -482,7 +482,7 @@
uni.showLoading({ uni.showLoading({
title:'请稍候' title:'请稍候'
}) })
console.log('抢单请求') //console.log('抢单请求')
// /wxh-worker-rest/rest/order/revision/applets/{token}/order/acceptAppletsOrder // /wxh-worker-rest/rest/order/revision/applets/{token}/order/acceptAppletsOrder
uni.request({ uni.request({
url: getApp().globalData.domain_Name url: getApp().globalData.domain_Name
...@@ -498,8 +498,8 @@ ...@@ -498,8 +498,8 @@
}, },
success: (res) => { success: (res) => {
uni.hideLoading() uni.hideLoading()
console.log('抢单请求 成功') // console.log('抢单请求 成功')
console.log(res) // console.log(res)
if(res.data.code==200){ if(res.data.code==200){
uni.showToast({ uni.showToast({
...@@ -521,7 +521,7 @@ ...@@ -521,7 +521,7 @@
// icon:'none', // icon:'none',
// title:res.data.message // title:res.data.message
// }) // })
console.log('抢单不为200时候') //console.log('抢单不为200时候')
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:res.data.message title:res.data.message
...@@ -534,8 +534,8 @@ ...@@ -534,8 +534,8 @@
}, },
fail: (e) => { fail: (e) => {
uni.hideLoading() uni.hideLoading()
console.log('抢单请求 失败') // console.log('抢单请求 失败')
console.log(e) // console.log(e)
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:'抢单请求失败' title:'抢单请求失败'
......
take-order/pages/take/web.vue
View file @ 32b684f2
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
//https://system.banshouhui.com/weixiuapp/site/index.html#/?pioneerId=40 //https://system.banshouhui.com/weixiuapp/site/index.html#/?pioneerId=40
this.webUrl = getApp().globalData.domain_Name this.webUrl = getApp().globalData.domain_Name
+ '/weixiuapp/site/index.html#/?pioneerId=40' + '/weixiuapp/site/index.html#/?pioneerId=40'
console.log(this.webUrl) //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