uu

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 || '',
 		}
 	}
 }

components/buns-order-templates/bo-scanlist-tmp.vue

@@ -5,10 +5,10 @@
 			<view class="pb-20">
 				<u-row>
 					<u-col span="8">
-						<text class="font-weight">运单号</text>
+						<text class="font-weight">{{customTabelConf.head[0] || '运单号'}}</text>
 					</u-col>
 					<u-col span="4">
-						<text class="font-weight">扫描时间</text>
+						<text class="font-weight">{{customTabelConf.head[1] || '扫描时间'}}</text>
 					</u-col>
 				</u-row>
 			</view>
@@ -52,6 +52,13 @@
 				default () {
 					return false
 				}
+			},
+			customTabelConf: {
+				default () {
+					return {
+						head: []
+					}
+				}
 			}
 		},
 		data() {

pages/login/login.vue

@@ -59,6 +59,7 @@
 					isEncrypt: true,
 					username: '',
 					password: '',
+					// macCode: '', // 设备唯一ID TODO
 					remberPassport: []
 				},
 			}

pages/print/courierNote.vue

@@ -38,10 +38,6 @@
 							
 							<u-row justify="between" custom-style="padding-top:20rpx;">
 								<view class="com-section">打印配置</view>
-								<view>
-									<u-button shape="square" plain="true" @click="handlePreview"
-										custom-style="width: 200rpx;height:60rpx;font-size: 30rpx;border-radius: 14rpx;">打印预览</u-button>
-								</view>
 							</u-row>
 							<view class="clr-prm mt-20">注意：当打印出来寄件分拨或未端分拨返回为空时，请等待5分钟后再补 打印</view>
 								
@@ -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
-				})
 			}
 		}
 	}

pages/tms/unpackingScanning.vue

@@ -25,7 +25,7 @@
 				
 				
 				<view class="blcok-white-noradius">
-					<bo-scanlist-tmp :resData="resData"></bo-scanlist-tmp>
+					<bo-scanlist-tmp :customTabelConf="customTabelConf" :resData="resData"></bo-scanlist-tmp>
 				</view>
 				
 			</template>
@@ -67,6 +67,9 @@
 				},
 				resData: { list: [] },
 				siteRes: { list: [] },
+				customTabelConf: {
+					head: ['包号']
+				},
 				submitParam: {
 					billCode: '',
 					preOrNextStationCode: '',