Merge branch 'video-tcplayer'

src/components/layout/modals/update-password.tsx

@@ -29,8 +29,8 @@ export default defineComponent({
 
     const validatePass2 = (rule: any, value: any, callback: any): any => {
       const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/;
-      if (value === '') {
-        callback(new Error('请再次输入密码'));
+      if (value === '' || !value) {
+        callback(new Error('请再次输入新密码'));
       } else if (value !== forms.password) {
         callback(new Error('两次输入密码不一致'));
       } else if (!reg.test(value)) {
@@ -39,6 +39,16 @@ export default defineComponent({
         callback();
       }
     };
+    const validatePass = (rule: any, value: any, callback: any): any => {
+      const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/;
+      if (value === '' || !value) {
+        callback(new Error('请输入新密码'));
+      } else if (!reg.test(value)) {
+        callback(new Error('密码为6-20位数字和字母组合'));
+      } else {
+        callback();
+      }
+    };
 
     const gotoClassPage = () => {
       formsRef.value.validate(async (error: any) => {
@@ -124,13 +134,9 @@ export default defineComponent({
             label="新密码"
             rule={[
               {
-                required: true,
-                message: '请输入新密码'
-              },
-              {
-                pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/,
-                message: '密码为6-20位数字和字母组合',
-                trigger: 'blur'
+                validator: validatePass,
+                trigger: 'blur',
+                required: true
               }
             ]}>
             <NInput
@@ -166,7 +172,7 @@ export default defineComponent({
               {
                 required: true,
                 message: '请输入验证码',
-                trigger: 'change'
+                trigger: 'blur'
               }
             ]}>
             <NInput

src/views/home/index.tsx

@@ -319,11 +319,11 @@ export default defineComponent({
       });
       getVersion();
 
-      if (!userStore.getUserInfo.account.updatePasswordFlag) {
-        showUpdatePassword.value = true;
-      } else {
-        forms.showGuide = true;
-      }
+      // if (!userStore.getUserInfo.account.updatePasswordFlag) {
+      showUpdatePassword.value = true;
+      // } else {
+      //   forms.showGuide = true;
+      // }
     });
 
     const formsRef = ref();