From 8edf190dd8755446613da55e0730c4aeabf60890 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 11 二月 2025 08:30:10 +0800
Subject: [PATCH] Revert "faat:提煤单详情下磅文字修改"
---
api/request.js | 138 ++++++++++++++++++++++-----------------------
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 2
2 files changed, 68 insertions(+), 72 deletions(-)
diff --git a/api/request.js b/api/request.js
index 5e952f3..13d0b61 100644
--- a/api/request.js
+++ b/api/request.js
@@ -1,10 +1,6 @@
import {
- globalApi,
+ globalApi
} from '@/api/globalApi.js';
-import {
- qualityInspectionApi
-} from '@/api/qualityInspection.js';
-
import {
apiLoginPassword
} from './publicInterface';
@@ -105,31 +101,31 @@
}
// const BaseUrl = "http://192.168.0.110:9896"
-// const webSocketUrl = "ws://192.168.0.110:9896/wrzs/ws/info"
+// const webSocketUrl = "ws://192.168.0.110: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.66:9896/wrzs/ws/info"
+// const BaseUrl = "http://192.168.0.87:9896"
+// const webSocketUrl = "ws://192.168.0.87:9896/wrzs/ws/info"
-export const onlineurl = 'https://wrzs.czjlchem.com:9090';
-// const BaseUrl = "http://192.168.0.100:9997s97";
+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://mx.jzeg.cn:9195';
-// const webSocketUrl = "wss://mx.jzeg.cn:9195/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) => {
// 鏌ユ壘瀵瑰簲鍦板潃
- let urls = (globalApi[opt.url]?.url || globalApi[url]?.url || qualityInspectionApi[opt.url]?.url || qualityInspectionApi[url]?.url);
+ let urls = (globalApi[opt.url]?.url || globalApi[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
@@ -138,60 +134,7 @@
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
- opt.method = opt.method || "GET";
- var header = {}
- if (uni.getStorageSync('token')) {
- header = {
- "Authorization": "Bearer" + ' ' + uni.getStorageSync('token'),
- "clientToc": "Y",
- 'CLIENT_TOC': 'Y',
+ "CLIENT_TOC": "Y",
}
}
@@ -215,6 +158,7 @@
Object.keys(opt).map(key => {
if (key !== "params") {
+
return options[key] = opt[key]
}
})
@@ -225,10 +169,62 @@
})
}
+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
+ 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] == '' || 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 interceptorsRes = ([err, resp], resolve, reject) => {
- console.log(resp,'resp===鎷︽埅鍣�===')
const {
statusCode,
data
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index e37dac6..f97e93c 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -219,7 +219,7 @@
</view>
<view class="weigh-button"
v-show="ablePrintOut">
- <u-button :text=" isBtnShow ? '涓嬬' : '鎵撳嵃鍑洪棬璇�'"
+ <u-button :text=" isXiaBang ? '涓嬬' : '鎵撳嵃鍑洪棬璇�'"
@click="printBefore('out')"
type="primary"
shape="circle"
--
Gitblit v1.9.1