From 10c3bce9528daaf45682efa8b163e63c5006a72f Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 21 十二月 2023 18:36:05 +0800
Subject: [PATCH] 必填只能编辑数量，非必填编辑销售单价，成本单价，数量+成本单价不填写可以通过校验填写则需要校验大于0

---
 src/common/untils/request.js |   84 ++++++++++++++++++++++++++---------------
 1 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/src/common/untils/request.js b/src/common/untils/request.js
index 4939506..9b321b2 100644
--- a/src/common/untils/request.js
+++ b/src/common/untils/request.js
@@ -1,8 +1,26 @@
 import axios from "axios"
 import { Message } from "element-ui"
-import Cookies from 'js-cookie'
 
 // import router from '@/router'
+
+// 寮�鍙戠幆澧冧笅灏嗚嚜宸辩殑token澶嶅埗鍒拌繖閲�, 涔熷彲浠ュ湪娴忚鍣ㄤ腑鎵嬪姩娣诲姞token鍒癱ookie涓�,cookie涓殑token浼樺厛
+const DEV_TOKEN =  ''
+
+function environmentType(){
+    let type
+    if (location.href.includes('192.168.20.119')) {
+        type = 'test'
+    } else if (location.href.includes('192.168') || location.href.includes('localhost')) {
+        type = 'dev'
+    } else {
+        type = 'prod'
+    }
+
+    return type
+}
+
+const isDev = environmentType() === 'dev'
+
 
 const Axios = axios.create({
   responseType: "json",
@@ -15,41 +33,26 @@
         prod:`//${window.location.hostname}:9080`,
         test:`//192.168.20.119:9080`,
         // 鎯宠烦鍒版湰鍦板惎鍔ㄧ殑鐧诲綍椤电殑璇濋渶瑕佹妸dev鏀规垚浣犳湰鍦伴」鐩矾寰�
-        dev: `//192.168.20.119:9080`
+        dev: `//192.168.8.111:8081`
     }
 
-    if (location.href.includes('192.168.20.119')) {
-        return loginPathMap.test
-    } else if (location.href.includes('192.168') || location.href.includes('localhost')) {
-        return loginPathMap.dev
-    } else {
-        return loginPathMap.prod
-    }
-}
-
-function getToken(){
-    const localStorageToken = localStorage.getItem('token')
-    const cookieToken = Cookies.get("token")
-    if (localStorageToken){
-        return  localStorageToken
-    }else if ( cookieToken) {
-        localStorage.setItem('token',cookieToken)
-        return cookieToken
-    }else {
-        return ''
-    }
+    return loginPathMap[environmentType()]
 }
 
 /* //POST浼犲弬搴忓垪鍖�(娣诲姞璇锋眰鎷︽埅鍣�) */
 Axios.interceptors.request.use(
   (config) => {
-    // 鑻ユ槸鏈夊仛閴存潈token , 灏辩粰澶撮儴甯︿笂token
-    let token = getToken()
-    if (token) {
-      config.headers.Authorization = "Bearer " + token;
-    }
-
-    return config
+      let token = document.cookie.replace(
+          /(?:(?:^|.*;\s*)token\s*\=\s*([^;]*).*$)|^.*$/,
+          "$1",
+      );
+      if (isDev){
+          token = token || DEV_TOKEN
+      }
+      if (token) {
+          config.headers.Authorization = "Bearer " + token;
+      }
+      return config
   },
   (error) => {
     return Promise.reject(error)
@@ -61,14 +64,23 @@
   (res) => {
     /* //瀵瑰搷搴旀暟鎹仛浜涗簨 */
     if (res.data.code === 200) {
-      return res.data ? res.data : {}
+      if(res.config.IsHeader){
+        return res;
+      }else{
+        return res.data ? res.data : {}
+      }
     } else if (res.data.code === 700001 || res.data.code === 700005) {
       console.log("瀹㈡埛鍚嶇О閲嶅")
       return res
     } else if([2012,2013,2014,2015].includes(res.data.code)){
+      if (isDev){
+        alert("JWT澶辨晥")
+        // window.location = getApsPage()+'/'
+      }else {
         //   JWT閴存潈澶辨晥 璺宠浆鍒扮櫥褰曢〉
         window.location = getApsPage()+'/login'
-        return Promise.reject(res.data)
+      }
+      return Promise.reject(res.data)
     } else {
       Message({
         message: res.data.msg,
@@ -79,6 +91,16 @@
     }
   },
   (error) => {
+    if (error.response.status === 401){
+      if (isDev){
+        alert("JWT澶辨晥")
+        // window.location = getApsPage()+'/'
+      }else {
+        //   JWT閴存潈澶辨晥 璺宠浆鍒扮櫥褰曢〉
+        window.location = getApsPage()+'/login'
+      }
+    }
+
     let { message } = error
     if (message === "Network Error") {
       message = "鍚庣鎺ュ彛杩炴帴寮傚父"

--
Gitblit v1.8.0