修复bug

lottery/registrationActivity.html

@@ -184,10 +184,11 @@
 
   .signup_page {
     width: 100vw;
-    height: 100vh;
+    height: 100%;
     background: url('./img/sign_up.png') no-repeat center;
-    background-size: 100vw 100vh;
+    background-size: 100vw 100%;
     background-repeat: no-repeat;
+    overflow-y: auto;
   }
 
   .signupSucc_page {
@@ -210,14 +211,16 @@
   }
 
   .signup_title {
+    padding-top: 80px;
+  }
+  .form_guide {
     font-weight: bold;
     font-size: 24px;
     color: #FFFFFF;
-    padding-top: 80px;
-    text-align: center;
     line-height: 41px;
+    text-align: center;
+    white-space: pre-line;
   }
-
   .signup_box {
     margin: 30px 20px 0;
     height: 469px;
@@ -234,6 +237,8 @@
     padding: 40px 31px 10px 32px;
     text-align: center;
     line-height: 27px;
+    white-space: pre-line;
+    box-sizing: border-box;
   }
   .store_msg {
     display: flex;
@@ -251,14 +256,17 @@
     height: 24px;
     margin-right: 5px;
   }
+  .signup_code_box {
+    padding: 0 20px;
+    box-sizing: border-box;
+  }
   .signup_code {
     font-weight: 500;
-    font-size: 30px;
+    font-size: 26px;
     color: #222222;
-    padding: 15px 36px;
+    padding: 15px 0;
     background: #D3E0F5;
     border-radius: 20px;
-    margin: 0 20px;
     text-align: center;
   }
 
@@ -340,16 +348,17 @@
   <div id="box" class="box">
     <div class="signup_page" v-if="step === 3">
       <div class="signup_title">
-        <div>恭喜您已经报名</div>
-        <div>{{toshopData.name}}</div>
+        <div class="form_guide">{{toshopData.formGuide1}}</div>
       </div>
       <div class="signup_box">
-        <div class="signup_tip">请您于活动结束前，凭以下核销码前往预约到店门店领取礼品</div>
+        <div class="signup_tip">{{toshopData.formGuide2}}</div>
         <div class="store_msg">
           <img class="store_icon" src="./img/store.png" />
           <span>{{storeName}}</span>
         </div>
-        <div class="signup_code">{{verificationCode}}</div>
+        <div class="signup_code_box">
+          <div class="signup_code">{{verificationCode}}</div>
+        </div>
         <div class="copy_text" @click="handleCopy(verificationCode)">
           <img class="copy_icon" src="./img/copy_icon.png" />
           <span>点击复制核销码</span>
@@ -374,7 +383,9 @@
       </div>
     </div>
     <div class="signup_page" v-else-if="step === 5">
-      <div class="signup_title">{{toshopData.name}}</div>
+      <div class="signup_title">
+        <div class="form_guide">{{toshopData.name}}</div>
+      </div>
       <div class="fail_box">
         <img class="fail_img" src="./img/fail_img.png" />
         <div class="fail_title">{{toshopData.verificationFailGuide}}</div>
@@ -463,6 +474,8 @@
           activityInfo: '',
           formProList: [],
           verificationGuide: '',
+          formGuide1: '',
+          formGuide2: '',
           verificationFailGuide: '',
           verificationFailGuide2: '',
           browseId: null,
@@ -735,6 +748,13 @@
         if (this.step === 1) {
           this.step = 2
         } else {
+          if (!this.toshopData.formProList || !this.toshopData.formProList.length) {
+            this.$message({
+              message: '请完善表单信息',
+              type: 'warning' 
+            })
+            return false
+          }
           const isValid = this.toshopData.formProList.some(item => {
             if (item.isNeed && !item.value) {
               this.$message({
@@ -878,5 +898,4 @@
     }
   })   
 </script>
-
 </html>

lottery/signUp.html

@@ -254,6 +254,7 @@
         bId: null,
         env: '',
         toshopData: {
+          id: null,
           name: '',
           verificationGuide: '',
           verificationFailGuide: '',
@@ -288,7 +289,6 @@
           if (!this.getQueryParam('externalUserid')) {
             this.gerQwAuth(this.bId);
           } else {
-            this.getCityLevel()
             this.lightenShare()
           }
         } else {
@@ -352,7 +352,13 @@
       },
       // 获取城市数据
       getCityLevel () {
-        fetch('https://wl-1306604067.cos.ap-guangzhou.myqcloud.com/production/ct/103548289110001/1742009720857/four-province.json')
+        let url = ''
+        if (this.toshopData.id == 115399319210021) {
+          url = 'https://wl-1306604067.cos.ap-guangzhou.myqcloud.com/production/ct/103548289110001/1744104152989/five-province.json'
+        } else {
+          url = 'https://wl-1306604067.cos.ap-guangzhou.myqcloud.com/production/ct/103548289110001/1742009720857/four-province.json'
+        }
+        fetch(url)
           .then(res => {
             return res.json()
           }).then(result => {
@@ -436,6 +442,7 @@
             let { data, code, msg } = result
             if (code === 1) {
               this.toshopData = data
+              this.getCityLevel()
             } else {
               this.$message({
                 message: msg,