diff --git a/my/order/pay.vue b/my/order/pay.vue index c998476..e88e066 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -155,7 +155,7 @@ - ￥{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}} + ￥{{(order.massagePrice*order.ordersMassageList[0].num)*(order.vipRate/100)*(1+order.technicianRate/100)}} @@ -381,7 +381,7 @@ ￥ {{item.memberPrice}}{{item.price}} /{{item.duration}}分钟 - 确认加钟 + 确认加钟 @@ -414,7 +414,7 @@ {{item.oldPrice}} - + 确认升级 @@ -560,7 +560,9 @@ earlyFinishReason:'', qurenJd:[], artificerlist:[], - tordersId:'' + tordersId:'', + jiazhong:'', + shengji:'' } }, onLoad(e) { @@ -678,9 +680,10 @@ }) }, - goOrderJ(item) {//加钟 生成订单 + goOrderJ(item,text) {//加钟 生成订单 let that = this let payMoney = that.isVip ? item.memberPrice : item.price; + that.jiazhong=text let data = { parentId: that.order.ordersId, artificerId: that.order.artificerId, @@ -708,9 +711,10 @@ }); }, - goOrderS(item) {//升级 生成订单 + goOrderS(item,text) {//升级 生成订单 let that = this + that.shengji=text let data = { classifyId:item.classifyId, ordersId:that.order.ordersId, @@ -1158,9 +1162,16 @@ title: '支付成功', icon: 'none' }) - uni.navigateTo({ - url:'/my/order/payShengji?ordersId='+that.tordersId - }) + if(that.jiazhong=='加钟'){ + uni.navigateTo({ + url:'/my/order/payJaZ?ordersId='+that.order.ordersId + }) + }else if(that.shengji=='升级'){ + uni.navigateTo({ + url:'/my/order/payShengji?ordersId='+that.tordersId + }) + } + that.getOrder() } else { diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue new file mode 100644 index 0000000..b2e9a7d --- /dev/null +++ b/my/order/payJaZ.vue @@ -0,0 +1,2192 @@ + + + + + \ No newline at end of file diff --git a/my/order/payModify.vue b/my/order/payModify.vue index 2d2eab7..cda1eda 100644 --- a/my/order/payModify.vue +++ b/my/order/payModify.vue @@ -321,8 +321,11 @@ let fullDate = `${month}-${days}` let Time = year + '-' + fullDate this.yearsDate = Time; - this.getMsTime(Time); + this.jishiName=this.$queue.getData('getJishi'); + if(this.jishiName){ + this.getMsTime(Time); + } this.couponId=this.$queue.getData('youhui'); if(this.couponId){ this.youhuiF(this.couponId) @@ -407,8 +410,9 @@ // } }, getMsTime(artificerDate) { - this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + this - .artificerId + '&artificerDate=' + artificerDate).then(res => { + let that = this; + let artificerId = that.jishiName.artificerId; + this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + artificerId + '&artificerDate=' + artificerDate).then(res => { if (res.code == 0) { this.msTimeList = res.data; console.log(res.data, "获取忙时时间") diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue index 5e529af..c5fd697 100644 --- a/my/order/payModifyDd.vue +++ b/my/order/payModifyDd.vue @@ -318,8 +318,10 @@ let fullDate = `${month}-${days}` let Time = year + '-' + fullDate this.yearsDate = Time; - this.getMsTime(Time); this.jishiName=this.$queue.getData('getJishi'); + if(this.jishiName){ + this.getMsTime(Time); + } this.couponId=this.$queue.getData('youhui'); if(this.couponId){ this.youhuiF(this.couponId) @@ -406,8 +408,9 @@ // } }, getMsTime(artificerDate) { - this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + this - .artificerId + '&artificerDate=' + artificerDate).then(res => { + let that = this; + let artificerId = that.jishiName.artificerId; + this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + artificerId + '&artificerDate=' + artificerDate).then(res => { if (res.code == 0) { this.msTimeList = res.data; console.log(res.data, "获取忙时时间") diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue index 51cd039..e939a78 100644 --- a/my/order/payModifyTc.vue +++ b/my/order/payModifyTc.vue @@ -254,8 +254,10 @@ this.yearsDate = Time; var classifyId=this.$queue.getData('classifyId') this.classifyId = classifyId; - this.getMsTime(Time); this.jishiName=this.$queue.getData('getJishi'); + if(this.jishiName){ + this.getMsTime(Time); + } this.couponId=this.$queue.getData('youhui'); if(this.couponId){ this.youhuiF(this.couponId) @@ -340,8 +342,9 @@ // } }, getMsTime(artificerDate) { - this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + this - .artificerId + '&artificerDate=' + artificerDate).then(res => { + let that = this; + let artificerId = that.jishiName.artificerId; + this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + artificerId + '&artificerDate=' + artificerDate).then(res => { if (res.code == 0) { this.msTimeList = res.data; console.log(res.data, "获取忙时时间") diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue index 5bf0ecd..41f2f02 100644 --- a/my/order/payShengji.vue +++ b/my/order/payShengji.vue @@ -10,13 +10,13 @@ 服务项目 - - {{order.ordersMassageList[0].massageType.title}} + {{order.oldEntryName}} 待支付 @@ -34,18 +34,18 @@ - - {{order.ordersMassageList[0].massageType.duration}}分钟 + + {{order.oldMassageDuration}}分钟 - + ￥ - {{order.massagePrice}} + {{order.oldMassagePrice}} @@ -148,6 +148,10 @@ 项目价格 ￥{{order.oldMassagePrice}} + + 下单数量 + {{order.oldMassageNum}} + 会员折扣 {{order.vipRate}}% @@ -158,7 +162,7 @@ - ￥{{order.oldMassagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}} + ￥{{((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)).toFixed(2)}} @@ -219,6 +223,14 @@ 升级项目 {{order.ordersMassageList[0].massageType.title}} + + 项目价格 + ￥{{order.massagePrice}} + + + 服务时长 + {{order.duration}}分钟 + 升级价格 ￥{{order.sumMoney}} @@ -240,38 +252,40 @@ 订单费用： ￥￥{{order.oldMassagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}} + style="font-size: 26rpx;font-weight: bold;">{{((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)).toFixed(2)}} 出行费用： ￥{{order.taxiMoney}} - + 优惠券： - - -￥{{order.couponMoney}} - - + + -￥{{order.couponMoney?order.couponMoney:0}} - + 加钟费用： - ￥ - {{order.addMoney}} - - + ￥ + {{order.addMoney?order.addMoney:0}} - + 升级费用： - ￥ + ￥ {{order.sumMoney}} - - 合计： - ￥ + + ￥ {{ - order.oldMassagePrice*(order.vipRate/100)*(1+order.technicianRate/100) - +order.sumMoney+order.addMoney-order.couponMoney+order.taxiMoney}} + (((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)) + +order.taxiMoney-order.couponMoney+order.addMoney+order.sumMoney).toFixed(2) + + }} + + + @@ -343,42 +357,7 @@ --> - 取消订单 - - 立即支付 - - - 去投诉 - - - 拒单详情 - - - 立即预约 - - - 修改订单 - - - 去评价 - + 联系客服 @@ -395,28 +374,30 @@ 提前结束 - 修改订单 - - - - - 充值 - - 加钟 - + 充值 + + + + + 充值 + + + diff --git a/pages.json b/pages.json index bc6660d..48be353 100644 --- a/pages.json +++ b/pages.json @@ -767,6 +767,16 @@ } } }, + { + "path": "order/payJaZ", + "style": { + "navigationBarTitleText": "加钟订单详情", + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, { "path": "order/payShengji", "style": { diff --git a/pages/index/order/orderDet.vue b/pages/index/order/orderDet.vue index 5b58fdb..f1d9794 100644 --- a/pages/index/order/orderDet.vue +++ b/pages/index/order/orderDet.vue @@ -316,6 +316,7 @@ this.hyCheck = this.$queue.getData('hyCheck'); console.log(option) this.artificerId = option.artificerId + this.massageTypeId = option.massageTypeId if (option.tripWay) { this.tripWay = option.tripWay; @@ -332,7 +333,9 @@ let fullDate = `${month}-${days}` let Time = year + '-' + fullDate this.yearsDate = Time; - this.getMsTime(Time); + if(this.artificerId){ + this.getMsTime(Time); + } this.getMoneyJiShi(); // #ifdef APP this.openLists = [{ @@ -425,8 +428,9 @@ }); }, getMsTime(artificerDate) { - this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + this - .artificerId + '&artificerDate=' + artificerDate).then(res => { + let that = this; + let artificerId = that.artificerId; + this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + artificerId + '&artificerDate=' + artificerDate).then(res => { if (res.code == 0) { this.msTimeList = res.data; console.log(res.data, "获取忙时时间") diff --git a/pages/order/index.vue b/pages/order/index.vue index 608be48..94908c5 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -52,7 +52,7 @@ 预约时间：{{item.serveTime}} - 实付：￥{{item.sumMoney}} + 实付：￥{{item.payMoneyTotal}} @@ -113,7 +113,7 @@ @click="goNav('/my/wallet/index?artificerId='+item.artificerId)"> 充值 - 加钟 @@ -319,6 +319,10 @@ uni.navigateTo({ url:'/my/order/payShengji?ordersId='+item.ordersId }) + }else if(item.addNum){ + uni.navigateTo({ + url:'/my/order/payJaZ?ordersId='+item.ordersId + }) }else if(text=='修改'){ uni.navigateTo({ url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId @@ -485,7 +489,8 @@ page: this.page, limit: this.limit } - this.$Request.get('/app/artificer/selectOrdersList', data).then(res => { + // selectOrdersList + this.$Request.get('/app/artificer/selectAppOrdersList', data).then(res => { if (res.code == 0) { uni.hideLoading(); if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表