更改自提备货加载样式

1 year ago · 3468e55b13
22 changed files with 2217 additions and 2260 deletions
--- 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)
--- 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/'
 /**
 * 图片域名
 * */
--- 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" : {
--- 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",
--- 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({
--- 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 })
--- 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 {
--- 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>

--- 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 == '') {
--- 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>
--- 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 })
--- 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'
 		})
--- 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">
--- 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}`
 						})
--- 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) => {
--- 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) {
--- a/unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
+++ b/unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
--- 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": {
--- 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;
--- 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");
--- 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