From abb53567015449c89d1aed4e54e6f6791ff85520 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Wed, 3 Apr 2024 11:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=A6=80=EF=B8=8F=20fix:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 exchange.html         | 19 ++++++++++---------
 packkey/exchange.html | 18 +++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/exchange.html b/exchange.html
index caf5549..2c667d1 100644
--- a/exchange.html
+++ b/exchange.html
@@ -295,17 +295,18 @@
         if (goodsDetail.available != 1) {
           return this.openErrorDialog(product_status(goodsDetail.available, goodsDetail));
         }
+
         /* 卡密商品直接兑换 */
         if (this.goodInfo.product_type === 2 && this.goodInfo.card_show == 2) {
-          this.maskshow = true;
-          this.popboxshow = true;
-          this.popboxtype = '兑换';
-          return;
-        }
-
-        /* 当只有一个卡密商品、为线上查看卡密且只能兑换一次时执行 */
-        if (this.goodInfo.product_type === 2 && this.goodInfo.card_show == 2 && !this.backAble && this.goodsDetail.restrict == 1) {
-          return this.surexchangeBtn();
+          /* 当只有一个卡密商品、为线上查看卡密且只能兑换一次时执行 */
+          if (!this.backAble && this.goodsDetail.restrict == 1) {
+            return this.surexchangeBtn();
+          } else {
+            this.maskshow = true;
+            this.popboxshow = true;
+            this.popboxtype = '兑换';
+            return;
+          }
         }
 
         /* 京东E卡 */
diff --git a/packkey/exchange.html b/packkey/exchange.html
index 758f31a..6227fcf 100644
--- a/packkey/exchange.html
+++ b/packkey/exchange.html
@@ -346,15 +346,15 @@
 
         /* 卡密商品直接兑换 */
         if (this.goodInfo.product_type === 2 && this.goodInfo.card_show == 2) {
-          this.maskshow = true;
-          this.popboxshow = true;
-          this.popboxtype = '兑换';
-          return;
-        }
-
-        /* 当只有一个卡密商品、为线上查看卡密且只能兑换一次时执行 */
-        if (this.goodInfo.product_type === 2 && this.goodInfo.card_show == 2 && !this.backAble && this.goodsDetail.restrict == 1) {
-          return this.surexchangeBtn();
+          /* 当只有一个卡密商品、为线上查看卡密且只能兑换一次时执行 */
+          if (!this.backAble && this.goodsDetail.restrict == 1) {
+            return this.surexchangeBtn();
+          } else {
+            this.maskshow = true;
+            this.popboxshow = true;
+            this.popboxtype = '兑换';
+            return;
+          }
         }
 
         /* 京东E卡 */