diff --git a/core/request/apis.js b/core/request/apis.js
index 6905e24..a0e8dac 100644
--- a/core/request/apis.js
+++ b/core/request/apis.js
@@ -498,6 +498,12 @@ export default {
method: "POST",
isSystemApi: true
},
+ confirmPrintUnclaimedWaveCount: {
+ path: "order.wave.confirmPrintUnclaimedWaveCount",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ },
wavePickTaskList: {
path: "order.wave.wavePickTaskList",
auth: true,
diff --git a/core/request/index.js b/core/request/index.js
index 6c556f2..d061256 100644
--- a/core/request/index.js
+++ b/core/request/index.js
@@ -11,7 +11,8 @@ export default function http(
data = {},
toastBefore = '', // 请求前加载提示
toastAfter = true, // 请求后错误提示
- responseType = 'text'
+ responseType = 'text',
+ timeout = 0 // 自定义请求超时(ms),0 表示使用默认 20s;长轮询接口需传入大于服务端等待时长的值
) {
let api = getApiPath(url);
console.log(api);
@@ -98,7 +99,8 @@ export default function http(
path: api.path,
data,
method: api.method,
- responseType
+ responseType,
+ ...(timeout ? { timeout } : {})
})
}
diff --git a/env.js b/env.js
index c33f58a..b87b72a 100644
--- a/env.js
+++ b/env.js
@@ -1,4 +1,4 @@
-// export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址
-export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址
+export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址
+// export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址
export const API_URL = `${BASE_URL}/system` //后台接口域名
export const IMG_URL = 'https://ye4s.file.gzxunren.com' //全局网络图片地址变量,css背景图片地址变量在uni.scss
diff --git a/pages/claim/shippingLabel.vue b/pages/claim/shippingLabel.vue
index 6509dc6..576e640 100644
--- a/pages/claim/shippingLabel.vue
+++ b/pages/claim/shippingLabel.vue
@@ -30,25 +30,29 @@
-
-
-
-
-
+
+
+ 确认打印未领料波次数量:
+ {{ unclaimedWaveCount }}
+
+
+
+
+
+
{{ item }}
-
-
-
+
+
暂无数据
-
-
+
+