diff --git a/compoment/BasicContainer/BasicContainer.vue b/compoment/BasicContainer/BasicContainer.vue
index 43b92cd..4b86a3d 100644
--- a/compoment/BasicContainer/BasicContainer.vue
+++ b/compoment/BasicContainer/BasicContainer.vue
@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<!-- 顶部导航栏 -->
-		<u-navbar :title="title" placeholder :autoBack="false" @leftClick="option.leftClick" leftIconSize='35'
-			bgColor='#d3832a' leftIconColor='#ffffff' titleStyle='color:#ffffff'></u-navbar>
+		<u-navbar :title="title" placeholder :autoBack="false" @leftClick="leftClick" leftIconSize='35' bgColor='#d3832a'
+			leftIconColor='#ffffff' titleStyle='color:#ffffff'></u-navbar>
 	</view>
 
 	<!-- 头部 -->
@@ -36,13 +36,15 @@
 	const props = defineProps({
 		option: {
 			type: Object,
-			default: {}
+			default: {
+
+			}
 		},
 		title: {
 			type: String
 		},
-		leftClick() {
-			uni.navigateBack()
+		leftClick: {
+			type: Function,
 		}
 	})
 
@@ -57,6 +59,7 @@
 	const pullDownRefreshInitPage = props.option.pullDownRefreshInitPage || function () { console.log('刷新'); }
 	// 触底加载请求页面
 	const reachBottomInitPage = props.option.reachBottomInitPage || function () { }
+	const leftClick = props.leftClick || function () { uni.navigateBack() }
 
 	// 初始化执行
 	onLoad(() => {
@@ -103,7 +106,6 @@
 		const timer = setTimeout(async () => {
 			// 触发下拉回调
 			await pullDownRefreshInitPage()
-			console.log('111 :>> ', 111);
 			uni.stopPullDownRefresh()
 			// 清除定时器
 			clearTimeout(timer)
diff --git a/config/host.js b/config/host.js
index a9fa6c9..41fe80d 100644
--- a/config/host.js
+++ b/config/host.js
@@ -4,7 +4,7 @@
  * 测试域名
  * */
 //测试域名
-const devhost = 'http://test.api.huitongys.com/'
+// const devhost = 'http://test.api.huitongys.com/'
 // lmy
 // const devhost = 'http://192.168.10.123:8889/'
 // zhy
@@ -12,7 +12,7 @@ const devhost = 'http://test.api.huitongys.com/'
 // tjj
 // const devhost = 'http://192.168.10.29:13000/'
 // cyz
-// const devhost = 'http://192.168.10.75:8777/'
+const devhost = 'http://192.168.10.75:8777/'
 // 正式
 // const devhost = 'http://h5uapi.huitongys.com/'
 // cg
@@ -20,8 +20,8 @@ const devhost = 'http://test.api.huitongys.com/'
 /**
  * 正式域名
  * */
-// const prohost = 'http://h5uapi.huitongys.com/'
-const prohost = 'http://test.api.huitongys.com/'
+const prohost = 'http://h5uapi.huitongys.com/'
+// const prohost = 'http://test.api.huitongys.com/'
 /**
  * 图片域名
  * */
diff --git a/manifest.json b/manifest.json
index cafa4ae..d08e3cc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "货无忧",
     "appid" : "__UNI__EB22F37",
     "description" : "",
-    "versionName" : "1.0.26",
-    "versionCode" : 1026,
+    "versionName" : "1.0.27",
+    "versionCode" : 1027,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 80bed23..eca5871 100644
--- a/pages.json
+++ b/pages.json
@@ -1272,12 +1272,12 @@
 			// 	"selectedIconPath": "/static/TabberIcon/icon3check.png",
 			// 	"text": "报表"
 			// },
-			// {
-			// 	"pagePath": "pages/news/news",
-			// 	"iconPath": "/static/TabberIcon/icon4.png",
-			// 	"selectedIconPath": "/static/TabberIcon/icon4check.png",
-			// 	"text": "消息"
-			// },
+			{
+				"pagePath": "pages/news/news",
+				"iconPath": "/static/TabberIcon/icon4.png",
+				"selectedIconPath": "/static/TabberIcon/icon4check.png",
+				"text": "消息"
+			},
 			{
 				"pagePath": "pages/user/user",
 				"iconPath": "/static/TabberIcon/icon5.png",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bb6f29f..3b32247 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -42,8 +42,8 @@
 	import { inject, reactive, toRefs, watchEffect, ref } from "vue";
 	import utils from '../../utils/utils';
 	const tip = ref(null)
-	let details = reactive<listtype>({ tablist: [] });
-	/* let details = reactive<listtype>({
+	// let details = reactive<listtype>({ tablist: [] }); 
+	let details = reactive<listtype>({
 		tablist: [
 			{
 				type: 1,
@@ -161,7 +161,7 @@
 				]
 			},
 		]
-	}) */
+	})
 
 	function gopathpage(path : string) {
 		uni.navigateTo({
diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue
index 1f23eae..1d912b3 100644
--- a/pagesHome/pages/CustomerSign/CustomerSign.vue
+++ b/pagesHome/pages/CustomerSign/CustomerSign.vue
@@ -350,19 +350,34 @@
 			imglist: [],
 			maximglength: 20,
 			success: async (detail) => {
-				let data = {
-					deliveryId: details.id,
-					reservationId: item.id,
-					deliverySignPictures: detail.imglist.join(','),
-					driverRemarks: detail.inputtext,
-				}
-
-				let res = await signforoneclick(data)
-				console.log(res);
-				if (res.code == 200) {
-					initpage()
+				try {
+					uni.showLoading({
+						title: '提交中',
+						mask: true
+					})
+					let data = {
+						deliveryId: details.id,
+						reservationId: item.id,
+						deliverySignPictures: detail.imglist.join(','),
+						driverRemarks: detail.inputtext,
+					}
+					let res = await signforoneclick(data)
+					if (res.code == 200) {
+						uni.showToast({
+							title: '签收成功',
+							icon: 'none'
+						})
+						// #ifdef APP
+						utils.ttsspke('成功签收' + deliveryNumber.value + '件')
+						// #endif
+						initpage()
+					}
+				} catch (e) {
+					//TODO handle the exception
+				} finally {
+					uni.hideLoading()
+					tiplists.value.setdetails({ isshow: false })
 				}
-				tiplists.value.setdetails({ isshow: false })
 			},
 			cancel: () => {
 				tiplists.value.setdetails({ isshow: false })
diff --git a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
index ebdd58a..785a5f0 100644
--- a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
+++ b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
@@ -986,7 +986,11 @@
 				text += 'FORM\r\n'
 				text += 'PRINT\r\n'
 				// 将数据传入打印函数中
-				utils.getbl(bluetoothInfo.value, text)
+				utils.getbl(bluetoothInfo.value, text).then(() => {
+					return tiplists.value.setdetails({ isshow: false })
+				}).catch(() => {
+					return bluetoothList.value.setdetails({ isshow: true })
+				})
 				/* const _arr = []
 				let list = ''
 				_arr.forEach((value, index) => {
@@ -1015,7 +1019,6 @@
 									^XZ               
 								` */
 				// #endif
-				tiplists.value.setdetails({ isshow: false })
 			},
 			cancel: (details) => {
 				tiplists.value.setdetails({ isshow: false })
@@ -1030,7 +1033,6 @@
 	 * 返回上一页
 	 */
 	function backPage() {
-		console.log('111 :>> ', 111);
 		uni.redirectTo({
 			url: '/pagesHome/pages/scansorting/scansorting'
 		})
@@ -1040,6 +1042,7 @@
 </script>
 
 <style lang="scss">
+	// 主题色
 	$subjectColor: #d3832a;
 
 	.mabxtop {
diff --git a/pagesHome/pages/SelfPScanList/SelfPScanList.vue b/pagesHome/pages/SelfPScanList/SelfPScanList.vue
index 2d895de..50d60e8 100644
--- a/pagesHome/pages/SelfPScanList/SelfPScanList.vue
+++ b/pagesHome/pages/SelfPScanList/SelfPScanList.vue
@@ -1,110 +1,115 @@
 <template>
-	<!-- <u-navbar title="自提扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> -->
-	<u-navbar title="自提扫描" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
-		:autoBack="true" leftIconSize='35'></u-navbar>
-	<view class="hdtpnum">
-		<view>
-			<view>订单总数</view>
-			<view>{{details.orderNum||0}}</view>
-		</view>
-		<view>
-			<view>齐套数</view>
-			<view>{{details.completeNum||0}}</view>
-		</view>
-		<view>
-			<view>自提件数</view>
-			<view>{{details.planNum||0}}</view>
-		</view>
-		<view>
-			<view>签收件数</view>
-			<view>{{details.signedNum||0}}</view>
-		</view>
-		<view>
-			<view>库存品数</view>
-			<view>{{details.inventoryNub||0}}</view>
-		</view>
-	</view>
-	<view class="scinp">
-		<view>齐套状态</view>
-		<view>
-			<cusSelects @change='checktype' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5' size='145'
-				:clearable='true'></cusSelects>
-		</view>
-		<view class="inputs">
-			<input v-model="orderCode" placeholder="请输入查询的订单号" />
-		</view>
-		<view class="btscan" @click="initpage">查询</view>
-	</view>
-	<view class="tabtip">
-		<view @click="setorderStatus(1)">
-			<view :class="orderType==1?'xz':''">定制品</view>
-		</view>
-		<view @click="setorderStatus(2)">
-			<view :class="orderType==2?'xz':''">库存品</view>
-		</view>
-		<view @click="setorderStatus(3)">
-			<view :class="orderType==3?'xz':''">零担</view>
-		</view>
-	</view>
-	<scroll-view class="scve" scroll-y="true">
-		<view class="mabx">
-			<block v-for="item in datalist" :key="item">
-				<template v-if="orderType==1">
-					<view class="itec" @click="showsdqs">
-						<view class="contenbx1">
-							<view>
-								<text style="color: #90A0AF;">订单编号：</text>
-								{{item.orderSelfNumbering}}
+	<BasicContainer ref="basicContainer" :option="option">
+		<template #head>
+			<view class="hdtpnum">
+				<view>
+					<view>订单总数</view>
+					<view>{{details.orderNum||0}}</view>
+				</view>
+				<view>
+					<view>齐套数</view>
+					<view>{{details.completeNum||0}}</view>
+				</view>
+				<view>
+					<view>自提件数</view>
+					<view>{{details.planNum||0}}</view>
+				</view>
+				<view>
+					<view>签收件数</view>
+					<view>{{details.signedNum||0}}</view>
+				</view>
+				<view>
+					<view>库存品数</view>
+					<view>{{details.inventoryNub||0}}</view>
+				</view>
+			</view>
+			<view class="scinp">
+				<view>齐套状态</view>
+				<view>
+					<cusSelects @change='checktype' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5'
+						size='145' :clearable='true'></cusSelects>
+				</view>
+				<view class="inputs">
+					<input v-model="orderCode" placeholder="请输入查询的订单号" />
+				</view>
+				<view class="btscan" @click="search">查询</view>
+			</view>
+			<view class="tabtip">
+				<view @click="setorderStatus(1)">
+					<view :class="orderType==1?'xz':''">定制品</view>
+				</view>
+				<view @click="setorderStatus(2)">
+					<view :class="orderType==2?'xz':''">库存品</view>
+				</view>
+				<view @click="setorderStatus(3)">
+					<view :class="orderType==3?'xz':''">零担</view>
+				</view>
+			</view>
+		</template>
+
+		<template #body>
+			<scroll-view class="scve" scroll-y="true">
+				<view class="mabx">
+					<block v-for="item in datalist" :key="item">
+						<template v-if="orderType==1">
+							<view class="itec" @click="showsdqs">
+								<view class="contenbx1">
+									<view>
+										<text style="color: #90A0AF;">订单编号：</text>
+										{{item.orderSelfNumbering}}
+									</view>
+								</view>
+								<view class="contenbx1">
+									<view><text style="color: #90A0AF;">配送数：</text>{{item.planNum}}</view>
+									<view><text style="color: #90A0AF;">已扫码数：</text>{{item.signedNum}}</view>
+								</view>
+								<view
+									:class="item.orderStatusStr=='齐套'?'tip tp1':item.orderStatusStr=='部分扫'?'tip tp3':'tip tp2'">
+									{{item.orderStatusStr}}
+								</view>
 							</view>
-						</view>
-						<view class="contenbx1">
-							<view><text style="color: #90A0AF;">配送数：</text>{{item.planNum}}</view>
-							<view><text style="color: #90A0AF;">已扫码数：</text>{{item.signedNum}}</view>
-						</view>
-						<view :class="item.orderStatusStr=='齐套'?'tip tp1':item.orderStatusStr=='部分扫'?'tip tp3':'tip tp2'">
-							{{item.orderStatusStr}}
-						</view>
-					</view>
-				</template>
-
-				<template v-if="orderType==2">
-					<view class="itec" @click="showsdqs">
-						<view class="contenbx1">
-							<view><text style="color: #90A0AF;">SKU：</text>{{item.sku}}</view>
-						</view>
-						<view class="contenbx1">
-							<view><text style="color: #90A0AF;">物品：</text>{{item.descriptionGoods}}</view>
-							<view><text style="color: #90A0AF;">规格：</text>{{item.specification}}</view>
-						</view>
-						<view class="contenbx1">
-							<view><text style="color: #90A0AF;">单位：</text>{{item.cargoUnit}}</view>
-							<view><text style="color: #90A0AF;">自提数：</text>{{item.quantity}}</view>
-						</view>
-						<!-- <view :class="item.signforNub==0?'tip tp2':item.signforNub==item.reservationNum?'tip tp1':'tip tp3'">{{item.signforNub==0?'未扫':item.signforNub==item.reservationNum?'齐套':'部分扫'}}</view> -->
-					</view>
-				</template>
-
-				<!-- 零担 -->
-				<template v-if="orderType==3">
-					<view class="itec" @click="showsTipsZero(item)">
-						<view class="contenbx1">
-							<view><text style="color: #90A0AF;">订单号：</text>{{item.orderCode}}</view>
-						</view>
-						<view class="contenbx1">
-							<view><text style="color: #90A0AF;">运单号：</text>{{item.waybillNumber}}</view>
-						</view>
-						<view class="contenbx1">
-							<view><text style="color: #90A0AF;">产品名称：</text>{{item.descriptionGoods}}</view>
-						</view>
-						<view class="contenbx1">
-							<view><text style="color: #90A0AF;">预计签收件数：</text>{{item.reservationQuantity}}</view>
-							<view><text style="color: #90A0AF;">实际签收件数：</text>{{item.signforQuantity}}</view>
-						</view>
-					</view>
-				</template>
-			</block>
-		</view>
-	</scroll-view>
+						</template>
+
+						<template v-if="orderType==2">
+							<view class="itec" @click="showsdqs">
+								<view class="contenbx1">
+									<view><text style="color: #90A0AF;">SKU：</text>{{item.sku}}</view>
+								</view>
+								<view class="contenbx1">
+									<view><text style="color: #90A0AF;">物品：</text>{{item.descriptionGoods}}</view>
+									<view><text style="color: #90A0AF;">规格：</text>{{item.specification}}</view>
+								</view>
+								<view class="contenbx1">
+									<view><text style="color: #90A0AF;">单位：</text>{{item.cargoUnit}}</view>
+									<view><text style="color: #90A0AF;">自提数：</text>{{item.quantity}}</view>
+								</view>
+								<!-- <view :class="item.signforNub==0?'tip tp2':item.signforNub==item.reservationNum?'tip tp1':'tip tp3'">{{item.signforNub==0?'未扫':item.signforNub==item.reservationNum?'齐套':'部分扫'}}</view> -->
+							</view>
+						</template>
+
+						<!-- 零担 -->
+						<template v-if="orderType==3">
+							<view class="itec" @click="showsTipsZero(item)">
+								<view class="contenbx1">
+									<view><text style="color: #90A0AF;">订单号：</text>{{item.orderCode}}</view>
+								</view>
+								<view class="contenbx1">
+									<view><text style="color: #90A0AF;">运单号：</text>{{item.waybillNumber}}</view>
+								</view>
+								<view class="contenbx1">
+									<view><text style="color: #90A0AF;">产品名称：</text>{{item.descriptionGoods}}</view>
+								</view>
+								<view class="contenbx1">
+									<view><text style="color: #90A0AF;">预计签收件数：</text>{{item.reservationQuantity}}</view>
+									<view><text style="color: #90A0AF;">实际签收件数：</text>{{item.signforQuantity}}</view>
+								</view>
+							</view>
+						</template>
+					</block>
+				</view>
+			</scroll-view>
+		</template>
+	</BasicContainer>
 	<tiplist ref="tiplists"></tiplist>
 	<saomiao2></saomiao2>
 </template>
@@ -125,9 +130,18 @@
 		billLadingzeroBillBatch
 	} from '@/api/user.js'
 	import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue'
-	import { reactive, toRefs, ref } from "vue";
+	import { reactive, toRefs, ref, renderList } from "vue";
 	import { pagedetails } from '@/interfaces/pagesHome/SelfPScanList'
-	let details = reactive<pagedetails>({
+	const option = {
+		title: '自提扫描',
+		haveData: true,
+		async pullDownRefreshInitPage() {
+			details.datalist = []
+			await initpage()
+		}
+	}
+
+	const details = reactive<pagedetails>({
 		schanvalue: '',
 		typearr: [
 			{
@@ -156,6 +170,7 @@
 		scancode: '',
 	})
 	const tiplists = ref(null)
+	const basicContainer = ref(null)
 	onLoad((op) => {
 		details.billLadingId = op.billLadingId
 	})
@@ -167,7 +182,11 @@
 				sacn()
 			}
 		})
-		initpage()
+		// initpage()
+		const timer = setTimeout(() => {
+			basicContainer.value.startPullDownRefresh()
+			clearTimeout(timer)
+		}, 200)
 	})
 	onHide(() => {
 		uni.$off('scancodedate')
@@ -201,65 +220,83 @@
 		let res = await billLadingscan(data)
 		console.log(res);
 		if (res.code == 200) {
-			initpage()
+			basicContainer.value.startPullDownRefresh()
 		}
 	}
 	async function initpage() {
-		details.datalist = []
-		if (details.orderType == 1) {
-			let data = {
-				orderStatus: details.orderStatus,
-				billLadingId: details.billLadingId,
-				orderCode: details.orderCode
-			}
-			let response = await billLadingorderList(data)
-			if (response.code !== 200) return
-			details.datalist = response.data.list
-			details.orderNum = response.data.orderNum
-			details.completeNum = response.data.completeNum
-			details.planNum = response.data.planNum
-			details.inventoryNub = response.data.inventoryNub
-			details.signedNum = response.data.signedNum
-		} else if (details.orderType == 2) {
-			let date = {
-				id: details.billLadingId,
-				current: 1,
-				size: 10
-			}
-			let response = await billLadinggetInventory(date)
-			if (res.code !== 200) return
-
-			details.datalist = response.data.records
-			details.datalist.every(item => {
-				if (item.esauInventoryNum == -1) {
-					uni.showToast({
-						title: '物品备货未完成，请前往备货',
-						icon: 'none'
-					})
-					return false
+		try {
+			uni.showLoading({
+				title: '数据加载中',
+				mask: true
+			});
+
+			if (details.orderType == 1) {
+				let data = {
+					orderStatus: details.orderStatus,
+					billLadingId: details.billLadingId,
+					orderCode: details.orderCode
 				}
-				return true
-			})
-			// details.orderNum=response.data.orderNum
-			// details.completeNum=response.data.completeNum
-			// details.planNum=response.data.planNum
-			// details.signedNum=response.data.signedNum
-		} else if (details.orderType === 3) {
-			let deta = {
-				billLadingId: details.billLadingId,
-				current: 1,
-				size: 10
+				let response = await billLadingorderList(data)
+				if (response.code !== 200) return
+				details.datalist = response.data.list
+				details.orderNum = response.data.orderNum
+				details.completeNum = response.data.completeNum
+				details.planNum = response.data.planNum
+				details.inventoryNub = response.data.inventoryNub
+				details.signedNum = response.data.signedNum
+			} else if (details.orderType == 2) {
+				let date = {
+					id: details.billLadingId,
+					current: 1,
+					size: 10
+				}
+				let response = await billLadinggetInventory(date)
+				if (response.code !== 200) return
+
+				details.datalist = response.data.records
+				details.datalist.every(item => {
+					if (item.esauInventoryNum == -1) {
+						uni.showToast({
+							title: '物品备货未完成，请前往备货',
+							icon: 'none'
+						})
+						return false
+					}
+					return true
+				})
+				// details.orderNum=response.data.orderNum
+				// details.completeNum=response.data.completeNum
+				// details.planNum=response.data.planNum
+				// details.signedNum=response.data.signedNum
+			} else if (details.orderType === 3) {
+				let deta = {
+					billLadingId: details.billLadingId,
+					current: 1,
+					size: 10
+				}
+				const res = await billLadingZeroBillOrderData(deta)
+				console.log('res :>> ', res);
+				const { code, data } = res
+				if (code === 200) details.datalist = data
 			}
-			const res = await billLadingZeroBillOrderData(deta)
-			console.log('res :>> ', res);
-			const { code, data } = res
-			if (code === 200) details.datalist = data
+		} catch (e) {
+			//TODO handle the exception
+		} finally {
+			uni.hideLoading()
 		}
+
 		// sacn()
 	}
+
 	function setorderStatus(state : number) {
+		details.datalist = []
 		details.orderType = state
-		initpage()
+		basicContainer.value.startPullDownRefresh()
+		// initpage()
+	}
+
+	function search() {
+		basicContainer.value.startPullDownRefresh()
 	}
 
 	async function showsTipsZero(item) {
@@ -340,7 +377,7 @@
 										uni.showToast({
 											title: res.msg
 										})
-										initpage()
+										basicContainer.value.startPullDownRefresh()
 									}
 									tiplists.value.setdetails({ isshow: false })
 								} catch (err) {
@@ -388,6 +425,7 @@
 			}
 		})
 	}
+
 	const { orderType, schanvalue, typearr, orderCode, datalist } = toRefs(details)
 </script>
 
diff --git a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
index b51d3ff..3643789 100644
--- a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
+++ b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
@@ -1,111 +1,114 @@
 <template>
-	<!-- <u-navbar title="自提明细扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> -->
-	<u-navbar title="自提明细扫描" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
-		:autoBack="true" leftIconSize='35'></u-navbar>
-	<view class="headtop">
-		<view>
-			<view>车牌号：{{details.pickUpPlate}}</view>
-			<view>司机：{{details.consignee}}</view>
-		</view>
-	</view>
-	<view class="tabmabx">
-		<view>
-			<uni-table :loading='false' emptyText="暂无更多数据">
-				<uni-tr>
-					<uni-th width="70" align="center"></uni-th>
-					<uni-th align="center">订单总数</uni-th>
-					<uni-th align="center">签收件数</uni-th>
-				</uni-tr>
-				<uni-tr v-for="item in [1,2]">
-					<uni-td align="center" class="jhjs">{{item==1?'计划':'完成'}}</uni-td>
-					<uni-td align="center">{{item==1?details.orderNum:details.completeNum}}</uni-td>
-					<uni-td align="center">{{item==1?details.planNum:details.signedNum}}</uni-td>
-				</uni-tr>
-			</uni-table>
-		</view>
-	</view>
-	<view class="scinp">
-		<view>齐套状态</view>
-		<view>
-			<cusSelects @change='checktype' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5' size='145'
-				:clearable='true'></cusSelects>
-		</view>
-		<view class="inputs">
-			<input placeholder="请输入查询的订单号" />
-		</view>
-		<view class="btscan" @click="initpage">查询</view>
-	</view>
-	<view class="tabtip">
-		<view @click="setorderStatus(1)">
-			<view :class="orderType==1?'xz':''">定制品</view>
-		</view>
-		<view @click="setorderStatus(2)">
-			<view :class="orderType==2?'xz':''">库存品</view>
-		</view>
-		<view @click="setorderStatus(3)">
-			<view :class="orderType==3?'xz':''">零担</view>
-		</view>
-
-	</view>
-	<scroll-view scroll-y="true" class="scrollv">
-		<view class="mabxs">
-
-			<block v-for="item in dataList" :key="item">
-				<!-- 定制品 -->
-				<template v-if="orderType==1">
-					<view class="ite" @click="showsdqs">
-						<view>
-							<view @click.stop="goorderdetail(item)">订单号：{{item.orderCode}}</view>
-							<view>包条码：{{item.orderPackageCode}}</view>
-						</view>
-						<view>
-							<view>是否扫描：{{item.scanStatusStr}}</view>
-							<view>异常：{{item.errorStatusStr}}</view>
-						</view>
-					</view>
-				</template>
-
-				<!-- 库存品 -->
-				<template v-if="orderType==2">
-					<view class="ite" @click="showsdqs">
-						<view>
-							<view>SKU：{{item.sku}}</view>
-							<view>包件号：{{item.coding}}</view>
-						</view>
-						<view>
-							<view>物品：{{item.descriptionGoods}}</view>
-							<view>规格：{{item.specification}}</view>
-						</view>
-						<view>
-							<view>单位：{{item.cargoUnit}}</view>
-							<view>扫描：{{item.scanStatus==1?'未扫描':item.scanStatus==''?'未扫描':'扫描'}}</view>
-							<!-- <view>规格：{{item.specification}}</view> -->
-						</view>
-					</view>
-
-				</template>
-
-				<!-- 零担 -->
-				<template v-if="orderType==3">
-					<view class="ite" @click="showsTipsZero(item)">
-						<view>
-							<view>订单号：{{item.orderCode}}</view>
-						</view>
-						<view>
-							<view>运单号：{{item.waybillNumber}}</view>
-						</view>
-						<view>
-							<view>产品名称：{{item.firsts}}</view>
-						</view>
-						<view>
-							<view>预计签收件数：{{item.reservationQuantity}}</view>
-							<view>实际签收件数：{{item.signforQuantity}}</view>
-						</view>
-					</view>
-				</template>
-			</block>
-		</view>
-	</scroll-view>
+	<BasicContainer ref="basicContainer" :option="option">
+		<template #head>
+			<view class="headtop">
+				<view>
+					<view>车牌号：{{details.pickUpPlate}}</view>
+					<view>司机：{{details.consignee}}</view>
+				</view>
+			</view>
+			<view class="tabmabx">
+				<view>
+					<uni-table :loading='false' emptyText="暂无更多数据">
+						<uni-tr>
+							<uni-th width="70" align="center"></uni-th>
+							<uni-th align="center">订单总数</uni-th>
+							<uni-th align="center">签收件数</uni-th>
+						</uni-tr>
+						<uni-tr v-for="item in [1,2]">
+							<uni-td align="center" class="jhjs">{{item==1?'计划':'完成'}}</uni-td>
+							<uni-td align="center">{{item==1?details.orderNum:details.completeNum}}</uni-td>
+							<uni-td align="center">{{item==1?details.planNum:details.signedNum}}</uni-td>
+						</uni-tr>
+					</uni-table>
+				</view>
+			</view>
+			<view class="scinp">
+				<view>齐套状态</view>
+				<view>
+					<cusSelects @change='checktype' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5'
+						size='145' :clearable='true'></cusSelects>
+				</view>
+				<view class="inputs">
+					<input placeholder="请输入查询的订单号" />
+				</view>
+				<view class="btscan" @click="initpage">查询</view>
+			</view>
+			<view class="tabtip">
+				<view @click="setorderStatus(1)">
+					<view :class="orderType==1?'xz':''">定制品</view>
+				</view>
+				<view @click="setorderStatus(2)">
+					<view :class="orderType==2?'xz':''">库存品</view>
+				</view>
+				<view @click="setorderStatus(3)">
+					<view :class="orderType==3?'xz':''">零担</view>
+				</view>
+			</view>
+		</template>
+
+		<template #body>
+			<scroll-view scroll-y="true" class="scrollv">
+				<view class="mabxs">
+
+					<block v-for="item in dataList" :key="item">
+						<!-- 定制品 -->
+						<template v-if="orderType==1">
+							<view class="ite" @click="showsdqs">
+								<view>
+									<view @click.stop="goorderdetail(item)">订单号：{{item.orderCode}}</view>
+									<view>包条码：{{item.orderPackageCode}}</view>
+								</view>
+								<view>
+									<view>是否扫描：{{item.scanStatusStr}}</view>
+									<view>异常：{{item.errorStatusStr}}</view>
+								</view>
+							</view>
+						</template>
+
+						<!-- 库存品 -->
+						<template v-if="orderType==2">
+							<view class="ite" @click="showsdqs">
+								<view>
+									<view>SKU：{{item.sku}}</view>
+									<view>包件号：{{item.coding}}</view>
+								</view>
+								<view>
+									<view>物品：{{item.descriptionGoods}}</view>
+									<view>规格：{{item.specification}}</view>
+								</view>
+								<view>
+									<view>单位：{{item.cargoUnit}}</view>
+									<view>扫描：{{item.scanStatus==1?'未扫描':item.scanStatus==''?'未扫描':'扫描'}}</view>
+									<!-- <view>规格：{{item.specification}}</view> -->
+								</view>
+							</view>
+
+						</template>
+
+						<!-- 零担 -->
+						<template v-if="orderType==3">
+							<view class="ite" @click="showsTipsZero(item)">
+								<view>
+									<view>订单号：{{item.orderCode}}</view>
+								</view>
+								<view>
+									<view>运单号：{{item.waybillNumber}}</view>
+								</view>
+								<view>
+									<view>产品名称：{{item.firsts}}</view>
+								</view>
+								<view>
+									<view>预计签收件数：{{item.reservationQuantity}}</view>
+									<view>实际签收件数：{{item.signforQuantity}}</view>
+								</view>
+							</view>
+						</template>
+					</block>
+				</view>
+			</scroll-view>
+		</template>
+	</BasicContainer>
 	<tiplist ref="tiplists"></tiplist>
 	<saomiao2></saomiao2>
 </template>
@@ -128,6 +131,15 @@
 	import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue'
 	import { inject, reactive, ref, toRefs, watchEffect } from "vue";
 	const utils = inject('utils') as any
+	const option = {
+		title: '自提明细扫描',
+		haveData: true,
+		async pullDownRefreshInitPage() {
+			details.dataList = []
+			await initpage()
+		}
+	}
+
 	let details = reactive<pagedetailType>({
 		schanvalue: '',
 		typearr: [
@@ -163,6 +175,7 @@
 		stockList: []
 	})
 	const tiplists = ref(null)
+	const basicContainer = ref(null)
 	onLoad((op) => {
 		details.billLadingId = op.billLadingId
 	})
@@ -174,8 +187,12 @@
 				sacn()
 			}
 		})
+		// initpage()
+		const timer = setTimeout(() => {
+			basicContainer.value.startPullDownRefresh()
+			clearTimeout(timer)
+		}, 200)
 		details.dataList = details.orderList
-		initpage()
 	})
 	function goorderdetail(item) {
 		uni.navigateTo({
@@ -301,51 +318,66 @@
 	}
 	async function initpage() {
 		details.dataList = []
-		console.log('获取数据')
-		if (details.orderType == 1) {
-			let data = {
-				orderStatus: details.orderStatus,
-				billLadingId: details.billLadingId,
-				orderCode: details.orderCode
-			}
-			let response = await billLadingdetailList(data)
-			if (response.code !== 200) return
-			details.orderList = response.data.list
-			details.consignee = response.data.consignee
-			details.pickUpPlate = response.data.pickUpPlate
-			details.carTypeStr = response.data.carTypeStr
-			details.orderNum = response.data.orderNum
-			details.planNum = response.data.planNum
-			details.completeNum = response.data.completeNum
-			details.signedNum = response.data.signedNum
-		} else if (details.orderType == 2) {
-			let data = {
-				orderStatus: details.orderStatus,
-				id: details.billLadingId,
-				orderCode: details.orderCode,
-				current: 1,
-				size: 10
+		try {
+			uni.showLoading({
+				title: '数据加载中',
+				mask: true
+			});
+
+			console.log('获取数据')
+			if (details.orderType == 1) {
+				let data = {
+					orderStatus: details.orderStatus,
+					billLadingId: details.billLadingId,
+					orderCode: details.orderCode
+				}
+				let response = await billLadingdetailList(data)
+				if (response.code !== 200) return
+				details.orderList = response.data.list || []
+				details.consignee = response.data.consignee
+				details.pickUpPlate = response.data.pickUpPlate
+				details.carTypeStr = response.data.carTypeStr
+				details.orderNum = response.data.orderNum
+				details.planNum = response.data.planNum
+				details.completeNum = response.data.completeNum
+				details.signedNum = response.data.signedNum
+				details.dataList = details.orderList
+			} else if (details.orderType == 2) {
+				let data = {
+					orderStatus: details.orderStatus,
+					id: details.billLadingId,
+					orderCode: details.orderCode,
+					current: 1,
+					size: 10
+				}
+				let response = await billLadinggetInventoryNum(data)
+				if (response.code !== 200) return
+				details.zeroList = response.data.records || []
+				details.dataList = details.zeroList
 			}
-			let response = await billLadinggetInventoryNum(data)
-			if (response.code !== 200) return
-			details.zeroList = response.data.records
-		}
-		else if (details.orderType == 3) {
-			let data = {
-				billLadingId: details.billLadingId
+			else if (details.orderType == 3) {
+				let data = {
+					billLadingId: details.billLadingId
+				}
+				const response = await billLadingzeroBillData(data)
+				console.log('response :>> ', response);
+				if (response.code !== 200) return
+				details.stockList = response.data || []
+				details.dataList = details.stockList
 			}
-			const response = await billLadingzeroBillData(data)
-			console.log('response :>> ', response);
-			if (response.code !== 200) return
-			details.stockList = response.data || []
+		} catch (e) {
+			//TODO handle the exception
+		} finally {
+			uni.hideLoading()
 		}
 	}
 	function setorderStatus(state : number) {
+		details.dataList = []
 		details.orderType = state
-		initpage()
-		if (state === 1) details.dataList = details.orderList
-		else if (state === 2) details.dataList = details.zeroList
-		else if (state === 3) details.dataList = details.stockList
+		basicContainer.value.startPullDownRefresh()
+		// if (state === 1) details.dataList = details.orderList
+		// else if (state === 2) details.dataList = details.zeroList
+		// else if (state === 3) details.dataList = details.stockList
 	}
 	function checktype(e) {
 		if (e == '') {
diff --git a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue
index fca7030..5878f4a 100644
--- a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue
+++ b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue
@@ -1,89 +1,93 @@
 <template>
 	<!-- <u-navbar title="自提扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> -->
-	<u-navbar title="自提扫描" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
-		:autoBack="true" leftIconSize='35'></u-navbar>
-	<view class="schbox">
-		<view>自提日期：</view>
-		<view @click='showCalendar' class="inputsr">
-			<input :value='datatime' disabled placeholder="请选择时间" />
-			<view @click.stop.prevent>
-				<u-icon @click='showCalendar' style="margin-right: 10rpx;" v-if="!datatime" name="calendar" color="#999999"
-					size="50"></u-icon>
-				<u-icon @click="cleartime" style="margin-right: 10rpx;" v-else name="close-circle" color="#999999"
-					size="40"></u-icon>
-			</view>
-		</view>
-		<view @click="init">
-			查询
-		</view>
-	</view>
-	<scroll-view scroll-y="true" class="scvbx" @scrolltolower="jiazai">
-		<view class="mabxslist">
-			<view class="item" v-for="item in recordsList">
-				<view class="headtop">
-					<!-- <view class="type1s">
-						<view>
-							<text style="color: #90A0AF;">配车类型：</text>{{item.item}}
-						</view>
-						<view>
-							<text style="color: #90A0AF;">配车状态：</text>{{item.conditionStr}}
-						</view>
-					</view> -->
-					<view class="type1s">
-						<view>
-							<text style="color: #90A0AF;">车牌号：</text>{{item.pickUpPlate}}
-						</view>
-						<view>
-							<text style="color: #90A0AF;">司机：</text>{{item.consignee}}
-						</view>
-					</view>
-					<view class="type1s">
-						<view>
-							<text style="color: #90A0AF;">装御班组：</text>A班组
-						</view>
-						<view>
-							<text style="color: #90A0AF;">备货是否完成：</text>是
-						</view>
-					</view>
-					<view class="type1s">
-						<view>
-							<text style="color: #90A0AF;">制单时间：</text>{{item.createTime}}
-						</view>
-					</view>
-					<view class="type1s">
-						<view>
-							<text style="color: #90A0AF;">任务时间：</text>{{item.createTime}}
-						</view>
+	<BasicContainer :option="option" ref="basicContainer">
+		<template #head>
+			<view class="schbox">
+				<view>自提日期：</view>
+				<view @click='showCalendar' class="inputsr">
+					<input :value='datatime' disabled placeholder="请选择时间" />
+					<view @click.stop.prevent>
+						<u-icon @click='showCalendar' style="margin-right: 10rpx;" v-if="!datatime" name="calendar"
+							color="#999999" size="50"></u-icon>
+						<u-icon @click="cleartime" style="margin-right: 10rpx;" v-else name="close-circle" color="#999999"
+							size="40"></u-icon>
 					</view>
-					<view class="liebs">
-						<view>
-							<view>订单总数</view>
-							<view>{{item.orderNum}}</view>
-						</view>
-						<view>
-							<view>自提件数</view>
-							<view>{{item.planNum}}</view>
-						</view>
-						<view>
-							<view>签收件数</view>
-							<view>{{item.signedNum}}</view>
+				</view>
+				<view @click="init">
+					查询
+				</view>
+			</view>
+		</template>
+
+		<template #body>
+			<scroll-view scroll-y="true" class="scvbx" @scrolltolower="jiazai">
+				<view class="mabxslist">
+					<view class="item" v-for="item in recordsList">
+						<view class="headtop">
+							<!-- <view class="type1s">
+								<view>
+									<text style="color: #90A0AF;">配车类型：</text>{{item.item}}
+								</view>
+								<view>
+									<text style="color: #90A0AF;">配车状态：</text>{{item.conditionStr}}
+								</view>
+							</view> -->
+							<view class="type1s">
+								<view>
+									<text style="color: #90A0AF;">车牌号：</text>{{item.pickUpPlate}}
+								</view>
+								<view>
+									<text style="color: #90A0AF;">司机：</text>{{item.consignee}}
+								</view>
+							</view>
+							<view class="type1s">
+								<view>
+									<text style="color: #90A0AF;">装御班组：</text>A班组
+								</view>
+								<view>
+									<text style="color: #90A0AF;">备货是否完成：</text>是
+								</view>
+							</view>
+							<view class="type1s">
+								<view>
+									<text style="color: #90A0AF;">制单时间：</text>{{item.createTime}}
+								</view>
+							</view>
+							<view class="type1s">
+								<view>
+									<text style="color: #90A0AF;">任务时间：</text>{{item.createTime}}
+								</view>
+							</view>
+							<view class="liebs">
+								<view>
+									<view>订单总数</view>
+									<view>{{item.orderNum}}</view>
+								</view>
+								<view>
+									<view>自提件数</view>
+									<view>{{item.planNum}}</view>
+								</view>
+								<view>
+									<view>签收件数</view>
+									<view>{{item.signedNum}}</view>
+								</view>
+								<view>
+									<view>库存品数</view>
+									<view>{{item.inventoryNub}}</view>
+								</view>
+							</view>
 						</view>
-						<view>
-							<view>库存品数</view>
-							<view>{{item.inventoryNub}}</view>
+						<view class="buts">
+							<view @click="goselscandetails(item)">明细扫描</view>
+							<view @click="goselscan(item)">扫描</view>
 						</view>
 					</view>
 				</view>
-				<view class="buts">
-					<view @click="goselscandetails(item)">明细扫描</view>
-					<view @click="goselscan(item)">扫描</view>
-				</view>
-			</view>
-		</view>
-	</scroll-view>
-	<l-calendar v-model:value="show" :initStartDate='date[0]' :initEndDate='date[1]' @hide='showCalendar'
-		@change="onConfirm"></l-calendar>
-	<!-- <hd-calendar :defaultDate='date' mode="range" color='#D3832A' minDate='2023-01-01' @confirm="onConfirm" /> -->
+			</scroll-view>
+			<l-calendar v-model:value="show" :initStartDate='date[0]' :initEndDate='date[1]' @hide='showCalendar'
+				@change="onConfirm"></l-calendar>
+		</template>
+	</BasicContainer>
 </template>
 
 <script lang="ts" setup>
@@ -96,6 +100,15 @@
 	import { billLadingpageList } from '@/api/user.js'
 	import { detailsType } from '@/interfaces/pagesHome/SelfPickupScan'
 	import { reactive, toRefs, ref, watchEffect } from "vue";
+	const option = {
+		title: '自提扫描',
+		haveData: true,
+		async pullDownRefreshInitPage() {
+			details.current = 1
+			await initpage()
+		}
+	}
+
 	let details = reactive<detailsType>({
 		datatime: '',
 		show: false,
@@ -104,6 +117,7 @@
 		recordsList: []
 	})
 	const date = ref<number | string[]>([])
+	const basicContainer = ref(null)
 	function showCalendar() {
 		details.show = !details.show
 	}
@@ -114,9 +128,7 @@
 		details.datatime = date.value[0] + ' 至 ' + date.value[1]
 		// details.datatime=(uni as any).$u.timeFormat(date.value[0], 'yyyy-mm-dd')+' 至 '+(uni as any).$u.timeFormat(date.value[1], 'yyyy-mm-dd')
 	}
-	function stop() {
 
-	}
 	watchEffect(() => {
 		if ((date.value as []).length != 0) {
 			details.datatime = date.value[0] + ' 至 ' + date.value[1]
@@ -127,7 +139,10 @@
 		date.value[1] = (uni as any).$u.timeFormat((new Date().valueOf()), 'yyyy-mm-dd')
 	})
 	onShow(() => {
-		init()
+		const timer = setTimeout(() => {
+			basicContainer.value.startPullDownRefresh()
+			clearTimeout(timer)
+		}, 200)
 	})
 	function init() {
 		details.current = 1
@@ -180,7 +195,7 @@
 		// console.log(1231211);
 		details.datatime = ''
 		date.value = []
-		init()
+		basicContainer.value.startPullDownRefresh()
 	}
 	const { datatime, dataList, show, recordsList } = toRefs(details)
 </script>
diff --git a/pagesHome/pages/StockUplist/StockUplist.vue b/pagesHome/pages/StockUplist/StockUplist.vue
index 4967c50..4565b03 100644
--- a/pagesHome/pages/StockUplist/StockUplist.vue
+++ b/pagesHome/pages/StockUplist/StockUplist.vue
@@ -344,18 +344,29 @@
 	/** 扫描接口
 	 * */
 	async function scandata() {
-		let data = {
-			trayBarCode: details.scancode,
-			stockupId: details.stockupId,
-			trayId: details.trayId,
-			reservationId: details.reservationId,
-			scanType: 1
+		try {
+			uni.showLoading({
+				title: '提交中',
+				mask: true
+			})
+			let data = {
+				trayBarCode: details.scancode,
+				stockupId: details.stockupId,
+				trayId: details.trayId,
+				reservationId: details.reservationId,
+				scanType: 1
+			}
+			let res = await distributionStockupscanningCode(data)
+			if (res.code !== 200) return
+			if (res.audio) utils.ttsspke(res.audio)
+			initpage()
+			details.isscan = false
+		} catch (err) {
+			console.log('err :>> ', err);
+			//TODO handle the exception
+		} finally {
+			uni.hideLoading()
 		}
-		let res = await distributionStockupscanningCode(data)
-		if (res.code !== 200) return
-		if (res.audio) utils.ttsspke(res.audio)
-		initpage()
-		details.isscan = false
 	}
 
 	/** 展示零担订单物料详情
@@ -525,6 +536,7 @@
 				}
 				// 不满足打印条件, 退出函数
 				if (!_flag) return tiplists.value.setdetails({ isshow: false })
+				// #ifdef APP
 				let _isReturn = false
 				for (let i = 0; i <= _inputValue; i++) {
 					if (_isReturn) return
@@ -556,12 +568,10 @@
 						_isReturn = true
 					})
 				}
-				// #ifdef APP
 
-				// deta.checklist.map(item => {
-				// 	
-				// })
+				if (_isReturn) return
 				// #endif
+				tiplists.value.setdetails({ isshow: false })
 			},
 			cancel: (details) => {
 				tiplists.value.setdetails({ isshow: false })
diff --git a/pagesHome/pages/pickingScan/pickingScan.vue b/pagesHome/pages/pickingScan/pickingScan.vue
index 4c12791..b517108 100644
--- a/pagesHome/pages/pickingScan/pickingScan.vue
+++ b/pagesHome/pages/pickingScan/pickingScan.vue
@@ -1,91 +1,98 @@
 <template>
 	<!-- <u-navbar title="拣货扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> -->
-	<u-navbar title="拣货扫描" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
-		@leftClick="backPreviousPage" leftIconSize='35'></u-navbar>
-	<view class="schbox">
-		<view>拣货日期：</view>
-		<view @click='showCalendar' class="inputsr">
-			<input :value='datatime' disabled placeholder="请选择时间" />
-			<view @click.stop.prevent>
-				<u-icon @click='showCalendar' style="margin-right: 10rpx;" v-if="!datatime" name="calendar" color="#999999"
-					size="50"></u-icon>
-				<u-icon @click="cleartime" style="margin-right: 10rpx;" v-else name="close-circle" color="#999999"
-					size="40"></u-icon>
-			</view>
-		</view>
-		<view @click="init">
-			查询
-		</view>
-	</view>
-	<view class="tabtip">
-		<view @click="setstate(0)">
-			<view :class="status==0?'xz':''">未完成</view>
-		</view>
-		<view @click="setstate(1)">
-			<view :class="status==1?'xz':''">完成</view>
-		</view>
-	</view>
-	<scroll-view class="sccv" scroll-y="true" @scrolltolower="jiazai">
-		<view class="mabx">
-			<view v-for="item in dataList" :key="item">
-				<view class="topbox">
-					<view class="type1">
-						<view>
-							<text style="color: #90A0AF;">配车类型：</text>{{item.typeServiceStr}}
-						</view>
-						<view>
-							<text style="color: #90A0AF;">备货是否完成：</text>{{item.stockupStatusStr}}
-						</view>
-					</view>
-					<view class="type1">
-						<view>
-							<text style="color: #90A0AF;">客户：</text>{{item.customer}}
-						</view>
-						<view>
-							<text style="color: #90A0AF;">备货区域：</text>{{item.stockupArea}}
-						</view>
-					</view>
-					<view class="type3">
-						<view>
-							<text style="color: #90A0AF;">库位：</text>{{item.warehouseArea}}
-						</view>
-					</view>
-					<view class="type3">
-						<view>
-							<text style="color: #90A0AF;">托盘：</text>{{item.trays}}
-						</view>
-					</view>
-					<view class="type2">
-						<view>
-							<view>订单总数</view>
-							<view>{{item.orderNum}}</view>
-						</view>
-						<view>
-							<view>计划备货件数</view>
-							<view>{{item.planNum}}</view>
-						</view>
-						<view>
-							<view>备货件数</view>
-							<view>{{item.realNum}}</view>
-						</view>
-						<view>
-							<view>库存品数</view>
-							<view>{{item.inventoryNub}}</view>
-						</view>
+	<BasicContainer ref="basicContainer" :option="option" :leftClick="backPreviousPage">
+		<template #head>
+			<view class="schbox">
+				<view>拣货日期：</view>
+				<view @click='showCalendar' class="inputsr">
+					<input :value='datatime' disabled placeholder="请选择时间" />
+					<view @click.stop.prevent>
+						<u-icon @click='showCalendar' style="margin-right: 10rpx;" v-if="!datatime" name="calendar"
+							color="#999999" size="50"></u-icon>
+						<u-icon @click="cleartime" style="margin-right: 10rpx;" v-else name="close-circle" color="#999999"
+							size="40"></u-icon>
 					</view>
 				</view>
+				<view @click="init">
+					查询
+				</view>
+			</view>
+			<view class="tabtip">
+				<view @click="setstate(0)">
+					<view :class="status==0?'xz':''">未完成</view>
+				</view>
+				<view @click="setstate(1)">
+					<view :class="status==1?'xz':''">完成</view>
+				</view>
+			</view>
+		</template>
+
+		<template #body>
+			<scroll-view class="sccv" scroll-y="true" @scrolltolower="jiazai">
+				<view class="mabx">
+					<view v-for="item in dataList" :key="item">
+						<view class="topbox">
+							<view class="type1">
+								<view>
+									<text style="color: #90A0AF;">配车类型：</text>{{item.typeServiceStr}}
+								</view>
+								<view>
+									<text style="color: #90A0AF;">备货是否完成：</text>{{item.stockupStatusStr}}
+								</view>
+							</view>
+							<view class="type1">
+								<view>
+									<text style="color: #90A0AF;">客户：</text>{{item.customer}}
+								</view>
+								<view>
+									<text style="color: #90A0AF;">备货区域：</text>{{item.stockupArea}}
+								</view>
+							</view>
+							<view class="type3">
+								<view>
+									<text style="color: #90A0AF;">库位：</text>{{item.warehouseArea}}
+								</view>
+							</view>
+							<view class="type3">
+								<view>
+									<text style="color: #90A0AF;">托盘：</text>{{item.trays}}
+								</view>
+							</view>
+							<view class="type2">
+								<view>
+									<view>订单总数</view>
+									<view>{{item.orderNum}}</view>
+								</view>
+								<view>
+									<view>计划备货件数</view>
+									<view>{{item.planNum}}</view>
+								</view>
+								<view>
+									<view>备货件数</view>
+									<view>{{item.realNum}}</view>
+								</view>
+								<view>
+									<view>库存品数</view>
+									<view>{{item.inventoryNub}}</view>
+								</view>
+							</view>
+						</view>
 
-				<view class="bts" v-if="Number(item.stockupStatus)!=40">
-					<!-- <view @click="submitsuccess">
-						备货完成
-					</view> -->
-					<view @click="gostockuplist(item)">
-						去备货
+						<view class="bts" v-if="Number(item.stockupStatus)!=40">
+							<!-- <view @click="submitsuccess">
+								备货完成
+							</view> -->
+							<view @click="gostockuplist(item)">
+								去备货
+							</view>
+						</view>
 					</view>
 				</view>
-			</view>
-		</view>
-	</scroll-view>
+			</scroll-view>
+		</template>
+	</BasicContainer>
+	<u-navbar title="拣货扫描" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
+		@leftClick="backPreviousPage" leftIconSize='35'></u-navbar>
 	<tips ref="tip"></tips>
 	<l-calendar v-model:value="show" :initStartDate='date[0]' :initEndDate='date[1]' @hide='showCalendar'
 		@change="onConfirm"></l-calendar>
@@ -105,7 +112,14 @@
 	import { timeType } from '@/interfaces/pagesHome/allType'
 	import { inject, reactive, ref, toRefs, watchEffect } from "vue";
 	import utils from '../../../utils/utils';
-	// const functions=inject('functions')
+	const option = {
+		title: '自提明细扫描',
+		haveData: true,
+		async pullDownRefreshInitPage() {
+			details.dataList = []
+			await init()
+		}
+	}
 	let details = reactive<pageData>({
 		datatime: '',
 		dataList: [],
@@ -116,6 +130,7 @@
 		status: 0,
 	})
 	let tip = ref(null)
+	const basicContainer = ref(null)
 	const date = ref<number | string[]>([])
 	function showCalendar() {
 		details.show = !details.show
@@ -133,60 +148,62 @@
 		}
 	})
 	onShow(() => {
-		init()
+		const timer = setTimeout(() => {
+			basicContainer.value.startPullDownRefresh()
+			clearTimeout(timer)
+		}, 200)
 	})
 	onLoad(() => {
-		details.currentPage = 1
 		date.value[0] = (uni as any).$u.timeFormat((new Date().valueOf() - 1000 * 60 * 60 * 24 * 3), 'yyyy-mm-dd')
 		date.value[1] = (uni as any).$u.timeFormat((new Date().valueOf()), 'yyyy-mm-dd')
 		utils.ttsspke('请选择拣货任务')
-		// initpage()
-	})
-	// 下拉刷新
-	onPullDownRefresh(() => {
-		init()
-
-		const timer = setTimeout(() => {
-			uni.stopPullDownRefresh()
-			clearTimeout(timer)
-		}, 500)
 	})
-	function init() {
+	async function init() {
 		details.currentPage = 1
 		details.dataList = []
-		initpage()
+		return initpage()
 	}
 	function jiazai() {
 		details.currentPage++
 		initpage()
 	}
 	async function initpage() {
-		let data = {
-			current: details.currentPage,
-			size: details.size,
-			stockupDateStart: date.value[0],
-			stockupDateEnd: date.value[1],
-			status: details.status,
-		}
-		// for(let i=0;i<=1900;i++){
-		// 	await distributionStockuppageList(data)
-		// }
-		let response = await distributionStockuppageList(data)
-		if (response.code !== 200) return
-		if (details.currentPage == 1 && response.data) {
-			details.dataList = response.data.records
-		} else {
-			if (response.data.records.lngth == 0) {
-				uni.showToast({
-					title: '已经到底了。',
-					icon: 'none'
-				})
-				details.currentPage--
-				return
+		try {
+			uni.showLoading({
+				title: '数据加载中',
+				mask: true
+			})
+			let data = {
+				current: details.currentPage,
+				size: details.size,
+				stockupDateStart: date.value[0],
+				stockupDateEnd: date.value[1],
+				status: details.status,
+			}
+			// for(let i=0;i<=1900;i++){
+			// 	await distributionStockuppageList(data)
+			// }
+			let response = await distributionStockuppageList(data)
+			if (response.code !== 200) return
+			if (details.currentPage == 1 && response.data) {
+				details.dataList = response.data.records
+			} else {
+				if (response.data.records.lngth == 0) {
+					uni.showToast({
+						title: '已经到底了。',
+						icon: 'none'
+					})
+					details.currentPage--
+					return
+				}
+				details.dataList = details.dataList.concat(response.data.records)
 			}
-			details.dataList = details.dataList.concat(response.data.records)
+			// details.dataList=response.data.records
+		} catch (e) {
+			//TODO handle the exception
+		} finally {
+			uni.hideLoading()
 		}
-		// details.dataList=response.data.records
 	}
 
 	function checktime(event : timeType) {
@@ -208,11 +225,11 @@
 		// console.log(1231211);
 		details.datatime = ''
 		date.value = []
-		init()
+		basicContainer.value.startPullDownRefresh()
 	}
 	function setstate(state : number) {
 		details.status = state
-		init()
+		basicContainer.value.startPullDownRefresh()
 	}
 	function submitsuccess() {
 		tip.value.setdetails({
@@ -235,6 +252,7 @@
 
 	// 返回上一级页面
 	function backPreviousPage() {
+		console.log('1123 :>> ', 1123);
 		uni.reLaunch({
 			url: '/pages/index/index'
 		})
diff --git a/pagesHome/pages/scansorting/scansorting.vue b/pagesHome/pages/scansorting/scansorting.vue
index 1497ec4..847cf8a 100644
--- a/pagesHome/pages/scansorting/scansorting.vue
+++ b/pagesHome/pages/scansorting/scansorting.vue
@@ -1,5 +1,5 @@
 <template>
-	<BasicContainer :option="option">
+	<BasicContainer :option="option" :leftClick="option.leftClick">
 		<!-- 头部 -->
 		<template #head>
 			<view class="headtop">
diff --git a/pagesTask/pages/checkTaskList/checkTaskList.vue b/pagesTask/pages/checkTaskList/checkTaskList.vue
index 440a455..e3c0e2c 100644
--- a/pagesTask/pages/checkTaskList/checkTaskList.vue
+++ b/pagesTask/pages/checkTaskList/checkTaskList.vue
@@ -28,7 +28,7 @@
 			<!-- 顶部 -->
 			<view class="main_top">
 				<input type="text" v-model="details.scancode" placeholder="请输入库位码" class="main_top_search" />
-				<view class="button" @click="searchStorage">搜索</view>
+				<view class="button" @click="scandata">搜索</view>
 			</view>
 
 			<!-- 表格 -->
@@ -329,7 +329,8 @@
 			if (code === 200 && data) {
 				if (details.pageType === 3) {
 					details.renderList = res.data.records
-				} else details.renderList = data
+				} else details.renderList = data.list || []
+				console.log('data.list :>> ', data.list);
 				if (data.length < details.page.size) details.isEnd = true
 			} else if (code === 3001) {
 				const msg = data.audio
@@ -380,6 +381,7 @@
 				}).then(res => {
 					console.log(res);
 					if (res.code != 403) {
+						console.log('跳转')
 						uni.navigateTo({
 							url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}`
 						})
diff --git a/pagesTask/pages/dynamicCheck/dynamicCheck.vue b/pagesTask/pages/dynamicCheck/dynamicCheck.vue
index c48ecd5..024dd90 100644
--- a/pagesTask/pages/dynamicCheck/dynamicCheck.vue
+++ b/pagesTask/pages/dynamicCheck/dynamicCheck.vue
@@ -1,5 +1,5 @@
 <template>
-	<BasicContainer ref="basicContainer" :option="option">
+	<BasicContainer ref="basicContainer" :option="option" :leftClick="option.leftClick">
 		<template #body v-if="renderList.length !== 0">
 			<view class="taskList" v-for="item in renderList" :key="item.id">
 				<view class="taskData">
@@ -106,34 +106,20 @@
 
 	// 页面初始化执行
 	onLoad((_info) => {
+		console.log('初始化');
 		// uni.startPullDownRefresh()
 	})
 
-	// // 下拉刷新
-	/* 	onPullDownRefresh(async () => {
-			// 重置页码
-			details.page.current = 1
-			// 恢复结束状态
-			details.isEnd = false
-			// 清空渲染列表
-			details.renderList = []
-	
-			const res = await initPage()
-			// if (res) {
-			const timer = setTimeout(() => {
-				// 关闭刷新动画
-				uni.stopPullDownRefresh()
-				clearTimeout(timer)
-			}, 500)
-			// }
-		}) */
-
 	onShow(() => {
-		initPage()
+		details.renderList = []
+		const timer = setTimeout(() => {
+			basicContainer.value.startPullDownRefresh()
+			clearTimeout(timer)
+		}, 200)
 	})
 
 	onMounted(() => {
-		basicContainer.value.startPullDownRefresh()
+		// basicContainer.value.startPullDownRefresh()
 	})
 
 	const goCheckList = (pageType : number | string, item : any) => {
diff --git a/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue b/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue
index f232fa8..69ff136 100644
--- a/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue
+++ b/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue
@@ -5,7 +5,7 @@
 			<view class="main">
 				<!-- 顶部 -->
 				<view class="main_top">
-					<input type="text" v-model="details.searchText" placeholder="请输入库位码" class="main_top_search" />
+					<input type="text" v-model="details.searchText" placeholder="请输入托盘码" class="main_top_search" />
 					<view class="button" @click="submitSearch">搜索</view>
 				</view>
 
@@ -20,15 +20,15 @@
 					<view class="main_info_row">
 						<view class="main_info_item">
 							<text>库位总数:</text>
-							<text>{{ tabBarCode === 1 ? article.allNum : (tabBarCode === 2 ? zero.allNum : stock.allNum) }}</text>
+							<text>{{ allNum }}</text>
 						</view>
 						<view class="main_info_item">
 							<text>库位已盘数:</text>
-							<text>{{article.finishNum}}</text>
+							<text>{{finishNum}}</text>
 						</view>
 						<view class="main_info_item">
 							<text>库位未盘数:</text>
-							<text>{{ tabBarCode === 1 ? (article.allNum - article.finishNum) : (tabBarCode === 2 ? (zero.allNum - zero.finishNum) : (stock.allNum- stock.finishNum)) }}</text>
+							<text>{{ allNum - finishNum }}</text>
 						</view>
 					</view>
 				</view>
@@ -239,7 +239,7 @@
 		onLoad,
 		onHide,
 	} from '@dcloudio/uni-app'
-	import { ref, reactive, toRefs, watch, onMounted } from "vue";
+	import { ref, reactive, toRefs, watch, onMounted, computed } from "vue";
 
 	import utils from '@/utils/utils.js';
 
@@ -264,12 +264,22 @@
 			details.showControl = false
 			// 渲染列表清空
 			details.renderList = []
-			// 定制品页面信息清空
-			article.articleList = []
-			// 零担页面信息清空
-			zero.zeroCheckList = []
-			// 库存品页面信息清空
-			stock.stockCheckList = []
+			if (details.tabBarCode === 1) {
+				// 重置数据
+				article.articlePage.current = 1
+				article.articleList = []
+			}
+			// 零担
+			if (details.tabBarCode === 2) {
+				// 重置数据
+				zero.zeroPage.current = 1
+				zero.zeroList = []
+			}
+			if (details.tabBarCode === 1) {
+				// 重置数据
+				stock.stockPage.current = 1
+				stock.stockList = []
+			}
 			return await initPage()
 		},
 		async reachBottomInitPage() {
@@ -277,8 +287,6 @@
 
 			return true
 		},
-		// 开启刷新
-		startPullDownRefresh: () => { },
 	})
 
 	const details = reactive({
@@ -396,6 +404,23 @@
 
 	const basicContainer = ref(null)
 
+	// 计算数据
+	const allNum = computed(() => {
+		let num = 0
+		num += Number(article.allNum)
+		num += Number(stock.allNum)
+		num += Number(zero.allNum)
+		return num
+	})
+
+	const finishNum = computed(() => {
+		let num = 0
+		num += Number(article.finishNum)
+		num += Number(stock.finishNum)
+		num += Number(zero.finishNum)
+		return num
+	})
+
 	// 页面初始化执行回调
 	onLoad((info) => {
 		details.allocationId = info.allocationId
@@ -492,13 +517,14 @@
 			console.log('res :>>1 ', res)
 			const { code, data } = res
 			if (code === 200) {
+				const list = data.list || []
+
 				article.total = data.allNum //总数
 				article.allocationCode = data.allocationCode//库位号
 				article.allNum = data.allNum //总数
 				article.finishNum = data.finishNum //已盘点
-
-				article.articleList = data.list
-				article.articleCheckList = data.list.map(() => false)
+				article.articleList = [...article.articleList, ...list] // 定制品数据
+				article.articleCheckList = article.articleList.map(() => false)
 			}
 		} catch (err) {
 			console.log('err :>> ', err)
@@ -506,7 +532,6 @@
 		}
 	}
 
-
 	/**
 	 * 请求零担数据
 	 */
@@ -529,8 +554,8 @@
 				zero.allocationCode = data.allocationCode //库位号
 				zero.allNum = data.allNum //总数
 				zero.finishNum = data.finishNum //已盘点
-				zero.zeroList = data.list
-				zero.zeroCheckList = data.list.map(() => false)
+				zero.zeroList = data.list || []
+				zero.zeroCheckList = zero.zeroList.map(() => false)
 			}
 		} catch (err) {
 			console.log('err :>> ', err)
@@ -560,8 +585,8 @@
 				stock.allocationCode = data.allocationCode //库位号
 				stock.allNum = data.allNum//总数
 				stock.finishNum = data.finishNum //已盘点
-				stock.stockList = data.list
-				stock.stockCheckList = data.list.map(() => false)
+				stock.stockList = data.list || []
+				stock.stockCheckList = stock.stockList.map(() => false)
 			}
 		} catch (err) {
 			console.log('err :>> ', err)
@@ -597,8 +622,9 @@
 			console.log('res :>> ', res);
 			if (code === 200) {
 				basicContainer.value.startPullDownRefresh()
-				// initPage()
+				// #ifdef APP
 				utils.ttsspke(msg)
+				// #endif
 			}
 		} else {
 			grounding()
@@ -609,7 +635,8 @@
 	function handleTabBarCode(code : number) {
 		showControl.value = false
 		tabBarCode.value = code
-		initPage()
+		// 开启刷新请求
+		basicContainer.value.startPullDownRefresh()
 	}
 
 	/**
@@ -677,8 +704,11 @@
 				// console.log('res :>> ', res);
 				try {
 					getWarehouseDeleteQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId }).then(res => {
-						initPage()
+						// 开启刷新请求
+						basicContainer.value.startPullDownRefresh()
+						// #ifdef APP
 						utils.ttsspke(res.msg)
+						// #endif
 					})
 				} catch (e) {
 					//TODO handle the exception
@@ -785,7 +815,7 @@
 						}]
 						const res = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId })
 						const { code } = res
-						if (code === 200) initPage()
+						if (code === 200) basicContainer.value.startPullDownRefresh()
 						tiplists.value.setdetails({ isshow: false })
 					},
 					cancel: () => {
@@ -839,7 +869,7 @@
 						}]
 						const res = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId })
 						const { code } = res
-						if (code === 200) initPage()
+						if (code === 200) basicContainer.value.startPullDownRefresh()
 						tiplists.value.setdetails({ isshow: false })
 					},
 					cancel: () => {
@@ -897,7 +927,7 @@
 				console.log('res :>> ', res);
 				const { code } = res
 				if (code === 200) {
-					initPage()
+					basicContainer.value.startPullDownRefresh()
 					uni.showToast({
 						title: '操作成功',
 						icon: 'success'
@@ -1024,7 +1054,7 @@
 					})
 					getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId }).then(res => {
 						utils.ttsspke(res.msg)
-						initPage()
+						basicContainer.value.startPullDownRefresh()
 					})
 				} catch (e) {
 					//TODO handle the exception
@@ -1084,7 +1114,7 @@
 			const questDetailList = arr.map(val => { return { id: val.id } })
 			const res = await postqueryupdateQuestDetailAllocation({ questNum: details.questNum, allocationId: details.scancode, questId: details.questId, questDetailList })
 			if (res.code === 200) {
-				initPage()
+				basicContainer.value.startPullDownRefresh()
 			}
 			utils.ttsspke(res.msg)
 		} catch (err) {
diff --git a/unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css b/unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
index 6220d5a..3aa94fa 100644
--- a/unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
+++ b/unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
@@ -1 +1 @@
-.u-status-bar[data-v-31491727]{width:100%}uni-view[data-v-5c79ae5e],uni-scroll-view[data-v-5c79ae5e],uni-swiper-item[data-v-5c79ae5e]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-5c79ae5e]{display:flex;align-items:center}.u-icon--left[data-v-5c79ae5e]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-5c79ae5e]{flex-direction:row;align-items:center}.u-icon--top[data-v-5c79ae5e]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-5c79ae5e]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-5c79ae5e]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-5c79ae5e]{color:#3c9cff}.u-icon__icon--success[data-v-5c79ae5e]{color:#5ac725}.u-icon__icon--error[data-v-5c79ae5e]{color:#f56c6c}.u-icon__icon--warning[data-v-5c79ae5e]{color:#f9ae3d}.u-icon__icon--info[data-v-5c79ae5e]{color:#909399}.u-icon__img[data-v-5c79ae5e]{height:auto;will-change:transform}.u-icon__label[data-v-5c79ae5e]{line-height:1}uni-view[data-v-917ffc31],uni-scroll-view[data-v-917ffc31],uni-swiper-item[data-v-917ffc31]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-917ffc31]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-917ffc31]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-917ffc31],.u-navbar__content__right[data-v-917ffc31]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-917ffc31]{left:0}.u-navbar__content__left--hover[data-v-917ffc31]{opacity:.7}.u-navbar__content__left__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-917ffc31]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-917ffc31]{right:0}.u-navbar__content__right__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.mabxtop{position:relative;width:21.375rem;background:#FFFFFF;border-radius:.625rem;margin:auto;margin-top:.625rem;padding:1.875rem;box-sizing:border-box;display:flex;flex-direction:column;align-items:center;justify-content:center}.mabxtop>uni-view{width:100%;display:flex;align-items:center;justify-content:space-between;margin-bottom:.3125rem}.mabxtop>uni-view:nth-last-child(1){margin-bottom:0}.mabxtop>uni-view>uni-view{display:flex;flex-direction:column;align-items:flex-start}.mabxtop>uni-view>uni-view:nth-of-type(1){width:60%}.mabxtop>uni-view>uni-view:nth-of-type(2){width:40%}.mabxtop>uni-view>uni-view>uni-view:nth-of-type(1){font-size:1rem;font-weight:400;color:#020b18;word-wrap:break-word;word-break:break-all}.mabxtop>uni-view>uni-view>uni-view:nth-of-type(2){font-size:.875rem;font-weight:400;color:#90a0af}.mabxtop .printBtn{background:#d3832a;color:#fff!important;width:3.125rem;padding:.3125rem;text-align:center;border-radius:.15625rem}.bgimg{position:fixed;left:0;top:0;width:100%}.scvmabx{width:21.375rem;height:45vh;margin:auto;margin-top:.625rem}.scvmabx .maxboxs{width:100%;display:flex;flex-direction:column;align-items:center}.scvmabx .maxboxs .chuanhuo{border:#ff0000}.scvmabx .maxboxs .weiqt,.scvmabx .maxboxs .qitao{position:absolute;right:0;top:0;width:2.1875rem;height:2.1875rem}.scvmabx .maxboxs>.items{width:21.5625rem;display:flex;flex-direction:column;align-items:center;padding:.625rem .9375rem;box-sizing:border-box;background-color:#fff;border-radius:.3125rem;margin-bottom:.9375rem;position:relative}.scvmabx .maxboxs>.items:nth-last-child(1){margin-bottom:.625rem}.scvmabx .maxboxs>.items .tophd{width:100%;display:flex;align-items:flex-start;justify-content:flex-start;padding:.9375rem .625rem .46875rem;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.scvmabx .maxboxs>.items .tophd>uni-image{width:1.5rem;height:1.5rem;margin-right:.3125rem;box-sizing:border-box}.scvmabx .maxboxs>.items .tophd>uni-view{font-size:1rem;color:#020b18;font-weight:400;word-wrap:break-word;word-break:break-all}.scvmabx .maxboxs>.items .tophd>uni-view:nth-of-type(1){width:5.625rem}.scvmabx .maxboxs>.items .tophd>uni-view:nth-of-type(2){flex:1}.scvmabx .maxboxs>.items .tophd1{width:100%;display:flex;box-sizing:border-box;padding:.46875rem .625rem;border-bottom:.125rem solid #EEEEEE}.scvmabx .maxboxs>.items .tophd1>uni-view{display:flex;flex:1;align-items:center}.scvmabx .maxboxs>.items .tophd1 uni-image{width:2rem;height:2rem}.scvmabx .maxboxs>.items .numbxvie{width:100%;display:flex;align-items:center;justify-content:space-around;padding:.46875rem .78125rem;box-sizing:border-box}.scvmabx .maxboxs>.items .numbxvie .zhon{color:#d3832a}.scvmabx .maxboxs>.items .numbxvie .yish{color:#1197eb}.scvmabx .maxboxs>.items .numbxvie .weish{color:#020b18}.scvmabx .maxboxs>.items .numbxvie>uni-view{display:flex;flex-direction:column;align-items:center}.scvmabx .maxboxs>.items .numbxvie>uni-view>uni-view:nth-of-type(1){font-size:1.125rem;margin-bottom:.375rem}.scvmabx .maxboxs>.items .numbxvie>uni-view>uni-view:nth-of-type(2){font-size:.875rem}.headtop{width:21.375rem;padding:.625rem;display:flex;align-items:center;justify-content:space-between;background-color:#fff;padding:.625rem .9375rem;box-sizing:border-box;position:relative;margin:auto;border-radius:.625rem;margin-top:.9375rem}.headtop>uni-view{flex:1}.headtop>uni-view>uni-input{flex:1;font-size:.875rem}.hedtopt{display:flex;align-items:center;justify-content:center;flex-direction:column;background-color:#fff;padding:1.125rem 1rem;box-sizing:border-box}.hedtopt .typto{display:flex;align-items:center;justify-content:space-between;width:100%;font-size:.875rem;font-weight:400;color:#092c4d;margin-bottom:.625rem}.hedtopt .typto:nth-last-child(1){margin-bottom:0}.hedtopt .typto>uni-view{flex:1}.tabBar[data-v-a1e26d0f]{margin-top:.3125rem;padding:0 .9375rem;display:flex}.tabBar_item[data-v-a1e26d0f]{flex:1;flex-basis:0;text-align:center;line-height:2.5rem;background:#fff;position:relative}.tabBar_item[data-v-a1e26d0f]:after{content:"";display:block;position:absolute;height:.125rem;background:#d3832a;width:0;left:50%;bottom:0;transition:all .5s}.tabBar_item.active[data-v-a1e26d0f]:after{left:0;width:100%}.buts[data-v-a1e26d0f]{position:fixed;bottom:.625rem;left:50%;transform:translate(-50%);width:10rem;height:2.75rem;border-radius:.25rem;opacity:1;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:700;color:#d3832a;margin:auto;margin-top:.625rem;border:.09375rem solid #d3832a}.tanchuangbg[data-v-a1e26d0f]{width:100%;height:100%;position:fixed;z-index:99;left:0;top:0;background-color:rgba(0,0,0,.314);display:flex;align-items:center;justify-content:center;transition:all 1s}.tanchuangbg .tanbx[data-v-a1e26d0f]{width:20.9375rem;background-color:#fff;box-sizing:border-box;border-radius:.3125rem;display:flex;flex-direction:column;align-items:center;padding:.9375rem}.tanchuangbg .tanbx .titlran[data-v-a1e26d0f]{font-size:1rem;color:#092c4d;margin-bottom:1.25rem}.tanchuangbg .tanbx .textareabx[data-v-a1e26d0f]{width:17.5rem;height:7.5rem;background:#F5F5F6;border-radius:.25rem;padding:.625rem 1.25rem;box-sizing:border-box}.tanchuangbg .tanbx .textareabx>uni-textarea[data-v-a1e26d0f]{width:100%;height:100%;box-sizing:border-box;font-size:.875rem;font-weight:400}.tanchuangbg .tanbx .btx[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:space-around;margin-top:1.5625rem}.tanchuangbg .tanbx .btx>uni-view[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:center;width:8.125rem;height:2.75rem;border-radius:.25rem;font-size:1rem}.tanchuangbg .tanbx .btx>.cancel[data-v-a1e26d0f]{background-color:#f5f5f6;color:#5a6875;margin-right:.625rem}.tanchuangbg .tanbx .btx>.confirm[data-v-a1e26d0f]{background-color:#d3832a;color:#fff}.tanchuangbg .inputbox[data-v-a1e26d0f]{width:20.9375rem;background-color:#fff;box-sizing:border-box;border-radius:.3125rem;display:flex;flex-direction:column;align-items:center;padding:.9375rem}.tanchuangbg .inputbox .inputscan[data-v-a1e26d0f]{width:100%;display:flex;align-items:center;justify-content:space-around}.tanchuangbg .inputbox .inputscan>uni-input[data-v-a1e26d0f]{width:13.75rem;height:2rem;border:.03125rem solid #092C4D30;border-radius:.25rem;font-size:.875rem;padding:0 .625rem;box-sizing:border-box}.tanchuangbg .inputbox .inputscan .scanbt[data-v-a1e26d0f]{width:4rem;height:2rem;background:#D3832A;border-radius:.25rem;opacity:1;display:flex;align-items:center;justify-content:center;font-size:.9375rem;font-weight:400;color:#fff}.tanchuangbg .inputbox .scvbw[data-v-a1e26d0f]{width:100%;height:14.0625rem;margin-top:.9375rem}.tanchuangbg .inputbox .scvbw .scboxitem[data-v-a1e26d0f]{display:flex;flex-direction:column;align-items:center}.tanchuangbg .inputbox .scvbw .scboxitem .items[data-v-a1e26d0f]{width:18.4375rem;display:flex;flex-direction:column;box-shadow:0 .0625rem .3125rem #e2e2e3;margin-top:.3125rem;padding:.625rem;box-sizing:border-box;position:relative}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite[data-v-a1e26d0f]{width:100%;display:flex;align-items:center;justify-content:center}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite>.itembox[data-v-a1e26d0f]{width:100%;display:flex;flex-direction:column;align-items:flex-start;justify-content:space-between;font-size:.875rem;color:#020b18;border:.03125rem solid #D3832A;padding:.3125rem .625rem;box-sizing:border-box;border-radius:.625rem;color:#d3832a}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite>.itembox>uni-view[data-v-a1e26d0f]{word-wrap:break-word;word-break:break-all}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:space-between;margin-bottom:.625rem}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view[data-v-a1e26d0f]{min-width:50%;display:flex;align-items:center;justify-content:flex-start;font-size:.875rem}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view>uni-view[data-v-a1e26d0f]:nth-of-type(1){color:#90a0af}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view>uni-view[data-v-a1e26d0f]:nth-of-type(2){color:#092c4d}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:space-between;margin-bottom:.625rem}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:flex-start;font-size:.875rem}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view>uni-view[data-v-a1e26d0f]:nth-of-type(1){color:#90a0af}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view>uni-input[data-v-a1e26d0f]{width:6.25rem;padding:0 .46875rem;border:.03125rem solid #00000020}.tanchuangbg .inputbox .btx[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:space-around;margin-top:1.5625rem}.tanchuangbg .inputbox .btx>uni-view[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:center;width:8.125rem;height:2.375rem;border-radius:.21875rem;font-size:.875rem}.tanchuangbg .inputbox .btx>.cancel[data-v-a1e26d0f]{background-color:#f5f5f6;color:#5a6875;margin-right:.625rem}.tanchuangbg .inputbox .btx>.confirm[data-v-a1e26d0f]{background-color:#d3832a;color:#fff}
+.u-status-bar[data-v-31491727]{width:100%}uni-view[data-v-5c79ae5e],uni-scroll-view[data-v-5c79ae5e],uni-swiper-item[data-v-5c79ae5e]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-5c79ae5e]{display:flex;align-items:center}.u-icon--left[data-v-5c79ae5e]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-5c79ae5e]{flex-direction:row;align-items:center}.u-icon--top[data-v-5c79ae5e]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-5c79ae5e]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-5c79ae5e]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-5c79ae5e]{color:#3c9cff}.u-icon__icon--success[data-v-5c79ae5e]{color:#5ac725}.u-icon__icon--error[data-v-5c79ae5e]{color:#f56c6c}.u-icon__icon--warning[data-v-5c79ae5e]{color:#f9ae3d}.u-icon__icon--info[data-v-5c79ae5e]{color:#909399}.u-icon__img[data-v-5c79ae5e]{height:auto;will-change:transform}.u-icon__label[data-v-5c79ae5e]{line-height:1}uni-view[data-v-917ffc31],uni-scroll-view[data-v-917ffc31],uni-swiper-item[data-v-917ffc31]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-917ffc31]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-917ffc31]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-917ffc31],.u-navbar__content__right[data-v-917ffc31]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-917ffc31]{left:0}.u-navbar__content__left--hover[data-v-917ffc31]{opacity:.7}.u-navbar__content__left__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-917ffc31]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-917ffc31]{right:0}.u-navbar__content__right__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.mabxtop{position:relative;width:21.375rem;background:#FFFFFF;border-radius:.625rem;margin:auto;margin-top:.625rem;padding:1.875rem;box-sizing:border-box;display:flex;flex-direction:column;align-items:center;justify-content:center}.mabxtop>uni-view{width:100%;display:flex;align-items:center;justify-content:space-between;margin-bottom:.3125rem}.mabxtop>uni-view:nth-last-child(1){margin-bottom:0}.mabxtop>uni-view>uni-view{display:flex;flex-direction:column;align-items:flex-start}.mabxtop>uni-view>uni-view:nth-of-type(1){width:60%}.mabxtop>uni-view>uni-view:nth-of-type(2){width:40%}.mabxtop>uni-view>uni-view>uni-view:nth-of-type(1){font-size:1rem;font-weight:400;color:#020b18;word-wrap:break-word;word-break:break-all}.mabxtop>uni-view>uni-view>uni-view:nth-of-type(2){font-size:.875rem;font-weight:400;color:#90a0af}.mabxtop .printBtn{background:#d3832a;color:#fff!important;width:3.125rem;padding:.3125rem;text-align:center;border-radius:.15625rem}.bgimg{position:fixed;left:0;top:0;width:100%}.scvmabx{width:21.375rem;height:45vh;margin:auto;margin-top:.625rem}.scvmabx .maxboxs{width:100%;display:flex;flex-direction:column;align-items:center}.scvmabx .maxboxs .chuanhuo{border:#ff0000}.scvmabx .maxboxs .weiqt,.scvmabx .maxboxs .qitao{position:absolute;right:0;top:0;width:2.1875rem;height:2.1875rem}.scvmabx .maxboxs>.items{width:21.5625rem;display:flex;flex-direction:column;align-items:center;padding:.625rem .9375rem;box-sizing:border-box;background-color:#fff;border-radius:.3125rem;margin-bottom:.9375rem;position:relative}.scvmabx .maxboxs>.items:nth-last-child(1){margin-bottom:.625rem}.scvmabx .maxboxs>.items .tophd{width:100%;display:flex;align-items:flex-start;justify-content:flex-start;padding:.9375rem .625rem .46875rem;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.scvmabx .maxboxs>.items .tophd>uni-image{width:1.5rem;height:1.5rem;margin-right:.3125rem;box-sizing:border-box}.scvmabx .maxboxs>.items .tophd>uni-view{font-size:1rem;color:#020b18;font-weight:400;word-wrap:break-word;word-break:break-all}.scvmabx .maxboxs>.items .tophd>uni-view:nth-of-type(1){width:5.625rem}.scvmabx .maxboxs>.items .tophd>uni-view:nth-of-type(2){flex:1}.scvmabx .maxboxs>.items .tophd1{width:100%;display:flex;box-sizing:border-box;padding:.46875rem .625rem;border-bottom:.125rem solid #EEEEEE}.scvmabx .maxboxs>.items .tophd1>uni-view{display:flex;flex:1;align-items:center}.scvmabx .maxboxs>.items .tophd1 uni-image{width:2rem;height:2rem}.scvmabx .maxboxs>.items .numbxvie{width:100%;display:flex;align-items:center;justify-content:space-around;padding:.46875rem .78125rem;box-sizing:border-box}.scvmabx .maxboxs>.items .numbxvie .zhon{color:#d3832a}.scvmabx .maxboxs>.items .numbxvie .yish{color:#1197eb}.scvmabx .maxboxs>.items .numbxvie .weish{color:#020b18}.scvmabx .maxboxs>.items .numbxvie>uni-view{display:flex;flex-direction:column;align-items:center}.scvmabx .maxboxs>.items .numbxvie>uni-view>uni-view:nth-of-type(1){font-size:1.125rem;margin-bottom:.375rem}.scvmabx .maxboxs>.items .numbxvie>uni-view>uni-view:nth-of-type(2){font-size:.875rem}.headtop{width:21.375rem;padding:.625rem;display:flex;align-items:center;justify-content:space-between;background-color:#fff;padding:.625rem .9375rem;box-sizing:border-box;position:relative;margin:auto;border-radius:.625rem;margin-top:.9375rem}.headtop>uni-view{flex:1}.headtop>uni-view>uni-input{flex:1;font-size:.875rem}.hedtopt{display:flex;align-items:center;justify-content:center;flex-direction:column;background-color:#fff;padding:1.125rem 1rem;box-sizing:border-box}.hedtopt .typto{display:flex;align-items:center;justify-content:space-between;width:100%;font-size:.875rem;font-weight:400;color:#092c4d;margin-bottom:.625rem}.hedtopt .typto:nth-last-child(1){margin-bottom:0}.hedtopt .typto>uni-view{flex:1}.tabBar[data-v-feffe25d]{margin-top:.3125rem;padding:0 .9375rem;display:flex}.tabBar_item[data-v-feffe25d]{flex:1;flex-basis:0;text-align:center;line-height:2.5rem;background:#fff;position:relative}.tabBar_item[data-v-feffe25d]:after{content:"";display:block;position:absolute;height:.125rem;background:#d3832a;width:0;left:50%;bottom:0;transition:all .5s}.tabBar_item.active[data-v-feffe25d]:after{left:0;width:100%}.buts[data-v-feffe25d]{position:fixed;bottom:.625rem;left:50%;transform:translate(-50%);width:10rem;height:2.75rem;border-radius:.25rem;opacity:1;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:700;color:#d3832a;margin:auto;margin-top:.625rem;border:.09375rem solid #d3832a}.tanchuangbg[data-v-feffe25d]{width:100%;height:100%;position:fixed;z-index:99;left:0;top:0;background-color:rgba(0,0,0,.314);display:flex;align-items:center;justify-content:center;transition:all 1s}.tanchuangbg .tanbx[data-v-feffe25d]{width:20.9375rem;background-color:#fff;box-sizing:border-box;border-radius:.3125rem;display:flex;flex-direction:column;align-items:center;padding:.9375rem}.tanchuangbg .tanbx .titlran[data-v-feffe25d]{font-size:1rem;color:#092c4d;margin-bottom:1.25rem}.tanchuangbg .tanbx .textareabx[data-v-feffe25d]{width:17.5rem;height:7.5rem;background:#F5F5F6;border-radius:.25rem;padding:.625rem 1.25rem;box-sizing:border-box}.tanchuangbg .tanbx .textareabx>uni-textarea[data-v-feffe25d]{width:100%;height:100%;box-sizing:border-box;font-size:.875rem;font-weight:400}.tanchuangbg .tanbx .btx[data-v-feffe25d]{display:flex;align-items:center;justify-content:space-around;margin-top:1.5625rem}.tanchuangbg .tanbx .btx>uni-view[data-v-feffe25d]{display:flex;align-items:center;justify-content:center;width:8.125rem;height:2.75rem;border-radius:.25rem;font-size:1rem}.tanchuangbg .tanbx .btx>.cancel[data-v-feffe25d]{background-color:#f5f5f6;color:#5a6875;margin-right:.625rem}.tanchuangbg .tanbx .btx>.confirm[data-v-feffe25d]{background-color:#d3832a;color:#fff}.tanchuangbg .inputbox[data-v-feffe25d]{width:20.9375rem;background-color:#fff;box-sizing:border-box;border-radius:.3125rem;display:flex;flex-direction:column;align-items:center;padding:.9375rem}.tanchuangbg .inputbox .inputscan[data-v-feffe25d]{width:100%;display:flex;align-items:center;justify-content:space-around}.tanchuangbg .inputbox .inputscan>uni-input[data-v-feffe25d]{width:13.75rem;height:2rem;border:.03125rem solid #092C4D30;border-radius:.25rem;font-size:.875rem;padding:0 .625rem;box-sizing:border-box}.tanchuangbg .inputbox .inputscan .scanbt[data-v-feffe25d]{width:4rem;height:2rem;background:#D3832A;border-radius:.25rem;opacity:1;display:flex;align-items:center;justify-content:center;font-size:.9375rem;font-weight:400;color:#fff}.tanchuangbg .inputbox .scvbw[data-v-feffe25d]{width:100%;height:14.0625rem;margin-top:.9375rem}.tanchuangbg .inputbox .scvbw .scboxitem[data-v-feffe25d]{display:flex;flex-direction:column;align-items:center}.tanchuangbg .inputbox .scvbw .scboxitem .items[data-v-feffe25d]{width:18.4375rem;display:flex;flex-direction:column;box-shadow:0 .0625rem .3125rem #e2e2e3;margin-top:.3125rem;padding:.625rem;box-sizing:border-box;position:relative}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite[data-v-feffe25d]{width:100%;display:flex;align-items:center;justify-content:center}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite>.itembox[data-v-feffe25d]{width:100%;display:flex;flex-direction:column;align-items:flex-start;justify-content:space-between;font-size:.875rem;color:#020b18;border:.03125rem solid #D3832A;padding:.3125rem .625rem;box-sizing:border-box;border-radius:.625rem;color:#d3832a}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite>.itembox>uni-view[data-v-feffe25d]{word-wrap:break-word;word-break:break-all}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s[data-v-feffe25d]{display:flex;align-items:center;justify-content:space-between;margin-bottom:.625rem}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view[data-v-feffe25d]{min-width:50%;display:flex;align-items:center;justify-content:flex-start;font-size:.875rem}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view>uni-view[data-v-feffe25d]:nth-of-type(1){color:#90a0af}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view>uni-view[data-v-feffe25d]:nth-of-type(2){color:#092c4d}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu[data-v-feffe25d]{display:flex;align-items:center;justify-content:space-between;margin-bottom:.625rem}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view[data-v-feffe25d]{display:flex;align-items:center;justify-content:flex-start;font-size:.875rem}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view>uni-view[data-v-feffe25d]:nth-of-type(1){color:#90a0af}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view>uni-input[data-v-feffe25d]{width:6.25rem;padding:0 .46875rem;border:.03125rem solid #00000020}.tanchuangbg .inputbox .btx[data-v-feffe25d]{display:flex;align-items:center;justify-content:space-around;margin-top:1.5625rem}.tanchuangbg .inputbox .btx>uni-view[data-v-feffe25d]{display:flex;align-items:center;justify-content:center;width:8.125rem;height:2.375rem;border-radius:.21875rem;font-size:.875rem}.tanchuangbg .inputbox .btx>.cancel[data-v-feffe25d]{background-color:#f5f5f6;color:#5a6875;margin-right:.625rem}.tanchuangbg .inputbox .btx>.confirm[data-v-feffe25d]{background-color:#d3832a;color:#fff}
diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js
index 2ed3893..df16081 100644
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
@@ -388,7 +388,7 @@ if (uni.restoreGlobal) {
   function registerAction(store, type, handler, local) {
     var entry = store._actions[type] || (store._actions[type] = []);
     entry.push(function wrappedActionHandler(payload) {
-      var res2 = handler.call(store, {
+      var res = handler.call(store, {
         dispatch: local.dispatch,
         commit: local.commit,
         getters: local.getters,
@@ -396,16 +396,16 @@ if (uni.restoreGlobal) {
         rootGetters: store.getters,
         rootState: store.state
       }, payload);
-      if (!isPromise(res2)) {
-        res2 = Promise.resolve(res2);
+      if (!isPromise(res)) {
+        res = Promise.resolve(res);
       }
       if (store._devtoolHook) {
-        return res2.catch(function(err) {
+        return res.catch(function(err) {
           store._devtoolHook.emit("vuex:error", err);
           throw err;
         });
       } else {
-        return res2;
+        return res;
       }
     });
   }
@@ -1011,7 +1011,7 @@ if (uni.restoreGlobal) {
       return handler(payload);
     })) : entry[0](payload);
     return new Promise(function(resolve, reject) {
-      result.then(function(res2) {
+      result.then(function(res) {
         try {
           this$1$1._actionSubscribers.filter(function(sub) {
             return sub.after;
@@ -1024,7 +1024,7 @@ if (uni.restoreGlobal) {
             console.error(e);
           }
         }
-        resolve(res2);
+        resolve(res);
       }, function(error2) {
         try {
           this$1$1._actionSubscribers.filter(function(sub) {
@@ -1149,9 +1149,9 @@ if (uni.restoreGlobal) {
     //一体机打印初始化
     init: () => {
       return new Promise((relove, reject) => {
-        sunmi_print.connect((res2) => {
-          formatAppLog("log", "at utils/utils.js:11", res2);
-          if (res2.connect == "hello") {
+        sunmi_print.connect((res) => {
+          formatAppLog("log", "at utils/utils.js:11", res);
+          if (res.connect == "hello") {
             formatAppLog("log", "at utils/utils.js:13", "打印机成功连接");
             relove(true);
           } else {
@@ -1200,8 +1200,8 @@ if (uni.restoreGlobal) {
     },
     //打印的内容
     printxie: async (obj) => {
-      let res2 = await sunmi_print.labelLocate();
-      formatAppLog("log", "at utils/utils.js:66", res2);
+      let res = await sunmi_print.labelLocate();
+      formatAppLog("log", "at utils/utils.js:66", res);
       setTimeout(() => {
         sunmi_print.printText({
           text: "日期:" + obj.rigthnumer + "  ",
@@ -1356,10 +1356,10 @@ if (uni.restoreGlobal) {
         if (status === 0) {
           formatAppLog("log", "at utils/utils.js:245", "引擎初始化成功");
           TTSSpeech.setSpeed(100);
-          TTSSpeech.getInstallTTS((res2) => {
-            formatAppLog("log", "at utils/utils.js:248", JSON.stringify(res2));
+          TTSSpeech.getInstallTTS((res) => {
+            formatAppLog("log", "at utils/utils.js:248", JSON.stringify(res));
             let flage = false;
-            res2.forEach((v) => {
+            res.forEach((v) => {
               if (v.name == "com.iflytek.speechcloud") {
                 flage = true;
               }
@@ -1371,8 +1371,8 @@ if (uni.restoreGlobal) {
                 content: "请选择浏览器下载安装还是直接安装",
                 cancelText: "浏览器安装",
                 confirmText: "直接安装",
-                success: function(res3) {
-                  if (res3.confirm) {
+                success: function(res2) {
+                  if (res2.confirm) {
                     var fileSaveUrl = plus.io.convertLocalFileSystemURL(
                       "static/TTS.apk"
                     );
@@ -1382,13 +1382,13 @@ if (uni.restoreGlobal) {
                       {
                         force: true
                       },
-                      function(res4) {
+                      function(res3) {
                         utils.showToast("更新成功,请重新打开APP");
                         TTSSpeech.setEngine("com.iflytek.speechcloud");
                         plus.runtime.quit();
                       }
                     );
-                  } else if (res3.cancel) {
+                  } else if (res2.cancel) {
                     setTimeout(() => {
                       plus.runtime.openURL(
                         "http://htys.oss-cn-chengdu.aliyuncs.com/htys/5402c622c319fac17c50fe52581cb627.apk"
@@ -1459,7 +1459,7 @@ if (uni.restoreGlobal) {
               {
                 force: true
               },
-              function(res2) {
+              function(res) {
                 uni.showToast({
                   title: "安装成功",
                   icon: 2e3,
@@ -1476,9 +1476,9 @@ if (uni.restoreGlobal) {
       var showLoading = plus.nativeUI.showWaiting("正在下载", {
         back: "none"
       });
-      downloadTask.onProgressUpdate((res2) => {
-        showLoading.setTitle("  正在下载" + res2.progress + "%  ");
-        if (res2.progress == 100) {
+      downloadTask.onProgressUpdate((res) => {
+        showLoading.setTitle("  正在下载" + res.progress + "%  ");
+        if (res.progress == 100) {
           plus.nativeUI.closeWaiting();
         }
       });
@@ -1497,7 +1497,7 @@ if (uni.restoreGlobal) {
               {
                 force: true
               },
-              function(res2) {
+              function(res) {
                 setTimeout(function() {
                   plus.runtime.restart();
                 }, 1100);
@@ -1732,8 +1732,8 @@ if (uni.restoreGlobal) {
           //途经点
           show_fields: "cost"
         },
-        success(res2) {
-          formatAppLog("log", "at utils/functions.js:33", res2);
+        success(res) {
+          formatAppLog("log", "at utils/functions.js:33", res);
         }
       });
     },
@@ -1821,8 +1821,8 @@ if (uni.restoreGlobal) {
         uni.showModal({
           title: "提示",
           content: contents,
-          success: function(res2) {
-            if (res2.confirm) {
+          success: function(res) {
+            if (res.confirm) {
               relove();
             }
           }
@@ -1838,8 +1838,8 @@ if (uni.restoreGlobal) {
           package: param.package,
           signType: param.signType,
           paySign: param.paySign,
-          success: function(res2) {
-            relove(res2);
+          success: function(res) {
+            relove(res);
           },
           fail: function(err) {
             formatAppLog("log", "at utils/functions.js:153", err);
@@ -2011,20 +2011,20 @@ if (uni.restoreGlobal) {
         data,
         method: "post",
         header
-      }).then((res2) => {
-        formatAppLog("log", "at utils/request.js:34", "请求res :>> ", res2);
-        if (res2.statusCode === 200) {
-          const userinfo = res2.data;
+      }).then((res) => {
+        formatAppLog("log", "at utils/request.js:34", "请求res :>> ", res);
+        if (res.statusCode === 200) {
+          const userinfo = res.data;
           uni.setStorageSync("access_token", userinfo.access_token);
           uni.setStorageSync("refresh_token", userinfo.refresh_token);
           uni.setStorageSync("userinfo", userinfo);
-          resolve(res2);
+          resolve(res);
         } else {
           uni.reLaunch({
             url: "/pages/login/login"
           });
-          const res3 = uni.getStorageInfoSync();
-          res3.keys.map((item) => {
+          const res2 = uni.getStorageInfoSync();
+          res2.keys.map((item) => {
             if (item == "loginuser" || item == "HistoryDate" || item == "setip" || item == "checkname" || item.indexOf("IMAGE_CACHE_INFO") != -1) {
               return;
             }
@@ -2044,8 +2044,8 @@ if (uni.restoreGlobal) {
         uni.reLaunch({
           url: "/pages/login/login"
         });
-        const res2 = uni.getStorageInfoSync();
-        res2.keys.map((item) => {
+        const res = uni.getStorageInfoSync();
+        res.keys.map((item) => {
           if (item == "loginuser" || item == "HistoryDate" || item == "setip" || item == "checkname" || item.indexOf("IMAGE_CACHE_INFO") != -1) {
             return;
           }
@@ -2079,7 +2079,6 @@ if (uni.restoreGlobal) {
           ;
       }
       header.Authorization = `Basic ${base64.encode(APPKEY)}`;
-      formatAppLog("log", "at utils/request.js:114", "params :1111>> ", params);
       if (params.url.indexOf("blade-auth/oauth/token") != -1) {
         header["Content-Type"] = "application/x-www-form-urlencoded";
         header["Tenant-Id"] = params.data.tenantId;
@@ -2114,11 +2113,11 @@ if (uni.restoreGlobal) {
         header
       };
       const request = uni.request(submitData);
-      request.then((res2) => {
-        formatAppLog("log", "at utils/request.js:164", "登录res :>> ", res2);
+      request.then((res) => {
+        formatAppLog("log", "at utils/request.js:163", "请求res :>> ", res);
         uni.hideLoading();
-        if (res2.statusCode == 200) {
-          let data = res2.data;
+        if (res.statusCode == 200) {
+          let data = res.data;
           utils.ttsspke(data.audio || "");
           if (data.code != 200 && (data == null ? void 0 : data.msg)) {
             uni.showToast({
@@ -2144,16 +2143,16 @@ if (uni.restoreGlobal) {
               break;
           }
         } else {
-          if (res2.statusCode == 400) {
+          if (res.statusCode == 400) {
             delete requestObj[key];
             relove({});
             return;
-          } else if (res2.statusCode == 500) {
+          } else if (res.statusCode == 500) {
             delete requestObj[key];
             api.error("接口出错，请联系后端开发人员");
             utils.ttsspke("接口出错，请联系后端开发人员");
             return;
-          } else if (res2.statusCode == 401) {
+          } else if (res.statusCode == 401) {
             if (isLogin) {
               return uni.showToast({
                 title: "登录失败",
@@ -2162,16 +2161,16 @@ if (uni.restoreGlobal) {
             }
             if (_isRefreshToken._isRefreshToken) {
               _isRefreshToken._isRefreshToken.then(() => {
-                HandleRequest(requestObj[key], key).then((res3) => {
-                  relove(res3);
+                HandleRequest(requestObj[key], key).then((res2) => {
+                  relove(res2);
                 });
               });
             } else {
-              formatAppLog("log", "at utils/request.js:229", "header :>> ", header);
+              formatAppLog("log", "at utils/request.js:228", "header :>> ", header);
               const refreshFn = HandleRefreshToken(header, urlhd, refresh_token, user);
-              refreshFn.then((res3) => {
-                HandleRequest(requestObj[key], key).then((res4) => {
-                  relove(res4);
+              refreshFn.then((res2) => {
+                HandleRequest(requestObj[key], key).then((res3) => {
+                  relove(res3);
                 });
               }).catch(() => {
               }).finally(() => {
@@ -2185,7 +2184,7 @@ if (uni.restoreGlobal) {
           }
         }
       }).catch((err) => {
-        formatAppLog("log", "at utils/request.js:253", err);
+        formatAppLog("log", "at utils/request.js:252", err);
         delete requestObj[key];
         api.error("请检查是否连接到无线网络");
         utils.ttsspke("请检查是否连接到无线网络");
@@ -2199,20 +2198,19 @@ if (uni.restoreGlobal) {
   };
   let isLogin = false;
   const service = async (params) => {
-    formatAppLog("log", "at utils/request.js:283", "params :>> ", params);
     if (params.data.isLogin) {
       isLogin = true;
       delete params.data.isLogin;
     } else
       isLogin = false;
-    formatAppLog("log", "at utils/request.js:288", "params :>> ", params);
+    formatAppLog("log", "at utils/request.js:286", "params :>> ", params);
     const _key = params.url + JSON.stringify(params.data);
     if (requestObj[_key])
       return new Promise((resolve) => resolve({
         code: 4e3
       }));
     requestObj[_key] = params;
-    formatAppLog("log", "at utils/request.js:297", "_isRefreshToken :>> ", _isRefreshToken);
+    formatAppLog("log", "at utils/request.js:295", "_isRefreshToken :>> ", _isRefreshToken);
     if (_isRefreshToken._isRefreshToken) {
       await _isRefreshToken._isRefreshToken;
       return HandleRequest(params, _key);
@@ -4922,8 +4920,8 @@ This will fail in production if not fixed.`);
               });
               return;
             }
-            let res2 = await getMyWarehouseList({});
-            details.warehouseList = res2.data;
+            let res = await getMyWarehouseList({});
+            details.warehouseList = res.data;
             if (details.warehouseList.length == 1) {
               let resdata = await preserveCurrentWarehouse(details.warehouseList[0]);
               uni.setStorageSync("checkname", details.warehouseList[0]);
@@ -7513,18 +7511,18 @@ This will fail in production if not fixed.`);
       } else {
         uni.downloadFile({
           url: filePath,
-          success: (res2) => {
-            if (res2.statusCode === 200) {
+          success: (res) => {
+            if (res.statusCode === 200) {
               uni.saveFile({
-                tempFilePath: res2.tempFilePath,
-                success: function(res22) {
-                  var t0 = plus.io.convertLocalFileSystemURL(res22.savedFilePath);
-                  var t0 = res22.savedFilePath;
+                tempFilePath: res.tempFilePath,
+                success: function(res2) {
+                  var t0 = plus.io.convertLocalFileSystemURL(res2.savedFilePath);
+                  var t0 = res2.savedFilePath;
                   uni.setStorageSync(storageKey, t0);
                   resolve(t0);
                   return;
                 },
-                fail: function(res22) {
+                fail: function(res2) {
                   resolve(filePath);
                   return;
                 }
@@ -7535,8 +7533,8 @@ This will fail in production if not fixed.`);
               return;
             }
           },
-          fail: (res2) => {
-            formatAppLog("log", "at utils/cacheimg.js:64", res2);
+          fail: (res) => {
+            formatAppLog("log", "at utils/cacheimg.js:64", res);
             resolve(filePath);
             return;
           }
@@ -7678,14 +7676,14 @@ This will fail in production if not fixed.`);
           details.tablist = tabber;
           return;
         }
-        let res2 = await appMenuroutes({});
-        formatAppLog("log", "at pages/index/index.vue:179", res2, "-------------");
+        let res = await appMenuroutes({});
+        formatAppLog("log", "at pages/index/index.vue:179", res, "-------------");
         formatAppLog("log", "at pages/index/index.vue:180", "刷新后");
-        if (res2.code == 200) {
-          getimgcache(res2.data[0]);
+        if (res.code == 200) {
+          getimgcache(res.data[0]);
         } else {
           uni.showToast({
-            title: res2.msg,
+            title: res.msg,
             icon: "none"
           });
         }
@@ -7932,9 +7930,9 @@ This will fail in production if not fixed.`);
         });
       }
       async function showwhselist() {
-        let res2 = await getMyWarehouseList({});
-        formatAppLog("log", "at pages/user/user.vue:140", res2.data);
-        details.warehouseList = res2.data;
+        let res = await getMyWarehouseList({});
+        formatAppLog("log", "at pages/user/user.vue:140", res.data);
+        details.warehouseList = res.data;
         details.showck = true;
       }
       function checkitem(item) {
@@ -7955,8 +7953,8 @@ This will fail in production if not fixed.`);
         }
       }
       function removeall() {
-        const res2 = uni.getStorageInfoSync();
-        res2.keys.map((item) => {
+        const res = uni.getStorageInfoSync();
+        res.keys.map((item) => {
           if (item == "loginuser" || item == "HistoryDate" || item == "setip" || item == "checkname" || item.indexOf("IMAGE_CACHE_INFO") != -1) {
             return;
           }
@@ -7965,8 +7963,8 @@ This will fail in production if not fixed.`);
         uni.reLaunch({
           url: "/pages/login/login"
         });
-        formatAppLog("log", "at pages/user/user.vue:176", res2.currentSize);
-        formatAppLog("log", "at pages/user/user.vue:177", String(res2.limitSize));
+        formatAppLog("log", "at pages/user/user.vue:176", res.currentSize);
+        formatAppLog("log", "at pages/user/user.vue:177", String(res.limitSize));
       }
       async function updateApp() {
         let version2 = await utils.getversion();
@@ -10007,28 +10005,37 @@ This will fail in production if not fixed.`);
         initpage();
       }
       async function initpage() {
-        let data = {
-          current: details.currentPage,
-          size: details.size,
-          stockupDateStart: date2.value[0],
-          stockupDateEnd: date2.value[1],
-          status: details.status
-        };
-        let response = await distributionStockuppageList(data);
-        if (response.code !== 200)
-          return;
-        if (details.currentPage == 1 && response.data) {
-          details.dataList = response.data.records;
-        } else {
-          if (response.data.records.lngth == 0) {
-            uni.showToast({
-              title: "已经到底了。",
-              icon: "none"
-            });
-            details.currentPage--;
+        try {
+          uni.showLoading({
+            title: "数据加载中",
+            mask: true
+          });
+          let data = {
+            current: details.currentPage,
+            size: details.size,
+            stockupDateStart: date2.value[0],
+            stockupDateEnd: date2.value[1],
+            status: details.status
+          };
+          let response = await distributionStockuppageList(data);
+          if (response.code !== 200)
             return;
+          if (details.currentPage == 1 && response.data) {
+            details.dataList = response.data.records;
+          } else {
+            if (response.data.records.lngth == 0) {
+              uni.showToast({
+                title: "已经到底了。",
+                icon: "none"
+              });
+              details.currentPage--;
+              return;
+            }
+            details.dataList = details.dataList.concat(response.data.records);
           }
-          details.dataList = details.dataList.concat(response.data.records);
+        } catch (e) {
+        } finally {
+          uni.hideLoading();
         }
       }
       function gostockuplist(item) {
@@ -10295,6 +10302,14 @@ This will fail in production if not fixed.`);
   const _sfc_main$1g = /* @__PURE__ */ vue.defineComponent({
     __name: "SelfPickupScan",
     setup(__props) {
+      const option = {
+        title: "自提扫描",
+        haveData: true,
+        async pullDownRefreshInitPage() {
+          details.current = 1;
+          await initpage();
+        }
+      };
       let details = vue.reactive({
         datatime: "",
         show: false,
@@ -10303,11 +10318,12 @@ This will fail in production if not fixed.`);
         recordsList: []
       });
       const date2 = vue.ref([]);
+      const basicContainer = vue.ref(null);
       function showCalendar() {
         details.show = !details.show;
       }
       function onConfirm(e) {
-        formatAppLog("log", "at pagesHome/pages/SelfPickupScan/SelfPickupScan.vue:111", e);
+        formatAppLog("log", "at pagesHome/pages/SelfPickupScan/SelfPickupScan.vue:125", e);
         date2.value[0] = e.startDate;
         date2.value[1] = e.endDate;
         details.datatime = date2.value[0] + " 至 " + date2.value[1];
@@ -10322,7 +10338,10 @@ This will fail in production if not fixed.`);
         date2.value[1] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd");
       });
       onShow(() => {
-        init();
+        const timer = setTimeout(() => {
+          basicContainer.value.startPullDownRefresh();
+          clearTimeout(timer);
+        }, 200);
       });
       function init() {
         details.current = 1;
@@ -10368,198 +10387,206 @@ This will fail in production if not fixed.`);
       function cleartime() {
         details.datatime = "";
         date2.value = [];
-        init();
+        basicContainer.value.startPullDownRefresh();
       }
       const { datatime, dataList, show, recordsList } = vue.toRefs(details);
       return (_ctx, _cache) => {
-        const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
         const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$1);
         const _component_l_calendar = resolveEasycom(vue.resolveDynamicComponent("l-calendar"), __easycom_1$2);
+        const _component_BasicContainer = vue.resolveComponent("BasicContainer");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
           [
             vue.createCommentVNode(` <u-navbar title="自提扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> `),
-            vue.createVNode(_component_u_navbar, {
-              title: "自提扫描",
-              bgColor: "#D3832A",
-              leftIconColor: "#ffffff",
-              titleStyle: "color:#ffffff",
-              placeholder: "",
-              autoBack: true,
-              leftIconSize: "35"
-            }),
-            vue.createElementVNode("view", { class: "schbox" }, [
-              vue.createElementVNode("view", null, "自提日期："),
-              vue.createElementVNode("view", {
-                onClick: showCalendar,
-                class: "inputsr"
-              }, [
-                vue.createElementVNode("input", {
-                  value: vue.unref(datatime),
-                  disabled: "",
-                  placeholder: "请选择时间"
-                }, null, 8, ["value"]),
-                vue.createElementVNode("view", {
-                  onClick: _cache[0] || (_cache[0] = vue.withModifiers(() => {
-                  }, ["stop", "prevent"]))
-                }, [
-                  !vue.unref(datatime) ? (vue.openBlock(), vue.createBlock(_component_u_icon, {
-                    key: 0,
-                    onClick: showCalendar,
-                    style: { "margin-right": "10rpx" },
-                    name: "calendar",
-                    color: "#999999",
-                    size: "50"
-                  })) : (vue.openBlock(), vue.createBlock(_component_u_icon, {
-                    key: 1,
-                    onClick: cleartime,
-                    style: { "margin-right": "10rpx" },
-                    name: "close-circle",
-                    color: "#999999",
-                    size: "40"
-                  }))
-                ])
-              ]),
-              vue.createElementVNode("view", { onClick: init }, " 查询 ")
-            ]),
-            vue.createElementVNode(
-              "scroll-view",
+            vue.createVNode(
+              _component_BasicContainer,
               {
-                "scroll-y": "true",
-                class: "scvbx",
-                onScrolltolower: jiazai
+                option,
+                ref_key: "basicContainer",
+                ref: basicContainer
               },
-              [
-                vue.createElementVNode("view", { class: "mabxslist" }, [
-                  (vue.openBlock(true), vue.createElementBlock(
-                    vue.Fragment,
-                    null,
-                    vue.renderList(vue.unref(recordsList), (item) => {
-                      return vue.openBlock(), vue.createElementBlock("view", { class: "item" }, [
-                        vue.createElementVNode("view", { class: "headtop" }, [
-                          vue.createCommentVNode(' <view class="type1s">\r\n						<view>\r\n							<text style="color: #90A0AF;">配车类型：</text>{{item.item}}\r\n						</view>\r\n						<view>\r\n							<text style="color: #90A0AF;">配车状态：</text>{{item.conditionStr}}\r\n						</view>\r\n					</view> '),
-                          vue.createElementVNode("view", { class: "type1s" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "车牌号："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.pickUpPlate),
-                                1
-                                /* TEXT */
-                              )
-                            ]),
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "司机："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.consignee),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createElementVNode("view", { class: "type1s" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "装御班组："),
-                              vue.createTextVNode("A班组 ")
-                            ]),
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "备货是否完成："),
-                              vue.createTextVNode("是 ")
-                            ])
-                          ]),
-                          vue.createElementVNode("view", { class: "type1s" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "制单时间："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.createTime),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createElementVNode("view", { class: "type1s" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "任务时间："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.createTime),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createElementVNode("view", { class: "liebs" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("view", null, "订单总数"),
-                              vue.createElementVNode(
-                                "view",
-                                null,
-                                vue.toDisplayString(item.orderNum),
-                                1
-                                /* TEXT */
-                              )
-                            ]),
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("view", null, "自提件数"),
-                              vue.createElementVNode(
-                                "view",
-                                null,
-                                vue.toDisplayString(item.planNum),
-                                1
-                                /* TEXT */
-                              )
-                            ]),
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("view", null, "签收件数"),
-                              vue.createElementVNode(
-                                "view",
-                                null,
-                                vue.toDisplayString(item.signedNum),
-                                1
-                                /* TEXT */
-                              )
-                            ]),
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("view", null, "库存品数"),
-                              vue.createElementVNode(
-                                "view",
-                                null,
-                                vue.toDisplayString(item.inventoryNub),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ])
-                        ]),
-                        vue.createElementVNode("view", { class: "buts" }, [
-                          vue.createElementVNode("view", {
-                            onClick: ($event) => goselscandetails(item)
-                          }, "明细扫描", 8, ["onClick"]),
-                          vue.createElementVNode("view", {
-                            onClick: ($event) => goselscan(item)
-                          }, "扫描", 8, ["onClick"])
-                        ])
-                      ]);
-                    }),
-                    256
-                    /* UNKEYED_FRAGMENT */
-                  ))
-                ])
-              ],
-              32
-              /* HYDRATE_EVENTS */
-            ),
-            vue.createVNode(_component_l_calendar, {
-              value: vue.unref(show),
-              "onUpdate:value": _cache[1] || (_cache[1] = ($event) => vue.isRef(show) ? show.value = $event : null),
-              initStartDate: date2.value[0],
-              initEndDate: date2.value[1],
-              onHide: showCalendar,
-              onChange: onConfirm
-            }, null, 8, ["value", "initStartDate", "initEndDate"]),
-            vue.createCommentVNode(` <hd-calendar :defaultDate='date' mode="range" color='#D3832A' minDate='2023-01-01' @confirm="onConfirm" /> `)
+              {
+                head: vue.withCtx(() => [
+                  vue.createElementVNode("view", { class: "schbox" }, [
+                    vue.createElementVNode("view", null, "自提日期："),
+                    vue.createElementVNode("view", {
+                      onClick: showCalendar,
+                      class: "inputsr"
+                    }, [
+                      vue.createElementVNode("input", {
+                        value: vue.unref(datatime),
+                        disabled: "",
+                        placeholder: "请选择时间"
+                      }, null, 8, ["value"]),
+                      vue.createElementVNode("view", {
+                        onClick: _cache[0] || (_cache[0] = vue.withModifiers(() => {
+                        }, ["stop", "prevent"]))
+                      }, [
+                        !vue.unref(datatime) ? (vue.openBlock(), vue.createBlock(_component_u_icon, {
+                          key: 0,
+                          onClick: showCalendar,
+                          style: { "margin-right": "10rpx" },
+                          name: "calendar",
+                          color: "#999999",
+                          size: "50"
+                        })) : (vue.openBlock(), vue.createBlock(_component_u_icon, {
+                          key: 1,
+                          onClick: cleartime,
+                          style: { "margin-right": "10rpx" },
+                          name: "close-circle",
+                          color: "#999999",
+                          size: "40"
+                        }))
+                      ])
+                    ]),
+                    vue.createElementVNode("view", { onClick: init }, " 查询 ")
+                  ])
+                ]),
+                body: vue.withCtx(() => [
+                  vue.createElementVNode(
+                    "scroll-view",
+                    {
+                      "scroll-y": "true",
+                      class: "scvbx",
+                      onScrolltolower: jiazai
+                    },
+                    [
+                      vue.createElementVNode("view", { class: "mabxslist" }, [
+                        (vue.openBlock(true), vue.createElementBlock(
+                          vue.Fragment,
+                          null,
+                          vue.renderList(vue.unref(recordsList), (item) => {
+                            return vue.openBlock(), vue.createElementBlock("view", { class: "item" }, [
+                              vue.createElementVNode("view", { class: "headtop" }, [
+                                vue.createCommentVNode(' <view class="type1s">\r\n								<view>\r\n									<text style="color: #90A0AF;">配车类型：</text>{{item.item}}\r\n								</view>\r\n								<view>\r\n									<text style="color: #90A0AF;">配车状态：</text>{{item.conditionStr}}\r\n								</view>\r\n							</view> '),
+                                vue.createElementVNode("view", { class: "type1s" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "车牌号："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.pickUpPlate),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ]),
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "司机："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.consignee),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createElementVNode("view", { class: "type1s" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "装御班组："),
+                                    vue.createTextVNode("A班组 ")
+                                  ]),
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "备货是否完成："),
+                                    vue.createTextVNode("是 ")
+                                  ])
+                                ]),
+                                vue.createElementVNode("view", { class: "type1s" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "制单时间："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.createTime),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createElementVNode("view", { class: "type1s" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "任务时间："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.createTime),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createElementVNode("view", { class: "liebs" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("view", null, "订单总数"),
+                                    vue.createElementVNode(
+                                      "view",
+                                      null,
+                                      vue.toDisplayString(item.orderNum),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ]),
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("view", null, "自提件数"),
+                                    vue.createElementVNode(
+                                      "view",
+                                      null,
+                                      vue.toDisplayString(item.planNum),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ]),
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("view", null, "签收件数"),
+                                    vue.createElementVNode(
+                                      "view",
+                                      null,
+                                      vue.toDisplayString(item.signedNum),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ]),
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("view", null, "库存品数"),
+                                    vue.createElementVNode(
+                                      "view",
+                                      null,
+                                      vue.toDisplayString(item.inventoryNub),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ])
+                              ]),
+                              vue.createElementVNode("view", { class: "buts" }, [
+                                vue.createElementVNode("view", {
+                                  onClick: ($event) => goselscandetails(item)
+                                }, "明细扫描", 8, ["onClick"]),
+                                vue.createElementVNode("view", {
+                                  onClick: ($event) => goselscan(item)
+                                }, "扫描", 8, ["onClick"])
+                              ])
+                            ]);
+                          }),
+                          256
+                          /* UNKEYED_FRAGMENT */
+                        ))
+                      ])
+                    ],
+                    32
+                    /* HYDRATE_EVENTS */
+                  ),
+                  vue.createVNode(_component_l_calendar, {
+                    value: vue.unref(show),
+                    "onUpdate:value": _cache[1] || (_cache[1] = ($event) => vue.isRef(show) ? show.value = $event : null),
+                    initStartDate: date2.value[0],
+                    initEndDate: date2.value[1],
+                    onHide: showCalendar,
+                    onChange: onConfirm
+                  }, null, 8, ["value", "initStartDate", "initEndDate"])
+                ]),
+                _: 1
+                /* STABLE */
+              },
+              512
+              /* NEED_PATCH */
+            )
           ],
-          64
-          /* STABLE_FRAGMENT */
+          2112
+          /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
         );
       };
     }
@@ -10622,13 +10649,13 @@ This will fail in production if not fixed.`);
         let data = {
           deliveryId: item.id
         };
-        let res2 = await deliveryvehicle(data);
-        if (res2.code !== 200)
+        let res = await deliveryvehicle(data);
+        if (res.code !== 200)
           return;
-        if (res2.data.length == 1) {
+        if (res.data.length == 1) {
           let data2 = {
             deliveryId: item.id,
-            loadingId: res2.data[0].id
+            loadingId: res.data[0].id
           };
           let response = await deliverystart(data2);
           if (response.code == 200) {
@@ -10640,7 +10667,7 @@ This will fail in production if not fixed.`);
           }
           return;
         }
-        if (res2.data.length == 0) {
+        if (res.data.length == 0) {
           uni.showToast({
             title: "没有司机数据",
             icon: "none"
@@ -10648,7 +10675,7 @@ This will fail in production if not fixed.`);
           return;
         }
         let list = [];
-        res2.data.map((item2) => {
+        res.data.map((item2) => {
           list.push(item2.driverName + "---" + item2.vehicleNub);
         });
         tiplists.value.setdetails({
@@ -10671,7 +10698,7 @@ This will fail in production if not fixed.`);
             tiplists.value.setdetails({ isshow: false });
             let data2 = {
               deliveryId: item.id,
-              loadingId: res2.data[deta.checklist[0]].id
+              loadingId: res.data[deta.checklist[0]].id
             };
             let response = await deliverystart(data2);
             if (response.code == 200) {
@@ -10751,15 +10778,15 @@ This will fail in production if not fixed.`);
         let data = {
           deliveryId: item.id
         };
-        let res2 = await deliveryvehicle(data);
-        if (res2.data.length == 1) {
-          uni.setStorageSync("checkvehicle", res2.data[0]);
+        let res = await deliveryvehicle(data);
+        if (res.data.length == 1) {
+          uni.setStorageSync("checkvehicle", res.data[0]);
           uni.navigateTo({
             url: "/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan?id=" + item.id + "&item=" + JSON.stringify(item)
           });
           return;
         }
-        if (res2.data.length == 0) {
+        if (res.data.length == 0) {
           uni.showToast({
             title: "没有司机数据",
             icon: "none"
@@ -10767,7 +10794,7 @@ This will fail in production if not fixed.`);
           return;
         }
         let list = [];
-        res2.data.map((item2) => {
+        res.data.map((item2) => {
           list.push(item2.driverName + "---" + item2.vehicleNub);
         });
         tiplists.value.setdetails({
@@ -10788,7 +10815,7 @@ This will fail in production if not fixed.`);
               return;
             }
             tiplists.value.setdetails({ isshow: false });
-            uni.setStorageSync("checkvehicle", res2.data[deta.checklist[0]]);
+            uni.setStorageSync("checkvehicle", res.data[deta.checklist[0]]);
             uni.navigateTo({
               url: "/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan?id=" + item.id + "&item=" + JSON.stringify(item)
             });
@@ -10806,16 +10833,16 @@ This will fail in production if not fixed.`);
         let data = {
           deliveryId: item.id
         };
-        let res2 = await deliveryvehicle(data);
-        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:391", res2);
-        if (res2.data.length == 1) {
-          uni.setStorageSync("checkvehicle", res2.data[0]);
+        let res = await deliveryvehicle(data);
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:391", res);
+        if (res.data.length == 1) {
+          uni.setStorageSync("checkvehicle", res.data[0]);
           uni.navigateTo({
             url: "/pagesHome/pages/loadingRetention/loadingRetention?item=" + JSON.stringify(item)
           });
           return;
         }
-        if (res2.data.length == 0) {
+        if (res.data.length == 0) {
           uni.showToast({
             title: "没有司机数据",
             icon: "none"
@@ -10823,7 +10850,7 @@ This will fail in production if not fixed.`);
           return;
         }
         let list = [];
-        res2.data.map((item2) => {
+        res.data.map((item2) => {
           list.push(item2.driverName + "---" + item2.vehicleNub);
         });
         tiplists.value.setdetails({
@@ -10844,7 +10871,7 @@ This will fail in production if not fixed.`);
               return;
             }
             tiplists.value.setdetails({ isshow: false });
-            uni.setStorageSync("checkvehicle", res2.data[deta.checklist[0]]);
+            uni.setStorageSync("checkvehicle", res.data[deta.checklist[0]]);
             uni.navigateTo({
               url: "/pagesHome/pages/LoadingDetails/LoadingDetails?item=" + JSON.stringify(item)
             });
@@ -10861,18 +10888,18 @@ This will fail in production if not fixed.`);
         let data = {
           deliveryId: item.id
         };
-        let res2 = await deliveryvehicle(data);
-        if (res2.code !== 200)
+        let res = await deliveryvehicle(data);
+        if (res.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:448", res2);
-        if (res2.data.length == 1) {
-          uni.setStorageSync("checkvehicle", res2.data[0]);
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:448", res);
+        if (res.data.length == 1) {
+          uni.setStorageSync("checkvehicle", res.data[0]);
           uni.navigateTo({
             url: "/pagesHome/pages/LoadingDetails/LoadingDetails?item=" + JSON.stringify(item)
           });
           return;
         }
-        if (res2.data.length == 0) {
+        if (res.data.length == 0) {
           uni.showToast({
             title: "没有司机数据",
             icon: "none"
@@ -10880,7 +10907,7 @@ This will fail in production if not fixed.`);
           return;
         }
         let list = [];
-        res2.data.map((item2) => {
+        res.data.map((item2) => {
           list.push(item2.driverName + "---" + item2.vehicleNub);
         });
         tiplists.value.setdetails({
@@ -10901,7 +10928,7 @@ This will fail in production if not fixed.`);
               return;
             }
             tiplists.value.setdetails({ isshow: false });
-            uni.setStorageSync("checkvehicle", res2.data[deta.checklist[0]]);
+            uni.setStorageSync("checkvehicle", res.data[deta.checklist[0]]);
             uni.navigateTo({
               url: "/pagesHome/pages/LoadingDetails/LoadingDetails?item=" + JSON.stringify(item)
             });
@@ -11311,9 +11338,9 @@ This will fail in production if not fixed.`);
           type: 1,
           barcode: details.scancode
         };
-        let res2 = await deliveryloadingscan(data);
-        formatAppLog("log", "at pagesHome/pages/loadingRetention/loadingRetention.vue:148", res2);
-        if (res2.code == 200)
+        let res = await deliveryloadingscan(data);
+        formatAppLog("log", "at pagesHome/pages/loadingRetention/loadingRetention.vue:148", res);
+        if (res.code == 200)
           ;
       }
       async function initpage() {
@@ -11652,16 +11679,16 @@ This will fail in production if not fixed.`);
         let data = {
           deliveryDetailsId: item.deliveryDetailsId
         };
-        let res2 = await distributionStockuplocationSelection(data);
-        if (res2.code !== 200)
+        let res = await distributionStockuplocationSelection(data);
+        if (res.code !== 200)
           return;
         let list = [];
-        res2.data.map((item2) => {
+        res.data.map((item2) => {
           list.push(item2.positionCode + " (" + item2.num + "件)");
         });
         if (list.length == 1) {
           uni.navigateTo({
-            url: "/pagesHome/pages/setbarcode/setbarcode?item=" + JSON.stringify(item) + "&reservationId=" + details.reservationId + "&goodsAreaName=" + details.user.goodsAreaName + "&stockupId=" + details.stockupId + "&allocationId=" + res2.data[0].allocationId + "&completeStact=" + item.completeStact
+            url: "/pagesHome/pages/setbarcode/setbarcode?item=" + JSON.stringify(item) + "&reservationId=" + details.reservationId + "&goodsAreaName=" + details.user.goodsAreaName + "&stockupId=" + details.stockupId + "&allocationId=" + res.data[0].allocationId + "&completeStact=" + item.completeStact
           });
           return;
         }
@@ -11683,7 +11710,7 @@ This will fail in production if not fixed.`);
               return;
             }
             uni.navigateTo({
-              url: "/pagesHome/pages/setbarcode/setbarcode?item=" + JSON.stringify(item) + "&reservationId=" + details.reservationId + "&goodsAreaName=" + details.user.goodsAreaName + "&stockupId=" + details.stockupId + "&allocationId=" + res2.data[deta.checklist[0]].allocationId + "&completeStact=" + item.completeStact
+              url: "/pagesHome/pages/setbarcode/setbarcode?item=" + JSON.stringify(item) + "&reservationId=" + details.reservationId + "&goodsAreaName=" + details.user.goodsAreaName + "&stockupId=" + details.stockupId + "&allocationId=" + res.data[deta.checklist[0]].allocationId + "&completeStact=" + item.completeStact
             });
             tiplists.value.setdetails({ isshow: false });
           },
@@ -11696,20 +11723,30 @@ This will fail in production if not fixed.`);
         });
       }
       async function scandata() {
-        let data = {
-          trayBarCode: details.scancode,
-          stockupId: details.stockupId,
-          trayId: details.trayId,
-          reservationId: details.reservationId,
-          scanType: 1
-        };
-        let res2 = await distributionStockupscanningCode(data);
-        if (res2.code !== 200)
-          return;
-        if (res2.audio)
-          utils2.ttsspke(res2.audio);
-        initpage();
-        details.isscan = false;
+        try {
+          uni.showLoading({
+            title: "提交中",
+            mask: true
+          });
+          let data = {
+            trayBarCode: details.scancode,
+            stockupId: details.stockupId,
+            trayId: details.trayId,
+            reservationId: details.reservationId,
+            scanType: 1
+          };
+          let res = await distributionStockupscanningCode(data);
+          if (res.code !== 200)
+            return;
+          if (res.audio)
+            utils2.ttsspke(res.audio);
+          initpage();
+          details.isscan = false;
+        } catch (err) {
+          formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:365", "err :>> ", err);
+        } finally {
+          uni.hideLoading();
+        }
       }
       async function showZeroOrderDetails(item) {
         if (!item.allocation) {
@@ -11725,13 +11762,13 @@ This will fail in production if not fixed.`);
           orderCode: item.orderCode,
           stockArticleId: item.stockArticleId
         };
-        const res2 = await postZeroStockUpData(data);
-        const { code: code2 } = res2;
+        const res = await postZeroStockUpData(data);
+        const { code: code2 } = res;
         let inpList = [];
         if (code2 !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:382", "res.data :>> ", res2.data);
-        inpList = res2.data.map((val) => {
+        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:393", "res.data :>> ", res.data);
+        inpList = res.data.map((val) => {
           return {
             id: val.id,
             title: val.categoryName,
@@ -11774,7 +11811,7 @@ This will fail in production if not fixed.`);
           confirmTxt: "确认选择",
           isonecheck: true,
           success: async (deta) => {
-            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:431", "deta :>> ", deta);
+            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:442", "deta :>> ", deta);
             if (deta.inpList.length === 0 || item.completeStact)
               return tiplists.value.setdetails({ isshow: false });
             let data2 = {
@@ -11788,7 +11825,7 @@ This will fail in production if not fixed.`);
             if (deta.inpList[0].allocationId)
               data2.allocationId = deta.inpList[0].allocationId;
             const _flag = deta.inpList.every((val) => {
-              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:443", "val :>> ", val);
+              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:454", "val :>> ", val);
               if (val.value < val.minNum) {
                 uni.showToast({
                   title: "不能小于当前数量"
@@ -11796,7 +11833,7 @@ This will fail in production if not fixed.`);
                 return false;
               }
               if (val.value > val.minNum) {
-                formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:451", "1 :>> ", 1);
+                formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:462", "1 :>> ", 1);
                 data2.list.push({
                   firsts: val.title,
                   id: val.id,
@@ -11814,15 +11851,15 @@ This will fail in production if not fixed.`);
                 icon: "none"
               });
             }
-            const res22 = await postZeroStockUp(data2);
-            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:472", "res :>> ", res22);
-            const { code: code22 } = res22;
+            const res2 = await postZeroStockUp(data2);
+            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:483", "res :>> ", res2);
+            const { code: code22 } = res2;
             if (code22 === 200) {
               tiplists.value.setdetails({ isshow: false });
               initpage();
             }
-            if (res22.audio) {
-              utils2.ttsspke(res22.audio);
+            if (res2.audio) {
+              utils2.ttsspke(res2.audio);
             }
           },
           cancel: (details2) => {
@@ -11834,7 +11871,7 @@ This will fail in production if not fixed.`);
         });
       }
       function printOrderCode(item) {
-        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:497", "item :>> ", item);
+        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:508", "item :>> ", item);
         tiplists.value.setdetails({
           title: "生成订单编号二维码数量",
           isshow: true,
@@ -11866,7 +11903,7 @@ This will fail in production if not fixed.`);
             for (let i = 0; i <= _inputValue; i++) {
               if (_isReturn)
                 return;
-              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:531", "i :>> ", i);
+              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:543", "i :>> ", i);
               let text = "! 0 200 200 330 1\r\n";
               text += "SETBOLD 2\r\n";
               text += `T 56 0 0 0 ${item.orderCode}\r
@@ -11896,12 +11933,15 @@ This will fail in production if not fixed.`);
               text += "FORM\r\n";
               text += "PRINT\r\n";
               let sylist = utils2.initbl();
-              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:553", sylist);
+              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:565", sylist);
               utils2.getbl(bluetoothInfo.value, text).catch(() => {
                 bluetoothList.value.setdetails({ isshow: true });
                 _isReturn = true;
               });
             }
+            if (_isReturn)
+              return;
+            tiplists.value.setdetails({ isshow: false });
           },
           cancel: (details2) => {
             tiplists.value.setdetails({ isshow: false });
@@ -12456,14 +12496,14 @@ This will fail in production if not fixed.`);
           stockupId: details.stockupId,
           typeService: details.typeService
         };
-        let res2 = await distributionStockupstockupScan(data);
-        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:289", res2);
-        if (res2.code == 200) {
+        let res = await distributionStockupstockupScan(data);
+        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:289", res);
+        if (res.code == 200) {
           details.isscan = true;
           initpage();
-        } else if (res2.code === 3001) {
-          if (res2.audio)
-            utils.ttsspke(res2.audio);
+        } else if (res.code === 3001) {
+          if (res.audio)
+            utils.ttsspke(res.audio);
         }
       }
       async function initpage() {
@@ -13327,7 +13367,15 @@ This will fail in production if not fixed.`);
   const _sfc_main$18 = /* @__PURE__ */ vue.defineComponent({
     __name: "SelfPScanList",
     setup(__props) {
-      let details = vue.reactive({
+      const option = {
+        title: "自提扫描",
+        haveData: true,
+        async pullDownRefreshInitPage() {
+          details.datalist = [];
+          await initpage();
+        }
+      };
+      const details = vue.reactive({
         schanvalue: "",
         typearr: [
           {
@@ -13356,18 +13404,22 @@ This will fail in production if not fixed.`);
         scancode: ""
       });
       const tiplists = vue.ref(null);
+      const basicContainer = vue.ref(null);
       onLoad((op) => {
         details.billLadingId = op.billLadingId;
       });
       onShow(() => {
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:165", code2);
+            formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:180", code2);
             details.scancode = code2;
             sacn();
           }
         });
-        initpage();
+        const timer = setTimeout(() => {
+          basicContainer.value.startPullDownRefresh();
+          clearTimeout(timer);
+        }, 200);
       });
       onHide(() => {
         uni.$off("scancodedate");
@@ -13398,74 +13450,86 @@ This will fail in production if not fixed.`);
           coding: details.scancode,
           type: details.orderType == 1 ? "2" : "1"
         };
-        let res2 = await billLadingscan(data);
-        formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:202", res2);
-        if (res2.code == 200) {
-          initpage();
+        let res = await billLadingscan(data);
+        formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:221", res);
+        if (res.code == 200) {
+          basicContainer.value.startPullDownRefresh();
         }
       }
       async function initpage() {
-        details.datalist = [];
-        if (details.orderType == 1) {
-          let data = {
-            orderStatus: details.orderStatus,
-            billLadingId: details.billLadingId,
-            orderCode: details.orderCode
-          };
-          let response = await billLadingorderList(data);
-          if (response.code !== 200)
-            return;
-          details.datalist = response.data.list;
-          details.orderNum = response.data.orderNum;
-          details.completeNum = response.data.completeNum;
-          details.planNum = response.data.planNum;
-          details.inventoryNub = response.data.inventoryNub;
-          details.signedNum = response.data.signedNum;
-        } else if (details.orderType == 2) {
-          let date2 = {
-            id: details.billLadingId,
-            current: 1,
-            size: 10
-          };
-          let response = await billLadinggetInventory(date2);
-          if (res.code !== 200)
-            return;
-          details.datalist = response.data.records;
-          details.datalist.every((item) => {
-            if (item.esauInventoryNum == -1) {
-              uni.showToast({
-                title: "物品备货未完成，请前往备货",
-                icon: "none"
-              });
-              return false;
-            }
-            return true;
+        try {
+          uni.showLoading({
+            title: "数据加载中",
+            mask: true
           });
-        } else if (details.orderType === 3) {
-          let deta = {
-            billLadingId: details.billLadingId,
-            current: 1,
-            size: 10
-          };
-          const res2 = await billLadingZeroBillOrderData(deta);
-          formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:254", "res :>> ", res2);
-          const { code: code2, data } = res2;
-          if (code2 === 200)
-            details.datalist = data;
+          if (details.orderType == 1) {
+            let data = {
+              orderStatus: details.orderStatus,
+              billLadingId: details.billLadingId,
+              orderCode: details.orderCode
+            };
+            let response = await billLadingorderList(data);
+            if (response.code !== 200)
+              return;
+            details.datalist = response.data.list;
+            details.orderNum = response.data.orderNum;
+            details.completeNum = response.data.completeNum;
+            details.planNum = response.data.planNum;
+            details.inventoryNub = response.data.inventoryNub;
+            details.signedNum = response.data.signedNum;
+          } else if (details.orderType == 2) {
+            let date2 = {
+              id: details.billLadingId,
+              current: 1,
+              size: 10
+            };
+            let response = await billLadinggetInventory(date2);
+            if (response.code !== 200)
+              return;
+            details.datalist = response.data.records;
+            details.datalist.every((item) => {
+              if (item.esauInventoryNum == -1) {
+                uni.showToast({
+                  title: "物品备货未完成，请前往备货",
+                  icon: "none"
+                });
+                return false;
+              }
+              return true;
+            });
+          } else if (details.orderType === 3) {
+            let deta = {
+              billLadingId: details.billLadingId,
+              current: 1,
+              size: 10
+            };
+            const res = await billLadingZeroBillOrderData(deta);
+            formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:278", "res :>> ", res);
+            const { code: code2, data } = res;
+            if (code2 === 200)
+              details.datalist = data;
+          }
+        } catch (e) {
+        } finally {
+          uni.hideLoading();
         }
       }
       function setorderStatus(state) {
+        details.datalist = [];
         details.orderType = state;
-        initpage();
+        basicContainer.value.startPullDownRefresh();
+      }
+      function search() {
+        basicContainer.value.startPullDownRefresh();
       }
       async function showsTipsZero(item) {
         try {
-          formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:267", "item :>> ", item);
+          formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:304", "item :>> ", item);
           let subdata = {
             billLadingId: details.billLadingId
           };
           const response = await billLadingzeroBillData(subdata);
-          formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:273", "response :>> ", response);
+          formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:310", "response :>> ", response);
           const { code: code2, data } = response;
           if (code2 !== 200)
             return uni.showToast({
@@ -13514,7 +13578,7 @@ This will fail in production if not fixed.`);
                 }
                 if (list.length === 0)
                   return tiplists.value.setdetails({ isshow: false });
-                formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:325", "list :>> ", list);
+                formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:362", "list :>> ", list);
                 tiplists.value.setdetails({
                   isshow: true,
                   tipstate: 2,
@@ -13524,17 +13588,17 @@ This will fail in production if not fixed.`);
                   isonecheck: true,
                   success: async () => {
                     try {
-                      const res2 = await billLadingzeroBillBatch({ billLadingId: details.billLadingId, list });
-                      formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:338", "res :>> ", res2);
-                      if (res2.code === 200) {
+                      const res = await billLadingzeroBillBatch({ billLadingId: details.billLadingId, list });
+                      formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:375", "res :>> ", res);
+                      if (res.code === 200) {
                         uni.showToast({
-                          title: res2.msg
+                          title: res.msg
                         });
-                        initpage();
+                        basicContainer.value.startPullDownRefresh();
                       }
                       tiplists.value.setdetails({ isshow: false });
                     } catch (err) {
-                      formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:347", "err :>> ", err);
+                      formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:384", "err :>> ", err);
                     }
                   },
                   cancel: () => {
@@ -13545,7 +13609,7 @@ This will fail in production if not fixed.`);
                   }
                 });
               } catch (err) {
-                formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:359", "err :>> ", err);
+                formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:396", "err :>> ", err);
               } finally {
               }
             },
@@ -13557,7 +13621,7 @@ This will fail in production if not fixed.`);
             }
           });
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:372", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:409", "err :>> ", err);
         }
       }
       function checktype(e) {
@@ -13570,328 +13634,336 @@ This will fail in production if not fixed.`);
           if (item.value == e) {
             details.schanvalue = item.label;
             details.orderStatus = item.value;
-            formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:387", details.schanvalue);
+            formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:424", details.schanvalue);
           }
         });
       }
       const { orderType, schanvalue, typearr, orderCode, datalist } = vue.toRefs(details);
       return (_ctx, _cache) => {
-        const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
+        const _component_BasicContainer = vue.resolveComponent("BasicContainer");
         const _component_tiplist = vue.resolveComponent("tiplist");
         const _component_saomiao2 = vue.resolveComponent("saomiao2");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
           [
-            vue.createCommentVNode(` <u-navbar title="自提扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> `),
-            vue.createVNode(_component_u_navbar, {
-              title: "自提扫描",
-              bgColor: "#D3832A",
-              leftIconColor: "#ffffff",
-              titleStyle: "color:#ffffff",
-              placeholder: "",
-              autoBack: true,
-              leftIconSize: "35"
-            }),
-            vue.createElementVNode("view", { class: "hdtpnum" }, [
-              vue.createElementVNode("view", null, [
-                vue.createElementVNode("view", null, "订单总数"),
-                vue.createElementVNode(
-                  "view",
-                  null,
-                  vue.toDisplayString(vue.unref(details).orderNum || 0),
-                  1
-                  /* TEXT */
-                )
-              ]),
-              vue.createElementVNode("view", null, [
-                vue.createElementVNode("view", null, "齐套数"),
-                vue.createElementVNode(
-                  "view",
-                  null,
-                  vue.toDisplayString(vue.unref(details).completeNum || 0),
-                  1
-                  /* TEXT */
-                )
-              ]),
-              vue.createElementVNode("view", null, [
-                vue.createElementVNode("view", null, "自提件数"),
-                vue.createElementVNode(
-                  "view",
-                  null,
-                  vue.toDisplayString(vue.unref(details).planNum || 0),
-                  1
-                  /* TEXT */
-                )
-              ]),
-              vue.createElementVNode("view", null, [
-                vue.createElementVNode("view", null, "签收件数"),
-                vue.createElementVNode(
-                  "view",
-                  null,
-                  vue.toDisplayString(vue.unref(details).signedNum || 0),
-                  1
-                  /* TEXT */
-                )
-              ]),
-              vue.createElementVNode("view", null, [
-                vue.createElementVNode("view", null, "库存品数"),
-                vue.createElementVNode(
-                  "view",
-                  null,
-                  vue.toDisplayString(vue.unref(details).inventoryNub || 0),
-                  1
-                  /* TEXT */
-                )
-              ])
-            ]),
-            vue.createElementVNode("view", { class: "scinp" }, [
-              vue.createElementVNode("view", null, "齐套状态"),
-              vue.createElementVNode("view", null, [
-                vue.createVNode(cusSelects, {
-                  onChange: checktype,
-                  data: vue.unref(typearr),
-                  value: vue.unref(schanvalue),
-                  placeholder: "全部",
-                  arrLeft: 5,
-                  size: "145",
-                  clearable: true
-                }, null, 8, ["data", "value"])
-              ]),
-              vue.createElementVNode("view", { class: "inputs" }, [
-                vue.withDirectives(vue.createElementVNode(
-                  "input",
-                  {
-                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(orderCode) ? orderCode.value = $event : null),
-                    placeholder: "请输入查询的订单号"
-                  },
-                  null,
-                  512
-                  /* NEED_PATCH */
-                ), [
-                  [vue.vModelText, vue.unref(orderCode)]
-                ])
-              ]),
-              vue.createElementVNode("view", {
-                class: "btscan",
-                onClick: initpage
-              }, "查询")
-            ]),
-            vue.createElementVNode("view", { class: "tabtip" }, [
-              vue.createElementVNode("view", {
-                onClick: _cache[1] || (_cache[1] = ($event) => setorderStatus(1))
-              }, [
-                vue.createElementVNode(
-                  "view",
-                  {
-                    class: vue.normalizeClass(vue.unref(orderType) == 1 ? "xz" : "")
-                  },
-                  "定制品",
-                  2
-                  /* CLASS */
-                )
-              ]),
-              vue.createElementVNode("view", {
-                onClick: _cache[2] || (_cache[2] = ($event) => setorderStatus(2))
-              }, [
-                vue.createElementVNode(
-                  "view",
-                  {
-                    class: vue.normalizeClass(vue.unref(orderType) == 2 ? "xz" : "")
-                  },
-                  "库存品",
-                  2
-                  /* CLASS */
-                )
-              ]),
-              vue.createElementVNode("view", {
-                onClick: _cache[3] || (_cache[3] = ($event) => setorderStatus(3))
-              }, [
-                vue.createElementVNode(
-                  "view",
-                  {
-                    class: vue.normalizeClass(vue.unref(orderType) == 3 ? "xz" : "")
-                  },
-                  "零担",
-                  2
-                  /* CLASS */
-                )
-              ])
-            ]),
-            vue.createElementVNode("scroll-view", {
-              class: "scve",
-              "scroll-y": "true"
-            }, [
-              vue.createElementVNode("view", { class: "mabx" }, [
-                (vue.openBlock(true), vue.createElementBlock(
-                  vue.Fragment,
-                  null,
-                  vue.renderList(vue.unref(datalist), (item) => {
-                    return vue.openBlock(), vue.createElementBlock(
-                      vue.Fragment,
-                      { key: item },
-                      [
-                        vue.unref(orderType) == 1 ? (vue.openBlock(), vue.createElementBlock("view", {
-                          key: 0,
-                          class: "itec",
-                          onClick: showsdqs
-                        }, [
-                          vue.createElementVNode("view", { class: "contenbx1" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "订单编号："),
-                              vue.createTextVNode(
-                                " " + vue.toDisplayString(item.orderSelfNumbering),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createElementVNode("view", { class: "contenbx1" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "配送数："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.planNum),
-                                1
-                                /* TEXT */
-                              )
-                            ]),
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "已扫码数："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.signedNum),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createElementVNode(
-                            "view",
-                            {
-                              class: vue.normalizeClass(item.orderStatusStr == "齐套" ? "tip tp1" : item.orderStatusStr == "部分扫" ? "tip tp3" : "tip tp2")
-                            },
-                            vue.toDisplayString(item.orderStatusStr),
-                            3
-                            /* TEXT, CLASS */
-                          )
-                        ])) : vue.createCommentVNode("v-if", true),
-                        vue.unref(orderType) == 2 ? (vue.openBlock(), vue.createElementBlock("view", {
-                          key: 1,
-                          class: "itec",
-                          onClick: showsdqs
-                        }, [
-                          vue.createElementVNode("view", { class: "contenbx1" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "SKU："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.sku),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createElementVNode("view", { class: "contenbx1" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "物品："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.descriptionGoods),
-                                1
-                                /* TEXT */
-                              )
-                            ]),
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "规格："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.specification),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createElementVNode("view", { class: "contenbx1" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "单位："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.cargoUnit),
-                                1
-                                /* TEXT */
-                              )
-                            ]),
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "自提数："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.quantity),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createCommentVNode(` <view :class="item.signforNub==0?'tip tp2':item.signforNub==item.reservationNum?'tip tp1':'tip tp3'">{{item.signforNub==0?'未扫':item.signforNub==item.reservationNum?'齐套':'部分扫'}}</view> `)
-                        ])) : vue.createCommentVNode("v-if", true),
-                        vue.createCommentVNode(" 零担 "),
-                        vue.unref(orderType) == 3 ? (vue.openBlock(), vue.createElementBlock("view", {
-                          key: 2,
-                          class: "itec",
-                          onClick: ($event) => showsTipsZero(item)
-                        }, [
-                          vue.createElementVNode("view", { class: "contenbx1" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "订单号："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.orderCode),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createElementVNode("view", { class: "contenbx1" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "运单号："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.waybillNumber),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createElementVNode("view", { class: "contenbx1" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "产品名称："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.descriptionGoods),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ]),
-                          vue.createElementVNode("view", { class: "contenbx1" }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "预计签收件数："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.reservationQuantity),
-                                1
-                                /* TEXT */
-                              )
-                            ]),
-                            vue.createElementVNode("view", null, [
-                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "实际签收件数："),
-                              vue.createTextVNode(
-                                vue.toDisplayString(item.signforQuantity),
-                                1
-                                /* TEXT */
-                              )
-                            ])
-                          ])
-                        ], 8, ["onClick"])) : vue.createCommentVNode("v-if", true)
-                      ],
-                      64
-                      /* STABLE_FRAGMENT */
-                    );
-                  }),
-                  128
-                  /* KEYED_FRAGMENT */
-                ))
-              ])
-            ]),
+            vue.createVNode(
+              _component_BasicContainer,
+              {
+                ref_key: "basicContainer",
+                ref: basicContainer,
+                option
+              },
+              {
+                head: vue.withCtx(() => [
+                  vue.createElementVNode("view", { class: "hdtpnum" }, [
+                    vue.createElementVNode("view", null, [
+                      vue.createElementVNode("view", null, "订单总数"),
+                      vue.createElementVNode(
+                        "view",
+                        null,
+                        vue.toDisplayString(details.orderNum || 0),
+                        1
+                        /* TEXT */
+                      )
+                    ]),
+                    vue.createElementVNode("view", null, [
+                      vue.createElementVNode("view", null, "齐套数"),
+                      vue.createElementVNode(
+                        "view",
+                        null,
+                        vue.toDisplayString(details.completeNum || 0),
+                        1
+                        /* TEXT */
+                      )
+                    ]),
+                    vue.createElementVNode("view", null, [
+                      vue.createElementVNode("view", null, "自提件数"),
+                      vue.createElementVNode(
+                        "view",
+                        null,
+                        vue.toDisplayString(details.planNum || 0),
+                        1
+                        /* TEXT */
+                      )
+                    ]),
+                    vue.createElementVNode("view", null, [
+                      vue.createElementVNode("view", null, "签收件数"),
+                      vue.createElementVNode(
+                        "view",
+                        null,
+                        vue.toDisplayString(details.signedNum || 0),
+                        1
+                        /* TEXT */
+                      )
+                    ]),
+                    vue.createElementVNode("view", null, [
+                      vue.createElementVNode("view", null, "库存品数"),
+                      vue.createElementVNode(
+                        "view",
+                        null,
+                        vue.toDisplayString(details.inventoryNub || 0),
+                        1
+                        /* TEXT */
+                      )
+                    ])
+                  ]),
+                  vue.createElementVNode("view", { class: "scinp" }, [
+                    vue.createElementVNode("view", null, "齐套状态"),
+                    vue.createElementVNode("view", null, [
+                      vue.createVNode(cusSelects, {
+                        onChange: checktype,
+                        data: vue.unref(typearr),
+                        value: vue.unref(schanvalue),
+                        placeholder: "全部",
+                        arrLeft: 5,
+                        size: "145",
+                        clearable: true
+                      }, null, 8, ["data", "value"])
+                    ]),
+                    vue.createElementVNode("view", { class: "inputs" }, [
+                      vue.withDirectives(vue.createElementVNode(
+                        "input",
+                        {
+                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(orderCode) ? orderCode.value = $event : null),
+                          placeholder: "请输入查询的订单号"
+                        },
+                        null,
+                        512
+                        /* NEED_PATCH */
+                      ), [
+                        [vue.vModelText, vue.unref(orderCode)]
+                      ])
+                    ]),
+                    vue.createElementVNode("view", {
+                      class: "btscan",
+                      onClick: search
+                    }, "查询")
+                  ]),
+                  vue.createElementVNode("view", { class: "tabtip" }, [
+                    vue.createElementVNode("view", {
+                      onClick: _cache[1] || (_cache[1] = ($event) => setorderStatus(1))
+                    }, [
+                      vue.createElementVNode(
+                        "view",
+                        {
+                          class: vue.normalizeClass(vue.unref(orderType) == 1 ? "xz" : "")
+                        },
+                        "定制品",
+                        2
+                        /* CLASS */
+                      )
+                    ]),
+                    vue.createElementVNode("view", {
+                      onClick: _cache[2] || (_cache[2] = ($event) => setorderStatus(2))
+                    }, [
+                      vue.createElementVNode(
+                        "view",
+                        {
+                          class: vue.normalizeClass(vue.unref(orderType) == 2 ? "xz" : "")
+                        },
+                        "库存品",
+                        2
+                        /* CLASS */
+                      )
+                    ]),
+                    vue.createElementVNode("view", {
+                      onClick: _cache[3] || (_cache[3] = ($event) => setorderStatus(3))
+                    }, [
+                      vue.createElementVNode(
+                        "view",
+                        {
+                          class: vue.normalizeClass(vue.unref(orderType) == 3 ? "xz" : "")
+                        },
+                        "零担",
+                        2
+                        /* CLASS */
+                      )
+                    ])
+                  ])
+                ]),
+                body: vue.withCtx(() => [
+                  vue.createElementVNode("scroll-view", {
+                    class: "scve",
+                    "scroll-y": "true"
+                  }, [
+                    vue.createElementVNode("view", { class: "mabx" }, [
+                      (vue.openBlock(true), vue.createElementBlock(
+                        vue.Fragment,
+                        null,
+                        vue.renderList(vue.unref(datalist), (item) => {
+                          return vue.openBlock(), vue.createElementBlock(
+                            vue.Fragment,
+                            { key: item },
+                            [
+                              vue.unref(orderType) == 1 ? (vue.openBlock(), vue.createElementBlock("view", {
+                                key: 0,
+                                class: "itec",
+                                onClick: showsdqs
+                              }, [
+                                vue.createElementVNode("view", { class: "contenbx1" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "订单编号："),
+                                    vue.createTextVNode(
+                                      " " + vue.toDisplayString(item.orderSelfNumbering),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createElementVNode("view", { class: "contenbx1" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "配送数："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.planNum),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ]),
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "已扫码数："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.signedNum),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createElementVNode(
+                                  "view",
+                                  {
+                                    class: vue.normalizeClass(item.orderStatusStr == "齐套" ? "tip tp1" : item.orderStatusStr == "部分扫" ? "tip tp3" : "tip tp2")
+                                  },
+                                  vue.toDisplayString(item.orderStatusStr),
+                                  3
+                                  /* TEXT, CLASS */
+                                )
+                              ])) : vue.createCommentVNode("v-if", true),
+                              vue.unref(orderType) == 2 ? (vue.openBlock(), vue.createElementBlock("view", {
+                                key: 1,
+                                class: "itec",
+                                onClick: showsdqs
+                              }, [
+                                vue.createElementVNode("view", { class: "contenbx1" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "SKU："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.sku),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createElementVNode("view", { class: "contenbx1" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "物品："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.descriptionGoods),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ]),
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "规格："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.specification),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createElementVNode("view", { class: "contenbx1" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "单位："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.cargoUnit),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ]),
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "自提数："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.quantity),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createCommentVNode(` <view :class="item.signforNub==0?'tip tp2':item.signforNub==item.reservationNum?'tip tp1':'tip tp3'">{{item.signforNub==0?'未扫':item.signforNub==item.reservationNum?'齐套':'部分扫'}}</view> `)
+                              ])) : vue.createCommentVNode("v-if", true),
+                              vue.createCommentVNode(" 零担 "),
+                              vue.unref(orderType) == 3 ? (vue.openBlock(), vue.createElementBlock("view", {
+                                key: 2,
+                                class: "itec",
+                                onClick: ($event) => showsTipsZero(item)
+                              }, [
+                                vue.createElementVNode("view", { class: "contenbx1" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "订单号："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.orderCode),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createElementVNode("view", { class: "contenbx1" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "运单号："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.waybillNumber),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createElementVNode("view", { class: "contenbx1" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "产品名称："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.descriptionGoods),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ]),
+                                vue.createElementVNode("view", { class: "contenbx1" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "预计签收件数："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.reservationQuantity),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ]),
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "实际签收件数："),
+                                    vue.createTextVNode(
+                                      vue.toDisplayString(item.signforQuantity),
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
+                                ])
+                              ], 8, ["onClick"])) : vue.createCommentVNode("v-if", true)
+                            ],
+                            64
+                            /* STABLE_FRAGMENT */
+                          );
+                        }),
+                        128
+                        /* KEYED_FRAGMENT */
+                      ))
+                    ])
+                  ])
+                ]),
+                _: 1
+                /* STABLE */
+              },
+              512
+              /* NEED_PATCH */
+            ),
             vue.createVNode(
               _component_tiplist,
               {
@@ -14698,13 +14770,13 @@ This will fail in production if not fixed.`);
       onShow(() => {
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:172", code2);
+            formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:173", code2);
             details.scancode = code2;
             sacn();
           }
         });
-        details.dataList = details.orderList;
         initpage();
+        details.dataList = details.orderList;
       });
       function goorderdetail(item) {
         uni.navigateTo({
@@ -14743,7 +14815,7 @@ This will fail in production if not fixed.`);
         });
       }
       function showsTipsZero(item) {
-        formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:218", "item :>> ", item);
+        formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:219", "item :>> ", item);
         const inpList = [
           {
             title: item.firsts,
@@ -14763,7 +14835,7 @@ This will fail in production if not fixed.`);
           inputtext: "",
           success: async (detail) => {
             try {
-              formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:241", "item :>> ", item);
+              formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:242", "item :>> ", item);
               const { inpList: [_info] } = detail;
               if (_info.disabled)
                 tiplists.value.setdetails({ isshow: false });
@@ -14777,11 +14849,11 @@ This will fail in production if not fixed.`);
                 stockArticleId: item.stockArticleId,
                 quantity: _info.value
               };
-              const res2 = await billLadinggetZeroBillPack({ billLadingId: details.billLadingId, billLadingZeroVO: submitForm });
-              if (res2.code === 200)
+              const res = await billLadinggetZeroBillPack({ billLadingId: details.billLadingId, billLadingZeroVO: submitForm });
+              if (res.code === 200)
                 initpage();
             } catch (err) {
-              formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:259", "err :>> ", err);
+              formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:260", "err :>> ", err);
             } finally {
               tiplists.value.setdetails({ isshow: false });
             }
@@ -14803,64 +14875,76 @@ This will fail in production if not fixed.`);
             coding: details.scancode,
             type: details.orderType == 1 ? "2" : "1"
           };
-          let res2 = await billLadingscan(data);
-          formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:284", res2);
-          if (res2.code == 200) {
+          let res = await billLadingscan(data);
+          formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:285", res);
+          if (res.code == 200) {
             details.isscan = true;
             initpage();
-          } else if (res2.code === 3001) {
+          } else if (res.code === 3001) {
             uni.showToast({
-              title: res2.msg,
+              title: res.msg,
               icon: "none"
             });
-            utils2.ttsspke(res2.audio);
+            utils2.ttsspke(res.audio);
           }
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:297", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:298", "err :>> ", err);
         } finally {
         }
       }
       async function initpage() {
         details.dataList = [];
-        formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:304", "获取数据");
-        if (details.orderType == 1) {
-          let data = {
-            orderStatus: details.orderStatus,
-            billLadingId: details.billLadingId,
-            orderCode: details.orderCode
-          };
-          let response = await billLadingdetailList(data);
-          if (response.code !== 200)
-            return;
-          details.orderList = response.data.list;
-          details.consignee = response.data.consignee;
-          details.pickUpPlate = response.data.pickUpPlate;
-          details.carTypeStr = response.data.carTypeStr;
-          details.orderNum = response.data.orderNum;
-          details.planNum = response.data.planNum;
-          details.completeNum = response.data.completeNum;
-          details.signedNum = response.data.signedNum;
-        } else if (details.orderType == 2) {
-          let data = {
-            orderStatus: details.orderStatus,
-            id: details.billLadingId,
-            orderCode: details.orderCode,
-            current: 1,
-            size: 10
-          };
-          let response = await billLadinggetInventoryNum(data);
-          if (response.code !== 200)
-            return;
-          details.zeroList = response.data.records;
-        } else if (details.orderType == 3) {
-          let data = {
-            billLadingId: details.billLadingId
-          };
-          const response = await billLadingzeroBillData(data);
-          formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:338", "response :>> ", response);
-          if (response.code !== 200)
-            return;
-          details.stockList = response.data || [];
+        try {
+          uni.showLoading({
+            title: "数据加载中",
+            mask: true
+          });
+          formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:311", "获取数据");
+          if (details.orderType == 1) {
+            let data = {
+              orderStatus: details.orderStatus,
+              billLadingId: details.billLadingId,
+              orderCode: details.orderCode
+            };
+            let response = await billLadingdetailList(data);
+            if (response.code !== 200)
+              return;
+            details.orderList = response.data.list || [];
+            details.consignee = response.data.consignee;
+            details.pickUpPlate = response.data.pickUpPlate;
+            details.carTypeStr = response.data.carTypeStr;
+            details.orderNum = response.data.orderNum;
+            details.planNum = response.data.planNum;
+            details.completeNum = response.data.completeNum;
+            details.signedNum = response.data.signedNum;
+            details.dataList = details.orderList;
+          } else if (details.orderType == 2) {
+            let data = {
+              orderStatus: details.orderStatus,
+              id: details.billLadingId,
+              orderCode: details.orderCode,
+              current: 1,
+              size: 10
+            };
+            let response = await billLadinggetInventoryNum(data);
+            if (response.code !== 200)
+              return;
+            details.zeroList = response.data.records || [];
+            details.dataList = details.zeroList;
+          } else if (details.orderType == 3) {
+            let data = {
+              billLadingId: details.billLadingId
+            };
+            const response = await billLadingzeroBillData(data);
+            formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:347", "response :>> ", response);
+            if (response.code !== 200)
+              return;
+            details.stockList = response.data || [];
+            details.dataList = details.stockList;
+          }
+        } catch (e) {
+        } finally {
+          uni.hideLoading();
         }
       }
       function setorderStatus(state) {
@@ -14881,12 +14965,13 @@ This will fail in production if not fixed.`);
           if (item.value == e) {
             details.schanvalue = item.label;
             details.orderStatus = item.value;
-            formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:358", details.schanvalue);
+            formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:373", details.schanvalue);
           }
         });
       }
       const { orderType, schanvalue, typearr, dataList } = vue.toRefs(details);
       return (_ctx, _cache) => {
+        const _component_BasicContainer = vue.resolveComponent("BasicContainer");
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
         const _component_uni_th = resolveEasycom(vue.resolveDynamicComponent("uni-th"), __easycom_1$1);
         const _component_uni_tr = resolveEasycom(vue.resolveDynamicComponent("uni-tr"), __easycom_2$1);
@@ -14899,6 +14984,10 @@ This will fail in production if not fixed.`);
           null,
           [
             vue.createCommentVNode(` <u-navbar title="自提明细扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> `),
+            vue.createVNode(_component_BasicContainer, {
+              ref: "basicContainer",
+              option: _ctx.option
+            }, null, 8, ["option"]),
             vue.createVNode(_component_u_navbar, {
               title: "自提明细扫描",
               bgColor: "#D3832A",
@@ -16001,8 +16090,8 @@ This will fail in production if not fixed.`);
               type: 1,
               barcode: details.scancode
             };
-            let res2 = await deliveryloadingscan(data);
-            const { code: code2, audio } = res2;
+            let res = await deliveryloadingscan(data);
+            const { code: code2, audio } = res;
             if (code2 === 5e3) {
               utils2.ttsspke("不在本次计划, 是否继续装车");
               tiplists.value.setdetails({
@@ -16020,8 +16109,8 @@ This will fail in production if not fixed.`);
                     type: 1,
                     barcode: details.scancode
                   };
-                  const res22 = await postAbnormalTruckLoading(data2);
-                  formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:514", "res :>> ", res22);
+                  const res2 = await postAbnormalTruckLoading(data2);
+                  formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:514", "res :>> ", res2);
                   tiplists.value.setdetails({ isshow: false });
                 },
                 cancel: () => {
@@ -16042,12 +16131,12 @@ This will fail in production if not fixed.`);
               type: 1,
               barcode: details.scancode
             };
-            let res2 = await deliveryloadinginventory(data);
-            const { audio } = res2;
-            formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:538", "res   :>> ", res2);
+            let res = await deliveryloadinginventory(data);
+            const { audio } = res;
+            formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:538", "res   :>> ", res);
             if (!audio)
               return;
-            utils2.ttsspke(res2.audio);
+            utils2.ttsspke(res.audio);
           }
         } catch (err) {
           formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:545", "err :>> ", err);
@@ -16103,9 +16192,9 @@ This will fail in production if not fixed.`);
                     loadingNum: val.value
                   };
                 });
-                const res2 = await deliveryZeroLoading(data);
-                if (res2.audio) {
-                  utils2.ttsspke(res2.audio);
+                const res = await deliveryZeroLoading(data);
+                if (res.audio) {
+                  utils2.ttsspke(res.audio);
                 }
                 uni.startPullDownRefresh();
               } catch (err) {
@@ -16679,9 +16768,9 @@ This will fail in production if not fixed.`);
           type: 1,
           barcode: details.scancode
         };
-        let res2 = await deliveryloadingscan(data);
-        formatAppLog("log", "at pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue:209", res2);
-        if (res2.code == 200)
+        let res = await deliveryloadingscan(data);
+        formatAppLog("log", "at pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue:209", res);
+        if (res.code == 200)
           ;
       }
       async function initpage() {
@@ -17003,9 +17092,9 @@ This will fail in production if not fixed.`);
         }, 500);
       });
       async function getconfig() {
-        let res2 = await dictbizdictionary({ code: "photo_type" });
-        formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:163", "res1>>>>", res2);
-        const { code: code2, data } = res2;
+        let res = await dictbizdictionary({ code: "photo_type" });
+        formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:163", "res1>>>>", res);
+        const { code: code2, data } = res;
         if (code2 === 200) {
           details.imgList = data.map((value) => {
             return {
@@ -17064,13 +17153,13 @@ This will fail in production if not fixed.`);
         let data = {
           reservationId: item.id
         };
-        let res2 = await signforprices(data);
-        formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:237", "res>>>>>", res2);
+        let res = await signforprices(data);
+        formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:237", "res>>>>>", res);
         let imglis = [], rearks = "";
-        if (res2.code == 200) {
-          if (Object.keys(res2.data.deliverySignPictures).length !== 0 || res2.data.driverRemarks) {
+        if (res.code == 200) {
+          if (Object.keys(res.data.deliverySignPictures).length !== 0 || res.data.driverRemarks) {
             details.isChange = true;
-            imglis = res2.data.deliverySignPictures;
+            imglis = res.data.deliverySignPictures;
             details.imgList.forEach((item2, index2) => {
               if (!imglis[item2.dictKey])
                 return;
@@ -17080,8 +17169,8 @@ This will fail in production if not fixed.`);
           } else {
             details.isChange = false;
           }
-          if (res2.data.driverRemarks) {
-            rearks = res2.data.driverRemarks;
+          if (res.data.driverRemarks) {
+            rearks = res.data.driverRemarks;
           }
         }
         const response = await signforSignNum({ ...data, id: details.id });
@@ -17106,7 +17195,7 @@ This will fail in production if not fixed.`);
               map: {},
               driverRemarks: detail.inputtext
             };
-            let res22 = null;
+            let res2 = null;
             let isSubmit = true;
             formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:288", "details.ImagesRequiredFields :>> ", details.ImagesRequiredFields);
             if (details.isChange) {
@@ -17127,7 +17216,7 @@ This will fail in production if not fixed.`);
                 utils.ttsspke("必传照片不足");
                 return;
               }
-              res22 = await signforUpdatePicture(data2);
+              res2 = await signforUpdatePicture(data2);
             } else {
               formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:308", "details.imgList :>> ", details.imgList);
               detail.imglist.forEach((item2) => {
@@ -17147,12 +17236,12 @@ This will fail in production if not fixed.`);
                 utils.ttsspke("必传照片不足");
                 return;
               }
-              res22 = await signforsignforack(data2);
+              res2 = await signforsignforack(data2);
             }
-            if (res22.code == 200) {
+            if (res2.code == 200) {
               initpage();
               uni.showToast({
-                title: res22.msg,
+                title: res2.msg,
                 icon: "none"
               });
             }
@@ -17176,18 +17265,31 @@ This will fail in production if not fixed.`);
           imglist: [],
           maximglength: 20,
           success: async (detail) => {
-            let data = {
-              deliveryId: details.id,
-              reservationId: item.id,
-              deliverySignPictures: detail.imglist.join(","),
-              driverRemarks: detail.inputtext
-            };
-            let res2 = await signforoneclick(data);
-            formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:361", res2);
-            if (res2.code == 200) {
-              initpage();
+            try {
+              uni.showLoading({
+                title: "提交中",
+                mask: true
+              });
+              let data = {
+                deliveryId: details.id,
+                reservationId: item.id,
+                deliverySignPictures: detail.imglist.join(","),
+                driverRemarks: detail.inputtext
+              };
+              let res = await signforoneclick(data);
+              if (res.code == 200) {
+                uni.showToast({
+                  title: "签收成功",
+                  icon: "none"
+                });
+                utils.ttsspke("成功签收" + deliveryNumber.value + "件");
+                initpage();
+              }
+            } catch (e) {
+            } finally {
+              uni.hideLoading();
+              tiplists.value.setdetails({ isshow: false });
             }
-            tiplists.value.setdetails({ isshow: false });
           },
           cancel: () => {
             tiplists.value.setdetails({ isshow: false });
@@ -17198,33 +17300,33 @@ This will fail in production if not fixed.`);
         });
       }
       function getLocation(item) {
-        formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:377", "getLocation-------");
+        formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:392", "getLocation-------");
         uni.getLocation({
           type: "wgs84",
           geocode: true,
           isHighAccuracy: true,
-          success: async function(res2) {
+          success: async function(res) {
             try {
               uni.showLoading({
                 title: "打卡中",
                 mask: true
               });
-              formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:388", JSON.stringify(res2));
-              formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:391", "当前位置的经度：" + res2.longitude);
-              formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:392", "当前位置的纬度：" + res2.latitude);
+              formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:403", JSON.stringify(res));
+              formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:406", "当前位置的经度：" + res.longitude);
+              formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:407", "当前位置的纬度：" + res.latitude);
               let data = {
                 deliveryId: details.id,
                 reservationId: item.id,
-                positioning: res2.longitude + "," + res2.latitude,
+                positioning: res.longitude + "," + res.latitude,
                 positioningAdr: ""
               };
               let response = await signforpositioning(data);
-              formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:400", response);
+              formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:415", response);
               if (response.code == 200) {
                 initpage();
               }
             } catch (err) {
-              formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:406", "err :>> ", err);
+              formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:421", "err :>> ", err);
             } finally {
               uni.hideLoading();
             }
@@ -17234,7 +17336,7 @@ This will fail in production if not fixed.`);
               title: "定位失败",
               icon: "none"
             });
-            formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:418", err);
+            formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:433", err);
             uni.hideLoading();
           }
         });
@@ -17815,11 +17917,11 @@ This will fail in production if not fixed.`);
                     signingNum: val.value
                   };
                 });
-                const res2 = await signforZeroSignfor(data);
-                if (res2.code !== 200)
+                const res = await signforZeroSignfor(data);
+                if (res.code !== 200)
                   return;
-                if (res2.audio) {
-                  utils2.ttsspke(res2.audio);
+                if (res.audio) {
+                  utils2.ttsspke(res.audio);
                 }
                 initpage();
               } catch (err) {
@@ -18330,17 +18432,17 @@ This will fail in production if not fixed.`);
           signforState: details.signforState
         };
         if (details.orderStatus == 1) {
-          let res2 = await signforwrap(data);
-          if (res2.code !== 200)
+          let res = await signforwrap(data);
+          if (res.code !== 200)
             return;
-          formatAppLog("log", "at pagesHome/pages/SignDetailScan/SignDetailScan.vue:181", res2);
-          details.datalist = res2.data.records;
+          formatAppLog("log", "at pagesHome/pages/SignDetailScan/SignDetailScan.vue:181", res);
+          details.datalist = res.data.records;
         } else if (details.orderStatus == 2) {
-          let res2 = await signforwrapIn(data);
-          if (res2.code !== 200)
+          let res = await signforwrapIn(data);
+          if (res.code !== 200)
             return;
-          formatAppLog("log", "at pagesHome/pages/SignDetailScan/SignDetailScan.vue:186", res2);
-          details.datalist = res2.data.records;
+          formatAppLog("log", "at pagesHome/pages/SignDetailScan/SignDetailScan.vue:186", res);
+          details.datalist = res.data.records;
         }
       }
       function checktype(type, e) {
@@ -18917,9 +19019,9 @@ This will fail in production if not fixed.`);
           status: details.completeStact ? 1 : 0,
           id: details.orderpackgedetails.stockListId
         };
-        let res2 = await distributionStockupstockupScan(data);
-        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:276", res2);
-        if (res2.code == 200) {
+        let res = await distributionStockupstockupScan(data);
+        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:276", res);
+        if (res.code == 200) {
           initpage();
         }
       }
@@ -19606,10 +19708,10 @@ This will fail in production if not fixed.`);
           });
           antiShake = setTimeout(async () => {
             details.pageNum += 1;
-            const res2 = await initpage();
+            const res = await initpage();
             uni.hideLoading();
             antiShake = null;
-            if (res2.data && res2.data.records.length < details.pageSize) {
+            if (res.data && res.data.records.length < details.pageSize) {
               uni.showToast({
                 title: "已经到底了",
                 icon: "success"
@@ -19659,19 +19761,19 @@ This will fail in production if not fixed.`);
         let data = {
           trayCode: details.scancode
         };
-        let res2 = await warehouseTrayTypeorderScanTrayCode(data);
-        if (res2.code !== 200)
+        let res = await warehouseTrayTypeorderScanTrayCode(data);
+        if (res.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:239", "res", res2);
-        if (Number(res2.data.isHasData) === 0) {
+        formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:239", "res", res);
+        if (Number(res.data.isHasData) === 0) {
           utils.ttsspke("请选择分拣方式");
-          uni.setStorageSync("trayCodeType", res2.data.data);
+          uni.setStorageSync("trayCodeType", res.data.data);
           uni.navigateTo({
             url: "/pagesHome/pages/ScanSortingType/ScanSortingType?trayCode=" + details.scancode
           });
         } else {
           uni.navigateTo({
-            url: "/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode=" + res2.data.data.trayCode + "&trayType=" + res2.data.data.trayType
+            url: "/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode=" + res.data.data.trayCode + "&trayType=" + res.data.data.trayType
           });
         }
       }
@@ -19683,16 +19785,16 @@ This will fail in production if not fixed.`);
             createDateStart: date2.value[0] || "",
             createDateEnd: date2.value[1] || ""
           };
-          const res2 = await warehouseTrayTypeorderPageList(submitData);
-          if (res2.code !== 200)
+          const res = await warehouseTrayTypeorderPageList(submitData);
+          if (res.code !== 200)
             return;
-          const { code: code2, data } = res2;
+          const { code: code2, data } = res;
           if (code2 === 200 && data)
             details.datalist = [...details.datalist, ...data.records];
           if (data && data.pages <= details.pageNum)
             option.isEnd = true;
           formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:267", "details.datalist :>> ", details.datalist);
-          return res2;
+          return res;
         } catch (err) {
           formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:271", "err :>> ", err);
         }
@@ -19742,7 +19844,10 @@ This will fail in production if not fixed.`);
           vue.Fragment,
           null,
           [
-            vue.createVNode(_component_BasicContainer, { option }, {
+            vue.createVNode(_component_BasicContainer, {
+              option,
+              leftClick: option.leftClick
+            }, {
               head: vue.withCtx(() => [
                 vue.createElementVNode("view", { class: "headtop" }, [
                   vue.createElementVNode("view", null, [
@@ -19925,7 +20030,7 @@ This will fail in production if not fixed.`);
               ]),
               _: 1
               /* STABLE */
-            }, 8, ["option"]),
+            }, 8, ["option", "leftClick"]),
             vue.createVNode(_component_l_calendar, {
               value: vue.unref(show),
               "onUpdate:value": _cache[3] || (_cache[3] = ($event) => vue.isRef(show) ? show.value = $event : null),
@@ -20361,10 +20466,10 @@ This will fail in production if not fixed.`);
               trayCode: details.trayCode,
               orderCode: item.dataCode
             };
-            let res2 = await warehouseTrayTypedeleteOrderCode(data);
-            if (res2.code !== 200)
+            let res = await warehouseTrayTypedeleteOrderCode(data);
+            if (res.code !== 200)
               return;
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:472", "res :>> ", res2);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:472", "res :>> ", res);
             initlist();
             tip.value.setisshow(false);
           },
@@ -20411,9 +20516,9 @@ This will fail in production if not fixed.`);
             let data = {
               trayGoodsId: item.trayGoodsId
             };
-            let res2 = await warehouseTrayTypedeleteStockByTrayGoodsId(data);
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:526", "res :>> ", res2);
-            if (res2.code == 200) {
+            let res = await warehouseTrayTypedeleteStockByTrayGoodsId(data);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:526", "res :>> ", res);
+            if (res.code == 200) {
               initlist();
             }
             tip.value.setdetails({ isshow: false });
@@ -20430,13 +20535,13 @@ This will fail in production if not fixed.`);
         let data = {
           trayCode: details.trayCode
         };
-        let res2 = await warehouseTrayTypeorderScanTrayCode(data);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:546", res2.data, "resresresres");
-        if (res2.code == 200) {
-          if (res2.data.isHasData == 1) {
-            details.detauser = res2.data.data;
-            details.stock.marketId = res2.data.data.marketId;
-            details.Remarktext = res2.data.data.reamrk;
+        let res = await warehouseTrayTypeorderScanTrayCode(data);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:546", res.data, "resresresres");
+        if (res.code == 200) {
+          if (res.data.isHasData == 1) {
+            details.detauser = res.data.data;
+            details.stock.marketId = res.data.data.marketId;
+            details.Remarktext = res.data.data.reamrk;
             formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:554", " details.detauser :>> ", details.detauser);
             if (details.tabBarState === 1)
               details.datelist = details.detauser.packageList;
@@ -20445,14 +20550,14 @@ This will fail in production if not fixed.`);
             else if (details.tabBarState === 3)
               details.datelist = details.detauser.stockList;
           } else {
-            res2.data.data.map((item) => {
+            res.data.data.map((item) => {
               if (item.dictKey == details.trayType) {
                 details.trayCodevalue = item.dictValue;
               }
             });
           }
         }
-        return res2;
+        return res;
       }
       function scandata() {
         if (details.scancode[0] === "T")
@@ -20468,18 +20573,18 @@ This will fail in production if not fixed.`);
         let data = {
           trayCode: details.scancode
         };
-        let res2 = await warehouseTrayTypeorderScanTrayCode(data);
-        if (res2.code !== 200)
+        let res = await warehouseTrayTypeorderScanTrayCode(data);
+        if (res.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:591", "res", res2);
-        if (Number(res2.data.isHasData) === 0) {
-          uni.setStorageSync("trayCodeType", res2.data.data);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:591", "res", res);
+        if (Number(res.data.isHasData) === 0) {
+          uni.setStorageSync("trayCodeType", res.data.data);
           uni.navigateTo({
             url: "/pagesHome/pages/ScanSortingType/ScanSortingType?trayCode=" + details.scancode
           });
         } else {
           uni.navigateTo({
-            url: "/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode=" + res2.data.data.trayCode + "&trayType=" + res2.data.data.trayType
+            url: "/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode=" + res.data.data.trayCode + "&trayType=" + res.data.data.trayType
           });
         }
       }
@@ -20492,9 +20597,9 @@ This will fail in production if not fixed.`);
         };
         let response = await warehouseTrayTypeorderScanOrderPackageCode(submitData);
         formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:616", "response", response);
-        const res2 = await initlist();
-        const { code: code2 } = res2;
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:620", "res :>> ", res2);
+        const res = await initlist();
+        const { code: code2 } = res;
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:620", "res :>> ", res);
         formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:622", "details.scancode :>> ", details.scancode);
         if (code2 !== 200)
           return;
@@ -20513,8 +20618,8 @@ This will fail in production if not fixed.`);
         let data = {
           orderPackageCode: details.scancode
         };
-        const res2 = warehouseTrayTypeenterStockNoDataMaterialCode(data);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:651", "res :>> ", res2);
+        const res = warehouseTrayTypeenterStockNoDataMaterialCode(data);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:651", "res :>> ", res);
       }
       async function setTabBarState(state) {
         details.tabBarState = state;
@@ -20532,11 +20637,11 @@ This will fail in production if not fixed.`);
         formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:674", "111 :>> ", 111);
         formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:676", "details.datelist :>> ", details.datelist.length);
         if (details.datelist.length === 0) {
-          const res2 = await warehouseTrayTypefindAllMarket({});
-          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:680", "res :>> ", res2);
-          if (res2.code !== 200)
+          const res = await warehouseTrayTypefindAllMarket({});
+          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:680", "res :>> ", res);
+          if (res.code !== 200)
             return;
-          const _marketArr = res2.data;
+          const _marketArr = res.data;
           const list = _marketArr.map((val) => val.marketName);
           tiplists.value.setdetails({
             isshow: true,
@@ -20662,8 +20767,8 @@ This will fail in production if not fixed.`);
           trayCode: details.trayCode,
           zeroList
         };
-        let res2 = await warehouseTrayenterZeroOrderByTrayCode(data);
-        if (res2.code == 200) {
+        let res = await warehouseTrayenterZeroOrderByTrayCode(data);
+        if (res.code == 200) {
           setshowstate(0);
           initlist();
           details.codelist = [];
@@ -20675,10 +20780,10 @@ This will fail in production if not fixed.`);
           marketId: details.stock.marketId,
           materialCode: details.stock.materialCode
         };
-        let res2 = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data);
-        if (res2.code !== 200)
+        let res = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data);
+        if (res.code !== 200)
           return;
-        details.stock.searchStockList = res2.data.filter((val) => val.quantityStock !== 0);
+        details.stock.searchStockList = res.data.filter((val) => val.quantityStock !== 0);
       }
       async function confirmlur() {
         try {
@@ -20705,8 +20810,8 @@ This will fail in production if not fixed.`);
               return warehouseTrayTypeenterStockNoDataMaterialCode(data);
             }
           });
-          Promise.all(PromiseArr).then((res2) => {
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:888", "res :>> ", res2);
+          Promise.all(PromiseArr).then((res) => {
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:888", "res :>> ", res);
             setshowstate(0);
             initlist();
             details.stock.searchStockList = [];
@@ -20801,8 +20906,11 @@ This will fail in production if not fixed.`);
             text += orderListText;
             text += "FORM\r\n";
             text += "PRINT\r\n";
-            utils.getbl(bluetoothInfo.value, text);
-            tiplists.value.setdetails({ isshow: false });
+            utils.getbl(bluetoothInfo.value, text).then(() => {
+              return tiplists.value.setdetails({ isshow: false });
+            }).catch(() => {
+              return bluetoothList.value.setdetails({ isshow: true });
+            });
           },
           cancel: (details2) => {
             tiplists.value.setdetails({ isshow: false });
@@ -20813,7 +20921,6 @@ This will fail in production if not fixed.`);
         });
       };
       function backPage() {
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:1033", "111 :>> ", 111);
         uni.redirectTo({
           url: "/pagesHome/pages/scansorting/scansorting"
         });
@@ -21925,8 +22032,8 @@ This will fail in production if not fixed.`);
           trayCode: details.trayCode,
           zeroList
         };
-        let res2 = await warehouseTrayenterZeroOrderByTrayCode(data);
-        if (res2.code == 200) {
+        let res = await warehouseTrayenterZeroOrderByTrayCode(data);
+        if (res.code == 200) {
           setshowstate(0);
           initpage();
           details.codelist = [];
@@ -22511,11 +22618,11 @@ This will fail in production if not fixed.`);
         let data = {
           trayCode: details.trayCode
         };
-        let res2 = await warehouseTrayTypestockScanTrayCode(data);
-        if (res2.code !== 200)
+        let res = await warehouseTrayTypestockScanTrayCode(data);
+        if (res.code !== 200)
           return;
-        details.Inventorydetail = res2.data.data;
-        details.datelist = res2.data.data.list;
+        details.Inventorydetail = res.data.data;
+        details.datelist = res.data.data.list;
       }
       async function scandata() {
         let data = {
@@ -22929,11 +23036,11 @@ This will fail in production if not fixed.`);
         let data = {
           warehouseCode: "LQ"
         };
-        let res2 = await warehouseTrayTypefindAllMarket(data);
-        formatAppLog("log", "at pagesHome/pages/inventoryenter/inventoryenter.vue:262", "Marketlist", res2.data);
-        if (res2.code !== 200)
+        let res = await warehouseTrayTypefindAllMarket(data);
+        formatAppLog("log", "at pagesHome/pages/inventoryenter/inventoryenter.vue:262", "Marketlist", res.data);
+        if (res.code !== 200)
           return;
-        details.Marketlist = res2.data;
+        details.Marketlist = res.data;
         let market = details.Marketlist.find((item) => {
           return item.marketId === details.marketId;
         });
@@ -22945,16 +23052,16 @@ This will fail in production if not fixed.`);
         let data = {
           trayCode: details.trayCode
         };
-        let res2 = await warehouseTrayTypestockNoDataScanTrayCode(data);
-        if (res2.code !== 200)
+        let res = await warehouseTrayTypestockNoDataScanTrayCode(data);
+        if (res.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/inventoryenter/inventoryenter.vue:277", "res.data >>>>>>>>>", res2.data);
-        details.marketId = res2.data.data.marketId;
+        formatAppLog("log", "at pagesHome/pages/inventoryenter/inventoryenter.vue:277", "res.data >>>>>>>>>", res.data);
+        details.marketId = res.data.data.marketId;
         formatAppLog("log", "at pagesHome/pages/inventoryenter/inventoryenter.vue:279", "details.marketId", details.marketId);
         initmarlist();
-        if ((_b = (_a = res2 == null ? void 0 : res2.data) == null ? void 0 : _a.data) == null ? void 0 : _b.list) {
-          details.datalist = (_d = (_c = res2 == null ? void 0 : res2.data) == null ? void 0 : _c.data) == null ? void 0 : _d.list;
-          details.trayTypeName = (_f = (_e = res2 == null ? void 0 : res2.data) == null ? void 0 : _e.data) == null ? void 0 : _f.trayTypeName;
+        if ((_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.data) == null ? void 0 : _b.list) {
+          details.datalist = (_d = (_c = res == null ? void 0 : res.data) == null ? void 0 : _c.data) == null ? void 0 : _d.list;
+          details.trayTypeName = (_f = (_e = res == null ? void 0 : res.data) == null ? void 0 : _e.data) == null ? void 0 : _f.trayTypeName;
         } else {
           details.datalist = [];
         }
@@ -22967,10 +23074,10 @@ This will fail in production if not fixed.`);
           marketId: details.marketId,
           materialCode: details.materialCode
         };
-        let res2 = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data);
-        if (res2.code !== 200)
+        let res = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data);
+        if (res.code !== 200)
           return;
-        details.scanlist = res2.data;
+        details.scanlist = res.data;
       }
       async function confirmlur() {
         if (details.maknumber > details.scanlist[0].quantityStock) {
@@ -23025,8 +23132,8 @@ This will fail in production if not fixed.`);
             let data = {
               trayGoodsId: item.trayGoodsId
             };
-            let res2 = await warehouseTrayTypedeleteStockByTrayGoodsId(data);
-            if (res2.code == 200) {
+            let res = await warehouseTrayTypedeleteStockByTrayGoodsId(data);
+            if (res.code == 200) {
               initpage();
             }
             tip.value.setdetails({ isshow: false });
@@ -23501,11 +23608,11 @@ This will fail in production if not fixed.`);
           });
           antiShake = setTimeout(async () => {
             details.pageNum += 1;
-            const res2 = await initpage();
+            const res = await initpage();
             uni.hideLoading();
             antiShake = null;
-            formatAppLog("log", "at pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue:156", "res :>> ", res2);
-            if (res2.data.records.length < details.pageSize || details.pageNum >= res2.pages) {
+            formatAppLog("log", "at pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue:156", "res :>> ", res);
+            if (res.data.records.length < details.pageSize || details.pageNum >= res.pages) {
               uni.showToast({
                 title: "已经到底了",
                 icon: "success"
@@ -23549,42 +23656,42 @@ This will fail in production if not fixed.`);
         let data = {
           trayCode: details.scancode
         };
-        let res2 = null;
+        let res = null;
         if (details.pageType == 1) {
-          res2 = await warehouseTrayTypestockScanTrayCode(data);
+          res = await warehouseTrayTypestockScanTrayCode(data);
         } else if (details.pageType == 2) {
-          res2 = await warehouseTrayTypestockNoDataScanTrayCode(data);
+          res = await warehouseTrayTypestockNoDataScanTrayCode(data);
         }
-        if (res2.code != 200) {
+        if (res.code != 200) {
           return;
         }
-        if (!res2.data.isHasData) {
-          uni.setStorageSync("trayCodeType", res2.data.data);
+        if (!res.data.isHasData) {
+          uni.setStorageSync("trayCodeType", res.data.data);
           uni.navigateTo({
             url: "/pagesHome/pages/inventoryType/inventoryType?type=" + details.pageType + "&trayCode=" + details.scancode
           });
         } else {
-          if (Number(details.pageType) == 1 && res2.data.data.type == 3) {
+          if (Number(details.pageType) == 1 && res.data.data.type == 3) {
             uni.navigateTo({
-              url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res2.data.data.trayType
+              url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType
             });
-          } else if (Number(details.pageType) == 2 && res2.data.data.type == 4) {
+          } else if (Number(details.pageType) == 2 && res.data.data.type == 4) {
             uni.navigateTo({
-              url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res2.data.data.trayType
+              url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType
             });
-          } else if (Number(details.pageType) == 2 && res2.data.data.type == 3) {
+          } else if (Number(details.pageType) == 2 && res.data.data.type == 3) {
             uni.navigateTo({
-              url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res2.data.data.trayType
+              url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType
             });
             return;
-          } else if (Number(details.pageType) == 1 && res2.data.data.type == 4) {
+          } else if (Number(details.pageType) == 1 && res.data.data.type == 4) {
             uni.navigateTo({
-              url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res2.data.data.trayType
+              url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType
             });
             return;
-          } else if (res2.data.data.type == 1 || res2.data.data.type == 2) {
+          } else if (res.data.data.type == 1 || res.data.data.type == 2) {
             uni.navigateTo({
-              url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res2.data.data.trayType
+              url: "/pagesHome/pages/inventoryenter/inventoryenter?trayCode=" + details.scancode + "&trayType=" + res.data.data.trayType
             });
             return;
           }
@@ -23595,25 +23702,25 @@ This will fail in production if not fixed.`);
           pageNum: details.pageNum,
           pageSize: details.pageSize
         };
-        let res2 = null;
+        let res = null;
         if (details.pageType == 1) {
-          res2 = await warehouseTrayTypestockPageList(submitData);
+          res = await warehouseTrayTypestockPageList(submitData);
         } else if (details.pageType == 2) {
-          res2 = await warehouseTrayTypestockNoDataPageList(submitData);
+          res = await warehouseTrayTypestockNoDataPageList(submitData);
         }
-        formatAppLog("log", "at pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue:298", "res :>> ", res2);
-        const { code: code2, data } = res2;
+        formatAppLog("log", "at pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue:298", "res :>> ", res);
+        const { code: code2, data } = res;
         if (code2 === 200 && data)
           details.datelist = [...details.datelist, ...data.records];
         formatAppLog("log", "at pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue:301", "details.datelist :>> ", details.datelist);
-        if (res2.data.records.length < details.pageSize || details.pageNum >= res2.pages) {
+        if (res.data.records.length < details.pageSize || details.pageNum >= res.pages) {
           uni.showToast({
             title: "已经到底了",
             icon: "success"
           });
           return option.isEnd = true;
         }
-        return res2;
+        return res;
       }
       function goorderdetail(item) {
         let url2 = "";
@@ -23899,8 +24006,8 @@ This will fail in production if not fixed.`);
               trayCode: details.trayCode,
               orderPackageCodes: [item.orderPackageCode]
             };
-            let res2 = await warehouseTrayTypedeleteScanOrderPackageCode(data);
-            if (res2.code == 200) {
+            let res = await warehouseTrayTypedeleteScanOrderPackageCode(data);
+            if (res.code == 200) {
               initpage();
             }
             tip.value.setisshow(false);
@@ -23943,8 +24050,8 @@ This will fail in production if not fixed.`);
               trayCode: details.trayCode,
               orderPackageCodes: removearr
             };
-            let res2 = await warehouseTrayTypedeleteScanOrderPackageCode(data);
-            if (res2.code == 200) {
+            let res = await warehouseTrayTypedeleteScanOrderPackageCode(data);
+            if (res.code == 200) {
               initpage();
               if (details.list.length == details.checkindex.length) {
                 uni.navigateBack();
@@ -24442,14 +24549,14 @@ This will fail in production if not fixed.`);
           let data = {
             allocationId: details.scancode
           };
-          let res2 = await warehouseUpdownTypeupShelfScanAllocation(data);
-          formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:286", res2);
-          if (res2.code == 200) {
-            details.reqobj = res2.data;
+          let res = await warehouseUpdownTypeupShelfScanAllocation(data);
+          formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:286", res);
+          if (res.code == 200) {
+            details.reqobj = res.data;
             const _positionArr = details.reqobj.allocationTitle.split("-");
             details.reqobj.positionInfo = _positionArr[0] + "层" + _positionArr[1] + "列";
-            details.allocationId = res2.data.allocationId;
-            details.datalist = ((_a = res2.data) == null ? void 0 : _a.list) || [];
+            details.allocationId = res.data.allocationId;
+            details.datalist = ((_a = res.data) == null ? void 0 : _a.list) || [];
             if (details.checkstate === 2)
               return details.renderList = details.datalist;
           }
@@ -24469,13 +24576,13 @@ This will fail in production if not fixed.`);
             upshelfScanType: details.upshelfScanType,
             code: details.scancode
           };
-          let res2 = await warehouseUpdownTypeupShelfScanGoods(data);
-          formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:320", "res>>>>>", res2);
-          if (res2.code == 200) {
+          let res = await warehouseUpdownTypeupShelfScanGoods(data);
+          formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:320", "res>>>>>", res);
+          if (res.code == 200) {
             if (Number(details.upshelfScanType) !== 3) {
               const _uplistarr = details.uplistarr;
               const _orderCodeArr = details.orderCodeArr;
-              const _flag = res2.data.every((val) => {
+              const _flag = res.data.every((val) => {
                 if (details.orderCodeArr.includes(val.orderCode)) {
                   uni.showToast({
                     title: "订单已存在, 勿重复扫码",
@@ -24492,7 +24599,7 @@ This will fail in production if not fixed.`);
               details.uplistarr = _uplistarr;
               details.orderCodeArr = _orderCodeArr;
             } else {
-              details.uplistarr = details.uplistarr.concat(res2.data);
+              details.uplistarr = details.uplistarr.concat(res.data);
             }
             let _content = "";
             if (details.upshelfScanType !== "3")
@@ -24502,8 +24609,8 @@ This will fail in production if not fixed.`);
             utils2.ttsspke(_content);
             if (details.checkstate === 1)
               return details.renderList = details.uplistarr;
-          } else if (res2.code === 3001 && res2.audio) {
-            utils2.ttsspke(res2.audio);
+          } else if (res.code === 3001 && res.audio) {
+            utils2.ttsspke(res.audio);
           }
         }
       }
@@ -24548,7 +24655,7 @@ This will fail in production if not fixed.`);
           isshow: true,
           isshowcancel: true,
           success: async () => {
-            let res2 = null;
+            let res = null;
             uni.showLoading({
               mask: true,
               title: "提交中"
@@ -24558,21 +24665,21 @@ This will fail in production if not fixed.`);
                 allocationId: details.allocationId,
                 upShelfOrderList: details.uplistarr
               };
-              res2 = await warehouseUpdownTypeupShelfOrder(data);
+              res = await warehouseUpdownTypeupShelfOrder(data);
             } else if (Number(details.upshelfScanType) == 3) {
               let data = {
                 allocationId: details.allocationId,
                 upShelfPackageList: details.uplistarr
               };
-              res2 = await warehouseUpdownTypeupShelfPackage(data);
+              res = await warehouseUpdownTypeupShelfPackage(data);
             } else if (Number(details.upshelfScanType) == 4) {
               let data = {
                 allocationId: details.allocationId,
                 trayCode: details.uplistarr[0].trayCode
               };
-              res2 = await warehouseUpdownTypeupShelfTray(data);
+              res = await warehouseUpdownTypeupShelfTray(data);
             }
-            if (res2.code == 200) {
+            if (res.code == 200) {
               details.uplistarr = [];
               details.scancode = details.allocationId;
               details.allocationId = "";
@@ -25208,7 +25315,7 @@ This will fail in production if not fixed.`);
         formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:339", details.codenumer);
       });
       async function scandata() {
-        let res2 = null;
+        let res = null;
         if (!details.allocationId) {
           if (details.scancode[0] === "T") {
             uni.showToast({
@@ -25221,11 +25328,11 @@ This will fail in production if not fixed.`);
           let data = {
             allocationId: details.scancode
           };
-          res2 = await warehouseUpdownTypemoveAllocationScanTarget(data);
-          formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:359", "res1 :>> ", res2);
-          if (res2.code == 200) {
-            details.dtilobj = res2.data;
-            details.allocationId = res2.data.allocationId;
+          res = await warehouseUpdownTypemoveAllocationScanTarget(data);
+          formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:359", "res1 :>> ", res);
+          if (res.code == 200) {
+            details.dtilobj = res.data;
+            details.allocationId = res.data.allocationId;
             details.scancode = "";
             if (details.pagetype === "1") {
               if (details.dtilobj.trayCode) {
@@ -25252,23 +25359,23 @@ This will fail in production if not fixed.`);
             let data = {
               trayCode: details.scancode
             };
-            res2 = await warehouseUpdownTypemoveAllocationScanTrayCode(data);
-            formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:396", "res :>> ", res2);
-            if (res2.code !== 200)
+            res = await warehouseUpdownTypemoveAllocationScanTrayCode(data);
+            formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:396", "res :>> ", res);
+            if (res.code !== 200)
               return;
             details.trayCode = details.scancode;
-            details.scanlist = res2.data.list;
+            details.scanlist = res.data.list;
             utils.ttsspke("当前托盘" + details.scanlist.reduce((curr, item) => curr + item.shelfNum, 0) + "件");
-            details.obldate = res2.data;
+            details.obldate = res.data;
           } else if (details.pagetype == "2") {
             let data = {
               allocationId: details.allocationId,
               orderPackageCode: details.scancode
             };
-            res2 = await warehouseUpdownTypemoveAllocationScanPackage(data);
-            formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:410", "res :>> ", res2);
-            if (res2.code == 200) {
-              details.scanlist.push(res2.data);
+            res = await warehouseUpdownTypemoveAllocationScanPackage(data);
+            formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:410", "res :>> ", res);
+            if (res.code == 200) {
+              details.scanlist.push(res.data);
               utils.ttsspke(details.scanlist.length + "件");
             }
           }
@@ -25277,7 +25384,7 @@ This will fail in production if not fixed.`);
         }
       }
       async function uplist() {
-        let res2 = null;
+        let res = null;
         uni.showLoading({
           mask: true,
           title: "移库中"
@@ -25287,17 +25394,17 @@ This will fail in production if not fixed.`);
             allocationId: details.allocationId,
             trayCode: details.trayCode
           };
-          res2 = await warehouseUpdownTypemoveAllocationByTrayCode(data);
+          res = await warehouseUpdownTypemoveAllocationByTrayCode(data);
         } else if (details.pagetype == "2") {
           let data = {
             allocationId: details.allocationId,
             upShelfPackageList: details.scanlist
           };
-          res2 = await warehouseUpdownTypemoveAllocationPackageList(data);
+          res = await warehouseUpdownTypemoveAllocationPackageList(data);
         }
         uni.hideLoading();
-        if (res2.code == 200) {
-          formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:446", "res :>> ", res2);
+        if (res.code == 200) {
+          formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:446", "res :>> ", res);
           uni.showToast({
             title: "移库成功",
             icon: "success"
@@ -26059,11 +26166,11 @@ This will fail in production if not fixed.`);
         let data = {
           warehouseCode: "LQ"
         };
-        let res2 = await warehouseTrayTypefindAllMarket(data);
-        if (res2.code !== 200)
+        let res = await warehouseTrayTypefindAllMarket(data);
+        if (res.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:472", res2.data);
-        details.Marketlist = res2.data;
+        formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:472", res.data);
+        details.Marketlist = res.data;
       }
       async function scanlist() {
         details.codelist = [];
@@ -26119,19 +26226,19 @@ This will fail in production if not fixed.`);
         let data = {
           allocationId: details.scancode
         };
-        let res2 = await warehouseUpdownTypeupShelfScanAllocation(data);
-        formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:542", res2);
-        if (res2.code == 200) {
-          details.reqobj = res2.data;
+        let res = await warehouseUpdownTypeupShelfScanAllocation(data);
+        formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:542", res);
+        if (res.code == 200) {
+          details.reqobj = res.data;
           const _positionArr = details.reqobj.allocationTitle.split("-");
           details.reqobj.positionInfo = _positionArr[0] + "层" + _positionArr[1] + "列";
-          details.allocationId = res2.data.allocationId;
-          details.datalist = ((_a = res2.data) == null ? void 0 : _a.list) || [];
+          details.allocationId = res.data.allocationId;
+          details.datalist = ((_a = res.data) == null ? void 0 : _a.list) || [];
           formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:550", "details.pageName.slice(0, details.pageName.length - 3) :>> ", details.pageName);
           utils.ttsspke("请输入" + details.pageName.slice(0, details.pageName.length - 2));
         } else {
           uni.showToast({
-            title: res2.msg,
+            title: res.msg,
             icon: "none"
           });
         }
@@ -26168,7 +26275,7 @@ This will fail in production if not fixed.`);
               mask: true,
               title: "上架中"
             });
-            let res2;
+            let res;
             details.uplistarr.map((item) => {
               if (item.enterNum > item.totalNumber) {
                 item.enterNum = item.totalNumber;
@@ -26179,17 +26286,17 @@ This will fail in production if not fixed.`);
                 allocationId: details.allocationId,
                 upShelfZeroOrderList: details.uplistarr
               };
-              res2 = await warehouseUpdownTypeupShelfZeroOrder(data);
+              res = await warehouseUpdownTypeupShelfZeroOrder(data);
             } else if (Number(details.upshelfScanType) == 3 || Number(details.upshelfScanType) == 4) {
               let data = {
                 allocationId: details.allocationId,
                 upShelfStockList: details.uplistarr
               };
-              res2 = await warehouseUpdownTypeupShelfStockList(data);
+              res = await warehouseUpdownTypeupShelfStockList(data);
             }
             uni.hideLoading();
-            formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:621", "res上架 :>> ", res2);
-            if (res2.code == 200) {
+            formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:621", "res上架 :>> ", res);
+            if (res.code == 200) {
               uni.showToast({
                 title: "上架成功",
                 icon: "none"
@@ -27124,10 +27231,10 @@ This will fail in production if not fixed.`);
         let data = {
           userId: user.user_id
         };
-        let res2 = await distributionStockupgetStockupArea(data);
-        formatAppLog("log", "at pagesHome/pages/PickingScanList/PickingScanList.vue:110", res2);
-        if (res2.code == 200) {
-          res2.data.map((item) => {
+        let res = await distributionStockupgetStockupArea(data);
+        formatAppLog("log", "at pagesHome/pages/PickingScanList/PickingScanList.vue:110", res);
+        if (res.code == 200) {
+          res.data.map((item) => {
             list.push(item.headline);
           });
         }
@@ -27151,8 +27258,8 @@ This will fail in production if not fixed.`);
             let data2 = {
               type: 2,
               stockupId: details.id,
-              stockupAreaId: res2.data[deta.checklist[0]].id,
-              stockupArea: res2.data[deta.checklist[0]].headline
+              stockupAreaId: res.data[deta.checklist[0]].id,
+              stockupArea: res.data[deta.checklist[0]].headline
             };
             let response = await distributionStockupupdateStockArea(data2);
             if (response.code == 200) {
@@ -27203,9 +27310,9 @@ This will fail in production if not fixed.`);
               stockupId: details.id,
               stockupAreaCode: details.scancode
             };
-            let res2 = await distributionStockupupdateStockArea(data);
-            formatAppLog("log", "at pagesHome/pages/PickingScanList/PickingScanList.vue:199", "res", res2);
-            if (res2.code === 200) {
+            let res = await distributionStockupupdateStockArea(data);
+            formatAppLog("log", "at pagesHome/pages/PickingScanList/PickingScanList.vue:199", "res", res);
+            if (res.code === 200) {
               initpage();
             }
             tiplists.value.setdetails({ isshow: false });
@@ -27429,17 +27536,17 @@ This will fail in production if not fixed.`);
           pageNum: details.pageNum,
           pageSize: details.pageSize
         };
-        let res2 = await warehouseRetentionretentionPackageList(data);
-        if (res2.code == 200) {
-          details.codelist = details.codelist.concat(res2.data.records);
+        let res = await warehouseRetentionretentionPackageList(data);
+        if (res.code == 200) {
+          details.codelist = details.codelist.concat(res.data.records);
         }
       }
       async function scandata() {
         let data = {
           orderPackageCode: details.scancode
         };
-        let res2 = await warehouseRetentionretentionScanPackage(data);
-        if (res2.code == 200) {
+        let res = await warehouseRetentionretentionScanPackage(data);
+        if (res.code == 200) {
           uni.showToast({
             title: "扫码成功",
             icon: "none"
@@ -27600,7 +27707,7 @@ This will fail in production if not fixed.`);
         });
       }
       async function scandata() {
-        let res2 = null;
+        let res = null;
         if (details.scantype == 1) {
           if (details.mergeTray) {
             details.scancode = details.mergeTray;
@@ -27608,7 +27715,7 @@ This will fail in production if not fixed.`);
           let data = {
             trayCode: details.scancode
           };
-          res2 = await warehouseTrayTypescanSourceTrayCode(data);
+          res = await warehouseTrayTypescanSourceTrayCode(data);
         } else if (details.scantype == 2) {
           if (details.newmergeTray) {
             details.scancode = details.newmergeTray;
@@ -27616,15 +27723,15 @@ This will fail in production if not fixed.`);
           let data = {
             trayCode: details.scancode
           };
-          res2 = await warehouseTrayTypescanTargetTrayCode(data);
+          res = await warehouseTrayTypescanTargetTrayCode(data);
         }
-        if (res2.code == 200) {
+        if (res.code == 200) {
           if (details.scantype == 1) {
-            details.beilist = res2.data;
+            details.beilist = res.data;
             details.mergeTray = details.scancode;
             details.scantype = 2;
           } else if (details.scantype == 2) {
-            details.newbeilist = res2.data;
+            details.newbeilist = res.data;
             details.newmergeTray = details.scancode;
             details.scantype = 1;
           }
@@ -27670,9 +27777,9 @@ This will fail in production if not fixed.`);
               sourceTrayCode: details.mergeTray,
               targetTrayCode: details.newmergeTray
             };
-            let res2 = await warehouseTrayTypemergeTray(data);
+            let res = await warehouseTrayTypemergeTray(data);
             uni.hideLoading();
-            if (res2.code == 200) {
+            if (res.code == 200) {
               utils.ttsspke("合托成功");
               uni.navigateTo({
                 url: "/pagesHome/pages/MergeTrayDetails/MergeTrayDetails?tray=" + details.newmergeTray
@@ -28050,10 +28157,10 @@ This will fail in production if not fixed.`);
         let data = {
           trayCode: trayCode.value
         };
-        let res2 = await warehouseTrayTypescanTargetTrayCode(data);
-        if (res2.code !== 200)
+        let res = await warehouseTrayTypescanTargetTrayCode(data);
+        if (res.code !== 200)
           return;
-        resdata.value = res2.data;
+        resdata.value = res.data;
       }
       return (_ctx, _cache) => {
         var _a, _b;
@@ -28474,11 +28581,11 @@ This will fail in production if not fixed.`);
         let data = {
           warehouseCode: "LQ"
         };
-        let res2 = await warehouseTrayTypefindAllMarket(data);
-        if (res2.code !== 200)
+        let res = await warehouseTrayTypefindAllMarket(data);
+        if (res.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:375", res2.data);
-        details.Marketlist = res2.data;
+        formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:375", res.data);
+        details.Marketlist = res.data;
       }
       vue.watchEffect(() => {
         if (details.datalist.length == details.checkdatalist.length) {
@@ -28510,34 +28617,34 @@ This will fail in production if not fixed.`);
         formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:416", "111 :>> ", 111);
         details.scandataList.push(_scancode);
         try {
-          let res2 = null;
+          let res = null;
           let data = null;
           switch (Number(details.pageType)) {
             case 1:
               data = {
                 trayCode: details.scancode
               };
-              res2 = await warehouseUpdownTypedownScanTrayCode(data);
-              if (res2.code == 200) {
+              res = await warehouseUpdownTypedownScanTrayCode(data);
+              if (res.code == 200) {
                 details.datalist = [];
                 details.checkdatalist = [];
-                details.datalist = details.datalist.concat(res2.data.list);
-                details.checkdatalist = details.checkdatalist.concat(res2.data.list);
+                details.datalist = details.datalist.concat(res.data.list);
+                details.checkdatalist = details.checkdatalist.concat(res.data.list);
                 details.trayCode = details.scancode;
-                details.allocaTitle = res2.data.warehouseName + res2.data.areaTitle + res2.data.allocationTitle;
+                details.allocaTitle = res.data.warehouseName + res.data.areaTitle + res.data.allocationTitle;
               }
               break;
             case 2:
               data = {
                 allocationId: details.scancode
               };
-              res2 = await warehouseUpdownTypeupShelfScanAllocation(data);
-              if (res2.code == 200) {
+              res = await warehouseUpdownTypeupShelfScanAllocation(data);
+              if (res.code == 200) {
                 details.datalist = [];
                 details.checkdatalist = [];
-                details.datalist = details.datalist.concat(res2.data.list);
-                details.checkdatalist = details.checkdatalist.concat(res2.data.list);
-                details.resdata = res2.data;
+                details.datalist = details.datalist.concat(res.data.list);
+                details.checkdatalist = details.checkdatalist.concat(res.data.list);
+                details.resdata = res.data;
                 const _positionArr = details.resdata.allocationTitle.split("-");
                 details.resdata.positionInfo = _positionArr[0] + "层" + _positionArr[1] + "列";
               }
@@ -28546,11 +28653,11 @@ This will fail in production if not fixed.`);
               data = {
                 orderPackageCode: details.scancode
               };
-              res2 = await warehouseUpdownTypedownScanPackage(data);
-              formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:458", "res", res2);
-              if (res2.code == 200) {
-                details.datalist = details.datalist.concat([res2.data]);
-                details.checkdatalist = details.checkdatalist.concat([res2.data]);
+              res = await warehouseUpdownTypedownScanPackage(data);
+              formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:458", "res", res);
+              if (res.code == 200) {
+                details.datalist = details.datalist.concat([res.data]);
+                details.checkdatalist = details.checkdatalist.concat([res.data]);
               }
               break;
             case 4:
@@ -28559,11 +28666,11 @@ This will fail in production if not fixed.`);
                 code: details.scancode,
                 marketId: (_a = details.Marketlist[details.checkmarkindex]) == null ? void 0 : _a.marketId
               };
-              res2 = await warehouseUpdownTypedownEnterStock(data);
-              if (res2.code == 200) {
+              res = await warehouseUpdownTypedownEnterStock(data);
+              if (res.code == 200) {
                 details.datalist = [];
                 details.checkdatalist = [];
-                details.codelist = res2.data;
+                details.codelist = res.data;
               }
               break;
             case 5:
@@ -28571,9 +28678,9 @@ This will fail in production if not fixed.`);
                 zeroType: details.checkmakindex + 1,
                 code: details.scancode
               };
-              res2 = await warehouseUpdownTypedownEnterZeroOrder(data);
-              if (res2.code == 200) {
-                details.codelist = res2.data;
+              res = await warehouseUpdownTypedownEnterZeroOrder(data);
+              if (res.code == 200) {
+                details.codelist = res.data;
               }
               break;
           }
@@ -28584,7 +28691,7 @@ This will fail in production if not fixed.`);
         }
       }
       async function downs() {
-        let res2 = null;
+        let res = null;
         let data = null;
         let list = [];
         uni.showLoading({
@@ -28596,13 +28703,13 @@ This will fail in production if not fixed.`);
             data = {
               trayCode: details.trayCode
             };
-            res2 = await warehouseUpdownTypedownTrayCode(data);
+            res = await warehouseUpdownTypedownTrayCode(data);
             break;
           case 2:
             data = {
               allocationId: details.resdata.allocationId
             };
-            res2 = await warehouseUpdownTypedownDownAllocation(data);
+            res = await warehouseUpdownTypedownDownAllocation(data);
             break;
           case 3:
             list = [];
@@ -28614,7 +28721,7 @@ This will fail in production if not fixed.`);
             data = {
               upShelfPackageList: list
             };
-            res2 = await warehouseUpdownTypedownPackage(data);
+            res = await warehouseUpdownTypedownPackage(data);
             break;
           case 4:
             list = [];
@@ -28630,7 +28737,7 @@ This will fail in production if not fixed.`);
             data = {
               upShelfStockList: list
             };
-            res2 = await warehouseUpdownTypedownStock(data);
+            res = await warehouseUpdownTypedownStock(data);
             break;
           case 5:
             list = [];
@@ -28645,17 +28752,17 @@ This will fail in production if not fixed.`);
             data = {
               upShelfZeroOrderList: list
             };
-            res2 = await warehouseUpdownTypedownZeroOrder(data);
+            res = await warehouseUpdownTypedownZeroOrder(data);
             break;
         }
-        formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:564", "res :>> ", res2);
+        formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:564", "res :>> ", res);
         uni.hideLoading();
-        if (res2.code == 200) {
+        if (res.code == 200) {
           uni.showToast({
-            title: res2.msg,
+            title: res.msg,
             icon: "none"
           });
-          utils.ttsspke(res2.msg);
+          utils.ttsspke(res.msg);
           details.checkdatalist = [];
           details.datalist = [];
           details.codelist = [];
@@ -29569,10 +29676,10 @@ This will fail in production if not fixed.`);
         let data = {
           reservationId: details.items.id
         };
-        let res2 = await addvalueaddvalueInfo(data);
-        if (res2.code !== 200)
+        let res = await addvalueaddvalueInfo(data);
+        if (res.code !== 200)
           return;
-        details.priceList = res2.data;
+        details.priceList = res.data;
       }
       function goValueaddedServicePage(item) {
         uni.navigateTo({
@@ -29604,9 +29711,9 @@ This will fail in production if not fixed.`);
               num: 0,
               packageEntityList: []
             };
-            const res2 = await addvalueupdateAddvalueInfo(submitData);
-            formatAppLog("log", "at pagesHome/pages/SetPrice/SetPrice.vue:179", "res :>> ", res2);
-            if (res2.code === 200)
+            const res = await addvalueupdateAddvalueInfo(submitData);
+            formatAppLog("log", "at pagesHome/pages/SetPrice/SetPrice.vue:179", "res :>> ", res);
+            if (res.code === 200)
               uni.showToast({
                 title: "删除成功",
                 icon: "none"
@@ -29877,12 +29984,12 @@ This will fail in production if not fixed.`);
         let submitData = {
           trayCode: details.scancode
         };
-        let res2 = await warehouseTrayTypetrayToNullScanTrayCode(submitData);
-        const { code: code2, data } = res2;
+        let res = await warehouseTrayTypetrayToNullScanTrayCode(submitData);
+        const { code: code2, data } = res;
         if (code2 == 200) {
           if (!data)
             return;
-          formatAppLog("log", "at pagesHome/pages/RemoveTray/RemoveTray.vue:203", "res", res2);
+          formatAppLog("log", "at pagesHome/pages/RemoveTray/RemoveTray.vue:203", "res", res);
           details.pageInfo = data;
           details.orderList = data.packageList;
           details.zeroList = data.zeroList;
@@ -29931,9 +30038,9 @@ This will fail in production if not fixed.`);
               mask: true,
               title: "提交中"
             });
-            let res2 = await warehouseTrayTypetrayToNull(data);
+            let res = await warehouseTrayTypetrayToNull(data);
             uni.hideLoading();
-            if (res2.code == 200) {
+            if (res.code == 200) {
               tip.value.setdetails({
                 title: "提示",
                 content: "空置托盘成功",
@@ -30404,29 +30511,29 @@ This will fail in production if not fixed.`);
           reservationId: details.reservationId,
           addvalueType: details.addvalueType
         };
-        let res2 = await addvalueeditAddvalueInfo(data);
-        formatAppLog("log", "at pagesHome/pages/createAddServe/createAddServe.vue:208", res2);
+        let res = await addvalueeditAddvalueInfo(data);
+        formatAppLog("log", "at pagesHome/pages/createAddServe/createAddServe.vue:208", res);
         formatAppLog("log", "at pagesHome/pages/createAddServe/createAddServe.vue:209", "details.allpack :>> ", details.allpack);
-        if (res2.code !== 200)
+        if (res.code !== 200)
           return;
-        if (res2.data.addvalueDetailId) {
-          details.addvalueDetailId = res2.data.addvalueDetailId;
+        if (res.data.addvalueDetailId) {
+          details.addvalueDetailId = res.data.addvalueDetailId;
         }
-        if (res2.data.addvalueId) {
-          details.checkserveindex = Number(res2.data.addvalueId) - 1;
+        if (res.data.addvalueId) {
+          details.checkserveindex = Number(res.data.addvalueId) - 1;
         }
         formatAppLog("log", "at pagesHome/pages/createAddServe/createAddServe.vue:217", details.checkserveindex);
-        if (res2.data.floolNum) {
-          details.floor = res2.data.floolNum;
+        if (res.data.floolNum) {
+          details.floor = res.data.floolNum;
         }
-        if (res2.data.distance) {
-          details.distance = res2.data.distance;
+        if (res.data.distance) {
+          details.distance = res.data.distance;
         }
-        if (res2.data.isAll === 1) {
+        if (res.data.isAll === 1) {
           details.typestate = 1;
         } else {
           details.typestate = 2;
-          details.scanpack = res2.data.packageEntityList;
+          details.scanpack = res.data.packageEntityList;
           formatAppLog("log", "at pagesHome/pages/createAddServe/createAddServe.vue:229", "details.scanpack :>> ", details.scanpack);
           details.scanpack.forEach((val) => val.zeroQuantity = val.quantity);
         }
@@ -31017,7 +31124,7 @@ This will fail in production if not fixed.`);
         formatAppLog("log", "at pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue:271", details.codenumer);
       });
       async function scandata(flg, type) {
-        let res2 = null;
+        let res = null;
         if (details.scancode[0] === "T") {
           uni.showToast({
             title: "请扫描库位码",
@@ -31031,11 +31138,11 @@ This will fail in production if not fixed.`);
             let data = {
               allocationId: details.scancode
             };
-            res2 = await warehouseUpdownTypemoveAllocationScanSourceAllocation(data);
-            if (res2.code == 200) {
-              details.dtilobj = res2.data;
-              details.allocationId = res2.data.allocationId;
-              details.scanlist = res2.data.list;
+            res = await warehouseUpdownTypemoveAllocationScanSourceAllocation(data);
+            if (res.code == 200) {
+              details.dtilobj = res.data;
+              details.allocationId = res.data.allocationId;
+              details.scanlist = res.data.list;
               utils.ttsspke("扫描成功, 请再扫描被移动的库位");
             }
             return;
@@ -31043,10 +31150,10 @@ This will fail in production if not fixed.`);
             let data = {
               allocationId: details.scancode1
             };
-            res2 = await warehouseUpdownTypemoveAllocationScanAllocation(data);
-            if (res2.code == 200) {
-              details.targetAllocationId = res2.data.allocationId;
-              details.obldate = res2.data;
+            res = await warehouseUpdownTypemoveAllocationScanAllocation(data);
+            if (res.code == 200) {
+              details.targetAllocationId = res.data.allocationId;
+              details.obldate = res.data;
             }
           }
           return;
@@ -31055,28 +31162,28 @@ This will fail in production if not fixed.`);
           let data = {
             allocationId: details.scancode
           };
-          res2 = await warehouseUpdownTypemoveAllocationScanSourceAllocation(data);
-          if (res2.code == 200) {
-            details.dtilobj = res2.data;
-            details.allocationId = res2.data.allocationId;
-            details.scanlist = res2.data.list;
-            formatAppLog("log", "at pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue:321", "res1 :>> ", res2);
+          res = await warehouseUpdownTypemoveAllocationScanSourceAllocation(data);
+          if (res.code == 200) {
+            details.dtilobj = res.data;
+            details.allocationId = res.data.allocationId;
+            details.scanlist = res.data.list;
+            formatAppLog("log", "at pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue:321", "res1 :>> ", res);
           }
           return;
         } else {
           let data = {
             allocationId: details.scancode1
           };
-          res2 = await warehouseUpdownTypemoveAllocationScanAllocation(data);
-          if (res2.code == 200) {
-            details.targetAllocationId = res2.data.allocationId;
-            details.obldate = res2.data;
-            formatAppLog("log", "at pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue:333", "res2 :>> ", res2);
+          res = await warehouseUpdownTypemoveAllocationScanAllocation(data);
+          if (res.code == 200) {
+            details.targetAllocationId = res.data.allocationId;
+            details.obldate = res.data;
+            formatAppLog("log", "at pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue:333", "res2 :>> ", res);
           }
         }
       }
       async function uplist() {
-        let res2 = null;
+        let res = null;
         uni.showLoading({
           title: "移库中",
           mask: true
@@ -31085,9 +31192,9 @@ This will fail in production if not fixed.`);
           allocationId: details.allocationId,
           targetAllocationId: details.targetAllocationId
         };
-        res2 = await warehouseUpdownTypemoveAllocationByAllocation(data);
+        res = await warehouseUpdownTypemoveAllocationByAllocation(data);
         uni.hideLoading();
-        if (res2.code == 200) {
+        if (res.code == 200) {
           uni.showToast({
             title: "移库成功",
             icon: "success"
@@ -32293,8 +32400,8 @@ This will fail in production if not fixed.`);
       });
       async function scandata() {
         searchForm.condition = scancode.value;
-        const res2 = await distributionOrderInfoInQuery(searchForm);
-        const { code: code2, data } = res2;
+        const res = await distributionOrderInfoInQuery(searchForm);
+        const { code: code2, data } = res;
         if (code2 === 200) {
           dataInfo.value = data;
           packageList.value = data.list.map((item) => {
@@ -32336,11 +32443,11 @@ This will fail in production if not fixed.`);
             title: "最少选择一条数据",
             icon: "none"
           });
-        const res2 = await BatchPrintPackages(ids);
-        const { code: code2, data } = res2;
+        const res = await BatchPrintPackages(ids);
+        const { code: code2, data } = res;
         if (code2 !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:356", "res :>> ", res2);
+        formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:356", "res :>> ", res);
         tiplists.value.setdetails({
           title: "请选择需要打印的包条码",
           isshow: true,
@@ -32885,10 +32992,10 @@ This will fail in production if not fixed.`);
           // orderCode: details.inputtxt
         };
         details.datalist = [];
-        const res2 = await distributionTrayDetail(data);
-        formatAppLog("log", "at pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue:183", "res", res2);
-        const { code: code2 } = res2;
-        const resData = res2.data;
+        const res = await distributionTrayDetail(data);
+        formatAppLog("log", "at pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue:183", "res", res);
+        const { code: code2 } = res;
+        const resData = res.data;
         details.datalist = [];
         if (code2 === 200 && !!resData) {
           details.datalist = resData.records;
@@ -32914,11 +33021,11 @@ This will fail in production if not fixed.`);
             type: 2,
             barcode: details.scancode
           };
-          let res2 = await deliveryloadingscan(data);
-          formatAppLog("log", "at pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue:234", "res", res2);
-          const { code: code2 } = res2;
+          let res = await deliveryloadingscan(data);
+          formatAppLog("log", "at pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue:234", "res", res);
+          const { code: code2 } = res;
           if (code2 === 3001 || code2 === 200)
-            utils2.ttsspke(res2.audio);
+            utils2.ttsspke(res.audio);
           initpage();
         } catch (err) {
           formatAppLog("log", "at pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue:240", "err :>> ", err);
@@ -33271,9 +33378,9 @@ This will fail in production if not fixed.`);
           stockupId: details.stockupId,
           typeService: details.typeService
         };
-        let res2 = await distributionStockupstockupScan(data);
-        formatAppLog("log", "at pagesHome/pages/StockUpListZero/StockUpListZero.vue:174", res2);
-        if (res2.code == 200) {
+        let res = await distributionStockupstockupScan(data);
+        formatAppLog("log", "at pagesHome/pages/StockUpListZero/StockUpListZero.vue:174", res);
+        if (res.code == 200) {
           details.isscan = true;
           initpage();
         }
@@ -33610,12 +33717,16 @@ This will fail in production if not fixed.`);
         isEnd: false
       });
       onLoad((_info) => {
+        formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:109", "初始化");
       });
       onShow(() => {
-        initPage();
+        details.renderList = [];
+        const timer = setTimeout(() => {
+          basicContainer.value.startPullDownRefresh();
+          clearTimeout(timer);
+        }, 200);
       });
       vue.onMounted(() => {
-        basicContainer.value.startPullDownRefresh();
       });
       const goCheckList = (pageType, item) => {
         const { startTime, endTime } = item;
@@ -33650,11 +33761,11 @@ This will fail in production if not fixed.`);
       };
       async function initPage() {
         try {
-          const res2 = await getWarehouseTask({ ...details.page });
-          formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:185", "res :>> ", res2);
-          const { code: code2, data: { records } } = res2;
-          if (code2 === 200 && res2.data) {
-            formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:188", "records :>> ", records);
+          const res = await getWarehouseTask({ ...details.page });
+          formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:171", "res :>> ", res);
+          const { code: code2, data: { records } } = res;
+          if (code2 === 200 && res.data) {
+            formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:174", "records :>> ", records);
             details.renderList = [...details.renderList, ...records];
             details.renderList.forEach((item) => {
               item.marketName = item.list.map((val) => val.refName).join(",");
@@ -33669,7 +33780,7 @@ This will fail in production if not fixed.`);
           }
           return code2;
         } catch (error2) {
-          formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:206", "error :>> ", error2);
+          formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:192", "error :>> ", error2);
         }
       }
       const { renderList, isEnd } = vue.toRefs(details);
@@ -33683,7 +33794,8 @@ This will fail in production if not fixed.`);
             vue.createVNode(_component_BasicContainer, {
               ref_key: "basicContainer",
               ref: basicContainer,
-              option
+              option,
+              leftClick: option.leftClick
             }, vue.createSlots({
               _: 2
               /* DYNAMIC */
@@ -33777,7 +33889,7 @@ This will fail in production if not fixed.`);
                 ]),
                 key: "0"
               } : void 0
-            ]), 1032, ["option"]),
+            ]), 1032, ["option", "leftClick"]),
             vue.createVNode(_component_saomiao2)
           ],
           64
@@ -33913,7 +34025,7 @@ This will fail in production if not fixed.`);
       });
       async function initPage() {
         try {
-          let res2 = null;
+          let res = null;
           uni.showLoading({
             mask: true,
             title: "数据加载中"
@@ -33921,28 +34033,29 @@ This will fail in production if not fixed.`);
           if (details.pageType === 1)
             return;
           if (details.pageType === 2) {
-            res2 = await getWarehouseTaskAllocationList({
+            res = await getWarehouseTaskAllocationList({
               ...details.page,
               questId: details.id,
               questNum: details.questNum
             });
           } else if (details.pageType === 3) {
-            res2 = await pgetContractList({
+            res = await pgetContractList({
               ...details.page,
               taskId: infodata.value.id,
               warehouseId: infodata.value.warehouseId,
               questNum: details.questNum
             });
           } else if (details.pageType === 4) {
-            res2 = await getTaryList();
+            res = await getTaryList();
           }
-          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:327", "res :>> ", res2);
-          const { code: code2, data } = res2;
+          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:327", "res :>> ", res);
+          const { code: code2, data } = res;
           if (code2 === 200 && data) {
             if (details.pageType === 3) {
-              details.renderList = res2.data.records;
+              details.renderList = res.data.records;
             } else
-              details.renderList = data;
+              details.renderList = data.list || [];
+            formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:333", "data.list :>> ", data.list);
             if (data.length < details.page.size)
               details.isEnd = true;
           } else if (code2 === 3001) {
@@ -33953,29 +34066,29 @@ This will fail in production if not fixed.`);
               title: msg
             });
           }
-          return res2;
+          return res;
         } catch (error2) {
-          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:345", "error :>> ", error2);
+          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:346", "error :>> ", error2);
         } finally {
           uni.hideLoading();
         }
       }
       async function getTaryList() {
-        formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:352", "details.id :>> ", details.id);
+        formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:353", "details.id :>> ", details.id);
         const submitData = {
           ...details.page,
           taskId: details.id,
           questNum: details.questNum
         };
         submitData.trayCode = details.scancode;
-        formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:359", "submitData :>> ", submitData);
+        formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:360", "submitData :>> ", submitData);
         return getWarehouseTrayList(submitData);
       }
       async function scandata() {
         try {
           if (!details.isscan)
             return;
-          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:368", "222 :>> ", 222);
+          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:369", "222 :>> ", 222);
           uni.showLoading({
             mask: true,
             title: "数据请求中"
@@ -33985,9 +34098,10 @@ This will fail in production if not fixed.`);
               questId: details.id,
               allocationId: details.scancode,
               questNum: details.questNum
-            }).then((res2) => {
-              formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:381", res2);
-              if (res2.code != 403) {
+            }).then((res) => {
+              formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:382", res);
+              if (res.code != 403) {
+                formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:384", "跳转");
                 uni.navigateTo({
                   url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}`
                 });
@@ -34003,19 +34117,19 @@ This will fail in production if not fixed.`);
               type: "1",
               code: details.scancode,
               questNum: details.questNum
-            }).then((res2) => {
-              formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:400", res2, "res===");
-              utils.ttsspke(res2.audio);
-              if (res2.code != 3001) {
-                details.renderList = res2.data;
+            }).then((res) => {
+              formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:402", res, "res===");
+              utils.ttsspke(res.audio);
+              if (res.code != 3001) {
+                details.renderList = res.data;
               }
             });
             return;
           }
           if (details.pageType === 4) {
-            const res2 = await initPage();
-            formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:411", "res :>> ", res2);
-            const { msg, code: code2, data } = res2;
+            const res = await initPage();
+            formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:413", "res :>> ", res);
+            const { msg, code: code2, data } = res;
             uni.showToast({
               title: msg,
               icon: "none"
@@ -34031,41 +34145,27 @@ This will fail in production if not fixed.`);
                 holdBackFirstPost: true,
                 questNum: details.questNum
               };
-              formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:428", "info :>> ", info);
+              formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:430", "info :>> ", info);
               uni.navigateTo({
                 url: `/pagesTask/pages/trayCheckDetails/trayCheckDetails?info=${JSON.stringify(info)}`
               });
             }
           }
         } catch (err) {
-          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:435", "err :>> ", err);
+          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:437", "err :>> ", err);
         } finally {
           uni.hideLoading();
         }
       }
-      const searchStorage = () => {
-        getWarehouseTaskAllocationDetailByStrip({
-          questId: details.id,
-          allocationId: details.scancode,
-          questNum: details.questNum
-        }).then((res2) => {
-          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:449", "res >>>>>>>>", res2);
-          if (res2.code !== 403) {
-            uni.navigateTo({
-              url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}`
-            });
-          }
-        });
-      };
       const goStorageDetails = (val) => {
-        formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:460", "val :>> ", val);
+        formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:462", "val :>> ", val);
         getWarehouseTaskAllocationDetailByStrip({
           questId: details.id,
           allocationId: val.allocationId,
           questNum: details.questNum
-        }).then((res2) => {
-          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:466", res2);
-          if (res2.code != 403) {
+        }).then((res) => {
+          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:468", res);
+          if (res.code != 403) {
             uni.navigateTo({
               url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${val.allocationId}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}`
             });
@@ -34113,26 +34213,26 @@ This will fail in production if not fixed.`);
           type: "2",
           incomingBatch: details.scancode,
           questNum: details.questNum
-        }).then((res2) => {
-          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:523", res2, "res===");
-          utils.ttsspke(res2.audio);
-          if (res2.code != 3001) {
-            details.renderList = res2.data;
+        }).then((res) => {
+          formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:525", res, "res===");
+          utils.ttsspke(res.audio);
+          if (res.code != 3001) {
+            details.renderList = res.data;
           }
         });
       };
       const handleInputChange = () => {
-        formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:533", details.searchText.taryText);
+        formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:535", details.searchText.taryText);
         if (!details.scancode) {
           pgetContractList({
             taskId: infodata.value.id,
             warehouseId: infodata.value.warehouseId,
             questNum: details.questNum
-          }).then((res2) => {
-            if (res2.code = res2.data) {
-              details.renderList = res2.data.records;
+          }).then((res) => {
+            if (res.code = res.data) {
+              details.renderList = res.data.records;
             }
-            utils.ttsspke(res2.msg);
+            utils.ttsspke(res.msg);
           });
         }
       };
@@ -34202,7 +34302,7 @@ This will fail in production if not fixed.`);
                     ]),
                     vue.createElementVNode("view", {
                       class: "button",
-                      onClick: searchStorage
+                      onClick: scandata
                     }, "搜索")
                   ]),
                   vue.createCommentVNode(" 表格 "),
@@ -34718,17 +34818,23 @@ This will fail in production if not fixed.`);
           formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:262", "下拉刷新");
           details.showControl = false;
           details.renderList = [];
-          article.articleList = [];
-          zero.zeroCheckList = [];
-          stock.stockCheckList = [];
+          if (details.tabBarCode === 1) {
+            article.articlePage.current = 1;
+            article.articleList = [];
+          }
+          if (details.tabBarCode === 2) {
+            zero.zeroPage.current = 1;
+            zero.zeroList = [];
+          }
+          if (details.tabBarCode === 1) {
+            stock.stockPage.current = 1;
+            stock.stockList = [];
+          }
           return await initPage();
         },
         async reachBottomInitPage() {
-          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:276", "触底加载");
+          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:286", "触底加载");
           return true;
-        },
-        // 开启刷新
-        startPullDownRefresh: () => {
         }
       });
       const details = vue.reactive({
@@ -34833,10 +34939,24 @@ This will fail in production if not fixed.`);
       } = vue.toRefs(stock);
       const tiplists = vue.ref(null);
       const basicContainer = vue.ref(null);
+      const allNum = vue.computed(() => {
+        let num = 0;
+        num += Number(article.allNum);
+        num += Number(stock.allNum);
+        num += Number(zero.allNum);
+        return num;
+      });
+      const finishNum = vue.computed(() => {
+        let num = 0;
+        num += Number(article.finishNum);
+        num += Number(stock.finishNum);
+        num += Number(zero.finishNum);
+        return num;
+      });
       onLoad((info) => {
         details.allocationId = info.allocationId;
         details.questId = info.questId;
-        formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:403", "info :>> ", info);
+        formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:428", "info :>> ", info);
         details.marketName = JSON.parse(info.marketName);
         details.questNum = info.questNum;
       });
@@ -34876,19 +34996,20 @@ This will fail in production if not fixed.`);
           questNum: details.questNum
         };
         try {
-          const res2 = await getWarehouseTaskAllocationDetailByStrip(submitData);
-          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:492", "res :>>1 ", res2);
-          const { code: code2, data } = res2;
+          const res = await getWarehouseTaskAllocationDetailByStrip(submitData);
+          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:517", "res :>>1 ", res);
+          const { code: code2, data } = res;
           if (code2 === 200) {
+            const list = data.list || [];
             article.total = data.allNum;
             article.allocationCode = data.allocationCode;
             article.allNum = data.allNum;
             article.finishNum = data.finishNum;
-            article.articleList = data.list;
-            article.articleCheckList = data.list.map(() => false);
+            article.articleList = [...article.articleList, ...list];
+            article.articleCheckList = article.articleList.map(() => false);
           }
         } catch (err) {
-          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:504", "err :>> ", err);
+          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:530", "err :>> ", err);
         }
       }
       async function initZero() {
@@ -34901,19 +35022,19 @@ This will fail in production if not fixed.`);
           questNum: details.questNum
         };
         try {
-          const res2 = await getallocationDetailByZeroWaList(submitData);
-          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:525", "res :>>0蛋 ", res2);
-          const { code: code2, data } = res2;
+          const res = await getallocationDetailByZeroWaList(submitData);
+          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:550", "res :>>0蛋 ", res);
+          const { code: code2, data } = res;
           if (code2 === 200) {
             zero.total = data.allNum;
             zero.allocationCode = data.allocationCode;
             zero.allNum = data.allNum;
             zero.finishNum = data.finishNum;
-            zero.zeroList = data.list;
-            zero.zeroCheckList = data.list.map(() => false);
+            zero.zeroList = data.list || [];
+            zero.zeroCheckList = zero.zeroList.map(() => false);
           }
         } catch (err) {
-          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:536", "err :>> ", err);
+          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:561", "err :>> ", err);
         }
       }
       async function initStock() {
@@ -34926,19 +35047,19 @@ This will fail in production if not fixed.`);
           questNum: details.questNum
         };
         try {
-          const res2 = await getallocationDetailByStockList(submitData);
-          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:556", "res :>>库存 ", res2);
-          const { code: code2, data } = res2;
+          const res = await getallocationDetailByStockList(submitData);
+          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:581", "res :>>库存 ", res);
+          const { code: code2, data } = res;
           if (code2 === 200) {
             stock.total = data.allNum;
             stock.allocationCode = data.allocationCode;
             stock.allNum = data.allNum;
             stock.finishNum = data.finishNum;
-            stock.stockList = data.list;
-            stock.stockCheckList = data.list.map(() => false);
+            stock.stockList = data.list || [];
+            stock.stockCheckList = stock.stockList.map(() => false);
           }
         } catch (err) {
-          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:567", "err :>> ", err);
+          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:592", "err :>> ", err);
         }
       }
       async function scandata() {
@@ -34946,7 +35067,7 @@ This will fail in production if not fixed.`);
           return;
         details.scancode;
         const flag2 = article.articleList.find((val) => val.ordePackageCode === details.scancode);
-        formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:577", "flag :>> ", flag2);
+        formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:602", "flag :>> ", flag2);
         if (flag2) {
           const questDetailList = [{
             id: flag2.id,
@@ -34963,9 +35084,9 @@ This will fail in production if not fixed.`);
             // 未入库
             noReceivedNum: 0
           }];
-          const res2 = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId });
-          const { code: code2, msg } = res2;
-          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:597", "res :>> ", res2);
+          const res = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId });
+          const { code: code2, msg } = res;
+          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:622", "res :>> ", res);
           if (code2 === 200) {
             basicContainer.value.startPullDownRefresh();
             utils.ttsspke(msg);
@@ -34977,7 +35098,7 @@ This will fail in production if not fixed.`);
       function handleTabBarCode(code2) {
         showControl.value = false;
         tabBarCode.value = code2;
-        initPage();
+        basicContainer.value.startPullDownRefresh();
       }
       function submitSearch() {
         uni.showToast({
@@ -35029,9 +35150,9 @@ This will fail in production if not fixed.`);
           isonecheck: true,
           success: (deta) => {
             try {
-              getWarehouseDeleteQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId }).then((res2) => {
-                initPage();
-                utils.ttsspke(res2.msg);
+              getWarehouseDeleteQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId }).then((res) => {
+                basicContainer.value.startPullDownRefresh();
+                utils.ttsspke(res.msg);
               });
             } catch (e) {
             } finally {
@@ -35126,10 +35247,10 @@ This will fail in production if not fixed.`);
                   // 未入库
                   noReceivedNum: checkSectionList2[4].value
                 }];
-                const res2 = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId });
-                const { code: code2 } = res2;
+                const res = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId });
+                const { code: code2 } = res;
                 if (code2 === 200)
-                  initPage();
+                  basicContainer.value.startPullDownRefresh();
                 tiplists.value.setdetails({ isshow: false });
               },
               cancel: () => {
@@ -35180,10 +35301,10 @@ This will fail in production if not fixed.`);
                   // 未入库
                   noReceivedNum: checkSectionList2[4].value
                 }];
-                const res2 = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId });
-                const { code: code2 } = res2;
+                const res = await getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId });
+                const { code: code2 } = res;
                 if (code2 === 200)
-                  initPage();
+                  basicContainer.value.startPullDownRefresh();
                 tiplists.value.setdetails({ isshow: false });
               },
               cancel: () => {
@@ -35200,7 +35321,7 @@ This will fail in production if not fixed.`);
       }
       function grounding() {
         const marketName = Array.from(details.marketName);
-        formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:863", "marketName :>> ", marketName);
+        formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:893", "marketName :>> ", marketName);
         const goodsType = ["定制品", "零担", "库存品"];
         tiplists.value.setdetails({
           title: "新增",
@@ -35233,11 +35354,11 @@ This will fail in production if not fixed.`);
             }
             if (tabBarCode.value === 3)
               submitData = stockAdd(deta);
-            const res2 = await getWarehouseSaveNewQuestDetail(submitData);
-            formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:897", "res :>> ", res2);
-            const { code: code2 } = res2;
+            const res = await getWarehouseSaveNewQuestDetail(submitData);
+            formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:927", "res :>> ", res);
+            const { code: code2 } = res;
             if (code2 === 200) {
-              initPage();
+              basicContainer.value.startPullDownRefresh();
               uni.showToast({
                 title: "操作成功",
                 icon: "success"
@@ -35282,9 +35403,9 @@ This will fail in production if not fixed.`);
       function zeroAdd(deta) {
       }
       function stockAdd(deta) {
-        formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:950", "deta :>> ", deta);
+        formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:980", "deta :>> ", deta);
         const { upform: { stock: { orderCode, stockNum, marketName, incomingBatch } } } = deta;
-        formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:952", "data :>> ", deta);
+        formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:982", "data :>> ", deta);
         const submitData = {
           questDetail: {
             orderCode,
@@ -35348,9 +35469,9 @@ This will fail in production if not fixed.`);
                 title: "更新中",
                 mask: true
               });
-              getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId }).then((res2) => {
-                utils.ttsspke(res2.msg);
-                initPage();
+              getWarehouseUpdateQuestDetail({ questNum: details.questNum, questDetailList, questId: details.questId }).then((res) => {
+                utils.ttsspke(res.msg);
+                basicContainer.value.startPullDownRefresh();
               });
             } catch (e) {
             } finally {
@@ -35401,13 +35522,13 @@ This will fail in production if not fixed.`);
           const questDetailList = arr.map((val) => {
             return { id: val.id };
           });
-          const res2 = await postqueryupdateQuestDetailAllocation({ questNum: details.questNum, allocationId: details.scancode, questId: details.questId, questDetailList });
-          if (res2.code === 200) {
-            initPage();
+          const res = await postqueryupdateQuestDetailAllocation({ questNum: details.questNum, allocationId: details.scancode, questId: details.questId, questDetailList });
+          if (res.code === 200) {
+            basicContainer.value.startPullDownRefresh();
           }
-          utils.ttsspke(res2.msg);
+          utils.ttsspke(res.msg);
         } catch (err) {
-          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:1091", "err :>> ", err);
+          formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:1121", "err :>> ", err);
         } finally {
           details.showUpData = false;
           details.isBatch = false;
@@ -35447,7 +35568,7 @@ This will fail in production if not fixed.`);
                       {
                         type: "text",
                         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => details.searchText = $event),
-                        placeholder: "请输入库位码",
+                        placeholder: "请输入托盘码",
                         class: "main_top_search"
                       },
                       null,
@@ -35481,7 +35602,7 @@ This will fail in production if not fixed.`);
                         vue.createElementVNode(
                           "text",
                           null,
-                          vue.toDisplayString(vue.unref(tabBarCode) === 1 ? article.allNum : vue.unref(tabBarCode) === 2 ? zero.allNum : stock.allNum),
+                          vue.toDisplayString(vue.unref(allNum)),
                           1
                           /* TEXT */
                         )
@@ -35491,7 +35612,7 @@ This will fail in production if not fixed.`);
                         vue.createElementVNode(
                           "text",
                           null,
-                          vue.toDisplayString(article.finishNum),
+                          vue.toDisplayString(vue.unref(finishNum)),
                           1
                           /* TEXT */
                         )
@@ -35501,7 +35622,7 @@ This will fail in production if not fixed.`);
                         vue.createElementVNode(
                           "text",
                           null,
-                          vue.toDisplayString(vue.unref(tabBarCode) === 1 ? article.allNum - article.finishNum : vue.unref(tabBarCode) === 2 ? zero.allNum - zero.finishNum : stock.allNum - stock.finishNum),
+                          vue.toDisplayString(vue.unref(allNum) - vue.unref(finishNum)),
                           1
                           /* TEXT */
                         )
@@ -36037,11 +36158,11 @@ This will fail in production if not fixed.`);
             trayId: details.pageInfo.trayId,
             questNum: details.pageInfo.questNum
           };
-          const res2 = await getWarehousetrayListInfo(submitForm);
-          formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:379", "res :>> ", res2);
-          const { code: code2, data } = res2;
+          const res = await getWarehousetrayListInfo(submitForm);
+          formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:379", "res :>> ", res);
+          const { code: code2, data } = res;
           if (code2 === 200) {
-            const dataInfo = res2.data;
+            const dataInfo = res.data;
             details.renderList = dataInfo.list;
             info.total = dataInfo.total;
             info.unTotal = dataInfo.unTotal;
@@ -36076,16 +36197,16 @@ This will fail in production if not fixed.`);
             // 未入库
             noReceivedNum: 0
           }];
-          const res2 = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum });
-          const { code: code2, msg } = res2;
-          formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:421", "res :>> ", res2);
+          const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum });
+          const { code: code2, msg } = res;
+          formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:421", "res :>> ", res);
           if (code2 === 200) {
             initPage();
             utils.ttsspke(msg);
           }
         } else {
-          const res2 = await postWarehouseTaskSelectPackageInfo({ orderPackageCode: details.scancode, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum });
-          formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:428", "res :>> ", res2);
+          const res = await postWarehouseTaskSelectPackageInfo({ orderPackageCode: details.scancode, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum });
+          formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:428", "res :>> ", res);
         }
       }
       function submitSearch() {
@@ -36107,11 +36228,11 @@ This will fail in production if not fixed.`);
         const questDetailList = arr.map((val) => {
           return { id: val.id };
         });
-        const res2 = await postqueryupdateQuestDetailAllocation({ allocationId: details.scancode, questId: details.pageInfo.taskId, questDetailList, questNum: details.pageInfo.questNum });
-        if (res2.code === 200) {
+        const res = await postqueryupdateQuestDetailAllocation({ allocationId: details.scancode, questId: details.pageInfo.taskId, questDetailList, questNum: details.pageInfo.questNum });
+        if (res.code === 200) {
           details.showUpData = false;
         }
-        utils.ttsspke(res2.msg);
+        utils.ttsspke(res.msg);
       }
       function submitCheck() {
         uni.navigateBack();
@@ -36142,7 +36263,7 @@ This will fail in production if not fixed.`);
           success: (deta) => {
             formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:506", "111 :>> ", 111);
             try {
-              getWarehouseDeleteQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum }).then((res2) => {
+              getWarehouseDeleteQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum }).then((res) => {
                 basicContainer.value.startPullDownRefresh();
               });
             } catch (e) {
@@ -36194,7 +36315,7 @@ This will fail in production if not fixed.`);
           isonecheck: true,
           success: (deta) => {
             try {
-              getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum }).then((res2) => {
+              getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum }).then((res) => {
                 basicContainer.value.startPullDownRefresh();
               });
             } catch (e) {
@@ -36284,8 +36405,8 @@ This will fail in production if not fixed.`);
                 // 未入库
                 noReceivedNum: checkSectionList2[4].value
               }];
-              const res2 = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum });
-              const { code: code2 } = res2;
+              const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId, questNum: details.pageInfo.questNum });
+              const { code: code2 } = res;
               if (code2 === 200)
                 basicContainer.value.startPullDownRefresh();
               tiplists.value.setdetails({ isshow: false });
@@ -36335,9 +36456,9 @@ This will fail in production if not fixed.`);
             }
             if (info.goodsType === "库存品")
               submitData = stockAdd(deta);
-            const res2 = await getWarehouseSaveNewQuestDetail(submitData);
-            formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:718", "res :>> ", res2);
-            const { code: code2 } = res2;
+            const res = await getWarehouseSaveNewQuestDetail(submitData);
+            formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:718", "res :>> ", res);
+            const { code: code2 } = res;
             if (code2 === 200) {
               basicContainer.value.startPullDownRefresh();
               uni.showToast({
@@ -37009,28 +37130,28 @@ This will fail in production if not fixed.`);
         if (infos.value.isInventory === "1") {
           FormData.orderCode = infos.value.martialCode;
         }
-        pcontractQuestDetailList(FormData).then((res2) => {
-          formatAppLog("log", "at pagesTask/pages/contracts/contracts.vue:481", res2);
-          if (res2.code !== 200)
+        pcontractQuestDetailList(FormData).then((res) => {
+          formatAppLog("log", "at pagesTask/pages/contracts/contracts.vue:481", res);
+          if (res.code !== 200)
             return;
-          if (res2.data.isInventory == 1) {
-            stock.isInventory = res2.data.isInventory;
+          if (res.data.isInventory == 1) {
+            stock.isInventory = res.data.isInventory;
             stock.contract = "库存品";
-            stock.allocationCode = res2.data.packagelistVOList;
-            details.renderList = res2.data.packagelistVOList;
-            stock.allNum = res2.data.total;
+            stock.allocationCode = res.data.packagelistVOList;
+            details.renderList = res.data.packagelistVOList;
+            stock.allNum = res.data.total;
             formatAppLog("log", "at pagesTask/pages/contracts/contracts.vue:490", stock.allocationCode, "列表");
-            stock.finishNum = res2.data.unTotal;
-            stock.renderList = res2.data.packagelistVOList;
-            stock.isInventory = res2.data.isInventory;
-          } else if (res2.data.isZero === 1) {
+            stock.finishNum = res.data.unTotal;
+            stock.renderList = res.data.packagelistVOList;
+            stock.isInventory = res.data.isInventory;
+          } else if (res.data.isZero === 1) {
             zero.isZero = 1;
           }
           article.contract = "定制品";
-          article.allocationCode = res2.data.orderCode;
-          article.allNum = res2.data.total;
-          article.finishNum = res2.data.unTotal;
-          details.renderList = res2.data.packagelistVOList;
+          article.allocationCode = res.data.orderCode;
+          article.allNum = res.data.total;
+          article.finishNum = res.data.unTotal;
+          details.renderList = res.data.packagelistVOList;
           details.checkList = details.renderList.map(() => false);
           if (stock.isInventory === 1)
             details.goodsType = "库存品";
@@ -37068,9 +37189,9 @@ This will fail in production if not fixed.`);
             // 未入库
             noReceivedNum: 0
           }];
-          const res2 = await getWarehouseUpdateQuestDetail({ questDetailList, questId: infos.value.taskId, questNum: infos.value.questNum });
-          const { code: code2, msg } = res2;
-          formatAppLog("log", "at pagesTask/pages/contracts/contracts.vue:559", "res :>> ", res2);
+          const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: infos.value.taskId, questNum: infos.value.questNum });
+          const { code: code2, msg } = res;
+          formatAppLog("log", "at pagesTask/pages/contracts/contracts.vue:559", "res :>> ", res);
           if (code2 === 200) {
             Tjinfo();
             utils.ttsspke(msg);
@@ -37113,9 +37234,9 @@ This will fail in production if not fixed.`);
           isonecheck: true,
           success: (deta) => {
             try {
-              getWarehouseDeleteQuestDetail({ questNum: infos.value.questNum, questDetailList, questId: infos.value.taskId }).then((res2) => {
+              getWarehouseDeleteQuestDetail({ questNum: infos.value.questNum, questDetailList, questId: infos.value.taskId }).then((res) => {
                 initPage();
-                utils.ttsspke(res2.msg);
+                utils.ttsspke(res.msg);
               });
             } catch (e) {
             } finally {
@@ -37165,11 +37286,11 @@ This will fail in production if not fixed.`);
           const questDetailList = arr.map((val) => {
             return { id: val.questDetailId };
           });
-          const res2 = await postqueryupdateQuestDetailAllocation({ allocationId: details.scancode, questId: infos.value.taskId, questDetailList, questNum: infos.value.questNum });
-          if (res2.code === 200) {
+          const res = await postqueryupdateQuestDetailAllocation({ allocationId: details.scancode, questId: infos.value.taskId, questDetailList, questNum: infos.value.questNum });
+          if (res.code === 200) {
             Tjinfo();
           }
-          utils.ttsspke(res2.msg);
+          utils.ttsspke(res.msg);
         } catch (err) {
           formatAppLog("log", "at pagesTask/pages/contracts/contracts.vue:699", "err :>> ", err);
         } finally {
@@ -37252,8 +37373,8 @@ This will fail in production if not fixed.`);
                   // 未入库
                   noReceivedNum: checkSectionList2[4].value
                 }];
-                const res2 = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.questId });
-                const { code: code2 } = res2;
+                const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.questId });
+                const { code: code2 } = res;
                 if (code2 === 200)
                   Tjinfo();
                 tiplists.value.setdetails({ isshow: false });
@@ -37306,15 +37427,15 @@ This will fail in production if not fixed.`);
                   // 未入库
                   noReceivedNum: checkSectionList2[4].value
                 }];
-                const res2 = await getWarehouseUpdateQuestDetail({ questDetailList, questId: infos.value.taskId });
-                const { code: code2 } = res2;
+                const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: infos.value.taskId });
+                const { code: code2 } = res;
                 if (code2 === 200)
                   initPage();
                 uni.showToast({
-                  title: res2.msg,
+                  title: res.msg,
                   icon: "none"
                 });
-                utils.ttsspke(res2.msg);
+                utils.ttsspke(res.msg);
                 tiplists.value.setdetails({ isshow: false });
               },
               cancel: () => {
@@ -37365,12 +37486,12 @@ This will fail in production if not fixed.`);
           isonecheck: true,
           success: (deta) => {
             try {
-              getWarehouseUpdateQuestDetail({ questDetailList, questId: infos.value.taskId }).then((res2) => {
+              getWarehouseUpdateQuestDetail({ questDetailList, questId: infos.value.taskId }).then((res) => {
                 uni.showToast({
-                  title: res2.msg,
+                  title: res.msg,
                   icon: "none"
                 });
-                utils.ttsspke(res2.msg);
+                utils.ttsspke(res.msg);
                 Tjinfo();
               });
             } catch (e) {
@@ -37421,9 +37542,9 @@ This will fail in production if not fixed.`);
             }
             if (goodsType === "库存品")
               submitData = stockAdd(deta);
-            const res2 = await getWarehouseSaveNewQuestDetail(submitData);
-            formatAppLog("log", "at pagesTask/pages/contracts/contracts.vue:968", "res :>> ", res2);
-            const { code: code2 } = res2;
+            const res = await getWarehouseSaveNewQuestDetail(submitData);
+            formatAppLog("log", "at pagesTask/pages/contracts/contracts.vue:968", "res :>> ", res);
+            const { code: code2 } = res;
             if (code2 === 200) {
               Tjinfo();
               uni.showToast({
@@ -39253,11 +39374,11 @@ This will fail in production if not fixed.`);
   }
   function iteratorOperation(arr, operation) {
     const [num1, num2, ...others] = arr;
-    let res2 = operation(num1, num2);
+    let res = operation(num1, num2);
     others.forEach((num) => {
-      res2 = operation(res2, num);
+      res = operation(res, num);
     });
-    return res2;
+    return res;
   }
   function times(...nums) {
     if (nums.length > 2) {
@@ -41737,11 +41858,11 @@ This will fail in production if not fixed.`);
         if (_atn)
           clearTimeout(_atn);
         _atn = setTimeout(async () => {
-          const res2 = await postqueryfindMaterialList({ materialCode: details.upform.stock.materialName });
-          formatAppLog("log", "at compoment/tiplist/tiplist.vue:415", "res :>> ", res2);
-          const { code: code2 } = res2;
+          const res = await postqueryfindMaterialList({ materialCode: details.upform.stock.materialName });
+          formatAppLog("log", "at compoment/tiplist/tiplist.vue:415", "res :>> ", res);
+          const { code: code2 } = res;
           if (code2 === 200)
-            details.materialName = res2.data;
+            details.materialName = res.data;
           clearTimeout(_atn);
         }, 500);
       }
@@ -42366,8 +42487,8 @@ This will fail in production if not fixed.`);
       title: {
         type: String
       },
-      leftClick() {
-        uni.navigateBack();
+      leftClick: {
+        type: Function
       }
     },
     setup(__props, { expose }) {
@@ -42378,10 +42499,13 @@ This will fail in production if not fixed.`);
       if (isEnd === void 0)
         isEnd = vue.ref(false);
       const pullDownRefreshInitPage = props2.option.pullDownRefreshInitPage || function() {
-        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:57", "刷新");
+        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:59", "刷新");
       };
       const reachBottomInitPage = props2.option.reachBottomInitPage || function() {
       };
+      const leftClick = props2.leftClick || function() {
+        uni.navigateBack();
+      };
       onLoad(() => {
       });
       let antiShake = null;
@@ -42392,7 +42516,7 @@ This will fail in production if not fixed.`);
             title: "数据已加载完毕"
           });
         }
-        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:78", "antiShake :>> ", antiShake);
+        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:81", "antiShake :>> ", antiShake);
         if (antiShake) {
           uni.hideLoading();
           clearTimeout(antiShake);
@@ -42411,13 +42535,12 @@ This will fail in production if not fixed.`);
       onPullDownRefresh(() => {
         const timer = setTimeout(async () => {
           await pullDownRefreshInitPage();
-          formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:106", "111 :>> ", 111);
           uni.stopPullDownRefresh();
           clearTimeout(timer);
         }, 500);
       });
       function startPullDownRefresh() {
-        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:115", "触发下拉");
+        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:117", "触发下拉");
         uni.startPullDownRefresh();
       }
       expose({ startPullDownRefresh });
@@ -42433,7 +42556,7 @@ This will fail in production if not fixed.`);
                 title: vue.unref(title),
                 placeholder: "",
                 autoBack: false,
-                onLeftClick: __props.option.leftClick,
+                onLeftClick: vue.unref(leftClick),
                 leftIconSize: "35",
                 bgColor: "#d3832a",
                 leftIconColor: "#ffffff",
diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json
index d443c65..c33a4e9 100644
--- a/unpackage/dist/dev/app-plus/manifest.json
+++ b/unpackage/dist/dev/app-plus/manifest.json
@@ -7,8 +7,8 @@
   "id": "__UNI__EB22F37",
   "name": "货无忧",
   "version": {
-    "name": "1.0.26",
-    "code": 1026
+    "name": "1.0.27",
+    "code": 1027
   },
   "description": "",
   "developer": {
diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPScanList/SelfPScanList.css b/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPScanList/SelfPScanList.css
index e0dd6ac..82ac0ef 100644
--- a/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPScanList/SelfPScanList.css
+++ b/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPScanList/SelfPScanList.css
@@ -1,205 +1,3 @@
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.u-status-bar[data-v-eb8e0cdd] {
-  width: 100%;
-}
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-uni-view[data-v-ac70166d], uni-scroll-view[data-v-ac70166d], uni-swiper-item[data-v-ac70166d] {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-@font-face {
-  font-family: "uicon-iconfont";
-  src: url("https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf") format("truetype");
-}
-.u-icon[data-v-ac70166d] {
-  display: flex;
-  align-items: center;
-}
-.u-icon--left[data-v-ac70166d] {
-  flex-direction: row-reverse;
-  align-items: center;
-}
-.u-icon--right[data-v-ac70166d] {
-  flex-direction: row;
-  align-items: center;
-}
-.u-icon--top[data-v-ac70166d] {
-  flex-direction: column-reverse;
-  justify-content: center;
-}
-.u-icon--bottom[data-v-ac70166d] {
-  flex-direction: column;
-  justify-content: center;
-}
-.u-icon__icon[data-v-ac70166d] {
-  font-family: uicon-iconfont;
-  position: relative;
-
-  display: flex;
-
-  flex-direction: row;
-  align-items: center;
-}
-.u-icon__icon--primary[data-v-ac70166d] {
-  color: #3c9cff;
-}
-.u-icon__icon--success[data-v-ac70166d] {
-  color: #5ac725;
-}
-.u-icon__icon--error[data-v-ac70166d] {
-  color: #f56c6c;
-}
-.u-icon__icon--warning[data-v-ac70166d] {
-  color: #f9ae3d;
-}
-.u-icon__icon--info[data-v-ac70166d] {
-  color: #909399;
-}
-.u-icon__img[data-v-ac70166d] {
-  height: auto;
-  will-change: transform;
-}
-.u-icon__label[data-v-ac70166d] {
-  line-height: 1;
-}
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[data-v-f631659b] {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-.u-navbar--fixed[data-v-f631659b] {
-  position: fixed;
-  left: 0;
-  right: 0;
-  top: 0;
-  z-index: 11;
-}
-.u-navbar__content[data-v-f631659b] {
-
-  display: flex;
-
-  flex-direction: row;
-  align-items: center;
-  height: 44px;
-  background-color: #9acafc;
-  position: relative;
-  justify-content: center;
-}
-.u-navbar__content__left[data-v-f631659b], .u-navbar__content__right[data-v-f631659b] {
-  padding: 0 13px;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-
-  display: flex;
-
-  flex-direction: row;
-  align-items: center;
-}
-.u-navbar__content__left[data-v-f631659b] {
-  left: 0;
-}
-.u-navbar__content__left--hover[data-v-f631659b] {
-  opacity: 0.7;
-}
-.u-navbar__content__left__text[data-v-f631659b] {
-  font-size: 15px;
-  margin-left: 3px;
-}
-.u-navbar__content__title[data-v-f631659b] {
-  text-align: center;
-  font-size: 16px;
-  color: #303133;
-}
-.u-navbar__content__right[data-v-f631659b] {
-  right: 0;
-}
-.u-navbar__content__right__text[data-v-f631659b] {
-  font-size: 15px;
-  margin-left: 3px;
-}
 .select_wrap[data-v-7a3666ce] {
   width: 7.5rem;
   height: 2rem;
diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupScan/SelfPickupScan.css b/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupScan/SelfPickupScan.css
index f9bb6c6..57f94d6 100644
--- a/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupScan/SelfPickupScan.css
+++ b/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupScan/SelfPickupScan.css
@@ -23,34 +23,6 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.u-status-bar[data-v-eb8e0cdd] {
-  width: 100%;
-}
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
 uni-view[data-v-ac70166d], uni-scroll-view[data-v-ac70166d], uni-swiper-item[data-v-ac70166d] {
   display: flex;
   flex-direction: column;
@@ -140,91 +112,6 @@ uni-view[data-v-ac70166d], uni-scroll-view[data-v-ac70166d], uni-swiper-item[dat
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[data-v-f631659b] {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-.u-navbar--fixed[data-v-f631659b] {
-  position: fixed;
-  left: 0;
-  right: 0;
-  top: 0;
-  z-index: 11;
-}
-.u-navbar__content[data-v-f631659b] {
-
-  display: flex;
-
-  flex-direction: row;
-  align-items: center;
-  height: 44px;
-  background-color: #9acafc;
-  position: relative;
-  justify-content: center;
-}
-.u-navbar__content__left[data-v-f631659b], .u-navbar__content__right[data-v-f631659b] {
-  padding: 0 13px;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-
-  display: flex;
-
-  flex-direction: row;
-  align-items: center;
-}
-.u-navbar__content__left[data-v-f631659b] {
-  left: 0;
-}
-.u-navbar__content__left--hover[data-v-f631659b] {
-  opacity: 0.7;
-}
-.u-navbar__content__left__text[data-v-f631659b] {
-  font-size: 15px;
-  margin-left: 3px;
-}
-.u-navbar__content__title[data-v-f631659b] {
-  text-align: center;
-  font-size: 16px;
-  color: #303133;
-}
-.u-navbar__content__right[data-v-f631659b] {
-  right: 0;
-}
-.u-navbar__content__right__text[data-v-f631659b] {
-  font-size: 15px;
-  margin-left: 3px;
-}
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
 @font-face {
   font-family: "l-icons";
   src: url("data:font/ttf;charset=utf-8;base64,AAEAAAANAIAAAwBQRkZUTZa9XzsAAAjcAAAAHEdERUYAKQAOAAAIvAAAAB5PUy8yPDVJwwAAAVgAAABgY21hcMxRtw0AAAHUAAABYmdhc3D//wADAAAItAAAAAhnbHlm05h+ZAAAA0wAAAJ8aGVhZCQifFoAAADcAAAANmhoZWEHyAOSAAABFAAAACRobXR4EnYBLQAAAbgAAAAcbG9jYQKkAegAAAM4AAAAEm1heHABFgBMAAABOAAAACBuYW1lXoIBAgAABcgAAAKCcG9zdMeZtAYAAAhMAAAAaAABAAAAAQAA+jMzTF8PPPUACwQAAAAAAOCMnBkAAAAA4IycGQAA/6sD6gOAAAAACAACAAAAAAAAAAEAAAOA/4AAXAQLAAAAAAPqAAEAAAAAAAAAAAAAAAAAAAAGAAEAAAAIAEAABAAAAAAAAgAAAAoACgAAAP8AAAAAAAAABAQEAZAABQAAAokCzAAAAI8CiQLMAAAB6wAyAQgAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZADA5gDm8AOA/4AAAAPcAIAAAAABAAAAAAAAAAAAAAAgAAEEAAAAAAAAAAFVAAAECwAWBAsAHgQAAPkBCwAAAAAAAwAAAAMAAAAcAAEAAAAAAFwAAwABAAAAHAAEAEAAAAAMAAgAAgAE5gDmB+Yf5iPm8P//AADmAOYH5h/mI+bw//8aAxn9GeYZ4xkXAAEAAAAAAAAAAAAAAAAAAAEGAAABAAAAAAAAAAECAAAAAgAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAByAOAA9AEIAT4AAAAEABb/wQPiA0sAIQAkAD4APwAAAQYUFwEWHwE3Njc2JyYnJicBJwE2NzY3NicmJzEuAQYHCQE3ByU+ATc2JwEnNwE2Jy4BDwEGBw4BFwEWHwE3MQHuFhYBcRIZDAwvDQQDAwsFBf7IBQE3DgUJAgICAQQLLDET/o8BqAwM/kUbJwEBGf7HBgYBOhwGB1MiabFZFwEXAXESGAoJAbkWQxf+kBIEAgIKLQ8TDw4HBAE5BAE3DQgNDRINBQkYGAcT/o/+CAICAQIqGyIZATkEBQE6HCUsHh5psVgXRBf+kBIEAgEAAAAEAB7/tQPqAz8AIAAiADwAPQAAATY0JwEmLwEHBgcGFxYXFhcBFwEGBwYHBhcWFzEeATY3AwclDgEHBhcBFwcBBhceAT8BNjc+AScBJi8BBzECEhYW/o8SGQwMLw0EAwMLBQUBOAX+yQ4FCQICAgEECywxEzcMAccbJwEBGQE5Bgb+xhwGB1MiabFZFwEX/o8SGAoJAUcWQxcBcBIEAgIKLQ8TDw4HBP7HBP7JDQgNDRINBQkYGAcTA2kCAQIqGyIZ/scEBf7GHCUsHh5psVgXRBcBcBIEAgEAAAAAAQD5/68DSQOAAAUAADcXCQEHAflnAen+F2cBghZnAekB6Gf+fwAAAAEBC/+rAxgDVQAFAAAJARcJAQcBCwG9UP6JAWJRAYEB1Ez+dv52SgABAAD/sAPOA4AAGwAACQEWFAYiJwkBBiImNDcJASY0NjIXCQE2MhYUBwJPAWoVKzwW/pb+lhY8KxUBa/6VFSs8FgFqAWoWPCsVAZj+lRU9KxUBa/6VFSs9FQFrAWsVPSsV/pUBaxUrPRUAAAAAABIA3gABAAAAAAAAABMAKAABAAAAAAABAAgATgABAAAAAAACAAcAZwABAAAAAAADAAgAgQABAAAAAAAEAAgAnAABAAAAAAAFAAsAvQABAAAAAAAGAAgA2wABAAAAAAAKACsBPAABAAAAAAALABMBkAADAAEECQAAACYAAAADAAEECQABABAAPAADAAEECQACAA4AVwADAAEECQADABAAbwADAAEECQAEABAAigADAAEECQAFABYApQADAAEECQAGABAAyQADAAEECQAKAFYA5AADAAEECQALACYBaABDAHIAZQBhAHQAZQBkACAAYgB5ACAAaQBjAG8AbgBmAG8AbgB0AABDcmVhdGVkIGJ5IGljb25mb250AABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABSAGUAZwB1AGwAYQByAABSZWd1bGFyAABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABWAGUAcgBzAGkAbwBuACAAMQAuADAAAFZlcnNpb24gMS4wAABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAHMAdgBnADIAdAB0AGYAIABmAHIAbwBtACAARgBvAG4AdABlAGwAbABvACAAcAByAG8AagBlAGMAdAAuAABHZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuAABoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAABodHRwOi8vZm9udGVsbG8uY29tAAAAAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAEAAgECAQMBBAEFAQYKeW91amlhbnRvdQt5b3VqaWFudG91MQt5b3VqaWFudG91Mgp6dW9qaWFudG91B3NoYW5jaHUAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwAHAAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAAOCMnBkAAAAA4IycGQ==") format("truetype");
diff --git a/utils/request.js b/utils/request.js
index 56840eb..fa9f401 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -111,7 +111,6 @@ const HandleRequest = (params, key) => {
 		header.Authorization = `Basic ${base64.encode(APPKEY)}`
 
 		// return
-		console.log('params :1111>> ', params);
 		if (params.url.indexOf('blade-auth/oauth/token') != -1) {
 			header['Content-Type'] = 'application/x-www-form-urlencoded'
 			header['Tenant-Id'] = params.data.tenantId
@@ -161,7 +160,7 @@ const HandleRequest = (params, key) => {
 
 		request.then(res => {
 			// console.log(res);
-			console.log('登录res :>> ', res);
+			console.log('请求res :>> ', res);
 			uni.hideLoading()
 			if (res.statusCode == 200) {
 
@@ -280,7 +279,6 @@ let _isRefreshToken = {
 let isLogin = false
 
 const service = async (params) => {
-	console.log('params :>> ', params);
 	if (params.data.isLogin) {
 		isLogin = true
 		delete params.data.isLogin