From b61339d992261502ea405f8c88431869ba868925 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Wed, 22 Feb 2023 15:32:06 +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 +++---
.../goods/refuel-confirm/refuel-confirm.vue | 9 +++----
high-unionPay/pages/order/confirmation.vue | 8 +++---
high-unionPay/pages/tabBar/home/home.vue | 13 ++++++---
.../unionComfirmation/unionComfirmation.vue | 8 +++---
high-unionPay/pages/user/news/news.vue | 6 ++---
.../user/order_details/order_details.vue | 25 +++++++++++++++--
.../qianzhu-KFC/confirmOrder/confirmOrder.vue | 8 +++---
.../order-details/order-details.vue | 27 ++++++++++++++++---
9 files changed, 80 insertions(+), 32 deletions(-)
diff --git a/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue b/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
index 0a7eb3c..7bd650a 100644
--- a/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
+++ b/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
@@ -74,19 +74,19 @@
-
+
下单返积分
-
返{{rebateIntegral}}积分
-
{{rebateIntegral}}
-
+ -->
diff --git a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
index ae49f9b..bb4915b 100644
--- a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -130,19 +130,18 @@
-
+
下单返积分
-
+
返{{rebateIntegral}}积分
-
{{rebateIntegral}}
-
+ -->
diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue
index 9c91801..b28e56d 100644
--- a/high-unionPay/pages/order/confirmation.vue
+++ b/high-unionPay/pages/order/confirmation.vue
@@ -111,19 +111,19 @@
-
+
下单返积分
-
返{{rebateIntegral}}积分
-
{{rebateIntegral}}
-
+ -->
diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue
index 385cabc..01dbcf2 100644
--- a/high-unionPay/pages/tabBar/home/home.vue
+++ b/high-unionPay/pages/tabBar/home/home.vue
@@ -38,7 +38,7 @@
-
@@ -244,8 +244,15 @@
})
},
test(item) {
- uni.navigateTo({
- url: '../../user/news/news'
+ 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?id=' + jumpid
})
},
//定位信息
diff --git a/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue b/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue
index 3ba845e..55f7bc6 100644
--- a/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue
+++ b/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue
@@ -84,19 +84,19 @@
-
+
下单返积分
-
返{{rebateIntegral}}积分
-
{{rebateIntegral}}
-
+ -->
diff --git a/high-unionPay/pages/user/news/news.vue b/high-unionPay/pages/user/news/news.vue
index 9bc054b..059b85c 100644
--- a/high-unionPay/pages/user/news/news.vue
+++ b/high-unionPay/pages/user/news/news.vue
@@ -96,7 +96,8 @@
return a[value1];
}
},
- onLoad() {
+ onLoad(options) {
+ this.newstypeid = options.id;
this.getDictionaryByCodeType();
},
// onShow() {
@@ -111,8 +112,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/high-unionPay/pages/user/order_details/order_details.vue b/high-unionPay/pages/user/order_details/order_details.vue
index 50c6469..5d919fd 100644
--- a/high-unionPay/pages/user/order_details/order_details.vue
+++ b/high-unionPay/pages/user/order_details/order_details.vue
@@ -485,7 +485,7 @@
-
+ 联系客服
@@ -756,7 +756,28 @@
'&amount=' + this.recinfo
.payPrice + '&productType=' + this.recinfo.productType
})
- },
+ },
+ //拨打客服电话
+ 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);
+
+ }
+ })
+ }
+ }
+ })
+ }
}
}
diff --git a/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue b/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
index 3502cd8..6897920 100644
--- a/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -124,19 +124,19 @@
-
+
下单返积分
-
返{{rebateIntegral}}积分
-
{{rebateIntegral}}
-
+ -->
diff --git a/high-unionPay/qianzhu-KFC/order-details/order-details.vue b/high-unionPay/qianzhu-KFC/order-details/order-details.vue
index 9f752aa..2973f5c 100644
--- a/high-unionPay/qianzhu-KFC/order-details/order-details.vue
+++ b/high-unionPay/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}}
@@ -190,8 +190,8 @@
-
-
+ 联系客服
+ 取消订单
@@ -372,6 +372,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() {