From 7cdea6d16a8b9f74800792ea412ad8b51c4df7f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 17:48:38 +0800
Subject: [PATCH] 最新版本541200007
---
pda/utils/service.js | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/pda/utils/service.js b/pda/utils/service.js
index 41d0bdf..0253a05 100644
--- a/pda/utils/service.js
+++ b/pda/utils/service.js
@@ -2,16 +2,18 @@
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
- })
+ if(!options.hideLoading){
+ uni.showLoading({
+ title: '鍔犺浇涓�',
+ mask: true
+ })
+ }
uni.request({
url: baseUrl + options.url,
data: options.data || {},
@@ -19,13 +21,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({
@@ -34,11 +49,7 @@
duration: 2000
})
})
- }
- if (data.code === 5112) {
- uni.navigateTo({
- url: '/pages/login/login'
- })
+ return
}
resolve(data)
// return response.data
@@ -46,13 +57,14 @@
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