update

lottery/index.html

@@ -389,7 +389,7 @@
 		</div>
 		<el-alert v-if="showError" class="alert_dialog" :title="errorMsg" :closable="false" type="error" show-icon>
 		</el-alert>
-		<div v-if="h5Type == 19 && h5Type == 30 && !qrCodeData.qrCode">
+		<div v-if="(h5Type == 19 || h5Type == 30) && !qrCodeData.qrCode">
 			<div class="lotteryPage">
 				<div class="event_notice" @click="handleRule">
 					<span>活动须知</span>

lottery/registrationActivity.html

@@ -13,9 +13,9 @@
   <!-- 引入element 的组件库-->
   <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <script src="https://unpkg.com/vconsole/dist/vconsole.min.js"></script>
-  <script>
+  <!-- <script>
 		  var vConsole = new window.VConsole();
-		</script>
+		</script> -->
 </head>
 <style>
   body {
@@ -157,6 +157,8 @@
     color: #222222;
     line-height: 40px;
     text-align: center;
+    width: 100%;
+    white-space: pre-wrap;
   }
   .signup_title {
     font-weight: bold;
@@ -264,19 +266,15 @@
     </div>
     <div class="signupSucc_page" v-else-if="step === 4">
       <div class="succ_tip">
-        <div>感谢参与{{toshopData.name}}活动</div>
-        <div>请联系门店顾问领取礼品</div>
+        {{toshopData.verificationGuide}}
       </div>
     </div>
     <div class="signup_page" v-else-if="step === 5">
       <div class="signup_title">{{toshopData.name}}</div>
       <div class="fail_box">
         <img class="fail_img" src="./img/fail_img.png" />
-        <div class="fail_title">很遗憾，您不在此次活动范围内</div>
-        <div class="fail_tip">
-          <div>后续有活动我们将第一时间通知您</div>
-          <div>敬请关注</div>
-        </div>
+        <div class="fail_title">{{toshopData.verificationFailGuide}}</div>
+        <div class="fail_tip">{{toshopData.verificationFailGuide2}}</div>
       </div>
     </div>
     <div class="page6" :style="{'background-image': 'url('+toshopData.banner+')'}" v-else-if="step === 1 || step === 2">
@@ -343,6 +341,9 @@
           endTime: '',
           activityInfo: '',
           formProList: [],
+          verificationGuide: '',
+          verificationFailGuide: '',
+          verificationFailGuide2: '',
         },
         step: 2,
         verificationCode: '',

lottery/signUp.html

@@ -13,9 +13,9 @@
   <!-- 引入element 的组件库-->
   <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <script src="https://unpkg.com/vconsole/dist/vconsole.min.js"></script>
-  <script>
+  <!-- <script>
 		  var vConsole = new window.VConsole();
-		</script>
+		</script> -->
 </head>
 <style>
   body {
@@ -113,6 +113,8 @@
     color: #222222;
     line-height: 40px;
     text-align: center;
+    width: 100%;
+    white-space: pre-wrap;
   }
   .signup_page {
     width: 100vw;
@@ -192,19 +194,15 @@
     </div>
     <div class="page6s" v-else-if="step === 2">
       <div class="succ_tip">
-        <div>感谢参与{{toshopData.name}}活动</div>
-        <div>请联系门店顾问领取礼品</div>
+        {{toshopData.verificationGuide}}
       </div>
     </div>
     <div class="signup_page" v-else-if="step === 3">
       <div class="signup_title">{{toshopData.name}}</div>
       <div class="fail_box">
         <img class="fail_img" src="./img/fail_img.png" />
-        <div class="fail_title">很遗憾，您不在此次活动范围内</div>
-        <div class="fail_tip">
-          <div>后续有活动我们将第一时间通知您</div>
-          <div>敬请关注</div>
-        </div>
+        <div class="fail_title">{{toshopData.verificationFailGuide}}</div>
+        <div class="fail_tip">{{toshopData.verificationFailGuide2}}</div>
       </div>
     </div>
   </div>
@@ -219,6 +217,9 @@
         env: '',
         toshopData: {
           name: '',
+          verificationGuide: '',
+          verificationFailGuide: '',
+          verificationFailGuide2: '',
           formProList: [],
         },
         step: 1,