浏览代码

修改bug

huangxiaojing 2 年之前
父节点
当前提交
50175dfb81
共有 2 个文件被更改,包括 23 次插入59 次删除
  1. 10 30
      pages/activity/lottery/index.vue
  2. 13 29
      pages/activity/lottery/pc.vue

+ 10 - 30
pages/activity/lottery/index.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="lottery-container">
   <div class="lottery-container">
     <van-swipe v-if="carousel.length" :autoplay="3000" class="lottery-swipe" vertical :show-indicators="false">
     <van-swipe v-if="carousel.length" :autoplay="3000" class="lottery-swipe" vertical :show-indicators="false">
-      <van-swipe-item v-for="item in carousel" :key="item.mealId">有{{ item.count }}个用户 {{ ['', '抽', '购买'][item.type]
+      <van-swipe-item v-for="item in carousel" :key="item.mealId">有{{ item.count }}个用户 {{ ['', '抽', '购买'][item.type]
         }}{{ item.title }}</van-swipe-item>
         }}{{ item.title }}</van-swipe-item>
     </van-swipe>
     </van-swipe>
     <img class="w51h26" src="~/assets/image/activity/lottery/rule.png" alt="" @click="showRule = true;makePoint('activity_购买协议');" />
     <img class="w51h26" src="~/assets/image/activity/lottery/rule.png" alt="" @click="showRule = true;makePoint('activity_购买协议');" />
@@ -89,7 +89,7 @@
           <div class="buy-bar">
           <div class="buy-bar">
             原价¥{{originalPrice}}
             原价¥{{originalPrice}}
             <div class="buy-bar-btn" @click="createOrder">
             <div class="buy-bar-btn" @click="createOrder">
-              <div>立即购买</div>
+              <div>立即购买¥{{actualPrice}}</div>
               <div class="tip">节省¥{{originalPrice-actualPrice}}</div>
               <div class="tip">节省¥{{originalPrice-actualPrice}}</div>
             </div>
             </div>
           </div>
           </div>
@@ -181,26 +181,6 @@
               1、请您理解:通过任何不正当手段参与活动,如借助非自然流量或外挂工具;利用技术漏洞,恶意退款,批量注册账号、买号等搅乱平台管理秩序的行为,臂云科技有权限制或取消用户的活动资格,不予发放或撤销相关交易及福利内容。
               1、请您理解:通过任何不正当手段参与活动,如借助非自然流量或外挂工具;利用技术漏洞,恶意退款,批量注册账号、买号等搅乱平台管理秩序的行为,臂云科技有权限制或取消用户的活动资格,不予发放或撤销相关交易及福利内容。
             </div>
             </div>
             <div class="txt7">2、如有疑问请联系双子星APP客服咨询</div>
             <div class="txt7">2、如有疑问请联系双子星APP客服咨询</div>
-            <div class="txt8 mt5 fw500" style="color: #ec6250">
-              时长包使用规则
-            </div>
-            <div class="txt7 mt5">年卡特惠云手机,按需补充时长包</div>
-            <div class="txt7">
-              有效时间:<span class="txt10">时长用完前一直有效,支持跨月</span>
-            </div>
-            <div class="txt7">
-              可用范围:<span class="txt10">可续时长的机型</span>
-            </div>
-            <div class="txt7">
-              生效方式:<span class="txt10">立即生效</span>
-            </div>
-            <div class="txt7">
-              退订说明:<span class="txt10">立即生效产品,不支持退订</span>
-            </div>
-            <div class="txt7 mt14">
-              产品说明<br />1、生效方式:时长补充包订购后立即生效,直至时长用完则失效,用户可重复订购。<br />
-              2、时长使用顺序:优先使用年卡特惠包时长,年卡特惠包时长耗尽,自动使用时长包时长。<br />3、年卡特惠包合约到期后,如时长补充包仍有时长,年卡特惠包所属云手机可继续使用至时长用尽。
-            </div>
           </div>
           </div>
           <img class="w304h62" src="~/assets/image/activity/lottery/buy-rule-icon.png" alt="" @click="showRule = false" />
           <img class="w304h62" src="~/assets/image/activity/lottery/buy-rule-icon.png" alt="" @click="showRule = false" />
         </div>
         </div>
@@ -540,14 +520,14 @@ export default {
 
 
       if (this.luckDrawType === 1) {
       if (this.luckDrawType === 1) {
         this.makePoint('activity_15.9年卡');
         this.makePoint('activity_15.9年卡');
-        if (Number(localStorage.getItem('year-15-9')) !== 2) {
-          localStorage.setItem('year-15-9', 1);
+        if (Number(localStorage.getItem(this.$auth.user.username + 'year-15-9')) !== 2) {
+          localStorage.setItem(this.$auth.user.username + 'year-15-9', 1);
         }
         }
       }
       }
       if (this.luckDrawType === 2) {
       if (this.luckDrawType === 2) {
         this.makePoint('activity_9.9年卡');
         this.makePoint('activity_9.9年卡');
-        if (Number(localStorage.getItem('year-9-9')) !== 2) {
-          localStorage.setItem('year-9-9', 1);
+        if (Number(localStorage.getItem(this.$auth.user.username + 'year-9-9')) !== 2) {
+          localStorage.setItem(this.$auth.user.username + 'year-9-9', 1);
         }
         }
       }
       }
     },
     },
@@ -593,13 +573,13 @@ export default {
     closed() {
     closed() {
       this.makePoint('activity_关闭抽奖', 'eventCode传27_抽奖流程');
       this.makePoint('activity_关闭抽奖', 'eventCode传27_抽奖流程');
       this.selMealId = this.mealId;
       this.selMealId = this.mealId;
-      if (+localStorage.getItem('year-15-9') !== 2) {
+      if (this.luckDrawType === 1 && +localStorage.getItem(this.$auth.user.username + 'year-15-9') !== 2) {
         this.show = true;
         this.show = true;
-        localStorage.setItem('year-15-9', 2);
+        localStorage.setItem(this.$auth.user.username + 'year-15-9', 2);
       }
       }
-      if (+localStorage.getItem('year-9-9') !== 2) {
+      if (this.luckDrawType === 2 && +localStorage.getItem(this.$auth.user.username + 'year-9-9') !== 2) {
         this.show = true;
         this.show = true;
-        localStorage.setItem('year-9-9', 2);
+        localStorage.setItem(this.$auth.user.username + 'year-9-9', 2);
       }
       }
       this.showPay = false
       this.showPay = false
     },
     },

+ 13 - 29
pages/activity/lottery/pc.vue

@@ -89,7 +89,7 @@
           <div class="buy-bar">
           <div class="buy-bar">
             原价¥{{originalPrice}}
             原价¥{{originalPrice}}
             <div class="buy-bar-btn" @click="createOrder">
             <div class="buy-bar-btn" @click="createOrder">
-              <div>立即购买</div>
+              <div>立即购买¥{{actualPrice}}</div>
               <div class="tip">节省¥{{originalPrice-actualPrice}}</div>
               <div class="tip">节省¥{{originalPrice-actualPrice}}</div>
             </div>
             </div>
           </div>
           </div>
@@ -181,26 +181,6 @@
               1、请您理解:通过任何不正当手段参与活动,如借助非自然流量或外挂工具;利用技术漏洞,恶意退款,批量注册账号、买号等搅乱平台管理秩序的行为,臂云科技有权限制或取消用户的活动资格,不予发放或撤销相关交易及福利内容。
               1、请您理解:通过任何不正当手段参与活动,如借助非自然流量或外挂工具;利用技术漏洞,恶意退款,批量注册账号、买号等搅乱平台管理秩序的行为,臂云科技有权限制或取消用户的活动资格,不予发放或撤销相关交易及福利内容。
             </div>
             </div>
             <div class="txt7">2、如有疑问请联系双子星APP客服咨询</div>
             <div class="txt7">2、如有疑问请联系双子星APP客服咨询</div>
-            <div class="txt8 mt5 fw500" style="color: #ec6250">
-              时长包使用规则
-            </div>
-            <div class="txt7 mt5">年卡特惠云手机,按需补充时长包</div>
-            <div class="txt7">
-              有效时间:<span class="txt10">时长用完前一直有效,支持跨月</span>
-            </div>
-            <div class="txt7">
-              可用范围:<span class="txt10">可续时长的机型</span>
-            </div>
-            <div class="txt7">
-              生效方式:<span class="txt10">立即生效</span>
-            </div>
-            <div class="txt7">
-              退订说明:<span class="txt10">立即生效产品,不支持退订</span>
-            </div>
-            <div class="txt7 mt14">
-              产品说明<br />1、生效方式:时长补充包订购后立即生效,直至时长用完则失效,用户可重复订购。<br />
-              2、时长使用顺序:优先使用年卡特惠包时长,年卡特惠包时长耗尽,自动使用时长包时长。<br />3、年卡特惠包合约到期后,如时长补充包仍有时长,年卡特惠包所属云手机可继续使用至时长用尽。
-            </div>
           </div>
           </div>
           <img class="w304h62" src="~/assets/image/activity/lottery/buy-rule-icon.png" alt="" @click="showRule = false" />
           <img class="w304h62" src="~/assets/image/activity/lottery/buy-rule-icon.png" alt="" @click="showRule = false" />
         </div>
         </div>
@@ -478,16 +458,20 @@ export default {
       this.showPay = true;
       this.showPay = true;
       // 解锁
       // 解锁
       this.isLocking = false;
       this.isLocking = false;
+      if (this.$userAgent.isSzx && this.$userAgent.isAndroid) {
+        window.native.isMembersLotto(true)
+      }
+
       if (this.luckDrawType === 1) {
       if (this.luckDrawType === 1) {
         this.makePoint('activity_15.9年卡');
         this.makePoint('activity_15.9年卡');
-        if (Number(localStorage.getItem('year-15-9')) !== 2) {
-          localStorage.setItem('year-15-9', 1);
+        if (Number(localStorage.getItem(this.$auth.user.username + 'year-15-9')) !== 2) {
+          localStorage.setItem(this.$auth.user.username + 'year-15-9', 1);
         }
         }
       }
       }
       if (this.luckDrawType === 2) {
       if (this.luckDrawType === 2) {
         this.makePoint('activity_9.9年卡');
         this.makePoint('activity_9.9年卡');
-        if (Number(localStorage.getItem('year-9-9')) !== 2) {
-          localStorage.setItem('year-9-9', 1);
+        if (Number(localStorage.getItem(this.$auth.user.username + 'year-9-9')) !== 2) {
+          localStorage.setItem(this.$auth.user.username + 'year-9-9', 1);
         }
         }
       }
       }
     },
     },
@@ -530,13 +514,13 @@ export default {
     closed() {
     closed() {
       this.makePoint('activity_关闭抽奖', 'eventCode传27_抽奖流程');
       this.makePoint('activity_关闭抽奖', 'eventCode传27_抽奖流程');
       this.selMealId = this.mealId;
       this.selMealId = this.mealId;
-      if (+localStorage.getItem('year-15-9') !== 2) {
+      if (this.luckDrawType === 1 && +localStorage.getItem(this.$auth.user.username + 'year-15-9') !== 2) {
         this.show = true;
         this.show = true;
-        localStorage.setItem('year-15-9', 2);
+        localStorage.setItem(this.$auth.user.username + 'year-15-9', 2);
       }
       }
-      if (+localStorage.getItem('year-9-9') !== 2) {
+      if (this.luckDrawType === 2 && +localStorage.getItem(this.$auth.user.username + 'year-9-9') !== 2) {
         this.show = true;
         this.show = true;
-        localStorage.setItem('year-9-9', 2);
+        localStorage.setItem(this.$auth.user.username + 'year-9-9', 2);
       }
       }
       this.showPay = false
       this.showPay = false
     },
     },