From 50072669bacb4c0fc842817ea0129cef98932d0b Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期四, 28 七月 2022 20:01:24 +0800
Subject: [PATCH] '解决冲突'
---
utils/request.js | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/utils/request.js b/utils/request.js
index b1f0de2..e957d69 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 {
@@ -69,7 +73,7 @@
title: response.data.msg,
icon: 'error',
position: 'top',
- duration: 1000
+ duration: 2000
})
return false;
}
@@ -85,22 +89,23 @@
// 璇锋眰鎷︽埅
-const fetch = (url, opt) => {
- let urls = (api[opt.url]?.url || api[url]?.url);
+const fetch = (url, opt ,urlParam) => {
+ let baseUrl = 'http://192.168.3.159:9999';
+ 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 +137,6 @@
statusCode,
data
} = resp;
-
// 楠岃瘉http鐘舵�佺爜
const handlerHTTPStatus = handlerCode[statusCode];
--
Gitblit v1.9.1