From 000b73c476c1f88707d9832b8ba3a96c2af1021a Mon Sep 17 00:00:00 2001
From: yunlongn <yunlongn@outlook.com>
Date: Tue, 21 Nov 2023 09:54:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84=E4=B8=80=E4=BA=9B=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=A1=B5=E9=9D=A2=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/goods_combination_details/index.vue | 4 ++--
 pages/goods_details/index.vue                      | 4 ++--
 pages/user/index.vue                               | 2 +-
 pages/users/order_confirm/index.vue                | 4 ++--
 pages/users/wechat_login/index.vue                 | 4 ++++
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pages/activity/goods_combination_details/index.vue b/pages/activity/goods_combination_details/index.vue
index 7b333bed..c5bae342 100644
--- a/pages/activity/goods_combination_details/index.vue
+++ b/pages/activity/goods_combination_details/index.vue
@@ -340,7 +340,7 @@
         qrcodeSize: 600, // 二维码的大小
         promotionCode: '', // 二维码图片
         imgTop: '', // 商品图片的 base64 码
-        errT: '',  // 获得小程序码失败的提示文本
+        errT: '获取海报失败',  // 获得小程序码失败的提示文本
         posters: false, // 分享弹窗的开关
         weixinStatus: false, // 微信分享是否打开
         canvasStatus: false, // 是否显示海报
@@ -854,7 +854,7 @@
         let data = {
           pid: this.uid,
           id: this.id,
-          path: 'pages/activity/goods_seckill_details/index'
+          path: 'pages/activity/goods_combination_details/index'
         }
         getQrcode(data).then(res=>{
           base64src(res.data.code, res => {
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 1463c620..1a031a40 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -869,11 +869,11 @@
           });
         } else if (activity.type === 2) {
           uni.navigateTo({
-            url: `/pages/activity/goods_bargain_details/index?id=${this.id}&startBargainUid=${this.uid}`
+            url: `/pages/activity/goods_bargain_details/index?id=${activity.id}&startBargainUid=${this.uid}`
           });
         } else {
           uni.navigateTo({
-            url: `/pages/activity/goods_combination_details/index?id=${this.id}`
+            url: `/pages/activity/goods_combination_details/index?id=${activity.id}`
           });
         }
       },
diff --git a/pages/user/index.vue b/pages/user/index.vue
index fcf31d99..043d1678 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -95,7 +95,7 @@
 							<block v-for="(item,index) in menus" :key="index">
 								<navigator class="item" :url="item.url" hover-class="none"
 									v-if="!(item.url ==='/pages/service/index'
-									|| (item.url === '/pages/users/user_spread_user/index' && brokerageUser && brokerageUser.enabled))">
+									|| (item.url === '/pages/users/user_spread_user/index' && brokerageUser && !brokerageUser.brokerageEnabled))">
 									<image :src="item.picUrl"></image>
 									<text>{{ item.name }}</text>
 								</navigator>
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 94bc0fdb..e8b0d980 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -399,8 +399,8 @@
       getCouponList: function() {
         CouponApi.getMatchCouponList({
           price: this.orderInfoVo.price.payPrice,
-          spuIds: this.orderInfoVo.items.map(item => item.spuId),
-          skuIds: this.orderInfoVo.items.map(item => item.skuId),
+          spuIds: this.orderInfoVo.items.map(item => item.spuId).join(","),
+          skuIds: this.orderInfoVo.items.map(item => item.skuId).join(","),
           categoryIds: this.orderInfoVo.items.map(item => item.categoryId)
         }).then(res => {
           this.$set(this.coupon, 'list', res.data);
diff --git a/pages/users/wechat_login/index.vue b/pages/users/wechat_login/index.vue
index 01686699..0042dbc4 100644
--- a/pages/users/wechat_login/index.vue
+++ b/pages/users/wechat_login/index.vue
@@ -193,6 +193,10 @@
           this.$store.commit("LOGIN", {
             'token': data.accessToken
           });
+          // 保存opendId用于支付
+          this.$store.commit("OPENID", data.openId);
+          // 设置当前userId
+          this.$store.commit("SETUID", data.userId);
           this.getUserInfo();
           this.bindBrokerUser();
         }).catch(e => {