From ee32956617bd4f22a7edd3ff34cc6445ce7a604d Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Fri, 11 Aug 2023 10:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=8A=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   | 45 ++++++++++++++++++++++++++++-----------------
 homepage2_0.css | 10 +++++++++-
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/exchange.html b/exchange.html
index eaf7d5e..7279080 100644
--- a/exchange.html
+++ b/exchange.html
@@ -28,7 +28,7 @@
   </script>
   <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/siteqiexchange/js/swiper.min.js"></script>
   <link href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/siteqiexchange/css/swiper.min.css" rel="stylesheet">
-  <link rel="stylesheet" href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/css/homepage2_0.css">
+  <link rel="stylesheet" href="./homepage2_0.css">
   <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js"></script>
 </head>
 
@@ -51,18 +51,21 @@
         </div>
       </div>
       <div class="ipt-acc" style="position: relative;z-index: 99;" @click="bindAvailable">
-        <p v-if="acctype=='tel'"><span>账号:</span><input :type="acctype"
-            onkeyup="this.value=this.value.replace(/\D/g,'')" :disabled="goodsDetail.available!=1"
-            onKeypress="return(/[\d]/.test(String.fromCharCode(event.keyCode)))" :maxlength="maxlen" v-model="account"
-            :placeholder="placeholder" @focus="(e)=>focusFn(e)"></p>
-        <p v-if="acctype=='tel'"><span>再次输入:</span> <input :type="acctype"
-            onkeyup="this.value=this.value.replace(/\D/g,'')" :disabled="goodsDetail.available!=1"
-            onKeypress="return(/[\d]/.test(String.fromCharCode(event.keyCode)))" :maxlength="maxlen" v-model="reaccount"
-            placeholder="请再次输入" @focus="(e)=>focusFn(e)"></p>
-        <p v-if="acctype!='tel'"><span>账号:</span> <input :type="acctype" :maxlength="maxlen" v-model="account"
-            :disabled="goodsDetail.available!=1" :placeholder="placeholder" @focus="(e)=>focusFn(e)"></p>
-        <p v-if="acctype!='tel'"><span>再次输入:</span><input :type="acctype" :maxlength="maxlen" v-model="reaccount"
-            :disabled="goodsDetail.available!=1" placeholder="请再次输入" @focus="(e)=>focusFn(e)"></p>
+        <h4 class="title" v-if="goodInfo.product_type===2">{{goodInfo.product_name}}</h4>
+        <template v-if="goodInfo.product_type===1">
+          <p v-if="acctype=='tel'"><span>账号:</span><input :type="acctype"
+              onkeyup="this.value=this.value.replace(/\D/g,'')" :disabled="goodsDetail.available!=1"
+              onKeypress="return(/[\d]/.test(String.fromCharCode(event.keyCode)))" :maxlength="maxlen" v-model="account"
+              :placeholder="placeholder" @focus="(e)=>focusFn(e)"></p>
+          <p v-if="acctype=='tel'"><span>再次输入:</span> <input :type="acctype"
+              onkeyup="this.value=this.value.replace(/\D/g,'')" :disabled="goodsDetail.available!=1"
+              onKeypress="return(/[\d]/.test(String.fromCharCode(event.keyCode)))" :maxlength="maxlen"
+              v-model="reaccount" placeholder="请再次输入" @focus="(e)=>focusFn(e)"></p>
+          <p v-if="acctype!='tel'"><span>账号:</span> <input :type="acctype" :maxlength="maxlen" v-model="account"
+              :disabled="goodsDetail.available!=1" :placeholder="placeholder" @focus="(e)=>focusFn(e)"></p>
+          <p v-if="acctype!='tel'"><span>再次输入:</span><input :type="acctype" :maxlength="maxlen" v-model="reaccount"
+              :disabled="goodsDetail.available!=1" placeholder="请再次输入" @focus="(e)=>focusFn(e)"></p>
+        </template>
       </div>
       <div class="bottom" id="bottom" v-show="describe.type||detailUrl">
         <img :src="detailUrl" v-show="detailUrl">
@@ -76,7 +79,7 @@
           <p>订单</p>
         </div>
         <button class="exchange-btn"
-          :style="{'background': exchangeOpen?bgcolor:'#D7D7D7','color':exchangeOpen?ftcolor:'#333'}"
+          :style="{'background': (exchangeOpen||goodInfo.product_type===2)?bgcolor:'#D7D7D7','color':(exchangeOpen||goodInfo.product_type===2)?ftcolor:'#333'}"
           @click="exchangeGoodsFn">立即兑换</button>
       </div>
     </div>
@@ -101,7 +104,7 @@
     <!-- 询问 -->
     <div class="popboxshow" v-if="popboxshow&&popboxtype=='兑换'" :class="popboxshow?'active':''">
       <div>
-        <p v-if="acctype=='tel'">是否为账号{{this.account}}兑换{{this.proname}}会员?</p>
+        <p v-if="acctype=='tel'">{{goodInfo.product_type===1?`是否为账号${this.account}兑换${this.proname}会员?`:'是否确认兑换？'}}</p>
         <p v-if="acctype=='text'">是否兑换{{this.proname}}会员?</p>
         <span @click="surexchangeBtn">确认兑换</span>
       </div>
@@ -222,12 +225,20 @@
       successchangeBtnFn () {
         window.location.replace(document.referrer);
       },
+
       //兑换商品
       exchangeGoodsFn () {
         if (goodsDetail.available != 1) {
-          this.openErrorDialog(product_status(goodsDetail.available, goodsDetail));
-          return;
+          return this.openErrorDialog(product_status(goodsDetail.available, goodsDetail));
         }
+        /* 卡密商品直接兑换 */
+        if (this.goodInfo.product_type === 2) {
+          this.maskshow = true;
+          this.popboxshow = true;
+          this.popboxtype = '兑换';
+          return;
+        };
+
         if (!this.account) {
           this.openDialog('请输入兑换账号！');
           return false;
diff --git a/homepage2_0.css b/homepage2_0.css
index 57cef72..d1ffe14 100644
--- a/homepage2_0.css
+++ b/homepage2_0.css
@@ -787,7 +787,7 @@ img.changegray {
 #exchangePage .ipt-acc {
   font-size: 0.15rem;
   width: 100%;
-  padding: 0.3rem 0;
+  padding: 0.2rem 0;
   display: flex;
   justify-content: space-between;
   flex-direction: column;
@@ -879,6 +879,14 @@ img.changegray {
   margin-bottom: 0.02rem;
 }
 
+#exchangePage .ipt-acc .title {
+  font-size: 0.17rem;
+  font-weight: bold;
+  color: #0a0a0a;
+  margin-left: 0.12rem;
+  margin-bottom: 0.24rem;
+}
+
 .suspensionDom {
   width: 100%;
   height: 100vh;