From 9213e2f70e80d5117e29a33575dd8396b161f667 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Wed, 10 Jan 2024 11:10:23 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 exchange.html | 7 +++++--
 homepage.html | 8 +++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/exchange.html b/exchange.html
index 9997851..22f59cb 100644
--- a/exchange.html
+++ b/exchange.html
@@ -345,15 +345,18 @@
             */
             if (this.goodInfo.product_type === 2) {
               if (this.goodInfo.card_show == 2) {
-                if (!this.backAble) { /* 当只有一个卡密商品时 */
+                if (!this.backAble && this.goodsDetail.restrict == 1) { /* 当只有一个卡密商品且仅兑换一次时 */
                   this.loading = true;
                   setTimeout(() => {
                     sessionStorage.setItem('orderNumber', res.data.order_number);
                     window.location.href = './coupon/lookCard.html';
                     this.loading = false;
                   }, 3000);
+                } else if (!this.backAble && this.goodsDetail.restrict > 1) {
+                  this.successTip = '兑换成功，请到页面左下角"订单"查看卡密信息！';
+                  this.popboxshow = true;
                 } else {
-                  this.successTip = '兑换成功，请到页面左下角"订单"(订单列表处)查看卡密信息！';
+                  this.successTip = '兑换成功，请到"订单列表"查看卡密信息！';
                   this.popboxshow = true;
                 }
               } else {
diff --git a/homepage.html b/homepage.html
index baa274b..cefc3bf 100644
--- a/homepage.html
+++ b/homepage.html
@@ -161,7 +161,7 @@
         <div v-html="describe.content" class="goodsTip" v-show="describe.type==3&&describe.content"></div>
       </div>
     </div>
-    <tab-static-component :current="1"></tab-static-component>
+    <tab-static-component :current="1" v-if="!isToLook"></tab-static-component>
     <!-- 悬浮提示 -->
     <div v-if="suspension" class="suspensionDom">
       <img @click="closeTip" src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/backprepageBtn.png"
@@ -226,6 +226,7 @@
         iskey: true,
         allgoods: [],
         showType: 0,
+        isToLook: false,
         tiptext: '还没开始哟，兑换时间为2021-12-05 12:12:12至2021-01-01 12:12:12',
         successTip: '兑换成功，到账信息请关注官方APP！',
       };
@@ -391,11 +392,12 @@
               if ((res.data && res.data.length == 1) || /miniProgram/i.test(ua)) {//单个商品直接进入详情页面
                 const product = res.data[0];
                 /* 满足3个条件进入此判断 仅兑换一次  在线查看卡密商品 则卡密页面不能返回 */
-                if (product.restrict == 1 && product.type == 1 && product.entity.card_show == 2) {
+                if (product.restrict == 1 && product.type == 1 && product.entity.card_show == 2 && product.entity.product_type == 2) {
                   sessionStorage.setItem('backShow', 1);
                 }
                 /* 满足3个条件进入此判断 仅兑换一次 已兑换 在线查看卡密商品 */
-                if (product.exchange == 1 && product.restrict == 1 && product.type == 1 && product.entity.card_show == 2) {
+                this.isToLook = product.exchange == 1 && product.restrict == 1 && product.type == 1 && product.entity.card_show == 2 && product.entity.product_type == 2;
+                if (this.isToLook) {
                   return req
                     .axiosGet(`/key/order/queryList`, {
                       token: data.token,