From 66a74ea7126a5b97361b4d7b9d9520e3e25ede5b Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 12 六月 2024 17:36:26 +0800
Subject: [PATCH] feat:库管首页改版
---
api/request.js | 72 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 7 deletions(-)
diff --git a/api/request.js b/api/request.js
index d4799c8..72b70e3 100644
--- a/api/request.js
+++ b/api/request.js
@@ -1,6 +1,10 @@
import {
- globalApi
+ globalApi,
} from '@/api/globalApi.js';
+import {
+ qualityInspectionApi
+} from '@/api/qualityInspection.js';
+
import {
apiLoginPassword
} from './publicInterface';
@@ -103,8 +107,10 @@
// 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.102:9896"
-// const webSocketUrl = "ws://192.168.0.102:9896/wrzs/ws/info"
+const BaseUrl = "http://192.168.0.31:9896"
+// const BaseUrl = "http://192.168.0.12:9896"
+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';
// const BaseUrl = "http://192.168.0.100:9997";
@@ -113,16 +119,66 @@
// const BaseUrl = "http://192.168.0.108:9997";
// const webSocketUrl = "ws://192.168.0.108:9997/wrzs/ws/info"
// 绾夸笂鐢熶骇
-const BaseUrl = 'https://mx.jzeg.cn:9195';
-const webSocketUrl = "wss://mx.jzeg.cn:9195/wrzs/ws/info"
+// const BaseUrl = 'https://mx.jzeg.cn:9195';
+// const webSocketUrl = "wss://mx.jzeg.cn:9195/wrzs/ws/info"
// 璇锋眰鎷︽埅
const fetch = (url, opt) => {
// 鏌ユ壘瀵瑰簲鍦板潃
- let urls = (globalApi[opt.url]?.url || globalApi[url]?.url);
+ let urls = (globalApi[opt.url]?.url || globalApi[url]?.url || qualityInspectionApi[opt.url]?.url || qualityInspectionApi[url]?.url);
let params = opt.params ? ('?' + Object.keys(opt.params).map(key => key + '=' + opt.params[key]).join('&')) :
'';
+ // #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')) {
+ 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] == "") {
+ 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 = {}
@@ -130,6 +186,7 @@
header = {
"Authorization": "Bearer" + ' ' + uni.getStorageSync('token'),
"clientToc": "Y",
+ 'CLIENT_TOC': 'Y',
}
}
@@ -153,7 +210,6 @@
Object.keys(opt).map(key => {
if (key !== "params") {
-
return options[key] = opt[key]
}
})
@@ -167,6 +223,7 @@
// 鍝嶅簲鎷︽埅
const interceptorsRes = ([err, resp], resolve, reject) => {
+ console.log(resp,'resp===鎷︽埅鍣�===')
const {
statusCode,
data
@@ -189,6 +246,7 @@
export {
fetch,
+ fetchId,
BaseUrl,
webSocketUrl
}
--
Gitblit v1.9.1