Merge branch 'develop' into test

src/pages/Register/Register.tsx

@@ -121,7 +121,7 @@ class Register extends Component {
     }
     if (!pwd || pwd.length < 6) {
       Taro.showToast({
-        title: '请输入密码',
+        title: '请输入大于6位密码',
         icon: 'none',
       });
       return false;

src/pages/ResetPwd/ResetPwd.tsx

@@ -85,7 +85,7 @@ class ResetPwd extends Component {
     }
     if (!checkPwd || checkPwd.length < 6) {
       Taro.showToast({
-        title: '请输入大于6位密码',
+        title: '请输入确认密码',
         icon: 'none',
       });
       return false;