From 016fd69d22a700cb546b468ed4f083ee54f13b13 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Fri, 5 Jul 2024 17:07:24 +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 | 60 ++++++++++++++++++++--------------
my/order/payJaZ.vue | 71 +++++++++++++++++++++++++----------------
my/order/payShengji.vue | 45 +++++++++++++++-----------
3 files changed, 106 insertions(+), 70 deletions(-)
diff --git a/my/order/pay.vue b/my/order/pay.vue
index bcf51dc..9fc8871 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -162,7 +162,7 @@
- ￥{{order.price}}
+ ￥{{order.massageCouponMoney}}
@@ -203,7 +203,7 @@
订单费用：
- ￥{{order.price}}
+ ￥{{order.massageCouponMoney}}
出行费用：
@@ -306,12 +306,19 @@
加钟
+
+ 加钟
+
-
-
-
-
- {{item.title}}
- 已售{{item.sales}}
-
-
- {{items}}
-
-
-
- ￥
- {{item.price}}
- /
- {{item.duration}}分钟
-
+
+
+
+
+
+ {{item.title}}
+
+
+ 服务时长：{{item.duration}}分钟
+ 已售：{{item.sales}}
+
+
+
+ {{item.jianjie}}
+
+
@@ -769,9 +783,7 @@
massageId: item.massageTypeId,
num: 1,
}],
- price: payMoney,
couponId: '',
- payMoney: payMoney,
userId: uni.getStorageSync('userId'),
addMassageTypeId:item.massageTypeId,
addEntryName:item.title
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index 605620e..f409c2d 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -10,13 +10,13 @@
服务项目
-
- {{order.ordersMassageList[0].massageType.title}}
+ {{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}
待支付
@@ -34,12 +34,10 @@
-
- {{order.ordersMassageList[0].massageType.duration}}分钟
-
-
- {{order.duration}}2分钟
+
+ {{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟
+
@@ -147,11 +145,11 @@
项目名称
- {{order.ordersMassageList[0].massageType.title}}
+ {{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}
服务时长
- {{order.ordersMassageList[0].massageType.duration}}分钟
+ {{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟
项目价格
@@ -287,11 +285,19 @@
class="btns">
提前结束
-
- 去投诉
+ @tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
+ class="btns">
+ 加钟
+
+
+ 加钟
-
-
-
-
- {{item.title}}
- 已售{{item.sales}}
+
+
+
+
+
+ {{item.title}}
+
+
+ 服务时长：{{item.duration}}分钟
+ 已售：{{item.sales}}
+
-
- {{items}}
+
+ {{item.jianjie}}
-
- ￥ {{item.memberPrice}}{{item.price}}
- /{{item.duration}}分钟
- 确认加钟
+
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 9f69206..50facf8 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -411,26 +411,33 @@
-
-
-
-
- {{item.title}}
- 已售{{item.sales}}
-
-
- {{items}}
-
-
-
- ￥
- {{item.price}}
- /
- {{item.duration}}分钟
-
+
+
+
+
+
+ {{item.title}}
+
+
+ 服务时长：{{item.duration}}分钟
+ 已售：{{item.sales}}
+
+
+
+ {{item.jianjie}}
+
+