From bb43c4765e0b30cc0892080b3d35be8e6c4bb53f Mon Sep 17 00:00:00 2001
From: zhengjie <zhengjie@tom.com>
Date: Mon, 22 Apr 2019 16:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8E=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                        |  4 ++--
 src/views/system/user/center/updatePass.vue | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 9339366..21d2208 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -47,14 +47,14 @@ service.interceptors.response.use(
     } catch (e) {
       if (error.toString().indexOf('Error: timeout') !== -1) {
         Notification.error({
-          title: '请求超时，请重试',
+          title: '网络请求超时',
           duration: 2500
         })
         return Promise.reject(error)
       }
       if (error.toString().indexOf('Error: Network Error') !== -1) {
         Notification.error({
-          title: '网络错误，请联系网站管理员恢复',
+          title: '网络请求错误',
           duration: 2500
         })
         return Promise.reject(error)
diff --git a/src/views/system/user/center/updatePass.vue b/src/views/system/user/center/updatePass.vue
index bd116fd..72d6b2c 100644
--- a/src/views/system/user/center/updatePass.vue
+++ b/src/views/system/user/center/updatePass.vue
@@ -26,13 +26,17 @@ import { validPass, updatePass } from '@/api/user'
 export default {
   data() {
     const validatePass = (rule, value, callback) => {
-      validPass(value).then(res => {
-        if (res.status === 200) {
-          callback()
-        } else {
-          callback(new Error('旧密码错误，请检查'))
-        }
-      })
+      if (value) {
+        validPass(value).then(res => {
+          if (res.status === 200) {
+            callback()
+          } else {
+            callback(new Error('旧密码错误，请检查'))
+          }
+        })
+      } else {
+        callback(new Error('请输入旧密码'))
+      }
     }
     const confirmPass = (rule, value, callback) => {
       if (this.form.newPass !== value) {
@@ -64,6 +68,7 @@ export default {
     doSubmit() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          alert(1)
           this.loading = true
           updatePass(this.form.confirmPass).then(res => {
             this.resetForm()