登陆

src/main/vue/src/router.js

@@ -3,6 +3,7 @@ import Router from 'vue-router';
 import Admin from '@/views/Admin';
 import store from './store';
 import http from './plugins/http';
+import { Message } from 'element-ui';
 
 Vue.use(Router);
 
@@ -473,6 +474,14 @@ router.beforeEach((to, from, next) => {
                 next();
             })
             .catch(() => {
+                if (from.path === '/organizationInfo') {
+                    Message({
+                        message: '请补全信息',
+                        type: 'warning'
+                    });
+
+                    next(false);
+                }
                 next('/organizationInfo');
             });
     } else {

src/main/vue/src/views/Login.vue

@@ -7,7 +7,7 @@
                     <div class="register-title" slot="content">注册账号</div>
                 </el-page-header>
 
-                <el-form :model="registerInfo" style="width: 460px" ref="registerForm">
+                <el-form :model="registerInfo" :rules="registerRule" style="width: 460px" ref="registerForm">
                     <el-form-item
                         prop="username"
                         label="用户名"
@@ -27,11 +27,7 @@
                             type="password"
                         ></el-input>
                     </el-form-item>
-                    <el-form-item
-                        prop="password1"
-                        label="确认密码"
-                        :rules="{ required: true, message: '请输入密码', trigger: 'blur' }"
-                    >
+                    <el-form-item prop="password1" label="确认密码">
                         <el-input
                             class="input-width"
                             v-model="registerInfo.password1"
@@ -242,6 +238,21 @@ export default {
             rules: {
                 password: [{ validator: validatePass, trigger: 'blur' }],
                 password1: [{ validator: validatePass2, trigger: 'blur' }]
+            },
+            registerRule: {
+                password1: [
+                    {
+                        validator: (rule, value, callback) => {
+                            if (value !== this.registerInfo.password) {
+                                callback(new Error('两次密码输入不一致'));
+                            } else {
+                                callback();
+                            }
+                        },
+                        trigger: 'blur'
+                    },
+                    { required: true, message: '请再次输入密码', trigger: 'blur' }
+                ]
             }
         };
         var validatePass = (rule, value, callback) => {