diff --git a/common/manageServer.js b/common/manageServer.js
index 4903e01..a00b163 100644
--- a/common/manageServer.js
+++ b/common/manageServer.js
@@ -2,13 +2,21 @@ import { goto, getImageTempFilePath } from "./untool";
import { showToast, showLoading, hideLoading, downloadFile } from "./untool"
import { setSessionXToken, getSessionXToken } from "@/session"
import { textEncoder, textDecoder } from "./util"
+import { getCurrentAppInfo } from "@/common/appUpdate"
+
+let _appVersion
+getCurrentAppInfo().then(res=> {
+ _appVersion = res._appVersion
+})
const getCommonReqData = ()=> {
const xToken = getSessionXToken()
+
return {
header: {
"dataFrom": "app",
"X-Token": xToken,
+ "appVersion": _appVersion || '',
}
}
}
diff --git a/components/buns-order-templates/bo-scanlist-tmp.vue b/components/buns-order-templates/bo-scanlist-tmp.vue
index 36293ac..21ef2f8 100644
--- a/components/buns-order-templates/bo-scanlist-tmp.vue
+++ b/components/buns-order-templates/bo-scanlist-tmp.vue
@@ -5,10 +5,10 @@
- 运单号
+ {{customTabelConf.head[0] || '运单号'}}
- 扫描时间
+ {{customTabelConf.head[1] || '扫描时间'}}
@@ -52,6 +52,13 @@
default () {
return false
}
+ },
+ customTabelConf: {
+ default () {
+ return {
+ head: []
+ }
+ }
}
},
data() {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 84c2a35..fbffa9c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -59,6 +59,7 @@
isEncrypt: true,
username: '',
password: '',
+ // macCode: '', // 设备唯一ID TODO
remberPassport: []
},
}
diff --git a/pages/print/courierNote.vue b/pages/print/courierNote.vue
index fb37195..78c5ea9 100644
--- a/pages/print/courierNote.vue
+++ b/pages/print/courierNote.vue
@@ -38,10 +38,6 @@
打印配置
-
- 打印预览
-
注意:当打印出来寄件分拨或未端分拨返回为空时,请等待5分钟后再补 打印
@@ -230,12 +226,6 @@
let res = await this.getRealGetWaybillPrintData()
const imgUrls = res?.data?.map(t=> t.imageUrl) || []
return imgUrls
- },
- async handlePreview(){
- const imgUrls = await this.getPrintImages()
- uni.previewImage({
- urls: imgUrls
- })
}
}
}
diff --git a/pages/tms/unpackingScanning.vue b/pages/tms/unpackingScanning.vue
index a6eac10..bfaa1be 100644
--- a/pages/tms/unpackingScanning.vue
+++ b/pages/tms/unpackingScanning.vue
@@ -25,7 +25,7 @@
-
+
@@ -67,6 +67,9 @@
},
resData: { list: [] },
siteRes: { list: [] },
+ customTabelConf: {
+ head: ['包号']
+ },
submitParam: {
billCode: '',
preOrNextStationCode: '',