From 790ca8241c42e916fda6c3e42501c0940210e553 Mon Sep 17 00:00:00 2001
From: wangqing <smalljop@foxmail.com>
Date: Fri, 28 May 2021 19:56:50 +0800
Subject: [PATCH] fix

---
 src/api/index.js             | 32 ++++++++++++++++++++++++--------
 src/assets/styles/index.scss |  1 +
 src/views/account/login.vue  |  6 +++---
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index b23559b..cb35d32 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -34,18 +34,22 @@ api.interceptors.request.use(
         if (store.getters['user/isLogin']) {
             request.headers.token = store.state.user.token
         }
-        // 签名验证
-        if (request.params == undefined) {
-            request.params = {}
-        }
-        let timestamp = new Date().getTime()
-        request.params.timestamp = '' + timestamp
-        let sign = signMd5Utils.getSign(request.url, request)
-        request.params.sign = sign
+        signRequest(request)
         return request
     }
 )
 
+function signRequest(request) {
+    // 签名验证
+    if (request.params == undefined) {
+        request.params = {}
+    }
+    let timestamp = new Date().getTime()
+    request.params.timestamp = '' + timestamp
+    let sign = signMd5Utils.getSign(request.url, request)
+    request.params.sign = sign
+}
+
 api.interceptors.response.use(
     response => {
         /**
@@ -56,11 +60,16 @@ api.interceptors.response.use(
          * 请求出错时 msg 会返回错误信息
          * 则代码如下
          */
+        console.log(response)
         let errCodes = [500, 405, 403]
         const res = response.data
+        // eslint-disable-next-line no-debugger
+        debugger
         if (res.code === 200) {
             return Promise.resolve(res)
         } else if (errCodes.includes(res.code)) {
+            // eslint-disable-next-line no-debugger
+            debugger
             // 这里做错误提示，如果使用了 element ui 则可以使用 Message 进行提示
             Message({
                 message: res.msg || 'Error',
@@ -93,6 +102,13 @@ api.interceptors.response.use(
             console.log('validate')
             Verification().then(value => {
                 console.log(value)
+                setTimeout(function() {
+                    response.config.params.slideCode = value
+                    delete response.config.params.sign
+                    response.config.data = JSON.parse(response.config.data)
+                    signRequest(response.config)
+                    return axios(response.config)
+                }, 1000)
             })
             return Promise.reject(res)
         }
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 5b05387..b662055 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -11,6 +11,7 @@ body {
     -webkit-font-smoothing: antialiased;
     text-rendering: optimizeLegibility;
     font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
+    color: #25262b;
 }
 label {
     font-weight: 700;
diff --git a/src/views/account/login.vue b/src/views/account/login.vue
index 7142f3f..f89ee8f 100644
--- a/src/views/account/login.vue
+++ b/src/views/account/login.vue
@@ -298,9 +298,9 @@ export default {
         this.refreshWxQrcodeTimer = setInterval(() => {
             this.getLoginWxQrCode()
         }, 5 * 60 * 1000)
-        this.wxQrcodeResultTimer = setInterval(() => {
-            this.getLoginWxQrCodeResult()
-        }, 5 * 1000)
+        // this.wxQrcodeResultTimer = setInterval(() => {
+        //     this.getLoginWxQrCodeResult()
+        // }, 5 * 1000)
         this.getQQLoginAuthorizeUrl()
     },
     destroyed() {