From 47c981a528d6a3a48192b8e4f0afa705af37ac79 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Wed, 3 Jul 2024 21:02:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=B7=BB=E5=8A=A0=20=E5=BE=85?=
=?UTF-8?q?=E8=A1=A5=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/address/address.vue | 4 +
my/order/pay.vue | 43 +-
my/order/payModifyTcMyDaiB.vue | 2114 ++++++++++++++++++++++++++
my/order/payding.vue | 2 +-
my/order/paydingTCX.vue | 9 +-
my/wallet/index.vue | 30 +-
pages.json | 9 +
pages/my/serviceOderDrtail.vue | 38 +-
pages/order/index.vue | 39 +-
pages/therapist/therapistDingdan.vue | 5 +
10 files changed, 2242 insertions(+), 51 deletions(-)
create mode 100644 my/order/payModifyTcMyDaiB.vue
diff --git a/my/address/address.vue b/my/address/address.vue
index 83a28a6..69f3d4a 100644
--- a/my/address/address.vue
+++ b/my/address/address.vue
@@ -114,6 +114,10 @@
uni.reLaunch({
url:'/my/order/payModifyJsDetail'
})
+ }else if (this.isfa == 7) {//待补单
+ uni.reLaunch({
+ url:'/my/order/payModifyTcMyDaiB'
+ })
}
},
diff --git a/my/order/pay.vue b/my/order/pay.vue
index bdc802c..f974d0b 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -377,7 +377,18 @@
class="dingshi">联系客服
+
+ 取消订单
+
+ 立即预约
+
+
@@ -649,6 +660,13 @@
// #endif
},
methods: {
+ taocanDaiBd(url,item){
+ this.$queue.setData('getJishi','');
+ this.$queue.setData('mainData',item);
+ uni.navigateTo({
+ url:url
+ })
+ },
getOrder() {
let data = {
ordersId: this.ordersId
@@ -998,25 +1016,29 @@
// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
this.$refs.popupQ.open(type)
},
- TuiPopup(typeTxte,type){//确认拒单 全额退款.同意按钮 关闭弹出框
- this.type = typeTxte
+ TuiPopup(typeTxte,type,id){//确认拒单 全额退款.同意按钮 关闭弹出框
+ var that=this;
+ that.type = typeTxte
let data = {
- ordersId: this.qurenJd.ordersId,
+ ordersId: that.qurenJd.ordersId?that.qurenJd.ordersId:id.ordersId,
isAuto: '0',
- type: type
+ type: type,
}
- this.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
+ that.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => {
if (res.code == 0) {
uni.showToast({
title:'操作完成!'
})
- this.getOrder()
- this.$refs.popupQ.close(typeTxte);
+ that.getOrder()
+ that.$refs.popupQ.close(typeTxte);
+ uni.showToast({
+ title:'操作成功!'
+ })
}else{
- this.getOrder()
+ that.getOrder()
uni.showToast({
icon:'error',
- title:'操作失败!'
+ title:res.msg
})
}
@@ -1412,6 +1434,7 @@
},
goNav(e,item) {
this.$queue.setData('xiangmu',item);
+ this.$queue.setData('getJishi','');
uni.navigateTo({
url: e
})
@@ -1830,7 +1853,7 @@
display: flex;
flex-direction: row;
align-items: center;
- justify-content: space-between;
+ justify-content: center;
}
.hideBtn{
width: 100%;
diff --git a/my/order/payModifyTcMyDaiB.vue b/my/order/payModifyTcMyDaiB.vue
new file mode 100644
index 0000000..f4b6409
--- /dev/null
+++ b/my/order/payModifyTcMyDaiB.vue
@@ -0,0 +1,2114 @@
+
+
+
+
+
+ 服务项目
+
+
+
+
+
+
+
+ {{orderXm.ordersMassageList[0].userPackageDetail.title}}
+
+
+
+
+
+
+
+ ¥
+ {{orderXm.ordersMassageList[0].userPackageDetail.packagePrice}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+ 去支付
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+ 已售{{item.sales}}
+
+
+ {{items}}
+
+
+ ¥ {{item.memberPrice}}{{item.price}}
+ /{{item.duration}}分钟
+ 确认加钟
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/my/order/payding.vue b/my/order/payding.vue
index c6df1a3..05f8e0b 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -7,7 +7,7 @@
- 服务项目1111
+ 服务项目
取消订单
+
立即支付
{
if (res.code == 0) {
uni.showToast({
title: '支付成功!'
});
- this.getMoney()
+ that.getMoney()
// const div = document.createElement('div')
// div.innerHTML = res.data //此处form就是后台返回接收到的数据
// document.body.appendChild(div)
@@ -776,20 +776,20 @@
// #ifdef APP-PLUS
// APP支付宝支付
let data = {
- payClassifyId: this.thisSelect.payClassifyId,
+ payClassifyId: that.thisSelect.payClassifyId,
type: 1,
userId: uni.getStorageSync('userId')
}
- if(this.artificerId){
- data.artificerId=this.artificerId
+ if(that.artificerId){
+ data.artificerId=that.artificerId
}
- if(this.ordersId){
- data.ordersId=this.ordersId
+ if(that.ordersId){
+ data.ordersId=that.ordersId
}
- this.$Request.post("/app/aliPay/payOrderMoney", data).then(ret => {
+ that.$Request.post("/app/aliPay/payOrderMoney", data).then(ret => {
console.log(ret)
- this.getMoney()
- this.isCheckPay(ret.code, 'alipay', ret.data);
+ that.getMoney()
+ that.isCheckPay(ret.code, 'alipay', ret.data);
});
// #endif
}
diff --git a/pages.json b/pages.json
index 3e07c28..7543258 100644
--- a/pages.json
+++ b/pages.json
@@ -522,6 +522,15 @@
"titleNView": false
}
}
+ },{
+ "path": "order/payModifyTcMyDaiB",
+ "style": {
+ "navigationBarTitleText": "待补单订单",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "titleNView": false
+ }
+ }
},{
"path": "hongbao/xinrenhongbao",
"style": {
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index 6b5a75f..4a84164 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -66,14 +66,14 @@
{{item.title}}
详情
-
+
+ {{item.status=='1'?'已使用':'未使用'}}