diff --git a/package.json b/package.json
index 6e32f13..85e5383 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,6 @@
         "element-ui": "^2.14.0",
         "file-saver": "^2.0.2",
         "js-cookie": "^2.2.1",
-        "js-md5": "^0.7.3",
         "nprogress": "^0.2.0",
         "vue": "^2.6.12",
         "vue-clipboard2": "^0.3.1",
diff --git a/src/api/index.js b/src/api/index.js
index 9b2616d..a344f40 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -33,45 +33,14 @@ api.interceptors.request.use(
         if (store.getters['user/isLogin']) {
             request.headers.token = store.state.user.token
         }
-        if (request.method == 'post') {
-            if (request.data instanceof FormData) {
-                if (store.getters['user/isLogin']) {
-                    // 如果是 FormData 类型（上传图片）
-                    request.data.append('token', store.state.user.token)
-                }
-            } else {
-                // 带上 token
-                if (request.data == undefined) {
-                    request.data = {}
-                }
-                // 参数验签
-                let timestamp = new Date().getTime()
-                request.data.timestamp = '' + timestamp
-                let sign = signMd5Utils.getSign(request.url, request.data)
-                request.data.sign = sign
-            }
-        } else if (request.method === 'get') {
-            // 带上 token
-            if (request.params == undefined) {
-                request.params = {}
-            }
-            let timestamp = new Date().getTime()
-            // get 请求所有参数转成string类型 用于签名计算
-            request.params.timestamp = '' + timestamp
-            let strParams = JSON.stringify(request.params, function(key, value) {
-                if (key) {
-                    if (value == undefined || value == null) {
-                        return undefined
-                    }
-                    return '' + value
-                }
-
-                return value
-            })
-            console.log(JSON.stringify(request.params) + ':str' + strParams)
-            let sign = signMd5Utils.getSign(request.url, JSON.parse(strParams))
-            request.params.sign = sign
+        // 签名验证
+        if (request.params == undefined) {
+            request.params = {}
         }
+        let timestamp = new Date().getTime()
+        request.params.timestamp = '' + timestamp
+        let sign = signMd5Utils.getSign(request.url, request, timestamp)
+        request.params.sign = sign
         return request
     }
 )
@@ -86,16 +55,18 @@ api.interceptors.response.use(
          * 请求出错时 msg 会返回错误信息
          * 则代码如下
          */
+        let errCodes = [500, 405, 403]
         const res = response.data
         if (res.code === 200) {
             return Promise.resolve(res)
-        } else if (res.code === 500 || res.code == 403) {
+        } else if (errCodes.includes(res.code)) {
             // 这里做错误提示，如果使用了 element ui 则可以使用 Message 进行提示
             Message({
                 message: res.msg || 'Error',
                 type: 'error',
                 duration: 5 * 1000
             })
+            return Promise.reject(res)
         } else if (res.code === 401) {
             // 有一个接口进入该方法 其他接口则不在进入
             let reLogin = store.getters['global/isReLogin']
@@ -111,6 +82,7 @@ api.interceptors.response.use(
                     })
                 })
             }
+            return Promise.reject(res)
         }
         return Promise.resolve(res)
     },
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index e3dacf9..a59c359 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -26,10 +26,7 @@ const actions = {
         })
     },
     logout(context) {
-        context.commit('setData', {
-            token: null,
-            userInfo: null
-        })
+        context.commit('delData')
     }
 }
 
@@ -39,6 +36,10 @@ const mutations = {
         localStorage.setItem('userInfo', JSON.stringify(data.userInfo))
         state.token = data.token
         state.userInfo = JSON.stringify(data.userInfo)
+    },
+    delData() {
+        localStorage.removeItem('token')
+        localStorage.removeItem('userInfo')
     }
 }
 
diff --git a/src/utils/sign.js b/src/utils/sign.js
index 573866b..0433795 100644
--- a/src/utils/sign.js
+++ b/src/utils/sign.js
@@ -1,7 +1,8 @@
 /* eslint-disable no-alert */
-import md5 from 'js-md5'
+import CryptoJS from 'crypto-js'
 import constants from './constants'
 import _ from 'lodash'
+
 export default class sign {
     /**
      * json参数升序
@@ -23,17 +24,34 @@ export default class sign {
         return sortObj
     }
 
+
     /**
      * @param url 请求的url,应该包含请求参数(url的?后面的参数)
      * @param requestParams 请求参数(POST的JSON参数)
      * @returns {string} 获取签名
      */
-    static getSign(url, requestParams) {
+    static getSign(url, request, timestamp) {
+        let requestParams = {}
+        if (request.params) {
+            // get 请求所有参数转成string类型 用于签名计算
+            requestParams = JSON.parse(JSON.stringify(request.params, function(key, value) {
+                if (key) {
+                    if (value == undefined || value == null) {
+                        return undefined
+                    }
+                    return '' + value
+                }
+                return value
+            }))
+        }
+        let dataParams = request.data ? request.data : {}
         let urlParams = this.parseQueryString(url)
         let jsonObj = _.merge(urlParams, requestParams)
+        jsonObj = _.merge(jsonObj, dataParams)
         let requestBody = this.sortAsc(jsonObj)
         console.log(constants.signSecret + JSON.stringify(requestBody))
-        return md5(constants.signSecret + JSON.stringify(requestBody)).toLowerCase()
+        console.log(CryptoJS.MD5(constants.signSecret + JSON.stringify(requestBody)).toString().toLowerCase())
+        return CryptoJS.MD5(constants.signSecret + JSON.stringify(requestBody)).toString().toLowerCase()
     }
 
     /**
diff --git a/src/views/account/ForgetPwd.vue b/src/views/account/ForgetPwd.vue
index 6a9f363..531d902 100644
--- a/src/views/account/ForgetPwd.vue
+++ b/src/views/account/ForgetPwd.vue
@@ -26,7 +26,7 @@
                         </el-form-item>
                     </el-form>
                 </el-tab-pane>
-                <el-tab-pane label="邮箱注册" name="email">
+                <el-tab-pane label="邮箱找回" name="email">
                     <el-form ref="emailRegForm" status-icon :rules="emailRetrieveRules" :model="retrieveAccountForm"
                              label-width="0px"
                     >
diff --git a/src/views/account/login.vue b/src/views/account/login.vue
index ea8e13d..886aec5 100644
--- a/src/views/account/login.vue
+++ b/src/views/account/login.vue
@@ -188,14 +188,26 @@
                 </el-tabs>
             </el-col>
         </el-row>
+        <Verify
+            ref="verify"
+            :mode="'pop'"
+            :captcha-type="'blockPuzzle'"
+            :img-size="{ width: '330px', height: '155px' }"
+            @success="verifySuccessHandle"
+        />
     </div>
 </template>
 <script>
 
 import {getCurrentDomain} from '@/utils'
+// 引入组件
+import Verify from '@/components/verifition/Verify'
 
 export default {
     name: 'Login',
+    components: {
+        Verify
+    },
     data() {
         const validatePassword = (rule, value, callback) => {
             // /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[\W_]).{10,20}$/
@@ -269,6 +281,17 @@ export default {
         },
         registerHandleClick() {
         },
+        verifySuccessHandle(params) {
+            let slideCode = params.captchaVerification
+            this.$api.request({
+                url: '/login/account',
+                method: 'post',
+                params: {slideCode},
+                data: this.accountForm
+            }).then(res => {
+                this.loginSuccessHandle(res.data)
+            })
+        },
         // 获取微信登录二维码
         getLoginWxQrCode() {
             this.wxQrCodeLoading = true
@@ -357,9 +380,7 @@ export default {
         loginHandle() {
             this.$refs['accountLoginForm'].validate(valid => {
                 if (valid) {
-                    this.$api.post('/login/account', this.accountForm).then(res => {
-                        this.loginSuccessHandle(res.data)
-                    })
+                    this.$refs.verify.show()
                 } else {
                     return false
                 }
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b1415a1..432e549 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -38,7 +38,7 @@
                         >
                             <div class="user-person-menu">
                                 <div>
-                                    <p class="nick-name">{{ getUserInfo.name }}</p>
+                                    <p v-if="getUserInfo" class="nick-name">{{ getUserInfo.name }}</p>
                                 </div>
                                 <div class="person-menu-divider" />
                                 <div>
@@ -62,7 +62,7 @@
                                 </div>
                             </div>
                             <div slot="reference" style="display: flex; align-items: center; justify-content: center;">
-                                <img :src="getUserInfo.avatar" class="user-avatar">
+                                <img v-if="getUserInfo" :src="getUserInfo.avatar" class="user-avatar">
                             </div>
                         </el-popover>
                     </el-col>
diff --git a/src/views/test.vue b/src/views/test.vue
index dddf977..1972b18 100644
--- a/src/views/test.vue
+++ b/src/views/test.vue
@@ -5,7 +5,7 @@
             :mode="'pop'"
             :captcha-type="'blockPuzzle'"
             :img-size="{ width: '330px', height: '155px' }"
-            @success="'success'"
+            @success="success"
         />
         <button @click="useVerify">调用验证组件</button>
     </div>
@@ -14,14 +14,17 @@
 <script>
 // 引入组件
 import Verify from '@/components/verifition/Verify'
-
 export default {
     name: 'App',
     components: {
         Verify
     },
+    created() {
+    },
     methods: {
         success(params) {
+            // eslint-disable-next-line no-debugger
+            debugger
             // params 返回的二次验证参数, 和登录参数一起回传给登录接口，方便后台进行二次验证
             console.log(params)
         },