From ad710aa0a75b4344fc66d802d8da5cb7dc6410c5 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 5 Dec 2022 11:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js   |  3 ++
 src/config/http.1.js     | 69 ++++++++++++++++++++++++++++++++--------
 src/config/http.js       | 15 ++++-----
 src/pages/login/Home.vue |  9 +++++-
 4 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 42a8a5b..6d9ba36 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -8,6 +8,9 @@ if (store.getters.userInfo !== '') {
   // user = JSON.parse(store.getters.userInfo).user_name
 }
 
+// 测试状态码报错接口
+export const handRequest = () => post('api/pda/test/5', {})
+
 /** 获取打印机名称 */
 export const setPrint = (url) => post3(url + '/api/pda/set/setPrint', {})
 /** 手持登陆 */
diff --git a/src/config/http.1.js b/src/config/http.1.js
index 55ad0d9..a959349 100644
--- a/src/config/http.1.js
+++ b/src/config/http.1.js
@@ -1,16 +1,21 @@
 import axios from 'axios'
-import qs from 'qs'
-import { Dialog } from './mUtils.js'
+import { Dialog, toast } from './mUtils.js'
 import store from '../vuex/store'
+import router from '@/router'
 
 axios.defaults.timeout = 50000
-axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
+axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
 
 axios.interceptors.request.use(
   config => {
+    let token = ''
+    if (store.getters.userInfo !== '') {
+      token = JSON.parse(store.getters.userInfo).token
+    }
+    token && (config.headers.Authorization = token)
     if (config.method === 'post') {
       if (!config.data.flag) {
-        config.data = qs.stringify(config.data)
+        config.data = config.data
       } else {
         config.data = config.data.formData
       }
@@ -25,25 +30,63 @@ axios.interceptors.request.use(
 
 axios.interceptors.response.use(
   response => {
-    return Promise.resolve(response)
+    if (response.status === 200) {
+      return Promise.resolve(response)
+    } else {
+      return Promise.reject(response)
+    }
   },
   error => {
-    Dialog('网络异常')
+    if (error && error.response) {
+      switch (error.response.status) {
+        case 401:
+          toast(error.response.data.message)
+          store.dispatch('setSignOut')
+          router.push('/login')
+          break
+      }
+    }
     return Promise.reject(error)
   }
 )
 
-export const post = (params) => {
+export const post = (sevmethod, params) => {
   return new Promise((resolve, reject) => {
-    // axios.post(`${store.getters.baseUrl}/nl-app-lx/wdk?action=wdk.pub&method=call_service&ajaxparam=` + new Date().getTime(), params)
-    // axios.post(`${store.getters.baseUrl}/hl_nlapp/wdk?action=wdk.pub&method=call_service&ajaxparam=` + new Date().getTime(), params)
-    axios.post(`${store.getters.baseUrl}/wdk?action=wdk.pub&method=call_service&ajaxparam=` + new Date().getTime(), params)
+    axios.post(`${store.getters.baseUrl}/` + sevmethod, params)
       .then(response => {
-        // if (response.data.code === '0') {
-        //   Dialog(response.data.desc)
-        // }
         resolve(response.data)
       }, error => {
+        Dialog(error.message)
+        reject(error.message)
+      })
+      .catch((error) => {
+        reject(error)
+      })
+  })
+}
+
+export const post2 = (sevmethod, params) => {
+  return new Promise((resolve, reject) => {
+    axios.post(`${store.getters.imgip}/` + sevmethod, params)
+      .then(response => {
+        resolve(response.data)
+      }, error => {
+        Dialog(error.message)
+        reject(error.message)
+      })
+      .catch((error) => {
+        reject(error)
+      })
+  })
+}
+
+export const post3 = (sevmethod, params) => {
+  return new Promise((resolve, reject) => {
+    axios.post(sevmethod, params)
+      .then(response => {
+        resolve(response.data)
+      }, error => {
+        Dialog(error.message)
         reject(error.message)
       })
       .catch((error) => {
diff --git a/src/config/http.js b/src/config/http.js
index a959349..acd7518 100644
--- a/src/config/http.js
+++ b/src/config/http.js
@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { Dialog, toast } from './mUtils.js'
+import { Dialog } from './mUtils.js'
 import store from '../vuex/store'
 import router from '@/router'
 
@@ -30,23 +30,22 @@ axios.interceptors.request.use(
 
 axios.interceptors.response.use(
   response => {
-    if (response.status === 200) {
-      return Promise.resolve(response)
-    } else {
-      return Promise.reject(response)
-    }
+    return Promise.resolve(response)
   },
   error => {
     if (error && error.response) {
       switch (error.response.status) {
+        case 400:
+          break
         case 401:
-          toast(error.response.data.message)
           store.dispatch('setSignOut')
           router.push('/login')
           break
       }
+      return Promise.reject(error.response.data)
+    } else {
+      return Promise.reject(error)
     }
-    return Promise.reject(error)
   }
 )
 
diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue
index 8a129f8..6c02049 100644
--- a/src/pages/login/Home.vue
+++ b/src/pages/login/Home.vue
@@ -95,7 +95,7 @@
 </template>
 
 <script>
-import {authority} from '@config/getData2.js'
+import {handRequest, authority} from '@config/getData2.js'
 export default {
   name: 'Home',
   data () {
@@ -111,6 +111,7 @@ export default {
     document.getElementsByTagName('body')[0].className = 'bgwhite'
   },
   created () {
+    // this._handRequest()
     this._authority()
   },
   // beforeDestroy () {
@@ -140,6 +141,12 @@ export default {
       }
       this.$router.push(e.path.substr(2))
     },
+    async _handRequest () {
+      let res = await handRequest()
+      if (res.code === '1') {
+        this.toast(res.desc)
+      }
+    },
     async _authority () {
       let accountId = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).account_id : ''
       let res = await authority(accountId)