111

src/components/index/SignUp/referInfo.vue

@@ -306,7 +306,7 @@
             </el-upload>
           </div>
 
-          <el-dialog :visible.sync="dialogVisible">
+          <el-dialog :visible.sync="dialogVisible" >
             <img width="100%" :src="resultPicture" alt="" />
           </el-dialog>
         </div>
@@ -934,6 +934,9 @@ export default {
         //去除upload组件过渡效果 css
         .el-upload-list__item {
           transition: none !important;
+          div{
+            height: 100%;
+          }
         }
         .el-upload--picture-card {
           display: inline-block;

src/views/index/camp/SignUp.vue

@@ -77,7 +77,6 @@ export default {
     statuss(val) {
       console.log(val, "val");
       // this.statuss = val;
-
       // this.signUpInit();
     },
     signUpInit() {
@@ -88,7 +87,6 @@ export default {
           return this.$message.error(res.data.message);
         }
         this.status = res.data.status;
-
         // doubt_code，doubt_info，doubt_check。0为不填写，1为填写
         if (this.status == 0) {
           this.type = "examInfo";
@@ -99,16 +97,16 @@ export default {
             this.status = 2;
           } else {
             this.type = "invitation";
-            // this.status = 2;
+            // this.status = 1;
           }
         } else if (this.status == 2) {
           // 是否填写个人资料
           if (this.doubt_info == 0) {
-             this.type = "check";
+            this.type = "check";
             this.status = 3;
           } else {
-          
-              this.type = "referInfo";
+            this.type = "referInfo";
+            // this.status = 2;
           }
         } else if (this.status == 3) {
           // 是否审核个人资料
@@ -142,7 +140,6 @@ export default {
 
         //订单支付金额
         window.localStorage.setItem("has_amount", res.data.has_amount);
-
         window.localStorage.setItem("campsite_id", res.data.campsite_id);
         window.localStorage.setItem("order_no", res.data.order_no);
       });

src/views/index/login/Register.vue

@@ -178,11 +178,11 @@ export default {
     };
   },
   created() {
-    const endTime = window.localStorage.getItem('register_code_time');
-    const phone = window.localStorage.getItem('register_code_phone');
-    if(endTime && Number(endTime)>new Date().getTime()){
+    const endTime = window.localStorage.getItem("register_code_time");
+    const phone = window.localStorage.getItem("register_code_phone");
+    if (endTime && Number(endTime) > new Date().getTime()) {
       this.registerForm.phone = phone;
-      this.intervalHandle(new Date(),Number(endTime));
+      this.intervalHandle(new Date(), Number(endTime));
     }
   },
   methods: {
@@ -195,10 +195,10 @@ export default {
       this.isShowPwd = !this.isShowPwd;
     },
     // 定时器倒计时
-    intervalHandle(startTime, endTime){
+    intervalHandle(startTime, endTime) {
       // 时间差
       const timeLag = intervalTime(startTime, endTime);
-      console.log(timeLag)
+      console.log(timeLag);
       if (!this.timer) {
         this.count = timeLag;
         this.show = false;
@@ -227,9 +227,15 @@ export default {
           return this.$message.error(res.data.message);
         }
         this.$message.success(res.data.message);
-        window.localStorage.setItem('register_code_time', res.data.data.now*1000);
-        window.localStorage.setItem('register_code_phone', this.registerForm.phone);
-        this.intervalHandle(new Date(), res.data.data.now*1000);
+        window.localStorage.setItem(
+          "register_code_time",
+          res.data.data.now * 1000
+        );
+        window.localStorage.setItem(
+          "register_code_phone",
+          this.registerForm.phone
+        );
+        this.intervalHandle(new Date(), res.data.data.now * 1000);
       });
     },
 
@@ -260,7 +266,7 @@ export default {
             res.data.cam.system_color
           );
 
-           // 跳转到报名
+          // 跳转到报名
           this.$router.push({ path: "/signUp/examInfo" });
         });
       });

src/views/index/login/Reset.vue

@@ -179,10 +179,10 @@ export default {
     };
   },
   created() {
-    const endTime = window.localStorage.getItem("register_code_time");
-    const phone = window.localStorage.getItem("register_code_phone");
+    const endTime = window.localStorage.getItem("restet_code_time");
+    const phone = window.localStorage.getItem("restet_code_phone");
     if (endTime && Number(endTime) > new Date().getTime()) {
-      this.registerForm.phone = phone;
+      this.resetForm.phone = phone;
       this.intervalHandle(new Date(), Number(endTime));
     }
   },
@@ -231,12 +231,12 @@ export default {
         // this.codeTime = parseTime(res.data.data.now);
         this.codeTime = res.data.data.now * 1000;
         window.localStorage.setItem(
-          "register_code_time",
+          "restet_code_time",
           res.data.data.now * 1000
         );
         window.localStorage.setItem(
-          "register_code_phone",
-          this.registerForm.phone
+          "restet_code_phone",
+          this.resetForm.phone
         );
         this.intervalHandle(new Date(), res.data.data.now * 1000);
       });