From 91dfd0f2469a5a71da63754e10cf0fb6c21faff2 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Wed, 22 Feb 2023 15:32:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4=E9=A1=B5=E6=98=BE=E7=A4=BA=202.=E8=A7=A3=E5=86=B3?=
=?UTF-8?q?=E8=81=94=E7=B3=BB=E5=AE=A2=E6=9C=8D=E4=B8=8D=E8=83=BD=E6=93=8D?=
=?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../rec-confirmation/rec-confirmation.vue | 8 ++---
pages/goods/refuel-confirm/refuel-confirm.vue | 13 ++++----
pages/order/confirmation.vue | 8 ++---
pages/tabBar/home/home.vue | 11 +++++--
pages/user/news/news.vue | 6 ++--
pages/user/order_details/order_details.vue | 30 +++++++++++++++--
qianzhu-KFC/confirmOrder/confirmOrder.vue | 8 ++---
qianzhu-KFC/order-details/order-details.vue | 32 +++++++++++++++++--
.../unionComfirmation/unionComfirmation.vue | 8 ++---
9 files changed, 91 insertions(+), 33 deletions(-)
diff --git a/member-Recharge/rec-confirmation/rec-confirmation.vue b/member-Recharge/rec-confirmation/rec-confirmation.vue
index 351ce5e..3b3025d 100644
--- a/member-Recharge/rec-confirmation/rec-confirmation.vue
+++ b/member-Recharge/rec-confirmation/rec-confirmation.vue
@@ -74,19 +74,19 @@
-
+
下单返积分
-
返{{rebateIntegral}}积分
-
{{rebateIntegral}}
-
+ -->
diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index 9f7f961..294dd37 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -129,19 +129,18 @@
-
+
下单返积分
-
+
返{{rebateIntegral}}积分
-
{{rebateIntegral}}
-
+ -->
@@ -307,7 +306,7 @@
imageUrl: app.globalData.imgUrl,
oilPirce: 0, //油卡余额
user: '',
- paytype: 'weixin',
+ paytype: '2',
PaymentPassword: '',
orderPrice: '', //原价
deductionPrice: '0.00', //优惠金额
@@ -526,7 +525,7 @@
if (item.discountType == 3) {
this.memDiscountId = items.id;
// 打折
- this.deductionPrice = this.orderPrice - (this.orderPrice * item.discountPrice);
+ this.deductionPrice = parseFloat(this.orderPrice - (this.orderPrice * item.discountPrice)).toFixed(2);
let oldprice = parseFloat(this.orderPrice * item.discountPrice).toFixed(2);
this.priceCaluc(oldprice);
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index a82e690..5165257 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -112,19 +112,19 @@
-
+
下单返积分
-
返{{rebateIntegral}}积分
-
{{rebateIntegral}}
-
+ -->
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index e0334b0..67f35d3 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -65,7 +65,7 @@
-
@@ -626,8 +626,15 @@
this.currentSwiper = event.detail.current;
},
test(item) {
+ let datas = [];
+ for (var i = 0; i < this.homeCateList.length; i++) {
+ if (this.homeCateList[i].type == 3) {
+ datas.push(this.homeCateList[i])
+ }
+ }
+ let jumpid = datas[0].childDate[item].type;
uni.navigateTo({
- url: '../../user/news/news'
+ url: '../../user/news/news?id=' + jumpid
})
},
diff --git a/pages/user/news/news.vue b/pages/user/news/news.vue
index 40e6dd3..866acc6 100644
--- a/pages/user/news/news.vue
+++ b/pages/user/news/news.vue
@@ -96,10 +96,11 @@
return a[value1];
}
},
- onLoad() {
+ onLoad(options) {
// #ifdef H5
this.headerTop = '44px';
// #endif
+ this.newstypeid = options.id;
this.getDictionaryByCodeType();
},
// onShow() {
@@ -114,8 +115,7 @@
getDictionaryByCodeType(datas).then(res => {
if (res.return_code == '000000') {
this.newsTyplist = res.return_data;
- this.newstypeid = res.return_data[0].codeValue;
- this.getMsgByList(res.return_data[0].codeValue);
+ this.getMsgByList(this.newstypeid);
}
})
},
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index c0fd2eb..6311629 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -483,8 +483,13 @@
-
-
+
+
+
+
+
+ 联系客服
+
@@ -733,6 +738,27 @@
}
}
});
+ },
+ //拨打客服电话
+ playPhone() {
+ uni.showModal({
+ title: '客服',
+ content: '4006780738',
+ success: function(res) {
+ if (res.confirm) {
+ uni.makePhoneCall({
+ phoneNumber: '4006780738', //电话号码
+ success: function(e) {
+ console.log(e);
+ },
+ fail: function(e) {
+ console.log(e);
+
+ }
+ })
+ }
+ }
+ })
},
toPay(item) {
let payTypes;
diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue
index faa1581..b34a1b8 100644
--- a/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -124,19 +124,19 @@
-
+
下单返积分
-
返{{rebateIntegral}}积分
-
{{rebateIntegral}}
-
+ -->
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
index bf092dd..cfdd51b 100644
--- a/qianzhu-KFC/order-details/order-details.vue
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -61,7 +61,7 @@
{{item.code}}
+ v-for="(item,index) in recinfo.object.orderItems" :key='index'>取餐口令:{{item.code}}
@@ -187,8 +187,13 @@
-
-
+
+
+
+
+
+ 联系客服
+
取消订单
@@ -370,6 +375,27 @@
}
holdTime--;
}, 1000)
+ },
+ //拨打客服电话
+ playPhone() {
+ uni.showModal({
+ title: '客服',
+ content: '4006780738',
+ success: function(res) {
+ if (res.confirm) {
+ uni.makePhoneCall({
+ phoneNumber: '4006780738', //电话号码
+ success: function(e) {
+ console.log(e);
+ },
+ fail: function(e) {
+ console.log(e);
+
+ }
+ })
+ }
+ }
+ })
},
//倒计时
showtime() {
diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue
index 689d48d..2f21101 100644
--- a/subPages/unionComfirmation/unionComfirmation.vue
+++ b/subPages/unionComfirmation/unionComfirmation.vue
@@ -82,19 +82,19 @@
-
+
下单返积分
-
返{{rebateIntegral}}积分
-
{{rebateIntegral}}
-
+ -->