From 9f075b3467044ca553b1efcb4668e7a483237152 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 20:41:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pda/utils/service.js | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pda/utils/service.js b/pda/utils/service.js
index 0814f6f..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 || {},
--
Gitblit v1.9.3