From 75811022288e2c4832974a1586f442608706c30a Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 12 九月 2024 17:40:10 +0800
Subject: [PATCH] feat:司机接单pvc吨数提示
---
api/request.js | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/api/request.js b/api/request.js
index 2398999..2bed3e1 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.17:9896"
-// const BaseUrl = "http://192.168.0.12:9896"
-const webSocketUrl = "ws://192.168.0.17: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.7: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"
@@ -133,6 +133,58 @@
opt.url = urls + params
// #endif
+ // #ifndef H5
+ opt.url = BaseUrl +urls + params
+ // #endif
+ opt.method = opt.method || "GET";
+ var header = {}
+ if (uni.getStorageSync('token')) {
+ header = {
+ "Authorization": "Bearer" + ' ' + uni.getStorageSync('token'),
+ "clientToc": "Y",
+ 'CLIENT_TOC': 'Y',
+ }
+ }
+ opt.header = {
+ ...opt.header,
+ ...header
+ }
+
+ opt.data = opt.data || {};
+ return new Promise((resolve, reject) => {
+ let options = {}
+ if (opt.data) {
+ Object.keys(opt.data).map(key => {
+ 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] == "") {
+ opt.data[key] = null;
+ }
+ });
+ }
+
+ Object.keys(opt).map(key => {
+ if (key !== "params") {
+
+ return options[key] = opt[key]
+ }
+ })
+ uni.request(options)
+ .then(res => interceptorsRes(res, resolve, reject))
+ .catch(err => interceptorsErr(err, reject))
+ })
+}
+const fetchId = (url, opt) => {
+ // 鏌ユ壘瀵瑰簲鍦板潃
+ let urls = (globalApi[opt.url]?.url || globalApi[url]?.url);
+ let params = opt.data ? ('/' +opt.data ):
+ '';
+ // #ifdef H5
+ opt.url = urls + params
+ // #endif
// #ifndef H5
opt.url = BaseUrl +urls + params
// #endif
@@ -166,7 +218,6 @@
Object.keys(opt).map(key => {
if (key !== "params") {
-
return options[key] = opt[key]
}
})
@@ -203,6 +254,7 @@
export {
fetch,
+ fetchId,
BaseUrl,
webSocketUrl
}
--
Gitblit v1.9.1