From 28a0d4f8d8d5b514fc6040d3130a99057c947daf Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Wed, 14 Aug 2024 17:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=20=E5=85=A8=E9=A2=9D?=
=?UTF-8?q?=E9=80=80=E6=AC=BE=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/pay.vue | 4 ++--
my/order/payCLDetail.vue | 4 ++--
my/order/payJaZ.vue | 4 ++--
my/order/payModifyQy.vue | 2 +-
my/order/payShengji.vue | 4 ++--
my/order/paydingDd.vue | 4 ++--
my/order/paydingTCX.vue | 4 ++--
my/order/paydingTc.vue | 10 +++++++---
my/order/paydingXiuGai.vue | 4 ++--
pages/my/hehuo.vue | 2 +-
pages/order/index - 副本.vue | 4 ++--
pages/order/index.vue | 4 ++--
pages/shop/index.vue | 2 +-
pages/shop/qiyeDatail.vue | 6 +++---
14 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/my/order/pay.vue b/my/order/pay.vue
index 09b0d63..2132ef6 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -707,9 +707,9 @@
同意
-
+
diff --git a/my/order/payCLDetail.vue b/my/order/payCLDetail.vue
index 2ecb1b5..4d135fb 100644
--- a/my/order/payCLDetail.vue
+++ b/my/order/payCLDetail.vue
@@ -515,9 +515,9 @@
同意
-
+
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index 48c86d2..29a2ec2 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -657,9 +657,9 @@
同意
-
+
diff --git a/my/order/payModifyQy.vue b/my/order/payModifyQy.vue
index 6669f42..9af9806 100644
--- a/my/order/payModifyQy.vue
+++ b/my/order/payModifyQy.vue
@@ -20,7 +20,7 @@
项目价格：
￥
- {{orderXm.price}}
+ {{detailData[0].packagePrice}}
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 6915229..90289f6 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -760,9 +760,9 @@
同意
-
+
diff --git a/my/order/paydingDd.vue b/my/order/paydingDd.vue
index fe19838..7e9b48d 100644
--- a/my/order/paydingDd.vue
+++ b/my/order/paydingDd.vue
@@ -367,9 +367,9 @@
同意
-
+
diff --git a/my/order/paydingTCX.vue b/my/order/paydingTCX.vue
index 3f5f2d6..e4c11aa 100644
--- a/my/order/paydingTCX.vue
+++ b/my/order/paydingTCX.vue
@@ -355,9 +355,9 @@
同意
-
+
diff --git a/my/order/paydingTc.vue b/my/order/paydingTc.vue
index 83f7301..d65b41b 100644
--- a/my/order/paydingTc.vue
+++ b/my/order/paydingTc.vue
@@ -24,10 +24,12 @@
+
￥
- {{order.sumMoney}}
+ {{order.ordersPackageList[0].packagePrice}}
+
￥
{{order.sumMoney}}/{{orderXm.serviceCount}}{{orderXm.type=='104'?'套':orderXm.type=='105'?'次':'次'}}
@@ -54,10 +56,12 @@
费用明细
+
项目价格
- ￥{{order.sumMoney}}
+ ￥{{order.ordersPackageList[0].packagePrice}}
+
{{orderXm.type=='104'?'套餐':orderXm.type=='105'?'次卡':orderXm.type=='106'?'疗程':'项目'}}价格
￥{{order.sumMoney}}
@@ -77,7 +81,7 @@
总金额
- ￥{{order.payMoney}}
+ ￥{{order.payMoney}}
diff --git a/my/order/paydingXiuGai.vue b/my/order/paydingXiuGai.vue
index 085cc89..c71cda6 100644
--- a/my/order/paydingXiuGai.vue
+++ b/my/order/paydingXiuGai.vue
@@ -410,9 +410,9 @@
同意
-
+
diff --git a/pages/my/hehuo.vue b/pages/my/hehuo.vue
index a50838b..bab9786 100644
--- a/pages/my/hehuo.vue
+++ b/pages/my/hehuo.vue
@@ -307,7 +307,7 @@
filePath: filePath,
success: (infoRes) => {
const size = infoRes.size;
- if (size / 1024 / 1024 > 2) {
+ if (size / 1024 / 1024 > 4) {
// 图片大于2MB
uni.showToast({
icon:'error',
diff --git a/pages/order/index - 副本.vue b/pages/order/index - 副本.vue
index b0ae67f..31fbb80 100644
--- a/pages/order/index - 副本.vue
+++ b/pages/order/index - 副本.vue
@@ -251,9 +251,9 @@
同意
-
+
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 4dbe7a1..ffcc59b 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -279,9 +279,9 @@
同意
-
+
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 2a301ab..7120706 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -35,7 +35,7 @@
- ￥{{item.price}}
+ ￥{{item.packagePrice}}
￥{{item.oldPrice}}
diff --git a/pages/shop/qiyeDatail.vue b/pages/shop/qiyeDatail.vue
index 3874d4d..76bfb2c 100644
--- a/pages/shop/qiyeDatail.vue
+++ b/pages/shop/qiyeDatail.vue
@@ -24,10 +24,10 @@
@@ -120,7 +120,7 @@
serviceCount:'',
labels:[],
page:1,
- limit:10
+ limit:10,
}
},
computed: {