From 10d1eeeaac1c07e6ce64cd2c2e65a6a71034a83a Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Sat, 29 Jun 2024 19:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/pay.vue | 17 +++++++++++------
my/order/payJaZ.vue | 11 +++++------
my/order/payShengji.vue | 15 ++++++++++-----
pages/order/index.vue | 4 ++++
4 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/my/order/pay.vue b/my/order/pay.vue
index e88e066..a384761 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -171,7 +171,7 @@
全程距离
{{order.km}}km
-
+
出行费用
￥{{order.taxiMoney}}
@@ -192,7 +192,7 @@
￥{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}
-
+
出行费用：
￥{{order.taxiMoney}}
@@ -378,9 +378,13 @@
:key="index">{{items}}
- ￥ {{item.memberPrice}}{{item.price}}
- /{{item.duration}}分钟
+
+ ￥
+ {{item.price}}
+ /
+ {{item.duration}}分钟
+
+
确认加钟
@@ -1162,8 +1166,9 @@
title: '支付成功',
icon: 'none'
})
+
if(that.jiazhong=='加钟'){
- uni.navigateTo({
+ uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+that.order.ordersId
})
}else if(that.shengji=='升级'){
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index b2e9a7d..5abd223 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -253,11 +253,10 @@
-￥{{order.couponMoney}}
-
-
+
加钟费用：
- ￥
- {{order.addMoney}}
- -
+ ￥
+ {{order.addMoney?order.addMoney:0}}
升级费用：
@@ -412,13 +411,13 @@
充值
加钟
-
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 41f2f02..72ec08a 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -424,9 +424,13 @@
:key="index">{{items}}
- ￥ {{item.memberPrice}}{{item.price}}
- /{{item.duration}}分钟
+
+ ￥
+ {{item.price}}
+ /
+ {{item.duration}}分钟
+
+
确认加钟
@@ -606,7 +610,8 @@
earlyFinishReason:'',
qurenJd:[],
artificerlist:[],
- tordersId:''
+ tordersId:'',
+ oldOrdersId:''
}
},
onLoad(e) {
@@ -726,7 +731,7 @@
},
goOrderJ(item) {//加钟 生成订单
let that = this
- let payMoney = that.isVip ? item.memberPrice : item.price;
+ let payMoney = item.price*(that.order.vipRate/100)*(1+that.order.technicianRate/100);
let data = {
parentId: that.order.ordersId,
artificerId: that.order.artificerId,
diff --git a/pages/order/index.vue b/pages/order/index.vue
index d522d7a..e85ffbf 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -323,6 +323,10 @@
uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+item.ordersId
})
+ }else if(item.addNum&&item.oldOrdersId){
+ uni.navigateTo({
+ url:'/my/order/payJaZ?ordersId='+item.ordersId
+ })
}else if(text=='修改'){
uni.navigateTo({
url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId