提交

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

@@ -28,13 +28,13 @@
                         ></el-input>
                     </el-form-item>
                     <el-form-item
-                        prop="password"
+                        prop="password1"
                         label="确认密码"
                         :rules="{ required: true, message: '请输入密码', trigger: 'blur' }"
                     >
                         <el-input
                             class="input-width"
-                            v-model="registerInfo.password"
+                            v-model="registerInfo.password1"
                             placeholder="密码"
                             type="password"
                         ></el-input>
@@ -217,6 +217,7 @@ export default {
             userInfo: {
                 username: '',
                 password: '',
+                password1: '',
                 phone: '',
                 code: ''
             },
@@ -224,13 +225,37 @@ export default {
             registerInfo: {
                 username: '',
                 password: '',
+                password1: '',
                 businessLicense: ''
             },
             activeName: 'first',
             time: 0,
             sending: false,
             districtOptions: [],
-            examination: []
+            examination: [],
+            rules: {
+                password: [{ validator: validatePass, trigger: 'blur' }],
+                password1: [{ validator: validatePass2, trigger: 'blur' }]
+            }
+        };
+        var validatePass = (rule, value, callback) => {
+            if (value === '') {
+                callback(new Error('请输入密码'));
+            } else {
+                if (this.ruleForm.checkPass !== '') {
+                    this.$refs.ruleForm.validateField('checkPass');
+                }
+                callback();
+            }
+        };
+        var validatePass2 = (rule, value, callback) => {
+            if (value === '') {
+                callback(new Error('请再次输入密码'));
+            } else if (value !== this.ruleForm.pass) {
+                callback(new Error('两次输入密码不一致!'));
+            } else {
+                callback();
+            }
         };
     },
     created() {

src/main/vue/src/views/organization/RateEdit.vue

@@ -499,6 +499,20 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.edit-view {
+    padding-left: 25%;
+}
+/deep/ .el-divider {
+    margin-top: 30px;
+}
+/deep/ .el-divider__text {
+    left: 0;
+    // margin-top: 10px;
+}
+.el-divider__text {
+    font-size: 20px;
+    font-weight: 500;
+}
 .info-content {
     // background: #f5f7fa;
     padding: 20px 10px 25px;
@@ -506,7 +520,6 @@ export default {
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
-
     .info-item {
         width: 50%;
         display: flex;