From 5792bde6060c0b1b30e99c2751a85fbf2f52ee7a Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 18 Nov 2022 15:26:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=9C=8D=E7=94=B5?=
=?UTF-8?q?=E8=AF=9D=E6=96=87=E6=A1=88=202.=E4=BF=AE=E6=94=B9=E9=A6=96?=
=?UTF-8?q?=E9=A1=B5=E5=AE=9A=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/goods/externalCoupon/externalCoupon.vue | 25 ++--
pages/order/confirmation.vue | 49 +++----
pages/tabBar/category/category.vue | 6 +-
pages/tabBar/home/home.vue | 121 +++++++++++-------
pages/tabBar/user/user.vue | 6 +-
5 files changed, 122 insertions(+), 85 deletions(-)
diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue
index df421d3..f7b19dd 100644
--- a/pages/goods/externalCoupon/externalCoupon.vue
+++ b/pages/goods/externalCoupon/externalCoupon.vue
@@ -17,11 +17,11 @@
-
+ v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status == 1"
+ @click="receiveDiscount">点击领取
+
去使用
@@ -261,9 +261,18 @@
//商品跳转
toGoods(e) {
if (app.globalData.userInfo) {
- uni.navigateTo({
- url: '../../order/confirmation?id=' + e
- })
+ if (app.globalData.openId) {
+ uni.navigateTo({
+ url: '../../order/confirmation?id=' + e
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: '网络异常,请稍后重试',
+ duration: 2000
+ })
+ }
+
} else {
uni.showToast({
icon: 'none',
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 5903071..502c77d 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -87,14 +87,14 @@
-
-
-
- 邀请码
-
-
-
-
+
+
+
+ 邀请码
+
+
+
+
@@ -103,6 +103,18 @@
+
+
+ 微信支付
+
+
+
+
+
+
+
@@ -115,18 +127,7 @@
-
-
- 微信支付
-
-
-
-
-
-
+ v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">
汇联通工会卡可用余额: {{tongCardPrice}}元
@@ -138,8 +139,8 @@
-
-
+
+