Merge branch 'dev_lqs' into 'master'

Dev lqs

See merge request !124

H5/src/views/bank.vue

@@ -24,10 +24,11 @@
         size="large"
       />
       <van-field
-              v-model="form.idCardNo"
-              label="身份证号"
-              placeholder="请输入"
-              size="large"
+        v-model="form.idCardNo"
+        maxlength="18"
+        label="身份证号"
+        placeholder="请输入"
+        size="large"
       />
     </van-cell-group>
     <van-button
@@ -70,7 +71,7 @@ export default {
         cardNumber: "",
         name: "",
         id: "",
-        idCardNo:'',
+        idCardNo: ""
       }
     };
   },
@@ -100,8 +101,13 @@ export default {
       } else if (!this.form.name) {
         this.$toast.fail("请填写姓名");
         return;
-      }else  if(!this.form.idCardNo){
-          this.$toast.fail("请输入身份证号");
+      } else if (!this.form.idCardNo) {
+        this.$toast.fail("请输入身份证号");
+        return;
+      }
+      if (!/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(this.form.idCardNo)) {
+        this.$toast.fail("请输入正确的身份证号");
+        return;
       }
       const params = this.form;
       if (this.form.id) {

H5/src/views/cashOut/cash-out.vue

@@ -64,6 +64,7 @@
           type="number"
           class="validCodeInput"
           placeholder="请输入"
+          center
         >
           <img
             slot="left-icon"
@@ -71,15 +72,14 @@
             src="@/assets/images/验证码.png"
           />
           <van-button
-                  slot="button"
-                  size="small"
-                  type="primary"
-                  class="verify-code"
-                  :disabled="disabled"
-                  @click="sendSms"
+            slot="button"
+            size="small"
+            type="primary"
+            class="verify-code"
+            @click="sendVerification"
           >
-            <span v-if="!disabled">发送验证码</span>
-            <span v-else>{{ time }}秒后重新发送</span>
+            <span v-if="!canSend">{{ time }}秒后重新发送</span>
+            <span v-else>发送验证码</span>
           </van-button>
         </van-field>
       </div>
@@ -120,11 +120,11 @@ export default {
       resultDialogTip: "",
       resultDialogImg: "",
       resultDialog: false,
-        disabled: false,
+      canSend: true,
       textName: "",
       validCodeDialogShow: false,
       validCode: null,
-        time: 60,
+      time: 60
     };
   },
   created() {
@@ -138,12 +138,28 @@ export default {
         return false;
       }
     },
-
-      sendSms() {
-          const _this = this;
-          _this.time = 60;
-          _this.disabled = true;
-      },
+    sendVerification() {
+      const params = {
+        userId: JSON.parse(localStorage.getItem("user")).userId
+      };
+      sendSms(params).then(res => {
+        if (res.code == 0) {
+          this.timeDown();
+        } else {
+          this.$toast.fail(res.message);
+        }
+      });
+    },
+    timeDown() {
+      this.canSend = false;
+      const timer = setInterval(() => {
+        this.time -= 1;
+        if (this.time <= 0) {
+          clearInterval(timer);
+          this.canSend = true;
+        }
+      }, 1000);
+    },
 
     inputClick() {
       this.rate = this.money * 0.02;
@@ -184,10 +200,6 @@ export default {
         this.$toast.fail("输入超过可提现金额，请重新输入");
         return;
       }
-      const params = {
-        userId: JSON.parse(localStorage.getItem("user")).userId
-      };
-      sendSms(params).then();
       this.validCode = null;
       this.validCodeDialogShow = true;
     },
@@ -223,7 +235,7 @@ export default {
     },
     onSubmit() {
       if (!this.validCode) {
-        this.$toast.fail('请输入验证码');
+        this.$toast.fail("请输入验证码");
         return;
       }
       this.validCodeDialogShow = false;

H5/src/views/modefyAvatar.vue

@@ -7,6 +7,8 @@
         :max-count="1"
         :before-delete="onDeleteAvatar"
         :after-read="onRead"
+        :max-size="2 * 1024 * 1024"
+        @oversize="onOversize"
       >
         <van-button type="primary">上传新头像</van-button>
       </van-uploader>
@@ -59,6 +61,9 @@ export default {
         }
       });
     },
+    onOversize() {
+      this.$toast.fail("上传头像超过了2M的限制,请重新上传");
+    },
     onRead(file) {
       console.log("读取到图片了", file);
       const inviteCode = JSON.parse(localStorage.getItem("user")).inviteCode;

H5/src/views/my/myStatus.vue

@@ -159,10 +159,10 @@ export default {
       console.log("tab", name);
       this.getRecommendDetail(name);
     },
-      changeTabs(name){
-          console.log("tab", name);
-          this.getRecommendDetail(name);
-      },
+    changeTabs(name) {
+      console.log("tab", name);
+      this.getRecommendDetail(name);
+    },
     onDownLoad(val) {
       console.log("下拉加载", val);
     },

H5/src/views/register.vue

@@ -110,7 +110,7 @@ export default {
     onClickHide() {
       this.show = false;
     },
-      sendSms() {
+    sendSms() {
       const _this = this;
       // if (_this.timer) {
       //   return false;
@@ -169,7 +169,7 @@ export default {
         this.$toast.clear();
         _this.registerBtnDisabled = false;
         if (res.code === 0) {
-            this.$toast.success("注册成功");
+          this.$toast.success("注册成功");
           //_this.$toast.sucess(res.msg);
         } else {
           _this.show = true;

H5/src/views/settings.vue

@@ -65,7 +65,7 @@ export default {
       inviteeCodeDialog: false
     };
   },
-  created() {
+  mounted() {
     this.imageBaseUrl = process.env.VUE_APP_BASE_URL;
     this.getUser();
   },
@@ -86,7 +86,6 @@ export default {
                   ? "请填写推荐人邀请码"
                   : res.beInvitedCode;
               this.avatar = res.headImage;
-              // this.avatar = "http://8.131.244.76:81" + res.headImage;
               this.headImage = res.headImage;
             });
           }