From ae2ccee437adefc8f1430fe9df09aa9aecba0ab9 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Fri, 2 Nov 2018 20:29:54 +0800
Subject: [PATCH] =?UTF-8?q?feat[litemall-admin]:=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E7=AE=A1=E7=90=86=E5=91=98=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=90=8E=E7=AB=AF=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-admin/src/views/login/index.vue |  6 +++-
 litemall-admin/src/views/sys/admin.vue   | 43 ++++--------------------
 2 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/litemall-admin/src/views/login/index.vue b/litemall-admin/src/views/login/index.vue
index ac7d9dad..c7b351e9 100644
--- a/litemall-admin/src/views/login/index.vue
+++ b/litemall-admin/src/views/login/index.vue
@@ -73,7 +73,11 @@ export default {
           this.$store.dispatch('LoginByUsername', this.loginForm).then(() => {
             this.loading = false
             this.$router.push({ path: '/' })
-          }).catch(() => {
+          }).catch(response => {
+            this.$notify.error({
+              title: '失败',
+              message: response.data.errmsg
+            })
             this.loading = false
           })
         } else {
diff --git a/litemall-admin/src/views/sys/admin.vue b/litemall-admin/src/views/sys/admin.vue
index e5042924..f3cd7dda 100644
--- a/litemall-admin/src/views/sys/admin.vue
+++ b/litemall-admin/src/views/sys/admin.vue
@@ -48,9 +48,6 @@
         <el-form-item label="管理员密码" prop="password">
           <el-input type="password" v-model="dataForm.password"  auto-complete="off"></el-input>
         </el-form-item>
-        <el-form-item label="确认密码" prop="checkPassword">
-          <el-input type="password" v-model="dataForm.checkPassword" auto-complete="off"></el-input>
-        </el-form-item>
         <el-form-item label="管理员头像" prop="avatar">
           <el-upload class="avatar-uploader" :headers="headers" :action="uploadPath" list-type="picture-card" :show-file-list="false" accept=".jpg,.jpeg,.png,.gif" :on-success="uploadAvatar">
 			      <img v-if="dataForm.avatar" :src="dataForm.avatar" class="avatar">
@@ -109,25 +106,6 @@ export default {
     }
   },
   data() {
-    var validatePass = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请输入密码'))
-      } else {
-        if (this.dataForm.checkPassword !== '') {
-          this.$refs.dataForm.validateField('checkPassword')
-        }
-        callback()
-      }
-    }
-    var validatePass2 = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请再次输入密码'))
-      } else if (value !== this.dataForm.password) {
-        callback(new Error('两次输入密码不一致!'))
-      } else {
-        callback()
-      }
-    }
     return {
       uploadPath,
       list: null,
@@ -144,7 +122,6 @@ export default {
         id: undefined,
         username: undefined,
         password: undefined,
-        checkPassword: undefined,
         avatar: undefined
       },
       dialogFormVisible: false,
@@ -155,14 +132,7 @@ export default {
       },
       rules: {
         username: [{ required: true, message: '管理员名称不能为空', trigger: 'blur' }],
-        password: [
-          { required: true, message: '密码不能为空', trigger: 'blur' },
-          { validator: validatePass, trigger: 'blur' }
-        ],
-        checkPassword: [
-          { required: true, message: '密码不能为空', trigger: 'blur' },
-          { validator: validatePass2, trigger: 'blur' }
-        ]
+        password: [{ required: true, message: '密码不能为空', trigger: 'blur' }]
       },
       downloadLoading: false
     }
@@ -200,7 +170,6 @@ export default {
         id: undefined,
         username: undefined,
         password: undefined,
-        checkPassword: undefined,
         avatar: undefined
       }
     },
@@ -224,11 +193,11 @@ export default {
             this.$notify.success({
               title: '成功',
               message: '添加管理员成功'
-            }).catch(response => {
-              this.$notify.error({
-                title: '失败',
-                message: response.data.errmsg
-              })
+            })
+          }).catch(response => {
+            this.$notify.error({
+              title: '失败',
+              message: response.data.errmsg
             })
           })
         }