From 80330c34cde39af44f9de452988025ab4df657d0 Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Mon, 1 Jul 2024 15:59:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=90=86=E7=96=97=E5=B8=88=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E5=8F=AB=E5=8A=A0=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 4 +- my/address/address.vue | 4 + my/gonghui/index.vue | 2 +- my/order/pay.vue | 8 +- my/order/payJaZ.vue | 2 +- my/order/payModify.vue | 60 +- my/order/payModifyDd.vue | 39 +- my/order/payModifyDzhifu.vue | 41 +- my/order/payModifyTcMy.vue | 190 +- my/order/payShengji.vue | 2 +- my/order/payYouHui.vue | 2 +- my/order/payding.vue | 6 +- my/order/paydingDd.vue | 6 +- my/order/paydingTCX.vue | 1927 ++++++++++++++++++++ my/order/paydingXiuGai.vue | 6 +- my/wallet/index.vue | 2 +- my/wallet/index1.vue | 2 +- pages.json | 21 +- pages/index/index.vue | 6 +- pages/index/index1.vue | 6 +- pages/index/index2.vue | 8 +- pages/index/order/order.vue | 4 +- pages/index/order/orderDet.vue | 4 +- pages/index/order/orderDetail.vue | 2 +- pages/index/search/index.vue | 4 +- pages/my/css/myteam.vue | 2 +- pages/my/cureOderDrtail.vue | 13 +- pages/my/index.vue | 2 +- pages/my/myteam.vue | 2 +- pages/my/serviceOderDrtail.vue | 2 +- pages/order/index1.vue | 8 +- pages/therapist/orderDetail - 副本 (2).vue | 4 +- pages/therapist/orderDetail - 副本.vue | 6 +- pages/therapist/orderDetail.vue | 4 +- pages/therapist/therapist.vue | 4 +- pages/therapist/therapistDingdan.vue | 9 +- pages/therapist/therapistList.vue | 6 +- pages/therapist/therapistList.vue.腾讯 | 8 +- 38 files changed, 2230 insertions(+), 198 deletions(-) create mode 100644 my/order/paydingTCX.vue diff --git a/App.vue b/App.vue index eb37a2e..a1bcdde 100644 --- a/App.vue +++ b/App.vue @@ -390,7 +390,7 @@ this.$queue.setData('ylTxSel', res.data.value); } }); - // 是否开启为理疗师充值 390 + // 是否开启为技师充值 390 this.$Request.get('/app/common/type/390').then(res => { if (res.code == 0) { this.$queue.setData('jsczSel', res.data.value); @@ -408,7 +408,7 @@ this.$queue.setData('closeKC', res.data.value); } }); - // 理疗师详情顶部图高度 421 + // 技师详情顶部图高度 421 this.$Request.get('/app/common/type/421').then(res => { if (res.code == 0) { this.$queue.setData('imageHeight', res.data.value); diff --git a/my/address/address.vue b/my/address/address.vue index a24949c..bcdddc1 100644 --- a/my/address/address.vue +++ b/my/address/address.vue @@ -93,6 +93,10 @@ }) } else if (this.isfa == 3) { this.updateaddress() + }else if (this.isfa == 4) { + uni.reLaunch({ + url:'/my/order/payModifyTcMy' + }) } }, diff --git a/my/gonghui/index.vue b/my/gonghui/index.vue index bdee3a6..83cfa4e 100644 --- a/my/gonghui/index.vue +++ b/my/gonghui/index.vue @@ -55,7 +55,7 @@ - 商家理疗师 + 商家技师 diff --git a/my/order/pay.vue b/my/order/pay.vue index e6b12ab..cd562cb 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -97,7 +97,7 @@ {{order.artificer.ordersCount}} - 健康理疗师 + 健康技师 @@ -155,7 +155,7 @@ - ￥{{(order.massagePrice*order.ordersMassageList[0].num)*(order.vipRate/100)*(1+order.technicianRate/100)}} + ￥{{order.massageMoney}} @@ -190,7 +190,7 @@ 订单费用： ￥{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}} + style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}} 出行费用： @@ -207,7 +207,7 @@ 合计： ￥ - {{order.oldMassageMoney==null?order.payMoney:((order.payMoney+order.oldMassageMoney).toFixed(2))}} + {{order.payMoney}} diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue index 53d4663..e3e1981 100644 --- a/my/order/payJaZ.vue +++ b/my/order/payJaZ.vue @@ -100,7 +100,7 @@ {{order.artificer.ordersCount}} - 健康理疗师 + 健康技师 diff --git a/my/order/payModify.vue b/my/order/payModify.vue index 147dd93..27062f6 100644 --- a/my/order/payModify.vue +++ b/my/order/payModify.vue @@ -68,6 +68,29 @@ + + + 技师 + {{jishiName.technicianTypeName}} + + + {{jishiName.artificerName}} + 选择不同技师价格可能不一样哦~ + + + + + + 平台优惠劵 + + + + -￥{{couponDataList}} + + 选择优惠劵 + + + 服务时间 @@ -85,39 +108,8 @@ - - - 理疗师 - {{jishiName.technicianTypeName}} - - - {{jishiName.artificerName}} - 选择不同技师价格可能不一样哦~ - - - - - - - 平台优惠劵 - - - - -￥{{couponDataList}} - - 选择优惠劵 - - - + + 备注 @@ -441,7 +433,7 @@ }) }else if(this.jishiName==''){ uni.showToast({ - title:'请选择理疗师！' + title:'请选择技师！' }) }else{ // this.showpay = true; diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue index c5fd697..8f31712 100644 --- a/my/order/payModifyDd.vue +++ b/my/order/payModifyDd.vue @@ -76,26 +76,10 @@ - - - 服务时间 - - - - - {{startTime}} - 请选择预约时间 - - - - + - 理疗师 + 技师 {{jishiName.technicianTypeName}} @@ -116,6 +100,23 @@ + + + 服务时间 + + + + + {{startTime}} + 请选择预约时间 + + + + 备注 @@ -438,7 +439,7 @@ }) }else if(this.jishiName==''){ uni.showToast({ - title:'请选择理疗师！' + title:'请选择技师！' }) }else{ // this.showpay = true; diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue index 33ecdc1..c72fa32 100644 --- a/my/order/payModifyDzhifu.vue +++ b/my/order/payModifyDzhifu.vue @@ -85,26 +85,10 @@ - - - 服务时间 - - - - - {{startTime}} - 请选择预约时间 - - - - + - 理疗师 + 技师 {{jishiName.technicianTypeName}} @@ -115,7 +99,7 @@ + + + 服务时间 + + + + + {{startTime}} + 请选择预约时间 + + + + 备注 @@ -665,7 +666,7 @@ }) }else if(this.jishiName==''){ uni.showToast({ - title:'请选择理疗师！' + title:'请选择技师！' }) }else{ // this.showpay = true; diff --git a/my/order/payModifyTcMy.vue b/my/order/payModifyTcMy.vue index 8192cba..3d8cac8 100644 --- a/my/order/payModifyTcMy.vue +++ b/my/order/payModifyTcMy.vue @@ -24,7 +24,7 @@ {{orderXm.price}} - + @@ -34,21 +34,68 @@ - - - - 平台优惠劵 - - - - -￥{{couponDataList}} + + 请选择地址 + + + 联系人 + + {{name}} + 修改 - 选择优惠劵 - + + + 手机号码 + + {{mobile}} + + + + 详细地址 + + + {{province}}/{{city}}/{{district}}/{{detailaddress}} + + + + + + + + + + + 技师 + + + + {{jishiName.artificerName}} + 请选择技师 + + + + + + 服务时间 + + + + {{startTime}} + 请选择预约时间 + - + + 备注 + + + + + + + 去支付 @@ -233,7 +280,7 @@ this.youhuiF(this.couponId) } - this.ordersId = this.$queue.getData('ordersId'); + this.ordersId = this.orderXm.id; this.userPackageDetailId = this.$queue.getData('userPackageDetailId'); this.youhui() // this.getOrder() @@ -278,6 +325,45 @@ // #endif }, methods: { + goOrder() {//生成orderId + let that = this + // let payMoney =item.price; + // let payMoney = that.isVip ? item.memberPrice : item.price; + let data = { + address:that.province+that.city+that.district+that.detailaddress, + artificerId:that.jishiName.artificerId, + phone:that.mobile, + userName:that.name, + tripWay:that.jishiName.tripWay, + city:that.province, + couponId: '', + userId: uni.getStorageSync('userId'), + longitude:that.longitude, + latitude:that.latitude, + serveTime:that.startTime, + remark:that.textareaData, + ordersMassageList:[ + {massageId:that.ordersId,num: 1}, + ], + userPackageDetailId : that.ordersId + } + that.$Request.postJson("/app/artificer/insertOrders", data).then(res => { + that.showorder = false + if (res.code == 0) { + that.tordersId = res.data.ordersId; + that.tpayMoney = res.data.payMoney; + // that.showpay = true; + that.paySel = 1; + // console.log("res.data",res.data) + uni.navigateTo({ + url:'/my/order/paydingTCX?ordersId='+ res.data.ordersId + }) + } else { + that.$queue.showToast(res.msg) + } + + }); + }, changeValue(value){ this.number=value }, @@ -377,7 +463,7 @@ liliaoshi(){ uni.setStorage({ key: 'taocanDd', - data: '支付', + data: '我的套餐', success: function () { uni.navigateTo({ url: '/pages/therapist/therapistDingdan' @@ -451,7 +537,7 @@ }); } else { uni.navigateTo({ - url: '../address/address?id=' + 2 + url: '../address/address?id=' + 4 }) } @@ -535,39 +621,7 @@ } }); }, - goOrder() {//生成orderId - let that = this - console.log('asdasd',that.couponId) - // let payMoney =item.price; - // let payMoney = that.isVip ? item.memberPrice : item.price; - let data = { - userId: uni.getStorageSync('userId'), - couponId: that.couponId, - oldSumMoney: that.orderXm.oldPrice, - sumMoney: that.orderXm.price, - // oldSumMoney: that.mainData.oldPrice*that.detailData.length, - // sumMoney: that.mainData.price*that.detailData.length, - ordersPackageList:[ - {packageId: that.orderXm.id,num: that.number}, - ] - } - that.$Request.postJson("/app/user/package/order/insertOrders", data).then(res => { - that.showorder = false - if (res.code == 0) { - that.tordersId = res.data.ordersId; - that.tpayMoney = res.data.payMoney; - // that.showpay = true; - that.paySel = 1; - // console.log("res.data",res.data) - uni.navigateTo({ - url:'/my/order/paydingTc?ordersId='+ res.data.ordersId - }) - } else { - that.$queue.showToast(res.msg) - } - - }); - }, + payJZ() { let that = this; if (that.openWay == 1) { //零钱支付 @@ -1209,6 +1263,46 @@ \ No newline at end of file diff --git a/my/order/paydingXiuGai.vue b/my/order/paydingXiuGai.vue index 092e768..b646db5 100644 --- a/my/order/paydingXiuGai.vue +++ b/my/order/paydingXiuGai.vue @@ -23,8 +23,8 @@ 待服务 已完成 服务中 - 理疗师出发 - 理疗师到达 + 技师出发 + 技师到达 待评价 已取消 待确认 @@ -102,7 +102,7 @@ {{order.artificer.ordersCount}}2 - 健康理疗师3 + 健康技师3 --> diff --git a/my/wallet/index.vue b/my/wallet/index.vue index e3a6a4b..76d261f 100644 --- a/my/wallet/index.vue +++ b/my/wallet/index.vue @@ -92,7 +92,7 @@ diff --git a/my/wallet/index1.vue b/my/wallet/index1.vue index 1a82373..36d9260 100644 --- a/my/wallet/index1.vue +++ b/my/wallet/index1.vue @@ -229,7 +229,7 @@ 为TA充值 - 我的理疗师 + 我的技师 diff --git a/pages.json b/pages.json index f00ee7b..f3c577b 100644 --- a/pages.json +++ b/pages.json @@ -78,7 +78,7 @@ { "path": "pages/index/order/orderDetail", "style": { - "navigationBarTitleText": "理疗师详情" + "navigationBarTitleText": "技师详情" } }, @@ -454,7 +454,7 @@ { "path": "pages/therapist/therapist", "style": { - "navigationBarTitleText": "理疗师", + "navigationBarTitleText": "技师", "enablePullDownRefresh": true, "app-plus": { "titleNView": false @@ -466,7 +466,7 @@ { "path": "pages/therapist/therapist", "style": { - "navigationBarTitleText": "理疗师", + "navigationBarTitleText": "技师", "enablePullDownRefresh": true, "app-plus": { "titleNView": false @@ -477,14 +477,14 @@ { "path": "pages/therapist/therapistList", "style": { - "navigationBarTitleText": "选择理疗师", + "navigationBarTitleText": "选择技师", "navigationStyle": "custom", "enablePullDownRefresh": false } }, { "path": "pages/therapist/orderDetail", "style": { - "navigationBarTitleText": "理疗师详情", + "navigationBarTitleText": "技师详情", "enablePullDownRefresh": true, "app-plus": { "titleNView": false @@ -511,6 +511,15 @@ "titleNView": false } } + },{ + "path": "order/paydingTCX", + "style": { + "navigationBarTitleText": "我的套餐支付", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false + } + } },{ "path": "order/payModifyTcMy", "style": { @@ -746,7 +755,7 @@ { "path": "gonghui/therapist", "style": { - "navigationBarTitleText": "商家理疗师" + "navigationBarTitleText": "商家技师" } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index df2532e..55d5aa9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -30,7 +30,7 @@ {{ city }} - @@ -359,7 +359,7 @@ } // #endif - that.$Request.getT('/app/common/type/250').then(res => { //理疗师完成通知 + that.$Request.getT('/app/common/type/250').then(res => { //技师完成通知 if (res.code == 0) { if (res.data && res.data.value) { that.arr.push(res.data.value) @@ -367,7 +367,7 @@ } }) - that.$Request.getT('/app/common/type/248').then(res => { //理疗师取消通知 + that.$Request.getT('/app/common/type/248').then(res => { //技师取消通知 if (res.code == 0) { if (res.data && res.data.value) { that.arr.push(res.data.value) diff --git a/pages/index/index1.vue b/pages/index/index1.vue index 848898f..02928e2 100644 --- a/pages/index/index1.vue +++ b/pages/index/index1.vue @@ -70,7 +70,7 @@ - 选择理疗师 + 选择技师 @@ -233,7 +233,7 @@ } if (this.myId) { - that.$Request.getT('/app/common/type/250').then(res => { //理疗师完成通知 + that.$Request.getT('/app/common/type/250').then(res => { //技师完成通知 if (res.code == 0) { if (res.data && res.data.value) { that.arr.push(res.data.value) @@ -241,7 +241,7 @@ } }) - that.$Request.getT('/app/common/type/248').then(res => { //理疗师取消通知 + that.$Request.getT('/app/common/type/248').then(res => { //技师取消通知 if (res.code == 0) { if (res.data && res.data.value) { that.arr.push(res.data.value) diff --git a/pages/index/index2.vue b/pages/index/index2.vue index 15ceadd..759f93f 100644 --- a/pages/index/index2.vue +++ b/pages/index/index2.vue @@ -87,14 +87,14 @@ - 选择理疗师 + 选择技师 选择教练 - 选择理疗师 + 选择技师 @@ -254,7 +254,7 @@ } // #endif - that.$Request.getT('/app/common/type/250').then(res => { //理疗师完成通知 + that.$Request.getT('/app/common/type/250').then(res => { //技师完成通知 if (res.code == 0) { if (res.data && res.data.value) { that.arr.push(res.data.value) @@ -262,7 +262,7 @@ } }) - that.$Request.getT('/app/common/type/248').then(res => { //理疗师取消通知 + that.$Request.getT('/app/common/type/248').then(res => { //技师取消通知 if (res.code == 0) { if (res.data && res.data.value) { that.arr.push(res.data.value) diff --git a/pages/index/order/order.vue b/pages/index/order/order.vue index d30a482..cdeda5a 100644 --- a/pages/index/order/order.vue +++ b/pages/index/order/order.vue @@ -162,7 +162,7 @@ - 选择理疗师 + 选择技师 - 选择理疗师 + 选择技师 diff --git a/pages/index/order/orderDet.vue b/pages/index/order/orderDet.vue index f1d9794..4f6a07f 100644 --- a/pages/index/order/orderDet.vue +++ b/pages/index/order/orderDet.vue @@ -66,7 +66,7 @@ - 服务理疗师 + 服务技师 {{order.artificerName}} @@ -639,7 +639,7 @@ } }); }, - // 理疗师详情 + // 技师详情 getDet() { this.$Request.get("/app/artificer/selectArtificerById", { artificerId: this.artificerId, diff --git a/pages/index/order/orderDetail.vue b/pages/index/order/orderDetail.vue index aa86fbe..7c1a775 100644 --- a/pages/index/order/orderDetail.vue +++ b/pages/index/order/orderDetail.vue @@ -56,7 +56,7 @@ - 健康理疗师 + 健康技师 diff --git a/pages/index/search/index.vue b/pages/index/search/index.vue index b6ef6f8..6ab3fd7 100644 --- a/pages/index/search/index.vue +++ b/pages/index/search/index.vue @@ -14,7 +14,7 @@ - @@ -69,7 +69,7 @@ - 健康理疗师 + 健康技师 团队用户 - 团队理疗师 + 团队技师 diff --git a/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue index db6b4db..e3b958e 100644 --- a/pages/my/cureOderDrtail.vue +++ b/pages/my/cureOderDrtail.vue @@ -160,20 +160,19 @@ }) }, goumai(item){//立即购买 - // this.$queue.setData('getJishi','') + this.$queue.setData('getJishi','') // this.$queue.setData('ordersId',this.dataList.massageTypeId); // this.$queue.setData('userPackageDetailId',this.dataList.id); - // this.$queue.setData('daibudan',''); - // uni.navigateTo({ - // url:'/my/order/payModifyTc?ordersId='+this.dataList.massageTypeId - // }) + this.$queue.setData('daibudan',''); this.$queue.setData('mainData',item) // this.$queue.setData('detailData',this.detailData) this.$queue.setData('youhui',''); + // uni.navigateTo({ + // url:'/my/order/payModifyTcMy?ordersId='+item.packageDetailId + // }) uni.navigateTo({ - url:'/my/order/payModifyTcMy?ordersId='+item.packageDetailId + url:'/my/order/payModifyTcMy?ordersId='+item.id }) - }, getIndexData(){//从首页 推荐进入 请求的接口 var that=this; diff --git a/pages/my/index.vue b/pages/my/index.vue index 2587db2..e0581db 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -124,7 +124,7 @@ XCXIsSelect: '否', useList:[ {urlImg:'../../static/my-gong-1.png',text:'我的收藏',link:'/my/gird/shoucang'}, - {urlImg:'../../static/my-gong-2.png',text:'成为理疗师',link:'/pages/my/hehuo'}, + {urlImg:'../../static/my-gong-2.png',text:'成为技师',link:'/pages/my/hehuo'}, {urlImg:'../../static/my-gong-3.png',text:'分享好友',link:'/pages/my/invitationUser'}, {urlImg:'../../static/my-gong-4.png',text:'成为代理商',link:'/pages/my/cooperation'}, {urlImg:'../../static/my-gong-5.png',text:'地址管理',link:'/my/address/address'}, diff --git a/pages/my/myteam.vue b/pages/my/myteam.vue index 7e1e769..1ff699c 100644 --- a/pages/my/myteam.vue +++ b/pages/my/myteam.vue @@ -6,7 +6,7 @@ - 团队理疗师 + 团队技师 diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue index 9bdbc83..f4a2634 100644 --- a/pages/my/serviceOderDrtail.vue +++ b/pages/my/serviceOderDrtail.vue @@ -63,7 +63,7 @@ {{item.title}} - 详情 + 详情 diff --git a/pages/order/index1.vue b/pages/order/index1.vue index 52bb0f2..cbdca37 100644 --- a/pages/order/index1.vue +++ b/pages/order/index1.vue @@ -19,8 +19,8 @@ 待评价 已完成 服务中 - 理疗师出发 - 理疗师到达 + 技师出发 + 技师到达 已取消 @@ -102,10 +102,10 @@ name: '待服务', status: '2' }, { - name: '理疗师出发', + name: '技师出发', status: '7' }, { - name: '理疗师到达', + name: '技师到达', status: '8' }, { name: '服务中', diff --git a/pages/therapist/orderDetail - 副本 (2).vue b/pages/therapist/orderDetail - 副本 (2).vue index 4e6108c..a2d28e8 100644 --- a/pages/therapist/orderDetail - 副本 (2).vue +++ b/pages/therapist/orderDetail - 副本 (2).vue @@ -297,7 +297,7 @@ }); }, - //服务理疗师 + //服务技师 getordertherapist() { this.$Request.get("/app/artificer/selectArtificerMassageList", { artificerId: this.artificerId @@ -334,7 +334,7 @@ goNav(massageTypeId,classifyId) { if (this.status == 2) { uni.showToast({ - title: '理疗师已下线', + title: '技师已下线', icon: 'none' }) } else { diff --git a/pages/therapist/orderDetail - 副本.vue b/pages/therapist/orderDetail - 副本.vue index e156676..204e879 100644 --- a/pages/therapist/orderDetail - 副本.vue +++ b/pages/therapist/orderDetail - 副本.vue @@ -54,7 +54,7 @@ - 健康理疗师 + 健康技师 @@ -321,7 +321,7 @@ }); }, - //服务理疗师 + //服务技师 getordertherapist() { this.$Request.get("/app/artificer/selectArtificerMassageList", { artificerId: this.artificerId @@ -358,7 +358,7 @@ goNav(massageTypeId,classifyId) { if (this.status == 2) { uni.showToast({ - title: '理疗师已下线', + title: '技师已下线', icon: 'none' }) } else { diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue index 3b0d2e0..5938fa5 100644 --- a/pages/therapist/orderDetail.vue +++ b/pages/therapist/orderDetail.vue @@ -498,7 +498,7 @@ }); }, - //服务理疗师 + //服务技师 getordertherapist() { this.$Request.get("/app/artificer/selectArtificerMassageList", { artificerId: this.artificerId @@ -535,7 +535,7 @@ goNav(massageTypeId,classifyId) { if (this.status == 2) { uni.showToast({ - title: '理疗师已下线', + title: '技师已下线', icon: 'none' }) } else { diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue index b34420f..6e013c2 100644 --- a/pages/therapist/therapist.vue +++ b/pages/therapist/therapist.vue @@ -7,7 +7,7 @@ {{ city }} - @@ -503,7 +503,7 @@ import permision from "@/components/permission.js"; }, showTips() { uni.showToast({ - title: '理疗师已下线', + title: '技师已下线', icon: 'none' }) }, diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue index 1da141b..0e8665c 100644 --- a/pages/therapist/therapistDingdan.vue +++ b/pages/therapist/therapistDingdan.vue @@ -7,7 +7,7 @@ {{ city }} - @@ -509,6 +509,11 @@ uni.reLaunch({ url:'/my/order/payModifyDzhifu?artificerId='+e.artificerId+'&text='+'my' }) + }else if(this.dataIndex=='我的套餐'){ + this.$queue.setData('getJishi',e); + uni.reLaunch({ + url:'/my/order/payModifyTcMy?artificerId='+e.artificerId+'&text='+'my' + }) } }, switch1Change: function (e) {//地图和列表切换 @@ -522,7 +527,7 @@ }, showTips() { uni.showToast({ - title: '理疗师已下线', + title: '技师已下线', icon: 'none' }) }, diff --git a/pages/therapist/therapistList.vue b/pages/therapist/therapistList.vue index 88dff08..dbbebb4 100644 --- a/pages/therapist/therapistList.vue +++ b/pages/therapist/therapistList.vue @@ -514,12 +514,12 @@ }) } else { uni.setNavigationBarTitle({ - title: '我的理疗师' + title: '我的技师' }) } } else { uni.setNavigationBarTitle({ - title: '选择理疗师' + title: '选择技师' }) } // #ifdef MP-WEIXIN @@ -1082,7 +1082,7 @@ if (this.numIndex == 1) { if (e.status != 1) { - this.$queue.showToast('当前理疗师已下线，请预约其他理疗师！') + this.$queue.showToast('当前技师已下线，请预约其他技师！') return; } uni.navigateTo({ diff --git a/pages/therapist/therapistList.vue.腾讯 b/pages/therapist/therapistList.vue.腾讯 index acabd0e..7541c7a 100644 --- a/pages/therapist/therapistList.vue.腾讯 +++ b/pages/therapist/therapistList.vue.腾讯 @@ -3,7 +3,7 @@ - 选择理疗师 + 选择技师 @@ -477,12 +477,12 @@ }) } else { uni.setNavigationBarTitle({ - title: '我的理疗师' + title: '我的技师' }) } } else { uni.setNavigationBarTitle({ - title: '选择理疗师' + title: '选择技师' }) } // #ifdef MP-WEIXIN @@ -1018,7 +1018,7 @@ if (this.numIndex == 1) { if (e.status != 1) { - this.$queue.showToast('当前理疗师已下线，请预约其他理疗师！') + this.$queue.showToast('当前技师已下线，请预约其他技师！') return; } uni.navigateTo({