Merge branch 'develop' into test

src/pages/Register/Register.tsx

@@ -119,14 +119,14 @@ class Register extends Component {
       });
       return false;
     }
-    if (!pwd) {
+    if (!pwd || pwd.length < 6) {
       Taro.showToast({
         title: '请输入密码',
         icon: 'none',
       });
       return false;
     }
-    if (!checkPwd) {
+    if (!checkPwd || checkPwd.length < 6) {
       Taro.showToast({
         title: '请输入确认密码',
         icon: 'none',
@@ -135,7 +135,7 @@ class Register extends Component {
     }
     if (pwd != checkPwd) {
       Taro.showToast({
-        title: '请输入确认密码',
+        title: '两次密码不一致',
         icon: 'none',
       });
       return false;
@@ -175,12 +175,9 @@ class Register extends Component {
             verificationCode: vcode,
           })
             .then(res => {
-              const { register, wxToken, ...userInfo } = res.data;
-              console.log(userInfo);
-              updateUserInfo({
-                ...userInfo,
-                token: wxToken,
-              });
+              const data = res.data;
+              console.log(data);
+              updateUserInfo(data);
               Taro.showToast({
                 title: '注册成功',
               });
@@ -230,7 +227,7 @@ class Register extends Component {
     Taro.navigateTo({
       url:
         '/pages/WebPage/WebPage?url=' +
-        encodeURIComponent(ANN_LINK_URL+'/agreement.html'),
+        encodeURIComponent(ANN_LINK_URL + '/agreement.html'),
     });
   }