From 77252da784ffa4036d613054696f73fbfdafb6d9 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期六, 27 七月 2024 17:48:51 +0800
Subject: [PATCH] feature：质检样式调整
---
api/request.js | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/api/request.js b/api/request.js
index 2398999..72b70e3 100644
--- a/api/request.js
+++ b/api/request.js
@@ -107,9 +107,9 @@
// 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.31: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.31:9896/wrzs/ws/info"
// const webSocketUrl = "ws://192.168.0.12:9896/wrzs/ws/info"
export const onlineurl = 'https://mx.jzeg.cn:9195';
@@ -145,6 +145,50 @@
'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] == "") {
+ 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 ):
+ '';
+ opt.url = BaseUrl + urls + params
+ 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,
@@ -166,7 +210,6 @@
Object.keys(opt).map(key => {
if (key !== "params") {
-
return options[key] = opt[key]
}
})
@@ -203,6 +246,7 @@
export {
fetch,
+ fetchId,
BaseUrl,
webSocketUrl
}
--
Gitblit v1.9.1