From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007

---
 pda/utils/service.js |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pda/utils/service.js b/pda/utils/service.js
index 936c175..26992f6 100644
--- a/pda/utils/service.js
+++ b/pda/utils/service.js
@@ -2,12 +2,9 @@
 export const http = function (options) {
 	{
 		return new Promise((resolve, reject) => {
-			let token = uni.getStorageSync('token') || ''
+			let token = uni.getStorageSync('token') || null
 			// 鍦ㄧ櫥褰曠殑鏃跺�欓渶瑕佸偍瀛� token uni.setStorageSync("authorization","杩欓噷鏄櫥褰曡幏鍙栫殑token鍊�")
 
-			// uni.showLoading({
-			// 	title:"鍔犺浇涓�..."
-			// })
 			uni.showLoading({
 				title: '鍔犺浇涓�',
 				mask: true
@@ -19,13 +16,26 @@
 				header: options.header || {
 					// 鏍规嵁瀹為檯鎺ュ彛璁捐 key 鍙� token 鎴栬�� authorization
 					dm_user_token: token,
-					"content-type": 'application/json'
+					"content-type": 'application/json;charset=UTF-8'
 				},
 				success: (res) => {
 					let data = res.data
 					// 鎺у埗鍙版樉绀烘暟鎹俊鎭�
 					uni.hideLoading()
 					// 鐧诲綍杩囨湡
+					if (data.code === 5112 || data.code === 5111) {
+						setTimeout(() => {
+							uni.showToast({
+								title: data.message,
+								icon: "none",
+								duration: 2000
+							})
+						})
+						uni.navigateTo({
+							url: '/pages/index/login'
+						})
+						return
+					}
 					if (data.code !== 200) {
 						setTimeout(() => {
 							uni.showToast({
@@ -36,24 +46,20 @@
 						})
 						return
 					}
-					if (data.code === 5112) {
-						return uni.navigateTo({
-							url: '/pages/login/login'
-						})
-					}
 					resolve(data)
 					// return response.data
 				},
 				fail: (err) => {
 					// 椤甸潰涓脊妗嗘樉绀哄け璐�
 					uni.showToast({
-						title: '璇锋眰鎺ュ彛澶辫触'
+						title: '璇锋眰鎺ュ彛澶辫触',
+						icon: "none",
 					})
-
+					console.log('err', err)
+					console.log('msg', baseUrl + options.url)
 					// 杩斿洖閿欒娑堟伅
 					reject(err)
 					uni.hideLoading()
-					return Promise.reject(err)
 				},
 				catch: (e) => {
 					console.log(e)

--
Gitblit v1.9.3