From 09f598294949f96d91cdf0f583ce10862131b6f5 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 15 十月 2024 16:11:21 +0800
Subject: [PATCH] feat:去除液氯限制
---
api/request.js | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/api/request.js b/api/request.js
index 4807228..d57a881 100644
--- a/api/request.js
+++ b/api/request.js
@@ -107,12 +107,12 @@
// 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.12:9896"
-// const BaseUrl = "http://192.168.0.12:9896"
-const webSocketUrl = "ws://192.168.0.12:9896/wrzs/ws/info"
-// const webSocketUrl = "ws://192.168.0.12:9896/wrzs/ws/info"
+const BaseUrl = "https://wrzs.czjlchem.com:9090"
+// const BaseUrl = 'http://192.168.0.66:9896'
+const webSocketUrl = "wss://wrzs.czjlchem.com:9090/wrzs/ws/info"
+// const webSocketUrl = "ws://192.168.0.7:9896/wrzs/ws/info"
-export const onlineurl = 'https://mx.jzeg.cn:9195';
+export const onlineurl = 'https://wrzs.czjlchem.com:9090';
// const BaseUrl = "http://192.168.0.100:9997";
// const webSocketUrl = "ws://192.168.0.100:9997/wrzs/ws/info"
@@ -155,10 +155,12 @@
let options = {}
if (opt.data) {
Object.keys(opt.data).map(key => {
- console.log(111,opt.data[key],opt.data[key] == '' || opt.data[key] == "")
- if(opt.data[key]==0){
+ if(opt.data[key]===0){
opt.data[key] = 0;
- }else if (opt.data[key] == '' || opt.data[key] == "") {
+ }else if(opt.data[key] === ''){
+ opt.data[key] = '';
+ }
+ else if (opt.data[key] == '' || opt.data[key] == "") {
opt.data[key] = null;
}
});
@@ -170,7 +172,6 @@
return options[key] = opt[key]
}
})
-
uni.request(options)
.then(res => interceptorsRes(res, resolve, reject))
.catch(err => interceptorsErr(err, reject))
@@ -181,7 +182,12 @@
let urls = (globalApi[opt.url]?.url || globalApi[url]?.url);
let params = opt.data ? ('/' +opt.data ):
'';
- 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')) {
@@ -212,7 +218,6 @@
Object.keys(opt).map(key => {
if (key !== "params") {
-
return options[key] = opt[key]
}
})
--
Gitblit v1.9.1