diff --git a/my/hongbao/youhuijuanList.vue b/my/hongbao/youhuijuanList.vue index 7bff737..71292a4 100644 --- a/my/hongbao/youhuijuanList.vue +++ b/my/hongbao/youhuijuanList.vue @@ -97,6 +97,14 @@ uni.navigateTo({//返回项目订单 url:'/my/order/payModifyDzhifu' }) + }else if(this.content=='疗程'){ + uni.navigateTo({//返回项目订单 + url:'/my/order/payModifyLiaoCi' + }) + }else if(this.content=='次卡'){ + uni.navigateTo({//返回项目订单 + url:'/my/order/payModifyCi' + }) } }, diff --git a/my/order/pay.vue b/my/order/pay.vue index 5c2499d..9c1d685 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -207,7 +207,7 @@ 合计： ￥ - {{order.oldMassageMoney==null?order.payMoney:(order.payMoney+order.oldMassageMoney)}} + {{order.oldMassageMoney==null?order.payMoney:((order.payMoney+order.oldMassageMoney).toFixed(2))}} @@ -282,14 +282,18 @@ + v-if="order.status != 3 && + order.status != 4 && + order.status != 5&& + order.status != 10" + > 取消订单 立即支付 - @@ -307,7 +311,9 @@ class="dingshi"> 立即预约 - @@ -328,12 +334,14 @@ 联系客服 提前结束 @@ -349,17 +357,17 @@ 充值 加钟 - - 升级项目 + 服务升级 @@ -690,7 +698,7 @@ }, goOrderJ(item,text) {//加钟 生成订单 let that = this - let payMoney = that.isVip ? item.memberPrice : item.price; + let payMoney = item.price; that.jiazhong=text let data = { parentId: that.order.ordersId, @@ -710,7 +718,7 @@ that.showorder = false if (res.code == 0) { that.tordersId = res.data.ordersId; - that.tpayMoney = payMoney; + that.tpayMoney = res.data.payMoney; that.showpay = true; that.paySel = 1; } else { diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue index 5abd223..53d4663 100644 --- a/my/order/payJaZ.vue +++ b/my/order/payJaZ.vue @@ -386,7 +386,7 @@ - 更多 + 联系客服 提前结束 - - 修改订单 + @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)" + class="dingshi"> + 去投诉 - - 充值 - + + + + diff --git a/my/order/payModifyCi.vue b/my/order/payModifyCi.vue new file mode 100644 index 0000000..6edf151 --- /dev/null +++ b/my/order/payModifyCi.vue @@ -0,0 +1,2009 @@ + + + + + \ No newline at end of file diff --git a/my/order/payModifyLiao.vue b/my/order/payModifyLiao.vue new file mode 100644 index 0000000..95f214e --- /dev/null +++ b/my/order/payModifyLiao.vue @@ -0,0 +1,2009 @@ + + + + + \ No newline at end of file diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue index e939a78..68efc94 100644 --- a/my/order/payModifyTc.vue +++ b/my/order/payModifyTc.vue @@ -6,7 +6,7 @@ 服务项目 - @@ -34,6 +34,8 @@ + + 套餐详情 @@ -45,19 +47,26 @@ {{item.title}} 详情 - - - ￥ - {{item.price}} - 元/套 - ￥{{item.oldPrice}} - 服务时长:{{item.duration}}分钟 + + + + + + ￥ + {{item.price}} + + + ￥{{item.oldPrice}} + + 服务时长:{{item.duration}}分钟 + + + 项目特色: + {{item.jianjie}} + - - - 项目特色: - {{item.jianjie}} + 服务项目{{index+1}} @@ -233,7 +242,7 @@ couponDataList:'', orderXm:[], detailData:[], - number:1 + number:1, } }, onLoad(e) { @@ -242,7 +251,8 @@ } else { this.msTimeDate = 60; } - this.orderXm=this.$queue.getData('mainData') + this.orderXm=this.$queue.getData('mainData'); + console.log("this.orderXm",this.orderXm) this.detailData=this.$queue.getData('detailData'); var date = new Date(); var year = date.getFullYear(); @@ -357,7 +367,7 @@ }, youhuijuan(){ uni.navigateTo({ - url:'/my/hongbao/youhuijuanList?text='+'套餐' + url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'套餐' }) }, openpay() {//验证 @@ -1239,6 +1249,30 @@ \ No newline at end of file diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue index 6b35166..31b3eed 100644 --- a/my/order/payShengji.vue +++ b/my/order/payShengji.vue @@ -254,7 +254,7 @@ 升级价格 - ￥{{order.sumMoney}} + ￥{{order.payMoney}} 会员折扣 @@ -263,7 +263,7 @@ 小计： ￥{{order.sumMoney}} + style="font-size: 35rpx;font-weight: bold;">{{order.payMoney}} @@ -294,7 +294,7 @@ 升级费用： ￥ - {{order.sumMoney}} + {{order.payMoney}} 合计： @@ -302,7 +302,7 @@ ￥ {{ (((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)) - +order.taxiMoney-order.couponMoney+order.addMoney+order.sumMoney).toFixed(2) + +order.taxiMoney-order.couponMoney+order.addMoney+order.payMoney).toFixed(2) }} @@ -394,34 +394,24 @@ 提前结束 加钟 - - 充值 - 充值 - - - 升级项目 + @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)" + class="dingshi"> + 去投诉 diff --git a/my/order/payding.vue b/my/order/payding.vue index bf4f809..092e768 100644 --- a/my/order/payding.vue +++ b/my/order/payding.vue @@ -86,7 +86,7 @@ - {{order.artificer.artificerName}}1 + {{order.artificer.artificerName}} + + + + 费用明细 + + + 服务价格 + ￥{{order.sumMoney}} + + + 服务数量 + {{order.ordersPackageList[0].num}} + + + 优惠券 + -￥{{order.couponMoney}} + + + 总金额 + ￥{{order.payMoney}} + + + + + + + + 立即支付 + + 联系客服 + + + + + + + + + + + + + + + + {{item.text}} + + + + + + + + 确认支付 + + + + + + + + + \ No newline at end of file diff --git a/my/order/paydingLiao.vue b/my/order/paydingLiao.vue new file mode 100644 index 0000000..a8c322e --- /dev/null +++ b/my/order/paydingLiao.vue @@ -0,0 +1,1507 @@ + + + + + \ No newline at end of file diff --git a/my/order/paydingTc.vue b/my/order/paydingTc.vue index 987055f..c351517 100644 --- a/my/order/paydingTc.vue +++ b/my/order/paydingTc.vue @@ -13,7 +13,7 @@ - + {{order.ordersPackageList[0].title}} @@ -23,32 +23,54 @@ - - - - - - ￥ - {{order.sumMoney}} - - + + + ￥ + {{order.sumMoney}} + + + - - - + + 请选择地址 + + + 联系人 + + {{name}} + 修改 + + + + 手机号码 + + {{mobile}} + + + + 详细地址 + + + {{province}}/{{city}}/{{district}}/{{detailaddress}} + + + + + + 备注内容 + + + {{order.remark}} + + + + + @@ -61,23 +83,26 @@ - + 费用明细 - 服务价格 + 套餐价格 ￥{{order.sumMoney}} - + 套餐数量 + {{order.ordersPackageList[0].num}} + + 优惠券 - -￥{{order.couponMoney}} + -￥{{order.couponMoney}} 总金额 @@ -88,11 +113,8 @@ - 取消订单 - + 立即支付 - - - - - - - - {{item.title}} - 已售{{item.sales}} - - - {{items}} - - - ￥ {{item.memberPrice}}{{item.price}} - /{{item.duration}}分钟 - 确认加钟 - - - - - - - - - - - - - - {{item.title}} - - - 服务时长：{{item.duration}}分钟 - 已售：{{item.sales}} - - - - {{item.jianjie}} - - - - - ￥ - {{item.price}} - /元套 - - {{item.oldPrice}} - - - 确认升级 - - - - - - + + @@ -184,54 +149,6 @@ 确认支付 - - - - - - - 请输入提前结束的原因 - x - - - - - - 取消 - - - 确定 - - - - - - - - - - - - - 确认拒单 - x - - - - {{qurenJd.refusalContent}} - - - - 同意 - - - 全额退款 - - - - - - @@ -248,7 +165,6 @@ tpayMoney: '', paySel: 0, showorder: false, - showorderS: false, orderList: [], loading: true, customStyle: { @@ -295,18 +211,17 @@ btnShow:false, tiqianData:'', type:'center', - earlyFinishReason:'', qurenJd:[], - artificerlist:[] + artificerlist:[], + province:'', + city:'', + district:'', + addressId:'', + mobile:'', + detailaddress:'', } }, onLoad(e) { - // uni.showLoading({ - // title: '加载中......', - // }) - // setTimeout(() => { - // // this.loading = false; - // }, 2000) this.isTrue = e.isTrue if (this.isTrue) { uni.setNavigationBarTitle({ @@ -317,8 +232,13 @@ this.getOrder() }, onShow() { + this.addressId = this.$queue.getData('EditAddress'); + if (this.addressId) { + this.getAddressList(this.addressId); + } else { + this.addressMy() + } this.yhqxSel = this.$queue.getData("yhqxSel"); - this.getOrder() if (uni.getStorageSync('token')) { this.getIsVip() } @@ -354,65 +274,55 @@ // #endif }, methods: { - saveJZS(artificerId) {//升级查询技师项目 - let data = { - artificerId: artificerId, - status: 0 - } - let that = this; - this.$queue.showLoading('查询中...') - that.$Request.get("/app/artificer/selectArtificerMassageList", data).then(res => { + addressMy() { + this.$Request.getT('/app/address/selectAddressById').then(res => { + console.log(res) if (res.code == 0) { - if (res.data && res.data.length > 0) { - that.artificerlist = res.data - // for (let i = 0; i < that.artificerlist.length; i++) { - // if (that.artificerlist[i].labels) { - // that.artificerlist[i].labels = that.artificerlist[i].labels.split(","); - // } - // } - uni.hideLoading(); - that.showorderS = true; - } else { - uni.hideLoading(); - that.$queue.showToast('暂无可升级项目'); - } - } else { - uni.hideLoading(); - that.$queue.showToast(res.msg); + this.name = res.data.name; + this.mobile = res.data.phone; + this.cityaddress = res.data.province + res.data.city + res.data.district; + this.detailaddress = res.data.detailsAddress; + this.isDefault = res.data.isDefault; + this.userId = res.data.userId; + this.latitude = res.data.latitude; + this.longitude = res.data.longitude; + this.province = res.data.province + this.city = res.data.city + this.district = res.data.district + this.addressId = res.data.addressId + // this.getChuXing(); + // this.$queue.setData('EditAddress', res.data.addressId); } - - }) + }); }, - saveJZ(classifyId) { - let data = { - parentId: classifyId, - page: 1, - limit: 50, - status: 1 - } - let that = this; - this.$queue.showLoading('查询中...') - that.$Request.get("/app/artificer/selectMassageTypePage", data).then(res => { - if (res.code == 0) { - if (res.data.list && res.data.list.length > 0) { - that.orderList = res.data.list - for (let i = 0; i < that.orderList.length; i++) { - if (that.orderList[i].labels) { - that.orderList[i].labels = that.orderList[i].labels.split(","); - } - } - uni.hideLoading(); - that.showorder = true; - } else { - uni.hideLoading(); - that.$queue.showToast('暂无可加钟项目'); + // 选中地址 + getAddressList(addressId) { + if (addressId) { + this.$Request.getT('/app/address/selectAddressByAddressId?addressId=' + this.addressId).then(res => { + console.log(res) + if (res.code == 0) { + this.name = res.data.name; + this.mobile = res.data.phone; + this.cityaddress = res.data.province + res.data.city + res.data.district; + this.detailaddress = res.data.detailsAddress; + this.isDefault = res.data.isDefault; + this.userId = res.data.userId; + this.latitude = res.data.latitude; + this.longitude = res.data.longitude; + this.province = res.data.province + this.city = res.data.city + this.district = res.data.district + + // this.getChuXing(); } - } else { - uni.hideLoading(); - that.$queue.showToast(res.msg); - } - - }) + // uni.hideLoading(); + }); + } else { + uni.navigateTo({ + url: '../address/address?id=' + 2 + }) + } + }, getTimeStampWithoutSeconds(date) { // 将日期转换为标准的UTC时间 @@ -426,6 +336,13 @@ // 返回不含秒的时间戳 return utcDate.getTime(); }, + openpay(item) { + // uni.navigateTo({ + // url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId + // }) + // this.goOrder() + this.showpay = true + }, getOrder() { let data = { ordersId: this.ordersId @@ -453,114 +370,8 @@ } }) }, - closePopupQ(type){//提前结束 关闭弹出框 - this.type = type - this.$refs.popupQ.close(type); - }, - toggleQ(type,item) {//确认拒单 弹出框 - this.qurenJd=item; - - this.type = type - // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性 - this.$refs.popupQ.open(type) - }, - TuiPopup(typeTxte,type){//确认拒单 全额退款.同意按钮 关闭弹出框 - this.type = typeTxte - let data = { - ordersId: this.qurenJd.ordersId, - isAuto: '0', - type: type - } - this.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => { - if (res.code == 0) { - uni.showToast({ - title:'操作完成！' - }) - this.getOrder() - this.$refs.popupQ.close(typeTxte); - }else{ - this.getOrder() - uni.showToast({ - icon:'error', - title:'操作失败！' - }) - } - - }).catch(() => { - this.getOrder() - //联网失败, 结束加载 - }); - }, - closePopup(type){//提前结束 关闭弹出框 - this.type = type - this.$refs.popup.close(type); - }, - textareaInp(e){//提前结束 输入框 - this.earlyFinishReason=e.detail.value; - console.log("earlyFinishReason",this.earlyFinishReason) - }, - tiqian(type){//提前结束 确认按钮 - var that=this; - that.type = type; - - uni.getLocation({ - type: 'wgs84', - success: function (resa) { - var longitude=resa.longitude; - var latitude=resa.latitude; - console.log('当前位置的经度：' + resa.longitude); - console.log('当前位置的纬度：' + resa.latitude); - let data = { - ordersId: that.tiqianData.ordersId, - accomplishLongitude:longitude, - accomplishLatitude:latitude, - earlyFinishReason: that.earlyFinishReason, - } - that.$Request.post('/app/artificer/accomplishOrders', data).then(res => { - if (res.code == 0) { - uni.showToast({ - title:'操作完成！' - }) - that.getOrder() - that.$refs.popup.close(type); - }else{ - that.getOrder() - uni.showToast({ - icon:'error', - title:'操作失败！' - }) - } - - }).catch(() => { - //联网失败, 结束加载 - that.getOrder() - }); - - }, - fail: function(e) { - that.getOrder() - // #ifdef H5 - uni.showToast({ - title:'获取地址失败！' - }) - // #endif - // #ifdef APP-PLUS - that.checkPermission(); - // #endif - } - }); - - }, - toggle(type,item) {//提前结束 弹出框 - this.tiqianData=item; - this.type = type; - // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性 - this.$refs.popup.open(type); - }, - gengBtn(){ - this.btnShow=!this.btnShow - }, + goChat() { let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 let kefuPhone = this.$queue.getData('kefuPhone'); @@ -637,45 +448,19 @@ } }); }, - goOrder(item) { - console.log("item=====>",item) - console.log("order=====>",this.order) - let that = this - let data = { - classifyId:item.classifyId, - ordersId:that.order.ordersId, - ordersMassageList:[ - {massageId: item.massageTypeId,num: 1}, - ], - massageTypeId:item.massageTypeId, - userPackageDetailId:item.userPackageDetailId, - } - that.$Request.postJson("/app/artificer/updateOrders", data).then(res => { - that.showorder = false - if (res.code == 0) { - that.ordersId = res.data.ordersId; - that.tpayMoney = res.data.payMoney; - that.showpay = true; - that.paySel = 1; - } else { - that.$queue.showToast(res.msg) - } - - }); - }, payJZ() { let that = this; if (that.openWay == 1) { //零钱支付 uni.showModal({ title: '付款提示', - content: '确认支付' + that.order.sumMoney + '元吗?', + content: '确认支付' + that.order.payMoney + '元吗?', success: function(re) { if (re.confirm) { that.$queue.showLoading('支付中...') // console.log('用户点击确定'); that.$Request.post("/app/artificer/payOrders", { - ordersId: order.ordersId, + ordersId: that.ordersId, }).then(ret => { uni.hideLoading(); if (ret.code == 0) { @@ -934,12 +719,7 @@ } }); }, - openpay(item) { - // uni.navigateTo({ - // url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId - // }) - this.showpay = true - }, + // 支付订单 pay() { let that = this @@ -951,19 +731,22 @@ if (that.openWay == 1) { //零钱支付 uni.showModal({ title: '付款提示', - content: '确认支付' + that.payMoney.sumMoney + '元吗?', + content: '确认支付' + that.order.payMoney + '元吗?', success: function(re) { if (re.confirm) { that.$queue.showLoading('支付中...') console.log('用户点击确定'); - that.$Request.post("/app/artificer/payOrders", { - ordersId: that.order.ordersId, + that.$Request.post("/app/user/package/order/payOrder", { + ordersId: that.ordersId, }).then(res => { uni.hideLoading(); if (res.code == 0) { uni.showToast({ title: '支付成功' }) + uni.redirectTo({ + url:'/pages/my/indextaociliaoList?type='+104+'&name='+'index' + }) that.getOrder() } else { uni.showToast({ @@ -1266,6 +1049,47 @@