From 89484ac1b090d4881038ac3258ac50aeef716752 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 21 十一月 2024 17:34:41 +0800
Subject: [PATCH] feat:外购去除参数
---
api/request.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/api/request.js b/api/request.js
index 1912f06..fc27ec4 100644
--- a/api/request.js
+++ b/api/request.js
@@ -1,13 +1,35 @@
import {
globalApi
} from '@/api/globalApi.js';
+import {
+ apiLoginPassword
+} from './publicInterface';
// 鎴愬姛
const responseOK = (response) => {
const {
data
} = response;
+ test(data);
return data;
+}
+const test = (obj) => {
+ if (obj instanceof Array) {
+ obj.forEach(e => {
+ test(e);
+ })
+ } else if (obj instanceof Object) {
+ for (let key in obj) {
+ if (obj[key] == null) {
+ obj[key] = "";
+ } else {
+ if (obj[key] instanceof Array || obj[key] instanceof Object) {
+ test(obj[key])
+ }
+ }
+ }
+ }
+
}
// 鍝嶅簲澶辫触鐨勪緷璧栨��
@@ -78,10 +100,22 @@
500: responseError
}
-// const BaseUrl = "http://192.168.0.120:9997"
-// const webSocketUrl = "ws://192.168.0.120:9997/wrzs/ws/info"
-const BaseUrl = "http://192.168.110.101:9997";
-const webSocketUrl = "ws://192.168.110.101:9997/wrzs/ws/info"
+// const BaseUrl = "http://192.168.0.110:9896"
+// const webSocketUrl = "ws://192.168.0.110:9896/wrzs/ws/info"
+
+// const BaseUrl = "http://192.168.0.23:9896"
+// const webSocketUrl = "ws://192.168.0.23:9896/wrzs/ws/info"
+
+export const onlineurl = "https://mr1.res.jzeg.cn:9096";
+// const BaseUrl = "http://192.168.0.100:9997";
+// const webSocketUrl = "ws://192.168.0.100:9997/wrzs/ws/info"
+
+// const BaseUrl = "http://192.168.0.108:9997";
+// const webSocketUrl = "ws://192.168.0.108:9997/wrzs/ws/info"
+// 绾夸笂鐢熶骇
+const BaseUrl = "https://mr1.res.jzeg.cn:9096";
+const webSocketUrl = "wss://mr1.res.jzeg.cn:9096/wrzs/ws/info"
+
// 璇锋眰鎷︽埅
const fetch = (url, opt) => {
@@ -89,7 +123,12 @@
let urls = (globalApi[opt.url]?.url || globalApi[url]?.url);
let params = opt.params ? ('?' + Object.keys(opt.params).map(key => key + '=' + opt.params[key]).join('&')) :
'';
- opt.url = BaseUrl + urls + params
+ // #ifdef H5
+ opt.url = urls + params
+ // #endif
+ // #ifndef H5
+ opt.url = BaseUrl +urls + params
+ // #endif
opt.method = opt.method || "GET";
var header = {}
if (uni.getStorageSync('token')) {
@@ -109,9 +148,17 @@
return new Promise((resolve, reject) => {
let options = {}
+ if (opt.data) {
+ Object.keys(opt.data).map(key => {
+ if (opt.data[key] == '' || opt.data[key] == "") {
+ opt.data[key] = null;
+ }
+ });
+ }
Object.keys(opt).map(key => {
if (key !== "params") {
+
return options[key] = opt[key]
}
})
--
Gitblit v1.9.1