点亮五菱

lottery/carOwnerScreening.html

@@ -322,7 +322,6 @@
         isWlCar: false,
         filter: 1,
         noTestDrive: false,
-        originalScrollY: 0
       }
     },
     created () {

lottery/lightUpWl.html

@@ -145,6 +145,7 @@
     width: 58px;
     height: 58px;
     border-radius: 10px;
+    background: #F5E3D4;
   }
 
   .award_tip {
@@ -251,7 +252,7 @@
       <div class="wl_btn" @click="handleAsk">
         <div class="image_wrapper">
           <img class="btn_img" src="./img/wl_btn.png" />
-          <div class="btn_text">{{lightData.raffle2Num ? '点亮成功，解锁终极大奖' : '邀请好友点亮'}}</div>
+          <div class="btn_text">{{lightData.raffle2.leftNum ? '点亮成功，解锁终极大奖' : '邀请好友点亮'}}</div>
         </div>
       </div>
     </div>
@@ -273,10 +274,13 @@
             <img class="award_ac" src="img/lottery1.png" />
             <div class="award_tip">
               <div class="award_title">好运抽奖</div>
-              <div>每邀请{{lightData.wxcpLighten.raffle1ClientNum}}人点亮即可抽奖{{lightData.wxcpLighten.raffle1NumMax}}次</div>
+              <div>每邀{{lightData.wxcpLighten.raffle1ClientNum}}人抽1次奖，最多{{lightData.wxcpLighten.raffle1NumMax}}次</div>
             </div>
           </div>
-          <div :class="lightData.raffle1Num ? 'award_btn_ac' : 'award_btn'" @click="handleLottery(lightData.raffle1BizId, lightData.raffle1Num)">{{lightData.raffle1Num ? '去抽奖' : '未完成'}}
+          <div v-if="lightData.wxcpLighten.raffle1NumMax === lightData.raffle1.useNum" class="award_btn">已完成</div>
+          <div v-else>
+            <div v-if="lightData.raffle1.leftNum" class="award_btn_ac" @click="handleLottery(lightData.raffle1BizId)">去抽奖</div>
+            <div v-else class="award_btn">未完成</div>
           </div>
         </div>
         <div class="lottery">
@@ -287,7 +291,10 @@
               <div>完全点亮即可抽取终极大奖！</div>
             </div>
           </div>
-          <div :class="lightData.raffle2Num ? 'award_btn_ac' : 'award_btn'" @click="handleLottery(lightData.raffle2BizId, lightData.raffle2Num)">{{lightData.raffle2Num ? '去抽奖' : '未完成'}}
+          <div v-if="lightData.wxcpLighten.raffle2NumMax === lightData.raffle2.useNum" class="award_btn">已完成</div>
+          <div v-else>
+            <div v-if="lightData.raffle2.leftNum" class="award_btn_ac" @click="handleLottery(lightData.raffle2BizId)">去抽奖</div>
+            <div v-else class="award_btn">未完成</div>
           </div>
         </div>
         <div class="activity_title">活动信息</div>
@@ -318,10 +325,17 @@
           wxcpLighten: {
             activityInfo: '',
             raffle1ClientNum: null,
-            raffle1NumMax: null,
+            raffle1NumMax: null, // 抽奖1总次数
+            raffle2NumMax: null, // 抽奖2总次数
+          },
+          raffle1: {
+            leftNum: null, // 抽奖1剩余次数
+            useNum: null, // 抽奖1已使用次数
+          },
+          raffle2: {
+            leftNum: null, // 抽奖2剩余次数
+            useNum: null, // 抽奖2已使用次数
           },
-          raffle1Num: 0,
-          raffle2Num: 0,
           raffle1BizId: null,
           raffle2BizId: null,
         },
@@ -428,28 +442,16 @@
           })
       },
       handleAsk () {
-        if (this.lightData.wxcpLightenClientList.length < 5) {
-          this.showAskDialog = true
-        } else {
-          this.$message({
-            message: '解锁终极大奖',
-          })
-        }
+        this.showAskDialog = true
       },
-      handleLottery (bizId, status) {
-        if (status) {
-          let url = ''
-          if (!this.env || this.env === 'prod') {
-            url = `https://lottery.camlook.cn/?bId=${bizId}&h5Type=30`
-          } else {
-            url = `https://lottery.camlook.cn/?bId=${bizId}&env=dev&h5Type=30`
-          }
-          window.location.replace(url)
+      handleLottery (bizId) {
+        let url = ''
+        if (!this.env || this.env === 'prod') {
+          url = `https://lottery.camlook.cn/?bId=${bizId}&h5Type=30`
         } else {
-          this.$message({
-            message: '未完成',
-          }) 
+          url = `https://lottery.camlook.cn/?bId=${bizId}&env=dev&h5Type=30`
         }
+        window.location.replace(url)
       },
       // 截取url中的数据
       getQueryParam (paramName) {

lottery/registrationActivity.html

@@ -27,19 +27,20 @@
 
   .box {
     width: 100vw;
-    height: 100vh;
+    height: 100%;
     box-sizing: border-box;
     background: #FAFAFA;
   }
 
   .page6 {
     width: 100vw;
-    height: 100vh;
+    height: 100%;
     background-size: 100vw 200px;
     background-repeat: no-repeat;
     display: flex;
     justify-content: center;
     align-items: center;
+    position: relative;
   }
 
   .activity_content {
@@ -77,7 +78,7 @@
   }
 
   .foot_btn {
-    position: fixed;
+    position: absolute;
     bottom: 14px;
     padding: 0 35px;
     width: 100%;
@@ -98,7 +99,8 @@
   .form_content {
     width: 100%;
     height: calc(100vh - 180px);
-    margin-top: 180px;
+    position: fixed;
+    top: 180px;
     background: #FFFFFF;
     border-radius: 20px 20px 0px 0px;
     padding: 20px 20px 66px;
@@ -428,6 +430,8 @@
       }
     },
     created () {
+      var hrt = document.documentElement.clientHeight; //获取当前可视区域的高度存到hrt变量
+      document.getElementById('box').style.height = hrt + 'px'//把获取到的高度赋值给根div
       this.bId = this.getQueryParam('bId')
       this.env = this.getQueryParam('env')
       if (!this.env || this.env === 'prod') {

lottery/signUp.html

@@ -28,20 +28,21 @@
 
   .box {
     width: 100vw;
-    height: 100vh;
+    height: 100%;
     box-sizing: border-box;
     background: #FAFAFA;
   }
 
   .page6 {
     width: 100vw;
-    height: 100vh;
+    height: 100%;
     background: url('./img/signup_bg.png') no-repeat top;
     background-size: 100vw 210px;
     background-repeat: no-repeat;
     display: flex;
     justify-content: center;
     align-items: center;
+    position: relative;
   }
 
   .page_title {
@@ -56,7 +57,8 @@
   .form_content {
     width: 100%;
     height: calc(100vh - 180px);
-    margin-top: 180px;
+    position: fixed;
+    top: 180px;
     background: #FFFFFF;
     border-radius: 20px 20px 0px 0px;
     padding: 20px 20px 66px;
@@ -65,7 +67,7 @@
   }
 
   .foot_btn {
-    position: fixed;
+    position: absolute;
     bottom: 14px;
     padding: 0 35px;
     width: 100%;
@@ -268,6 +270,8 @@
       }
     },
     created () {
+      var hrt = document.documentElement.clientHeight; //获取当前可视区域的高度存到hrt变量
+      document.getElementById('box').style.height = hrt + 'px'//把获取到的高度赋值给根div
       this.bId = this.getQueryParam('bId')
       this.env = this.getQueryParam('env')
       if (!this.env || this.env === 'prod') {