Merge branch 'develop' into test

src/pages/Register/Register.tsx

@@ -89,7 +89,7 @@ class Register extends Component {
   }
 
   validateRegisterEntity(): boolean {
-    const { name, cellphone, pwd, checkPwd } = this.state;
+    const { name, cellphone, vcode, pwd, checkPwd } = this.state;
     const {
       userinfo: { areaId },
     } = this.props;
@@ -107,6 +107,13 @@ class Register extends Component {
       });
       return false;
     }
+    if (!vcode || vcode.length !== 6) {
+      Taro.showToast({
+        title: '请输入6位验证码',
+        icon: 'none',
+      });
+      return false;
+    }
     if (!pwd) {
       Taro.showToast({
         title: '请输入密码',

src/pages/ResetPwd/ResetPwd.tsx

@@ -71,7 +71,7 @@ class ResetPwd extends Component {
     }
     if (!vcode || vcode.length !== 6) {
       Taro.showToast({
-        title: '请输入验证码',
+        title: '请输入6位验证码',
         icon: 'none',
       });
       return false;