From 513be798a677672644770e2b2f7025b6d4d20414 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期三, 07 九月 2022 14:44:04 +0800
Subject: [PATCH] 完善登录，登录授权
---
utils/request.js | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/utils/request.js b/utils/request.js
index b1f0de2..d9517b4 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -2,6 +2,10 @@
api
} from './api.js';
+import {
+ jihua
+} from './jihua.js';
+
// 鎴愬姛
const responseOK = (response) => {
const {
@@ -19,16 +23,11 @@
duration: 2000
});
setTimeout(() => {
- try {
uni.clearStorageSync();
// 閲嶅畾鍚戠櫥褰�
uni.redirectTo({
url: '/pages/login/login'
})
- } catch (e) {
- // error
- console.log(e)
- }
}, 2000);
return false;
}
@@ -69,7 +68,7 @@
title: response.data.msg,
icon: 'error',
position: 'top',
- duration: 1000
+ duration: 2000
})
return false;
}
@@ -83,24 +82,28 @@
500: responseError
}
+// let BaseUrl = 'http://192.168.3.159:9999';
+// const BaseUrl = 'https://mx.jzeg.cn:443/app';
+const BaseUrl = "https://mx.jzeg.cn:9998"; // 姝ｅ紡鏈嶅姟
// 璇锋眰鎷︽埅
-const fetch = (url, opt) => {
- let urls = (api[opt.url]?.url || api[url]?.url);
+const fetch = (url, opt ,urlParam) => {
+
+ let urls = (api[opt.url]?.url || api[url]?.url || jihua[opt.url]?.url || jihua[url]?.url);
let params = opt.params ? ('?' + Object.keys(opt.params).map(key => key + '=' + opt.params[key]).join('&')) :
'';
- opt.url = urls + params
+ opt.url = urlParam ? BaseUrl + urls + `/${urlParam}` + params : BaseUrl + urls + params
opt.method = opt.method || "GET";
var header = {}
if (uni.getStorageSync('access_token')) {
header = {
"TENANT-ID": 5,
Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
- VERSION: "zzl"
+ VERSION: "zzl",
+ Accept:'application/json, text/plain, */*' // 瀹㈡埛绔墍鑳芥帴鍙楃殑鏁版嵁绫诲瀷
}
}
- // 'Bearer'
- // 'version:zzl'
+
opt.header = {
...opt.header,
...header
@@ -132,7 +135,6 @@
statusCode,
data
} = resp;
-
// 楠岃瘉http鐘舵�佺爜
const handlerHTTPStatus = handlerCode[statusCode];
@@ -150,5 +152,6 @@
export {
- fetch
+ fetch,
+ BaseUrl
}
--
Gitblit v1.9.1