From f02fde734aba50a4d5b5f89d88c075e6e93cb499 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 九月 2024 09:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pda/utils/service.js |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pda/utils/service.js b/pda/utils/service.js
index 936c175..0814f6f 100644
--- a/pda/utils/service.js
+++ b/pda/utils/service.js
@@ -19,13 +19,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) {
+						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 +49,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