From 232d84ee4269ae20939530aeaead7f5cc4d494d1 Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Sat, 5 Aug 2023 17:18:29 +0800
Subject: [PATCH] 1

---
 api/user.js                                   |  146 +-
 compoment/tiplist/tiplist.vue                 |   71 +-
 config/host.js                                |    3 +-
 interfaces/compoment/tiplist.ts               |    6 +
 interfaces/pagesHome/SelfPScanList.ts         |    6 +
 interfaces/pagesHome/SelfPickupDetails.ts     |    8 +-
 manifest.json                                 |   27 +-
 pages.json                                    |   11 +-
 pages/index/index.vue                         |   11 +
 .../CustomerOrdersDetails.vue                 |   46 +-
 pagesHome/pages/CustomerSign/CustomerSign.vue |  139 +-
 .../DeliveryCustomerScan.vue                  |   26 +-
 .../pages/LoadingDetails/LoadingDetails.vue   |   30 +-
 pagesHome/pages/LoadingScan/LoadingScan.vue   |   38 +-
 .../pages/OfflineUpload/OfflineUpload.vue     |   40 +
 .../pages/SelfPScanList/SelfPScanList.vue     |  167 +-
 .../SelfPickupDetails/SelfPickupDetails.vue   |  173 +-
 .../pages/SelfPickupScan/SelfPickupScan.vue   |    4 +-
 .../pages/SignDetailScan/SignDetailScan.vue   |  182 +-
 .../StockUplistScandetails.vue                |   26 +-
 pagesHome/pages/pickingScan/pickingScan.vue   |    3 +-
 pagesHome/pages/setbarcode/setbarcode.vue     |   27 +
 .../pages/signOrderScan/signOrderScan.vue     |  162 +-
 pagesHome/pages/signinScan/signinScan.vue     |   37 +-
 static/add.png                                |  Bin 0 -> 785 bytes
 .../dist/dev/app-plus/app-config-service.js   |    2 +-
 unpackage/dist/dev/app-plus/app-service.js    | 2460 ++++++++++++-----
 unpackage/dist/dev/app-plus/app.css           |   22 +-
 unpackage/dist/dev/app-plus/manifest.json     |   32 +-
 .../pages/OfflineUpload/OfflineUpload.css     |  250 ++
 .../pages/SelfPScanList/SelfPScanList.css     |   30 +-
 .../SelfPickupDetails/SelfPickupDetails.css   |   26 +
 .../pages/SignDetailScan/SignDetailScan.css   |   45 +-
 .../pagesHome/pages/setbarcode/setbarcode.css |  202 ++
 unpackage/dist/dev/app-plus/static/add.png    |  Bin 0 -> 785 bytes
 unpackage/dist/dev/mp-weixin/api/user.js      |   80 +
 unpackage/dist/dev/mp-weixin/app.js           |    2 +
 unpackage/dist/dev/mp-weixin/app.json         |    3 +-
 .../mp-weixin/compoment/tiplist/tiplist.js    |   47 +-
 .../mp-weixin/compoment/tiplist/tiplist.wxml  |    2 +-
 .../mp-weixin/compoment/tiplist/tiplist.wxss  |   22 +-
 unpackage/dist/dev/mp-weixin/config/host.js   |    2 +-
 .../dist/dev/mp-weixin/pages/index/index.js   |   11 +
 .../dist/dev/mp-weixin/pages/login/login.js   |    2 +-
 .../CustomerOrdersDetails.js                  |   72 +-
 .../CustomerOrdersDetails.wxml                |    2 +-
 .../pages/CustomerSign/CustomerSign.js        |  132 +-
 .../pages/CustomerSign/CustomerSign.wxml      |    2 +-
 .../DeliveryCustomerScan.js                   |   32 +-
 .../DeliveryCustomerScan.wxml                 |    2 +-
 .../pages/LoadingDetails/LoadingDetails.js    |   45 +-
 .../pages/LoadingDetails/LoadingDetails.wxml  |    2 +-
 .../pages/LoadingScan/LoadingScan.js          |   51 +-
 .../pages/LoadingScan/LoadingScan.wxml        |    2 +-
 .../pages/OfflineUpload/OfflineUpload.js      |   24 +
 .../pages/OfflineUpload/OfflineUpload.json    |    8 +
 .../pages/OfflineUpload/OfflineUpload.wxml    |    1 +
 .../pages/OfflineUpload/OfflineUpload.wxss    |   48 +
 .../pages/SelfPScanList/SelfPScanList.js      |  135 +-
 .../pages/SelfPScanList/SelfPScanList.wxml    |    2 +-
 .../pages/SelfPScanList/SelfPScanList.wxss    |   30 +-
 .../SelfPickupDetails/SelfPickupDetails.js    |  158 +-
 .../SelfPickupDetails/SelfPickupDetails.wxml  |    2 +-
 .../SelfPickupDetails/SelfPickupDetails.wxss  |   26 +
 .../pages/SelfPickupScan/SelfPickupScan.js    |    4 +-
 .../pages/SignDetailScan/SignDetailScan.js    |   85 +-
 .../pages/SignDetailScan/SignDetailScan.wxml  |    2 +-
 .../pages/SignDetailScan/SignDetailScan.wxss  |   45 +-
 .../pages/StockUplist/StockUplist.js          |    2 +-
 .../StockUplistScandetails.js                 |   30 +-
 .../StockUplistScandetails.wxml               |    2 +-
 .../pages/pickingScan/pickingScan.js          |    5 +-
 .../pagesHome/pages/setbarcode/setbarcode.js  |   41 +-
 .../pages/setbarcode/setbarcode.json          |    5 +-
 .../pages/setbarcode/setbarcode.wxml          |    2 +-
 .../pages/signOrderScan/signOrderScan.js      |  177 +-
 .../pages/signOrderScan/signOrderScan.wxml    |    2 +-
 .../pagesHome/pages/signinScan/signinScan.js  |   45 +-
 .../pages/signinScan/signinScan.wxml          |    2 +-
 unpackage/dist/dev/mp-weixin/static/add.png   |  Bin 0 -> 785 bytes
 .../dist/dev/mp-weixin/utils/functions.js     |   10 +-
 utils/functions.js                            |   12 +-
 82 files changed, 4836 insertions(+), 1040 deletions(-)
 create mode 100644 pagesHome/pages/OfflineUpload/OfflineUpload.vue
 create mode 100644 static/add.png
 create mode 100644 unpackage/dist/dev/app-plus/pagesHome/pages/OfflineUpload/OfflineUpload.css
 create mode 100644 unpackage/dist/dev/app-plus/static/add.png
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.js
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.json
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/static/add.png

diff --git a/api/user.js b/api/user.js
index 0d3e5ea..49cf064 100644
--- a/api/user.js
+++ b/api/user.js
@@ -232,7 +232,7 @@ export function signfororder(data) {
 	});
 }
 /**
- * 签收详情
+ * 签收订制品详情
  * @param {Object} data
  */
 export function signforwrap(data) {
@@ -243,6 +243,18 @@ export function signforwrap(data) {
 		data
 	});
 }
+/**
+ * 签收库存品详情
+ * @param {Object} data
+ */
+export function signforwrapIn(data) {
+
+	return request({
+		url: `logpm-distribution/app/signfor/wrapIn`,
+		method: "get",
+		data
+	});
+}
 /**
  * 客户查看库存品
  * @param {Object} data
@@ -279,27 +291,111 @@ export function deliveryloadinginventory(data) {
 		data
 	});
 }
-// /**
-//  * 配车明细订制品扫描
-//  * @param {Object} data
-//  */
-// export function deliveryloadinginventory(data) {
-
-// 	return request({
-// 		url: `logpm-distribution/app/delivery/loadinginventory`,
-// 		method: "post",
-// 		data
-// 	});
-// }
-// /**
-//  * 配车明细库存品扫描
-//  * @param {Object} data
-//  */
-// export function deliveryloadinginventory(data) {
-
-// 	return request({
-// 		url: `logpm-distribution/app/delivery/loadinginventory`,
-// 		method: "post",
-// 		data
-// 	});
-// }
\ No newline at end of file
+/**
+ * 客户签收订制品扫描
+ * @param {Object} data
+ */
+export function signforsignfor(data) {
+
+	return request({
+		url: `logpm-distribution/app/signfor/signfor`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 客户签收库存品扫描
+ * @param {Object} data
+ */
+export function signforsignforIn(data) {
+
+	return request({
+		url: `logpm-distribution/app/signfor/signforIn`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 不在配送单签收
+ * @param {Object} data
+ */
+export function signforsignforcontinue(data) {
+
+	return request({
+		url: `logpm-distribution/app/signfor/signforcontinue`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 司机确认签收
+ * @param {Object} data
+ */
+export function signforsignforack(data) {
+
+	return request({
+		url: `logpm-distribution/app/signfor/signforack`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 定位打卡
+ * @param {Object} data
+ */
+export function signforpositioning(data) {
+
+	return request({
+		url: `logpm-distribution/app/signfor/positioning`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 司机批量签收
+ * @param {Object} data
+ */
+export function signforoneclick(data) {
+
+	return request({
+		url: `logpm-distribution/app/signfor/oneclick`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 自提列表库存品
+ * @param {Object} data
+ */
+export function billLadinggetInventory(data) {
+
+	return request({
+		url: `logpm-distribution/app/billLading/getInventory`,
+		method: "get",
+		data
+	});
+}
+/**
+ * 自提详情库存品
+ * @param {Object} data
+ */
+export function billLadinggetInventoryNum(data) {
+
+	return request({
+		url: `logpm-distribution/app/billLading/getInventoryNum`,
+		method: "get",
+		data
+	});
+}
+/**
+ * 自提扫描
+ * @param {Object} data
+ */
+export function billLadingscan(data) {
+
+	return request({
+		url: `logpm-distribution/app/billLading/scan`,
+		method: "get",
+		data
+	});
+}
diff --git a/compoment/tiplist/tiplist.vue b/compoment/tiplist/tiplist.vue
index f7af17c..623a9ba 100644
--- a/compoment/tiplist/tiplist.vue
+++ b/compoment/tiplist/tiplist.vue
@@ -33,10 +33,34 @@
 				<view @click="checkbox(2)" class="confirm">{{confirmTxt||'确认'}}</view>
 			</view>
 		</view>
+		<view class="modtips" @click.stop="" v-if="tipstate==3">
+			<view class="title">
+				{{title||'提示'}}
+			</view>
+			<!-- <view class="contents">
+				{{content||'提示内容模板'}}
+			</view> -->
+			<view class="imgbx">
+				<view v-for="item in details.imglist">
+					<image :src="item"></image>
+				</view>
+				<view @click="updateimg" v-if="details.imglist.length!=details.maximglength">
+					<image src="/static/add.png"></image>
+				</view>
+			</view>
+			<view class="inputbx">
+				<input v-model="inputtext" :placeholder="placeholder" />
+			</view>
+			<view class="buts">
+				<view @click="checkbox(1)" v-if="isshowcancel" class="cancel">{{cancelTxt||'取消'}}</view>
+				<view @click="checkbox(2)" class="confirm">{{confirmTxt||'确认'}}</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script lang="ts" setup>
+	import functions from '@/utils/functions.js'
 	import { tiplistType } from '@/interfaces/compoment/tiplist'
 	import { reactive,ref,toRefs } from "vue";
 	let details=reactive<tiplistType>({
@@ -53,7 +77,9 @@
 		list:['12341131212'],
 		checklist:[],
 		inputtext:'',
-		isonecheck:false
+		isonecheck:false,
+		imglist:[],
+		maximglength:3
 	})
 	function setdetails(objs:any){
 		for(let key in objs){
@@ -94,8 +120,27 @@
 				break;
 		}
 	}
+	function updateimg(){
+		uni.chooseImage({
+			count:details.maximglength,
+			success:async (chooseImageRes) => {
+				const tempFilePaths = chooseImageRes.tempFilePaths;
+				let url=await functions.upfile(tempFilePaths[0])
+				details.imglist.push(url.link)
+				
+				// uni.uploadFile({
+				// 	url: 'https://www.example.com/upload', //仅为示例，非真实的接口地址
+				// 	filePath: tempFilePaths[0],
+				// 	name: 'file',
+				// 	success: (uploadFileRes) => {
+				// 		console.log(uploadFileRes.data);
+				// 	}
+				// });
+			}
+		});
+	}
 	defineExpose({setdetails})
-	const { inputtext,checklist,list,isshow,tipstate,title,isshowcancel,placeholder,confirmTxt,cancelTxt }=toRefs(details)
+	const { imglist,inputtext,checklist,list,isshow,tipstate,title,isshowcancel,placeholder,confirmTxt,cancelTxt }=toRefs(details)
 </script>
 
 <style lang="scss">
@@ -106,6 +151,7 @@
 		left: 0;
 		top: 0;
 		background-color: #00000050;
+		z-index: 9999;
 	}
 	.modtips{
 		width: 630upx;
@@ -131,6 +177,25 @@
 			color:#90A0AF;
 			margin-top: 30upx;
 		}
+		.imgbx{
+			width: 550upx;
+			display: grid;
+			grid-template-columns: 33% 33% 33%;
+			margin-top: 30upx;
+			>view{
+				width: 150upx;
+				height: 150upx;
+				padding: 10upx;
+				box-sizing: border-box;
+				border: 1upx solid #e6e6e6;
+				margin-bottom: 15upx;
+				border-radius: 8upx;
+				>image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
 		.buts{
 			display: flex;
 			align-items: center;
@@ -169,7 +234,7 @@
 			font-size: 27upx;
 			color: #092C4D;
 			>input{
-				width: 390upx;
+				width: 480upx;
 				flex: 1;
 			}
 		}
diff --git a/config/host.js b/config/host.js
index 2630eea..79be53b 100644
--- a/config/host.js
+++ b/config/host.js
@@ -3,8 +3,9 @@
 /**
  * 测试域名
  * */
-const devhost='http://192.168.10.51:8888/'
+// const devhost='http://192.168.10.51:8888/'
 // const devhost='http://192.168.10.126:8889/'
+const devhost='http://192.168.10.73:8777/'
 // const host='http://192.168.1.5:9503/api'
 /**
  * 正式域名
diff --git a/interfaces/compoment/tiplist.ts b/interfaces/compoment/tiplist.ts
index 397fafa..fd94025 100644
--- a/interfaces/compoment/tiplist.ts
+++ b/interfaces/compoment/tiplist.ts
@@ -43,4 +43,10 @@ export interface tiplistType{
 	/** 是否单选
 	 * */
 	isonecheck:boolean;
+	/** 图片数组
+	 * */
+	imglist:string[];
+	/** 图片长度
+	 * */
+	maximglength:number;
 }
\ No newline at end of file
diff --git a/interfaces/pagesHome/SelfPScanList.ts b/interfaces/pagesHome/SelfPScanList.ts
index 286d48f..3e75f7b 100644
--- a/interfaces/pagesHome/SelfPScanList.ts
+++ b/interfaces/pagesHome/SelfPScanList.ts
@@ -11,6 +11,9 @@ export interface pagedetails{
 	/**订单状态
 	 * */
 	orderStatus:number;
+	/**订单状态
+	 * */
+	orderType:number;
 	/**自提单ID
 	 * */
 	billLadingId:number|string;
@@ -32,4 +35,7 @@ export interface pagedetails{
 	/**签收总数
 	 * */
 	signedNum:string|number;
+	/**扫描结果
+	 * */
+	scancode:string|number;
 }
\ No newline at end of file
diff --git a/interfaces/pagesHome/SelfPickupDetails.ts b/interfaces/pagesHome/SelfPickupDetails.ts
index a8a583a..7f61d58 100644
--- a/interfaces/pagesHome/SelfPickupDetails.ts
+++ b/interfaces/pagesHome/SelfPickupDetails.ts
@@ -11,15 +11,18 @@ export interface pagedetailType{
 	/**订单状态
 	 * */
 	orderStatus:number;
+	
+	orderType:number;
 	/**订单自编码，用户输入的
 	 * */
-	orderSelfNumbering:string;
+	// orderSelfNumbering:string;
 	/**返回的数据列表
 	 * */
 	dataList:any;
 	/**自提订单id
 	 * */
 	billLadingId:string|number;
+	orderCode?:string|number;
 	/**配车类型
 	 * */
 	carTypeStr:string;
@@ -41,4 +44,7 @@ export interface pagedetailType{
 	/**完成签收总数
 	 * */
 	signedNum:number|string;
+	/**扫描参数
+	 * */
+	scancode:string
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index b5133fa..4090463 100644
--- a/manifest.json
+++ b/manifest.json
@@ -29,20 +29,20 @@
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
@@ -52,7 +52,16 @@
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "geolocation" : {},
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    },
+                    "amap" : {
+                        "__platform__" : [ "android" ],
+                        "appkey_ios" : "382bfd7864cb0b0d53fddc58b56281d6",
+                        "appkey_android" : "382bfd7864cb0b0d53fddc58b56281d6"
+                    }
+                },
                 "ad" : {}
             }
         },
diff --git a/pages.json b/pages.json
index ff7f8df..fbf9452 100644
--- a/pages.json
+++ b/pages.json
@@ -180,7 +180,16 @@
 				"path": "pages/setbarcode/setbarcode",
 				"style": {
 					"navigationBarTitleText": "配置包条码",
-					"enablePullDownRefresh": false
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+
+			}, {
+				"path": "pages/OfflineUpload/OfflineUpload",
+				"style": {
+					"navigationBarTitleText": "离线上传",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
 				}
 
 			}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6ff5fcf..60c753e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -76,6 +76,17 @@
 					},
 				]
 			},
+			{
+				type:1,
+				name:'离线上传',
+				minilist:[
+					{
+						icon:'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name:'离线上传',
+						router:'/pagesHome/pages/OfflineUpload/OfflineUpload',
+					},
+				]
+			},
 		]
 	})
 	function gopathpage(path:string){
diff --git a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
index 6af9b0b..e71b13a 100644
--- a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
+++ b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
@@ -36,7 +36,7 @@
 				:clearable='true'></cusSelects>
 		</view>
 		<view class="inputs">
-			<input placeholder="请输入查询的订单号" />
+			<input placeholder="请输入查询的订单号" v-model="inputtxt"/>
 		</view>
 		<view @click="initpage" class="btscan">查询</view>
 	</view>
@@ -50,7 +50,7 @@
 	</view>
 	<scroll-view class="scve" scroll-y="true">
 		<view class="mabx">
-			<view class="itec" v-if="orderStatus==1" v-for="item in datalist">
+			<view class="itec" @click="showsdqs" v-if="orderStatus==1" v-for="item in datalist">
 				<view class="contenbx1">
 					<view><text style="color: #90A0AF;">订单编号：</text>{{item.orderCode}}</view>
 				</view>
@@ -60,7 +60,7 @@
 				</view>
 				<view :class="item.completecode==3?'tip tp1':item.completecode==1?'tip tp2':'tip tp3'">{{item.complete}}</view>
 			</view>
-			<view class="itec" v-if="orderStatus==2" v-for="item in datalist">
+			<view class="itec" @click="showsdqs" v-if="orderStatus==2" v-for="item in datalist">
 				<view class="contenbx1">
 					<view><text style="color: #90A0AF;">SKU：</text>{{item.sku}}</view>
 				</view>
@@ -76,6 +76,7 @@
 			</view>
 		</view>
 	</scroll-view>
+	<tiplist ref="tiplists"></tiplist>
 	<saomiao></saomiao>
 	<saomiao1></saomiao1>
 	<saomiao2></saomiao2>
@@ -97,12 +98,12 @@
 		onUnload
 	} from '@dcloudio/uni-app'
 	import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue'
-	import { reactive, toRefs } from "vue";
+	import { reactive, ref, toRefs } from "vue";
 	let details = reactive({
 		schanvalue: '',
 		typearr: [
 			{
-				value: 1,
+				value: 3,
 				label: '齐套'
 			},
 			{
@@ -110,7 +111,7 @@
 				label: '部分扫'
 			},
 			{
-				value: 3,
+				value: 1,
 				label: '未扫'
 			}
 		],
@@ -118,8 +119,11 @@
 		datalist:[],
 		scancode:'',
 		orderStatus:1,
-		id:''
+		id:'',
+		orderType:0,
+		inputtxt:''
 	})
+	const tiplists=ref(null)
 	onLoad((op)=>{
 		details.items=JSON.parse(op.item)
 		details.id=op.id
@@ -132,9 +136,31 @@
 			}
 		})
 	})
+	function showsdqs(){
+		tiplists.value.setdetails({
+			isshow:true,
+			tipstate:1,
+			title:'请输入签收的包条',
+			placeholder:'请输入签收的包条',
+			inputtext:'',
+			success:(detail)=>{
+				details.scancode=detail.inputtext
+				scandata()
+				tiplists.value.setdetails({isshow:false})
+			},
+			cancel:()=>{
+				tiplists.value.setdetails({isshow:false})
+			},
+			close:()=>{
+				tiplists.value.setdetails({isshow:false})
+			}
+		})
+	}
 	async function initpage(){
 		let data={
-			reservationId:details.items.id
+			reservationId:details.items.id,
+			completecode:details.orderType,
+			orderCode:details.inputtxt
 		}
 		details.datalist=[]
 		let response=null
@@ -148,10 +174,12 @@
 	function checktype(e) {
 		if (e == '') {
 			details.schanvalue = ''
+			details.orderType=0
 		}
 		details.typearr.map(item => {
 			if (item.value == e) {
 				details.schanvalue = item.label
+				details.orderType=item.value
 				console.log(details.schanvalue)
 			}
 		})
@@ -187,7 +215,7 @@
 		
 		initpage()
 	}
-	const { orderStatus,schanvalue, typearr , items, datalist } = toRefs(details)
+	const { inputtxt,orderStatus,schanvalue, typearr , items, datalist } = toRefs(details)
 </script>
 
 <style lang="scss">
diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue
index cf76908..ecbe567 100644
--- a/pagesHome/pages/CustomerSign/CustomerSign.vue
+++ b/pagesHome/pages/CustomerSign/CustomerSign.vue
@@ -55,22 +55,26 @@
 				</view>
 				<view class="tbck">
 					<view>
-						<view>定位打卡</view>
+						<view @click="getLocation(item)">定位打卡</view>
 						<view @click.stop="gosinorderscan(item)">签到扫描</view>
-						<view>上传签收图片</view>
+						<view @click="uplodimg(item)">上传签收图片</view>
 					</view>
-					<view>
+					<view @click="allclick(item)">
 						批量签收
 					</view>
 				</view>
 			</view>
 		</view>
 	</scroll-view>
+	<tiplist ref="tiplists"></tiplist>
 </template>
 
 <script lang="ts" setup>
 	import {
-		signforcustom
+		signforcustom,
+		signforsignforack,
+		signforpositioning,
+		signforoneclick,
 	} from '@/api/user.js'
 	import {
 		onLoad,
@@ -78,13 +82,14 @@
 		onHide,
 		onUnload
 	} from '@dcloudio/uni-app'
-	import { reactive, toRefs } from "vue";
+	import { reactive, ref, toRefs } from "vue";
 	let details=reactive({
 		items:{} as any,
 		id:'',
 		datalist:[] as any,
 		
 	})
+	const tiplists=ref(null)
 	onLoad((op)=>{
 		details.items=JSON.parse(op.item)
 		details.id=JSON.parse(op.item).id
@@ -102,15 +107,137 @@
 	// 		url:'/pagesHome/pages/SignDetailScan/SignDetailScan?item='+JSON.stringify(item)
 	// 	})
 	// }
+	function uplodimg(item){
+		tiplists.value.setdetails({
+			isshow:true,
+			tipstate:3,
+			placeholder:'请填写备注',
+			confirmTxt:'确认签收',
+			inputtext:'',
+			imglist:[],
+			maximglength:3,
+			success:async (detail)=>{
+				let data={
+					deliveryId:details.id,
+					reservationId:item.id,
+					deliverySignPictures:detail.imglist.join(','),
+					driverRemarks:detail.inputtext
+				}
+				let res=await signforsignforack(data)
+				console.log(res);
+				if(res.code==200){
+					uni.showToast({
+						title:'上传签收图片',
+						icon:'none'
+					})
+					initpage()
+				}else{
+					uni.showToast({
+						title:res.msg,
+						icon:'none'
+					})
+				}
+				tiplists.value.setdetails({isshow:false})
+			},
+			cancel:()=>{
+				tiplists.value.setdetails({isshow:false})
+			},
+			close:()=>{
+				tiplists.value.setdetails({isshow:false})
+			},
+		})
+	}
+	async function allclick(item:any){
+		tiplists.value.setdetails({
+			isshow:true,
+			tipstate:3,
+			placeholder:'请填写备注',
+			confirmTxt:'确认批量签收',
+			inputtext:'',
+			imglist:[],
+			maximglength:3,
+			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){
+					uni.showToast({
+						title:'批量签收成功',
+						icon:'none'
+					})
+					initpage()
+				}else{
+					uni.showToast({
+						title:res.msg,
+						icon:'none'
+					})
+				}
+				tiplists.value.setdetails({isshow:false})
+			},
+			cancel:()=>{
+				tiplists.value.setdetails({isshow:false})
+			},
+			close:()=>{
+				tiplists.value.setdetails({isshow:false})
+			},
+		})
+		
+	}
+	function getLocation(item){
+		console.log('getLocation-------');
+		uni.getLocation({
+			type: 'wgs84',
+			geocode:true,
+			isHighAccuracy:true,
+			success:async function (res) {
+				console.log(JSON.stringify(res));
+				// let addr=res.address
+				// console.log(`${addr.province}${addr.city}${addr.district}${addr.street}${addr.streetNum}`);
+				console.log('当前位置的经度：' + res.longitude);
+				console.log('当前位置的纬度：' + res.latitude);
+				let data={
+					deliveryId:details.id,
+					reservationId:item.id,
+					positioning:res.longitude+','+res.latitude,
+					positioningAdr:''
+				}
+				let response=await signforpositioning(data)
+				console.log(response);
+				if(response.code==200){
+					uni.showToast({
+						title:'定位打卡成功',
+						icon:'none'
+					})
+					initpage()
+				}else{
+					uni.showToast({
+						title:response.msg,
+						icon:'none'
+					})
+				}
+			},
+			fail:(err)=>{
+				console.log(err);
+			}
+		});
+	}
+	
 	function gosinorderscan(item){
 		uni.navigateTo({
-			url:'/pagesHome/pages/signOrderScan/signOrderScan?item='+JSON.stringify(item)
+			url:'/pagesHome/pages/signOrderScan/signOrderScan?item='+JSON.stringify(item)+'&deliveryId='+details.id
 		})
 	}
 	const { items,datalist }=toRefs(details)
 </script>
 
 <style lang="scss">
+	
 	.scvbx{
 		width: 100%;
 		height: 60vh;
diff --git a/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue b/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue
index 915c5b8..cf38caf 100644
--- a/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue
+++ b/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue
@@ -34,7 +34,7 @@
 	</view>
 	<scroll-view class="scoolv" scroll-y="true">
 		<view class="minbx">
-			<view class="its" v-for="item in datalist">
+			<view class="its" @click="showsdqs" v-for="item in datalist">
 				<view class="titl">
 					客户：{{item.consignee}}
 				</view>
@@ -59,11 +59,12 @@
 					</view>
 				</view>
 				<view class="bts">
-					<view @click="ckoneloading(item)">一键装车</view>
+					<view @click.stop="ckoneloading(item)">一键装车</view>
 				</view>
 			</view>
 		</view>
 	</scroll-view>
+	<tiplist ref="tiplists"></tiplist>
 	<saomiao ></saomiao>
 	<saomiao1 ></saomiao1>
 	<saomiao2 ></saomiao2>
@@ -92,6 +93,7 @@
 		scancode:'',
 	})
 	const tip=ref(null)
+	const tiplists=ref(null)
 	onLoad((op)=>{
 		details.id=op.id
 		details.items=JSON.parse(op.item)
@@ -107,6 +109,26 @@
 	onShow(()=>{
 		initpage()
 	})
+	function showsdqs(){
+		tiplists.value.setdetails({
+			isshow:true,
+			tipstate:1,
+			title:'请输入签收的包条',
+			placeholder:'请输入签收的包条',
+			inputtext:'',
+			success:(detail)=>{
+				details.scancode=detail.inputtext
+				scandata()
+				tiplists.value.setdetails({isshow:false})
+			},
+			cancel:()=>{
+				tiplists.value.setdetails({isshow:false})
+			},
+			close:()=>{
+				tiplists.value.setdetails({isshow:false})
+			}
+		})
+	}
 	async function ckoneloading(item){
 		tip.value.setdetails({
 			title:'提示',
diff --git a/pagesHome/pages/LoadingDetails/LoadingDetails.vue b/pagesHome/pages/LoadingDetails/LoadingDetails.vue
index 5f05fad..f8205e8 100644
--- a/pagesHome/pages/LoadingDetails/LoadingDetails.vue
+++ b/pagesHome/pages/LoadingDetails/LoadingDetails.vue
@@ -28,14 +28,14 @@
 		</view>
 	</view>
 	<view class="scinp">
-		<view>齐套状态</view>
+		<view>扫描状态</view>
 		<view>
 			<cusSelects  @change='checktype' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5' size='145' :clearable='true'></cusSelects>
 		</view>
 		<view class="inputs">
-			<input placeholder="请输入查询的订单号"/>
+			<input placeholder="请输入查询的订单号" v-model="orderCode"/>
 		</view>
-		<view class="btscan">查询</view>
+		<view @click="initpage" class="btscan">查询</view>
 	</view>
 	<view class="tabtip">
 		<view @click="setorderStatus(1)">
@@ -53,7 +53,7 @@
 					<view>包装号：{{item.packageBarCode}}</view>
 				</view>
 				<view>
-					<view>是否扫描：{{item.scanStatus}}</view>
+					<view>是否扫描：{{item.scanStatus==1?'未扫描':item.scanStatus==''?'未扫描':item.scanStatus==4?'未扫描':'扫描'}}</view>
 					<!-- <view>异常：{{item.StockNot}}</view> -->
 				</view>
 			</view>
@@ -68,7 +68,7 @@
 				</view>
 				<view>
 					<view>单位：{{item.cargoUnit}}</view>
-					<view>扫描：{{item.scanStatus==1?'未扫描':item.scanStatus==''?'未扫描':'扫描'}}</view>
+					<view>扫描：{{item.scanStatus==1?'未扫描':item.scanStatus==''?'未扫描':item.scanStatus==4?'未扫描':'扫描'}}</view>
 					<!-- <view>规格：{{item.specification}}</view> -->
 				</view>
 			</view>
@@ -93,25 +93,23 @@
 	let details=reactive({
 		schanvalue:'',
 		typearr:[
-			{
-				value:1,
-				label:'齐套'
-			},
 			{
 				value:2,
-				label:'部分扫'
+				label:'已扫'
 			},
 			{
-				value:3,
+				value:1,
 				label:'未扫'
-			}
+			},
 		],
 		dataList:[],
 		id:'',
 		items:null as any,
 		current:1,
 		size:10,
-		orderStatus:1
+		orderStatus:1,
+		scanStatus:'' as string|number,
+		orderCode:''
 	})
 	onLoad((op)=>{
 		details.items=JSON.parse(op.item)
@@ -127,6 +125,8 @@
 			current:details.current,
 			size:details.size,
 			id:details.id,
+			scanStatus:details.scanStatus,
+			orderCode:details.orderCode
 		}
 		let response=null
 		if(details.orderStatus==1){
@@ -149,15 +149,17 @@
 	function checktype(e){
 		if(e==''){
 			details.schanvalue=''
+			details.scanStatus=''
 		}
 		details.typearr.map(item=>{
 			if(item.value==e){
 				details.schanvalue=item.label
+				details.scanStatus=item.value
 				console.log(details.schanvalue)
 			}
 		})
 	}
-	const { orderStatus,schanvalue,typearr,dataList,items }=toRefs(details)
+	const { orderCode,orderStatus,schanvalue,typearr,dataList,items }=toRefs(details)
 </script>
 
 <style lang="scss">
diff --git a/pagesHome/pages/LoadingScan/LoadingScan.vue b/pagesHome/pages/LoadingScan/LoadingScan.vue
index 2c5f454..c490ee6 100644
--- a/pagesHome/pages/LoadingScan/LoadingScan.vue
+++ b/pagesHome/pages/LoadingScan/LoadingScan.vue
@@ -9,11 +9,11 @@
 				<u-icon @click.stop="cleartime" style="margin-right: 10rpx;" v-else name="close-circle" color="#999999" size="40"></u-icon>
 			</view>
 		</view>
-		<view>
+		<view @click="init">
 			查询
 		</view>
 	</view>
-	<scroll-view scroll-y="true" class="scvbx">
+	<scroll-view scroll-y="true" class="scvbx" @scrolltolower="jiazai">
 		<view class="mabxslist">
 			<view class="item" v-for="item in recordsList">
 				<view class="headtop">
@@ -113,6 +113,14 @@
 	function showCalendar(){
 		details.show=!details.show
 	}
+	function init(){
+		details.current=1
+		initpage()
+	}
+	function jiazai(){
+		details.current++
+		initpage()
+	}
 	function onConfirm(e:any) {
 		console.log(e);
 		date.value[0]=e.startDate
@@ -121,10 +129,10 @@
 		// details.datatime=(uni as any).$u.timeFormat(date.value[0], 'yyyy-mm-dd')+' 至 '+(uni as any).$u.timeFormat(date.value[1], 'yyyy-mm-dd')
 	}
 	onLoad(()=>{
-		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')
+		// 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')
 		details.current=1
-		initpage()
+		init()
 	})
 	function showtime(value : boolean) {
 		console.log(value);
@@ -134,7 +142,8 @@
 		let data={
 			current:details.current,
 			size:details.size,
-			
+			taskTime_start:date.value[0]||'',
+			taskTime_end:date.value[1]||'',
 		}
 		let response=await deliverypage(data)
 		console.log(response); 
@@ -151,6 +160,13 @@
 			deliveryId:item.id
 		}
 		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
+		}
 		let list=[]
 		res.data.map(item=>{
 			list.push(item.driverName+'---'+item.vehicleNub)
@@ -192,6 +208,13 @@
 		}
 		let res=await deliveryvehicle(data)
 		console.log(res);
+		if(res.data.length==1){
+			uni.setStorageSync('checkvehicle',res.data[0])
+			uni.navigateTo({
+				url: '/pagesHome/pages/LoadingDetails/LoadingDetails?item='+JSON.stringify(item)
+			})
+			return
+		}
 		let list=[]
 		res.data.map(item=>{
 			list.push(item.driverName+'---'+item.vehicleNub)
@@ -214,7 +237,7 @@
 					return
 				}
 				tips.value.setdetails({isshow:false})
-				uni.setStorageSync('checkvehicle',res.data[deta.checklist[0]].id)
+				uni.setStorageSync('checkvehicle',res.data[deta.checklist[0]])
 				uni.navigateTo({
 					url: '/pagesHome/pages/LoadingDetails/LoadingDetails?item='+JSON.stringify(item)
 				})
@@ -232,6 +255,7 @@
 	function cleartime(){
 		// console.log(cleartime);
 		details.datatime=''
+		date.value=[]
 	}
 	const { datatime, recordsList, show } = toRefs(details)
 </script>
diff --git a/pagesHome/pages/OfflineUpload/OfflineUpload.vue b/pagesHome/pages/OfflineUpload/OfflineUpload.vue
new file mode 100644
index 0000000..7ed8743
--- /dev/null
+++ b/pagesHome/pages/OfflineUpload/OfflineUpload.vue
@@ -0,0 +1,40 @@
+<template>
+	<u-navbar title="离线上传" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar>
+	<scroll-view scroll-y="true" class="scview">
+		
+	</scroll-view>
+	<view class="buts">
+		<view>创建任务</view>
+		<view>一键上传</view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	
+</script>
+
+<style lang="scss">
+	.scview{
+		width: 100%;
+		height: 70vh;
+		background-color: #ffffff;
+	}
+	.buts{
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		>view{
+			width: 320upx;
+			height: 88upx;
+			background: #D3832A;
+			border-radius: 8upx;
+			font-size: 32upx;
+			font-weight: 400;
+			color: #FFFFFF;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+</style>
diff --git a/pagesHome/pages/SelfPScanList/SelfPScanList.vue b/pagesHome/pages/SelfPScanList/SelfPScanList.vue
index 28c7f6e..0520aeb 100644
--- a/pagesHome/pages/SelfPScanList/SelfPScanList.vue
+++ b/pagesHome/pages/SelfPScanList/SelfPScanList.vue
@@ -28,9 +28,17 @@
 		</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>
 	<scroll-view class="scve" scroll-y="true">
 		<view class="mabx">
-			<view class="itec" v-for="item in datalist">
+			<view class="itec" @click="showsdqs" v-if="orderType==1" v-for="item in datalist">
 				<view class="contenbx1">
 					<view><text style="color: #90A0AF;">订单编号：</text>{{item.orderCode}}</view>
 				</view>
@@ -40,8 +48,28 @@
 				</view>
 				<view :class="item.orderStatusStr=='齐套'?'tip tp1':item.orderStatusStr=='部分扫'?'tip tp3':'tip tp2'">{{item.orderStatusStr}}</view>
 			</view>
+			<view class="itec"  @click="showsdqs" v-if="orderType==2" v-for="item in datalist">
+				<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>
 		</view>
 	</scroll-view>
+	<tiplist ref="tiplists"></tiplist>
+	<saomiao></saomiao>
+	<saomiao1></saomiao1>
+	<saomiao2></saomiao2>
+	<saomiao3></saomiao3>
+	<saomiao4></saomiao4>
 </template>
 
 <script lang="ts" setup>
@@ -51,9 +79,13 @@
 		onHide,
 		onUnload
 	} from '@dcloudio/uni-app'
-	import { billLadingorderList } from '@/api/user.js'
+	import { 
+		billLadingorderList,
+		billLadinggetInventory,
+		billLadingscan
+	} from '@/api/user.js'
 	import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue'
-	import { reactive, toRefs } from "vue";
+	import { reactive, toRefs,ref } from "vue";
 	import { pagedetails } from '@/interfaces/pagesHome/SelfPScanList'
 	let details=reactive<pagedetails>({
 		schanvalue:'',
@@ -72,6 +104,7 @@
 			}
 		],
 		orderStatus:0,
+		orderType:1,
 		billLadingId:'',
 		datalist:[],
 		orderCode:'',
@@ -79,19 +112,102 @@
 		completeNum:'',
 		planNum:'',
 		signedNum:'',
+		scancode:'',
 	})
+	const tiplists=ref(null)
 	onLoad((op)=>{
 		details.billLadingId=op.billLadingId
 		initpage()
+		details.scancode='TESTCodeBJ2308030001'
+		uni.$on('scancodedate', function(code) {
+			if (code) {
+				console.log(code);
+				details.scancode=code
+				sacn()
+			}
+		})
 	})
-	async function initpage(){
+	function showsdqs(){
+		tiplists.value.setdetails({
+			isshow:true,
+			tipstate:1,
+			title:'请输入签收的包条',
+			placeholder:'请输入签收的包条',
+			inputtext:'',
+			success:(detail)=>{
+				details.scancode=detail.inputtext
+				sacn()
+				tiplists.value.setdetails({isshow:false})
+			},
+			cancel:()=>{
+				tiplists.value.setdetails({isshow:false})
+			},
+			close:()=>{
+				tiplists.value.setdetails({isshow:false})
+			}
+		})
+	}
+	async function sacn(){
 		let data={
-			orderStatus:details.orderStatus,
-			billLadingId:details.billLadingId,
-			orderCode:details.orderCode
+			id:details.billLadingId,
+			coding:details.scancode,
+			type:details.orderType==1?'2':'1'
+		}
+		let res=await billLadingscan(data)
+		console.log(res);
+		if(res.code==200){
+			uni.showToast({
+				title:'签收成功',
+				icon:'none'
+			})
+			initpage()
+		}else{
+			uni.showToast({
+				title:res.msg,
+				icon:'none'
+			})
 		}
-		let response=await billLadingorderList(data)
-		details.datalist=response.data.list
+	}
+	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)
+			details.datalist=response.data.list
+			details.orderNum=response.data.orderNum
+			details.completeNum=response.data.completeNum
+			details.planNum=response.data.planNum
+			details.signedNum=response.data.signedNum
+		}else if(details.orderType==2){
+			let date={
+				id:details.billLadingId,
+				current:1,
+				size:10
+			}
+			let response=await billLadinggetInventory(date)
+			details.datalist.map(item=>{
+				if(item.esauInventoryNum==-1){
+					uni.showToast({
+						title:'物品备货未完成，请前往备货',
+						icon:'none'
+					})
+				}
+			})
+			details.datalist=response.data.records
+			// details.orderNum=response.data.orderNum
+			// details.completeNum=response.data.completeNum
+			// details.planNum=response.data.planNum
+			// details.signedNum=response.data.signedNum
+		}
+		// sacn()
+	}
+	function setorderStatus(state:number){
+		details.orderType=state
+		initpage()
 	}
 	function checktype(e){
 		if(e==''){
@@ -107,10 +223,37 @@
 			}
 		})
 	}
-	const { schanvalue,typearr,orderCode,datalist }=toRefs(details)
+	const { orderType,schanvalue,typearr,orderCode,datalist }=toRefs(details)
 </script>
 
 <style lang="scss">
+	.tabtip{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		>view{
+			width: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background-color: #ffffff;
+			font-size: 32upx;
+			font-weight: 400;
+			color: #90A0AF;
+			>view{
+				height: 80upx;
+				border-bottom: 8upx solid #ffffff;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		.xz{
+			color: #D3832A;
+			border-bottom: 8upx solid #D3832A;
+			// border-radius: 5upx;
+		}
+	}
 	.scve{
 		width: 100%;
 		height: 69vh;
@@ -133,7 +276,7 @@
 				}
 				>.contenbx1{
 					display: flex;
-					align-items: center;
+					align-items: flex-start;
 					justify-content: space-between;
 					font-size: 28upx;
 					color: #092C4D;
@@ -143,6 +286,8 @@
 					}
 					>view{
 						flex: 1;
+						word-wrap: break-word;
+						word-break: break-all;
 					}
 				}
 				.tip{
diff --git a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
index b8aaab6..c19763e 100644
--- a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
+++ b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
@@ -2,11 +2,11 @@
 	<u-navbar title="自提明细扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar>
 	<view class="headtop">
 		<view>
-			<view>配车类型：自提</view>
+			<view>配车类型：{{details.carTypeStr}}</view>
 		</view>
 		<view>
-			<view>车牌号：川A88888</view>
-			<view>司机：张琪、罗翔</view>
+			<view>车牌号：{{details.pickUpPlate}}</view>
+			<view>司机：{{details.consignee}}</view>
 		</view>
 	</view>
 	<view class="tabmabx">
@@ -33,22 +33,51 @@
 		<view class="inputs">
 			<input placeholder="请输入查询的订单号"/>
 		</view>
-		<view class="btscan">查询</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>
 	<scroll-view scroll-y="true" class="scrollv">
 		<view class="mabxs">
-			<view class="ite" v-for="item in dataList">
+			<view class="ite" @click="showsdqs" v-if="orderType==1" v-for="item in dataList">
 				<view>
 					<view>订单号：{{item.orderCode}}</view>
-					<view>包装号：{{item.packetBarCode}}</view>
+					<view>包装号：{{item.orderPackageCode}}</view>
 				</view>
 				<view>
 					<view>是否扫描：{{item.scanStatusStr}}</view>
 					<view>异常：{{item.errorStatusStr}}</view>
 				</view>
 			</view>
+			<view class="ite" @click="showsdqs" v-if="orderType==2" v-for="item in dataList">
+				<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>
 		</view>
 	</scroll-view>
+	<tiplist ref="tiplists"></tiplist>
+	<saomiao></saomiao>
+	<saomiao1></saomiao1>
+	<saomiao2></saomiao2>
+	<saomiao3></saomiao3>
+	<saomiao4></saomiao4>
 </template>
 
 <script lang="ts" setup>
@@ -58,10 +87,14 @@
 		onHide,
 		onUnload
 	} from '@dcloudio/uni-app'
-	import { billLadingdetailList } from '@/api/user.js'
+	import { 
+		billLadingdetailList,
+		billLadinggetInventoryNum,
+		billLadingscan
+	} from '@/api/user.js'
 	import { pagedetailType } from '@/interfaces/pagesHome/SelfPickupDetails'
 	import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue'
-	import { reactive, toRefs } from "vue";
+	import { reactive, ref, toRefs } from "vue";
 	let details=reactive<pagedetailType>({
 		schanvalue:'',
 		typearr:[
@@ -80,6 +113,7 @@
 		],
 		dataList:[],
 		orderStatus:0,
+		orderType:1,
 		billLadingId:'',
 		orderCode:'',
 		consignee:'',
@@ -89,26 +123,93 @@
 		planNum:'',
 		completeNum:'',
 		signedNum:'',
+		scancode:''
 	})
+	const tiplists=ref(null)
 	onLoad((op)=>{
 		details.billLadingId=op.billLadingId
 		initpage()
+		details.scancode='1686568463442280450'
+		uni.$on('scancodedate', function(code) {
+			if (code) {
+				console.log(code);
+				details.scancode=code
+				sacn()
+			}
+		})
 	})
-	async function initpage(){
+	function showsdqs(){
+		tiplists.value.setdetails({
+			isshow:true,
+			tipstate:1,
+			title:'请输入签收的包条',
+			placeholder:'请输入签收的包条',
+			inputtext:'',
+			success:(detail)=>{
+				details.scancode=detail.inputtext
+				sacn()
+				tiplists.value.setdetails({isshow:false})
+			},
+			cancel:()=>{
+				tiplists.value.setdetails({isshow:false})
+			},
+			close:()=>{
+				tiplists.value.setdetails({isshow:false})
+			}
+		})
+	}
+	async function sacn(){
 		let data={
-			orderStatus:details.orderStatus,
-			billLadingId:details.billLadingId,
-			orderCode:details.orderCode
+			id:details.billLadingId,
+			coding:details.scancode,
+			type:details.orderType==1?'2':'1'
+		}
+		let res=await billLadingscan(data)
+		console.log(res);
+		uni.showToast({
+			title:res.msg,
+			icon:'none'
+		})
+	}
+	async function initpage(){
+		if(details.orderType==1){
+			let data={
+				orderStatus:details.orderStatus,
+				billLadingId:details.billLadingId,
+				orderCode:details.orderCode
+			}
+			let response=await billLadingdetailList(data)
+			details.dataList=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)
+			details.dataList=response.data.records
+			// 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
 		}
-		let response=await billLadingdetailList(data)
-		details.dataList=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
+		// sacn()
+	}
+	function setorderStatus(state:number){
+		details.orderType=state
+		initpage()
 	}
 	function checktype(e){
 		if(e==''){
@@ -117,14 +218,42 @@
 		details.typearr.map(item=>{
 			if(item.value==e){
 				details.schanvalue=item.label
+				details.orderStatus=item.value
 				console.log(details.schanvalue)
 			}
 		})
 	}
-	const { schanvalue,typearr,dataList }=toRefs(details)
+	const { orderType,schanvalue,typearr,dataList }=toRefs(details)
 </script>
 
 <style lang="scss">
+	.tabtip{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		>view{
+			width: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background-color: #ffffff;
+			font-size: 32upx;
+			font-weight: 400;
+			color: #90A0AF;
+			>view{
+				height: 80upx;
+				border-bottom: 8upx solid #ffffff;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		.xz{
+			color: #D3832A;
+			border-bottom: 8upx solid #D3832A;
+			// border-radius: 5upx;
+		}
+	}
 	.scrollv{
 		width: 686upx;
 		height: 48.5vh;
diff --git a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue
index c433762..d7a0e97 100644
--- a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue
+++ b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue
@@ -107,8 +107,8 @@
 		// details.datatime=(uni as any).$u.timeFormat(date.value[0], 'yyyy-mm-dd')+' 至 '+(uni as any).$u.timeFormat(date.value[1], 'yyyy-mm-dd')
 	}
 	onLoad(()=>{
-		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')
+		// 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')
 		init()
 	})
 	function init(){
diff --git a/pagesHome/pages/SignDetailScan/SignDetailScan.vue b/pagesHome/pages/SignDetailScan/SignDetailScan.vue
index aed5549..a29f4da 100644
--- a/pagesHome/pages/SignDetailScan/SignDetailScan.vue
+++ b/pagesHome/pages/SignDetailScan/SignDetailScan.vue
@@ -28,17 +28,27 @@
 		</view>
 	</view>
 	<view class="scinp">
-		<view class="titl">齐套状态</view>
-		<view>
-			<cusSelects @change='checktype' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5' size='145'
-				:clearable='true'></cusSelects>
+		<view class="left">
+			<view class="titl">齐套状态</view>
+			<view>
+				<cusSelects @change='checktype(1,$event)' :data='signforStatearr' :value="signforStatevalue" placeholder='全部' :arrLeft='5' size='145'
+					:clearable='true'></cusSelects>
+			</view>
 		</view>
-		<view class="titl">包件类型</view>
+		<!-- <view class="titl">包件类型</view>
 		<view>
-			<cusSelects @change='checktype' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5' size='145'
+			<cusSelects @change='checktype(2,$event)' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5' size='145'
 				:clearable='true'></cusSelects>
+		</view> -->
+		<view @click="initpage" class="btscan">查询</view>
+	</view>
+	<view class="tabtip">
+		<view @click="setorderStatus(1)">
+			<view :class="orderStatus==1?'xz':''">定制品</view>
+		</view>
+		<view @click="setorderStatus(2)">
+			<view :class="orderStatus==2?'xz':''">库存品</view>
 		</view>
-		<view class="btscan">查询</view>
 	</view>
 	<scroll-view class="scbx" scroll-y="true">
 		<view class="mabox">
@@ -74,7 +84,8 @@
 <script lang="ts" setup>
 	import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue'
 	import {
-		signforwrap
+		signforwrap,
+		signforwrapIn
 	} from '@/api/user.js'
 	import {
 		onLoad,
@@ -84,8 +95,23 @@
 	} from '@dcloudio/uni-app'
 	import { reactive, toRefs,ref } from "vue";
 	let details = reactive({
-		schanvalue: '',
-		typearr: [
+		orderCodevalue: '',
+		signforStatevalue: '',
+		signforStatearr: [
+			{
+				value: 1,
+				label: '齐套'
+			},
+			{
+				value: 2,
+				label: '部分扫'
+			},
+			{
+				value: 3,
+				label: '未扫'
+			}
+		],
+		statearr: [
 			{
 				value: 1,
 				label: '齐套'
@@ -102,27 +128,94 @@
 		items:{} as any,
 		id:'',
 		datalist:[],
+		orderStatus:1,
+		signforState:'' as string|number,
+		
 	})
 	onLoad((op)=>{
 		details.items=JSON.parse(op.item)
 		details.id=JSON.parse(op.item).id
 		initpage()
 	})
+	function setorderStatus(state:number){
+		details.orderStatus=state
+		initpage()
+	}
 	async function initpage(){
 		let data={
-			id:details.id
+			id:details.id,
+			signforState:details.signforState
+		}
+		if(details.orderStatus==1){
+			let res=await signforwrap(data)
+			console.log(res);
+			details.datalist=res.data.records
+		}else if(details.orderStatus==2){
+			let res=await signforwrapIn(data)
+			console.log(res);
+			details.datalist=res.data.records
 		}
-		let res=await signforwrap(data)
-		console.log(res);
-		details.datalist=res.data.records
-	}
-	function checktype(e) {
 		
 	}
-	const { typearr, schanvalue,items,datalist } = toRefs(details)
+	function checktype(type,e) {
+		console.log(type,e);
+		if(type==1){
+			if(e==''){
+				details.signforStatevalue=''
+				details.signforState=''
+			}
+			details.signforStatearr.map(item=>{
+				if(item.value==e){
+					details.signforStatevalue=item.label
+					details.signforState=item.value
+					console.log(details.signforStatevalue)
+				}
+			})
+			initpage()
+		}else if(type==2){
+			// if(e==''){
+			// 	details.schanvalue=''
+			// }
+			// details.typearr.map(item=>{
+			// 	if(item.value==e){
+			// 		details.schanvalue=item.label
+			// 		details.orderStatus=item.value
+			// 		console.log(details.schanvalue)
+			// 	}
+			// })
+		}
+	}
+	const { orderStatus,signforStatearr,signforStatevalue,items,datalist } = toRefs(details)
 </script>
 
 <style lang="scss">
+	.tabtip{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		>view{
+			width: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background-color: #ffffff;
+			font-size: 32upx;
+			font-weight: 400;
+			color: #90A0AF;
+			>view{
+				height: 80upx;
+				border-bottom: 8upx solid #ffffff;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		.xz{
+			color: #D3832A;
+			border-bottom: 8upx solid #D3832A;
+			// border-radius: 5upx;
+		}
+	}
 	.scbx{
 		width: 100%;
 		height: 45vh;
@@ -150,7 +243,7 @@
 				.toptitl{
 					width: 100%;
 					display: flex;
-					align-items: center;
+					align-items: flex-start;
 					justify-content: space-between;
 					border-bottom: 2upx solid #EEEEEE;
 					padding: 34upx 24upx;
@@ -159,11 +252,16 @@
 						font-size: 32upx;
 						font-weight: 400;
 						color: #092C4D;
+						word-wrap: break-word;
+						word-break: break-all;
 					}
 					.tis{
+						width: 180upx;
 						font-size: 32upx;
 						font-weight: 400;
 						color: #0086F1;
+						display: flex;
+						justify-content: flex-end;
 					}
 					.bf{
 						color: #D3832A;
@@ -236,28 +334,34 @@
 		box-sizing: border-box;
 		background-color: #ffffff;
 
-		>.titl {
-			font-size: 28upx;
-			font-weight: 400;
-			color: #092C4D;
-		}
-
-		.inputs {
-			width: 276upx;
-			height: 64upx;
-			background: #F5F5F6;
-			border-radius: 8upx;
-			opacity: 1;
-			border: 2upx solid #EEEEEE;
-			padding: 10upx;
-			box-sizing: border-box;
-			font-size: 24upx;
-			font-weight: 400;
-			color: #AFB4BA;
-			>input{
-				flex: 1;
-				font-size: 24upx;
+		>.left{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			>.titl {
+				font-size: 28upx;
+				font-weight: 400;
 				color: #092C4D;
+				margin-right: 30upx;
+			}
+			
+			.inputs {
+				width: 276upx;
+				height: 64upx;
+				background: #F5F5F6;
+				border-radius: 8upx;
+				opacity: 1;
+				border: 2upx solid #EEEEEE;
+				padding: 10upx;
+				box-sizing: border-box;
+				font-size: 24upx;
+				font-weight: 400;
+				color: #AFB4BA;
+				>input{
+					flex: 1;
+					font-size: 24upx;
+					color: #092C4D;
+				}
 			}
 		}
 
diff --git a/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue b/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
index 34d60b5..dd8d302 100644
--- a/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
+++ b/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
@@ -72,7 +72,7 @@
 		</hd-table> -->
 		<scroll-view scroll-y="true" class="scrollv">
 			<view class="mabxs">
-				<view class="ite" v-for="item in dataList">
+				<view class="ite" @click="showsdqs" v-for="item in dataList">
 					<view>
 						<view>订单号：{{item.orderCode}}</view>
 						<view>包装号：{{item.packageBarCode}}</view>
@@ -91,6 +91,7 @@
 			打印
 		</view>
 	</view>
+	<tiplist ref="tiplists"></tiplist>
 	<saomiao></saomiao>
 	<saomiao1></saomiao1>
 	<saomiao2></saomiao2>
@@ -107,7 +108,7 @@
 	} from '@dcloudio/uni-app'
 	import { distributionStockuporderInfo,distributionStockupstockupScan } from '@/api/user.js'
 	import {detailType} from '@/interfaces/pagesHome/StockUplistScandetails'
-	import { reactive, toRefs } from "vue";
+	import { reactive, ref, toRefs } from "vue";
 	let details=reactive<detailType>({
 		dataList:[
 			
@@ -127,6 +128,7 @@
 		orderCode:'',
 		scancode:'',
 	})
+	const tiplists=ref(null)
 	onLoad((op)=>{
 		details.stockArticleId=op.stockArticleId
 		details.orderStatus=op.orderStatus
@@ -145,6 +147,26 @@
 			}
 		})
 	})
+	function showsdqs(){
+		tiplists.value.setdetails({
+			isshow:true,
+			tipstate:1,
+			title:'请输入签收的包条',
+			placeholder:'请输入签收的包条',
+			inputtext:'',
+			success:(detail)=>{
+				details.scancode=detail.inputtext
+				scandata()
+				tiplists.value.setdetails({isshow:false})
+			},
+			cancel:()=>{
+				tiplists.value.setdetails({isshow:false})
+			},
+			close:()=>{
+				tiplists.value.setdetails({isshow:false})
+			}
+		})
+	}
 	async function scandata(){
 		let data={
 			scanType:1,
diff --git a/pagesHome/pages/pickingScan/pickingScan.vue b/pagesHome/pages/pickingScan/pickingScan.vue
index 3cc2233..196f3bf 100644
--- a/pagesHome/pages/pickingScan/pickingScan.vue
+++ b/pagesHome/pages/pickingScan/pickingScan.vue
@@ -126,7 +126,8 @@
 		let data={
 			current:details.currentPage,
 			size:details.size,
-			stockupDate:details.stockupDate,
+			stockupDateStart:date.value[0],
+			stockupDateEnd:date.value[1],
 			status:details.status,
 			
 		}
diff --git a/pagesHome/pages/setbarcode/setbarcode.vue b/pagesHome/pages/setbarcode/setbarcode.vue
index 174e456..d8b2b34 100644
--- a/pagesHome/pages/setbarcode/setbarcode.vue
+++ b/pagesHome/pages/setbarcode/setbarcode.vue
@@ -1,4 +1,5 @@
 <template>
+	<u-navbar title="配置包条码" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar>
 	<view class="head">
 		<view class="type1">
 			<view>货位：<view style="color: #092C4D;">{{items.allocation}}</view></view>
@@ -32,6 +33,11 @@
 		</view>
 	</scroll-view>
 	<tiplist ref="tips"></tiplist>
+	<saomiao></saomiao>
+	<saomiao1></saomiao1>
+	<saomiao2></saomiao2>
+	<saomiao3></saomiao3>
+	<saomiao4></saomiao4>
 </template>
 
 <script lang="ts" setup>
@@ -57,6 +63,7 @@
 		goodsAreaName:''
 	})
 	const tips=ref(null)
+	// const tiplists=ref(null)
 	onLoad((op)=>{
 		details.items=JSON.parse(op.item)
 		details.reservationId=op.reservationId
@@ -69,6 +76,26 @@
 		})
 		initpage()
 	})
+	function showsdqs(){
+		tips.value.setdetails({
+			isshow:true,
+			tipstate:1,
+			title:'请输入签收的包条',
+			placeholder:'请输入签收的包条',
+			inputtext:'',
+			success:(detail)=>{
+				// details.scancode=
+				scandata(detail.inputtext)
+				tips.value.setdetails({isshow:false})
+			},
+			cancel:()=>{
+				tips.value.setdetails({isshow:false})
+			},
+			close:()=>{
+				tips.value.setdetails({isshow:false})
+			}
+		})
+	}
 	async function initpage(){
 		let data={
 			orderStatus:2,
diff --git a/pagesHome/pages/signOrderScan/signOrderScan.vue b/pagesHome/pages/signOrderScan/signOrderScan.vue
index 5df794e..8da228e 100644
--- a/pagesHome/pages/signOrderScan/signOrderScan.vue
+++ b/pagesHome/pages/signOrderScan/signOrderScan.vue
@@ -29,9 +29,9 @@
 			<cusSelects  @change='checktype' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5' size='145' :clearable='true'></cusSelects>
 		</view>
 		<view class="inputs">
-			<input placeholder="请输入查询的订单号"/>
+			<input placeholder="请输入查询的订单号" v-model="inputtxt"/>
 		</view>
-		<view class="btscan">查询</view>
+		<view class="btscan" @click="initpage">查询</view>
 	</view>
 	<view class="tabtip">
 		<view @click="setorderStatus(1)">
@@ -43,7 +43,7 @@
 	</view>
 	<scroll-view class="scve" scroll-y="true">
 		<view class="mabx">
-			<view class="itec" v-if="orderStatus==1" v-for="item in datalist">
+			<view class="itec" @click="showsdqs" v-if="orderStatus==1" v-for="item in datalist">
 				<view class="contenbx1">
 					<view><text style="color: #90A0AF;">订单编号：</text>{{item.orderCode}}</view>
 				</view>
@@ -57,7 +57,7 @@
 				</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>
-			<view class="itec" v-if="orderStatus==2" v-for="item in datalist">
+			<view class="itec" @click="showsdqs" v-if="orderStatus==2" v-for="item in datalist">
 				<view class="contenbx1">
 					<view><text style="color: #90A0AF;">SKU：</text>{{item.sku}}</view>
 				</view>
@@ -73,12 +73,22 @@
 			</view>
 		</view>
 	</scroll-view>
+	<tips ref="tip"></tips>
+	<tiplist ref="tiplists"></tiplist>
+	<saomiao></saomiao>
+	<saomiao1></saomiao1>
+	<saomiao2></saomiao2>
+	<saomiao3></saomiao3>
+	<saomiao4></saomiao4>
 </template>
 
 <script lang="ts" setup>
 	import {
 		signfororder,
-		signforinventory
+		signforinventory,
+		signforsignfor,
+		signforsignforIn,
+		signforsignforcontinue
 	} from '@/api/user.js'
 	import {
 		onLoad,
@@ -87,12 +97,12 @@
 		onUnload
 	} from '@dcloudio/uni-app'
 	import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue'
-	import { reactive, toRefs } from "vue";
+	import { reactive, ref, toRefs } from "vue";
 	let details=reactive({
 		schanvalue:'',
 		typearr:[
 			{
-				value:1,
+				value:3,
 				label:'齐套'
 			},
 			{
@@ -100,27 +110,143 @@
 				label:'部分扫'
 			},
 			{
-				value:3,
+				value:1,
 				label:'未扫'
 			}
 		],
 		items:{} as any,
 		datalist:[] as any,
 		id:'',
-		orderStatus:1
+		orderStatus:1,
+		scancode:'',
+		deliveryId:'',
+		orderType:'' as string|number,
+		inputtxt:'',
 	})
+	const tiplists=ref(null)
+	const tip=ref(null)
 	onLoad((op)=>{
 		details.items=JSON.parse(op.item)
 		details.id=JSON.parse(op.item).id
+		details.deliveryId=op.deliveryId
 		initpage()
+		// details.scancode='23072506149-1'
+		// scandata()
+		uni.$on('scancodedate', function(code) {
+			if (code) {
+				console.log(code);
+				details.scancode=code
+				scandata()
+			}
+		})
 	})
+	async function scandata(){
+		let data={
+			barcode:details.scancode,
+			deliveryId:details.deliveryId,
+			reservationId:details.id,
+		}
+		if(details.orderStatus==1){
+			let response=await signforsignfor(data)
+			console.log(response);
+			if(response.code==3006){
+				tip.value.setdetails({
+					isshow:true,
+					content:'请确认是否异常签收',
+					success:async ()=>{
+						let data={
+							barcode:details.scancode,
+							deliveryId:details.deliveryId,
+							reservationId:details.id
+						}
+						let response=await signforsignforcontinue(data)
+						console.log(response);
+						uni.showToast({
+							title:response.msg,
+							icon:'none'
+						})
+						tip.value.setdetails({isshow:false})
+					},
+					cancel:()=>{
+						tip.value.setdetails({isshow:false})
+					},
+					close:()=>{
+						tip.value.setdetails({isshow:false})
+					}
+				})
+			}else{
+				uni.showToast({
+					title:response.msg,
+					icon:'none'
+				})
+			}
+		}else if(details.orderStatus==2){
+			// data.barcode="23072405915-2"
+			let response=await signforsignforIn(data)
+			console.log(response);
+			if(response.code==3006){
+				tip.value.setdetails({
+					isshow:true,
+					content:'请确认是否异常签收',
+					success:async ()=>{
+						let data={
+							barcode:details.scancode,
+							deliveryId:details.deliveryId,
+							reservationId:details.id
+						}
+						let response=await signforsignforcontinue(data)
+						console.log(response);
+						uni.showToast({
+							title:response.msg,
+							icon:'none'
+						})
+						tip.value.setdetails({isshow:false})
+					},
+					cancel:()=>{
+						tip.value.setdetails({isshow:false})
+					},
+					close:()=>{
+						tip.value.setdetails({isshow:false})
+					}
+				})
+			}else{
+				uni.showToast({
+					title:response.msg,
+					icon:'none'
+				})
+			}
+		}
+		
+	}
+	function showsdqs(){
+		tiplists.value.setdetails({
+			isshow:true,
+			tipstate:1,
+			title:'请输入签收的包条',
+			placeholder:'请输入签收的包条',
+			inputtext:'',
+			success:(detail)=>{
+				details.scancode=detail.inputtext
+				scandata()
+				tiplists.value.setdetails({isshow:false})
+			},
+			cancel:()=>{
+				tiplists.value.setdetails({isshow:false})
+			},
+			close:()=>{
+				tiplists.value.setdetails({isshow:false})
+			}
+		})
+	}
 	function setorderStatus(state:number){
 		details.orderStatus=state
 		initpage()
 	}
 	async function initpage(){
 		let data={
-			reservationId:details.id
+			reservationId:details.id,
+			completecode:details.orderType,
+			orderCode:details.inputtxt,
 		}
 		let response=null;
 		if(details.orderStatus==1){
@@ -128,12 +254,24 @@
 		}else if(details.orderStatus==2){
 			response=await signforinventory(data)
 		}
+		// scandata()
 		details.datalist=response.data.records
 	}
 	function checktype(e){
-		
+		if(e==''){
+			details.schanvalue=''
+			details.orderType=''
+			return
+		}
+		details.typearr.map(item=>{
+			if(item.value==e){
+				details.schanvalue=item.label
+				details.orderType=item.value
+				console.log(details.schanvalue)
+			}
+		})
 	}
-	const { orderStatus,datalist,items,typearr,schanvalue }=toRefs(details)
+	const { inputtxt,orderStatus,datalist,items,typearr,schanvalue }=toRefs(details)
 </script>
 
 <style lang="scss">
diff --git a/pagesHome/pages/signinScan/signinScan.vue b/pagesHome/pages/signinScan/signinScan.vue
index b5eab8f..aa47a0f 100644
--- a/pagesHome/pages/signinScan/signinScan.vue
+++ b/pagesHome/pages/signinScan/signinScan.vue
@@ -9,12 +9,12 @@
 				<u-icon @click.stop="cleartime" style="margin-right: 10rpx;" v-else name="close-circle" color="#999999" size="40"></u-icon>
 			</view>
 		</view>
-		<view>
+		<view @click="init">
 			查询
 		</view>
 	</view>
 
-	<scroll-view scroll-y="true" class="scvbx">
+	<scroll-view scroll-y="true" class="scvbx" @scrolltolower="jiazai">
 		<view class="mabxslist">
 			<view class="item" v-for="item in datalist">
 				<view class="headtop">
@@ -114,18 +114,37 @@
 		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')
 		details.current=1
-		initpage()
+		init()
 	})
-	
+	function init(){
+		details.current=1
+		initpage()
+	}
+	function jiazai(){
+		details.current++
+		initpage()
+	}
 	async function initpage(){
 		let data={
-			current:'',
-			size:'',
-			taskTime_start:'',
-			taskTime_end:'',
+			current:details.current,
+			size:3,
+			taskTime_start:date.value[0],
+			taskTime_end:date.value[1],
 		}
 		let response=await signforpage(data)
-		details.datalist=response.data.records
+		if(details.current==1){
+			details.datalist=response.data.records
+		}else{
+			if(response.data.records.lngth==0){
+				uni.showToast({
+					title:'已经到底了。',
+					icon:'none'
+				})
+				return
+			}
+			details.datalist=details.datalist.concat(response.data.records)
+		}
+		
 	}
 	function showtime(value : boolean) {
 		console.log(value);
diff --git a/static/add.png b/static/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f11301617d2983de2cfeb558d3b95d143fd484d
GIT binary patch
literal 785
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV7lSy;uum9_x8^2K;}T6)`z9+
zQyet&8mDk5WgH0I!Ps$PjuYn;2hNhDYY(=bRlaO+-1^rEj<R!8OD5FaHI3t`i%L(p
zXjOHPpXb6I7M=qPXN@n|)W|k4&PrcU`NN8V+2p*#=MSX}Y#H+!pFModz;nTd`Rw8A
zj1mhf*=Dt`XEt!y&l7Wh{k&r<^7py!lZ`X$f4w^IX2wlMi3b_QY%_`$GJnaevufaL
zVEiU$z|_-Vx3<3P3I~wIpnSmgz&U0K2Iho@^E^A)UnH{#a4<P4aIiEgd?<O9$iVZU
zv_P1@!2vFMA@svR=4}mXEEa8?P=x|4O(6N-8}2Ix!PP+p_ZvOX+R-nZ!?=whx<U7V
zSOWJ3)*DPYjI}q;hklUX`tAI};Gi{)wNZ_x7o;+Hx3EPquWh{MkiEck1OM+x=KsmO
zcZ9#*$=M>qU-R?vh4+u&uP^3K`MhD@+BrLG_zk2IqAeTJvn3^X16C!ze0cYw<btpR
zuP*ZhoPBU+etN@9@eNgf_AtH+JAYMy>Ae1N)*p|=S@PPqABgmtbank!O=E|bUlz9S
z<+f0p$G9w}LR#WiG0%xt3|0->8>{&x7~LEeu(zxB0)q$`QZ))G&l!0d7!NU9D)ciN
zFt8n900!EeKKby2jfpaoj(~Ux3_t}24c!Zx*&Px(PB3j!fCd62JPjBUGd)qmXNKCQ
z20Kt#BNXyDL_`U(fCChwO@L)tr_KU?CKwMa#Vjyw8dzId+kp~xEA_wA?hBRqv3ksJ
zWxOQH@!Hs72Sa8hn@709n)3_~nU*}2RETZdV8`6TJz-jULka7lUpxYO4pH+6D*n%~
XYL?}EM(3br1|aZs^>bP0l+XkK@6H_v

literal 0
HcmV?d00001

diff --git a/unpackage/dist/dev/app-plus/app-config-service.js b/unpackage/dist/dev/app-plus/app-config-service.js
index 1da90d2..943b3bf 100644
--- a/unpackage/dist/dev/app-plus/app-config-service.js
+++ b/unpackage/dist/dev/app-plus/app-config-service.js
@@ -2,7 +2,7 @@
   ;(function(){
   let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
   const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"货无忧","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"3.8.7","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"tabBar":{"position":"bottom","color":"#999999","selectedColor":"#df8926","borderStyle":"black","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","backgroundColor":"#ffffff","list":[{"pagePath":"pages/index/index","iconPath":"/static/TabberIcon/icon1.png","selectedIconPath":"/static/TabberIcon/icon1check.png","text":"工作台"},{"pagePath":"pages/taskList/taskList","iconPath":"/static/TabberIcon/icon2.png","selectedIconPath":"/static/TabberIcon/icon2check.png","text":"任务"},{"pagePath":"pages/reportForms/reportForms","iconPath":"/static/TabberIcon/icon3.png","selectedIconPath":"/static/TabberIcon/icon3check.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","selectedIconPath":"/static/TabberIcon/icon5check.png","text":"我的"}],"selectedIndex":0,"shown":true},"locales":{},"darkmode":false,"themeConfig":{}};
-  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"isTabBar":true,"tabBarIndex":0,"navigationBar":{"titleText":"工作台","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/login/login","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"登录","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/user/user","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":4,"enablePullDownRefresh":false,"navigationBar":{"titleText":"我的","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/news/news","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":3,"enablePullDownRefresh":false,"navigationBar":{"titleText":"消息","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/taskList/taskList","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"enablePullDownRefresh":false,"navigationBar":{"titleText":"任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/reportForms/reportForms","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"enablePullDownRefresh":false,"navigationBar":{"titleText":"报表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/pickingScan/pickingScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"拣货扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPickupScan/SelfPickupScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"自提扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/LoadingScan/LoadingScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"装车扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUplist/StockUplist","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"备货列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUplistScandetails/StockUplistScandetails","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"备货列表扫码","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownScan/DownScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signinScan/signinScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"签收扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPScanList/SelfPScanList","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"自提订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPickupDetails/SelfPickupDetails","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"自提明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/LoadingDetails/LoadingDetails","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"配车明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"客户订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"配送客户扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerSign/CustomerSign","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"客户签收","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signOrderScan/signOrderScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"签收订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SignDetailScan/SignDetailScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"签收明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/setbarcode/setbarcode","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"配置包条码","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"isTabBar":true,"tabBarIndex":0,"navigationBar":{"titleText":"工作台","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/login/login","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"登录","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/user/user","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":4,"enablePullDownRefresh":false,"navigationBar":{"titleText":"我的","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/news/news","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":3,"enablePullDownRefresh":false,"navigationBar":{"titleText":"消息","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/taskList/taskList","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"enablePullDownRefresh":false,"navigationBar":{"titleText":"任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/reportForms/reportForms","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"enablePullDownRefresh":false,"navigationBar":{"titleText":"报表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/pickingScan/pickingScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"拣货扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPickupScan/SelfPickupScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"自提扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/LoadingScan/LoadingScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"装车扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUplist/StockUplist","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"备货列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUplistScandetails/StockUplistScandetails","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"备货列表扫码","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownScan/DownScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signinScan/signinScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"签收扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPScanList/SelfPScanList","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"自提订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPickupDetails/SelfPickupDetails","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"自提明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/LoadingDetails/LoadingDetails","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"配车明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"客户订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"配送客户扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerSign/CustomerSign","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"客户签收","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signOrderScan/signOrderScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"签收订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SignDetailScan/SignDetailScan","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"签收明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/setbarcode/setbarcode","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"配置包条码","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/OfflineUpload/OfflineUpload","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"离线上传","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
   __uniConfig.styles=[];//styles
   __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
   __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js
index b69a7eb..3e006c2 100644
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
@@ -1761,7 +1761,7 @@ if (uni.restoreGlobal) {
     }
     return target;
   };
-  const _sfc_main$D = {
+  const _sfc_main$E = {
     name: "u-status-bar",
     mixins: [mpMixin$1, mixin$1, props$3],
     data() {
@@ -1776,7 +1776,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock(
       "view",
       {
@@ -1790,7 +1790,7 @@ if (uni.restoreGlobal) {
       /* STYLE */
     );
   }
-  const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["render", _sfc_render$f], ["__scopeId", "data-v-eb8e0cdd"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]);
+  const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["render", _sfc_render$g], ["__scopeId", "data-v-eb8e0cdd"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]);
   const icons = {
     "uicon-level": "",
     "uicon-column-line": "",
@@ -2094,7 +2094,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  const _sfc_main$C = {
+  const _sfc_main$D = {
     name: "u-icon",
     data() {
       return {};
@@ -2144,7 +2144,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock(
       "view",
       {
@@ -2188,7 +2188,7 @@ if (uni.restoreGlobal) {
       /* CLASS */
     );
   }
-  const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["render", _sfc_render$e], ["__scopeId", "data-v-ac70166d"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-icon/u-icon.vue"]]);
+  const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["render", _sfc_render$f], ["__scopeId", "data-v-ac70166d"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-icon/u-icon.vue"]]);
   const props$1 = {
     props: {
       // 是否开启顶部安全区适配
@@ -2273,7 +2273,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  const _sfc_main$B = {
+  const _sfc_main$C = {
     name: "u-navbar",
     mixins: [mpMixin$1, mixin$1, props$1],
     data() {
@@ -2293,7 +2293,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_u_status_bar = resolveEasycom(vue.resolveDynamicComponent("u-status-bar"), __easycom_0$1);
     const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_1$1);
     return vue.openBlock(), vue.createElementBlock("view", { class: "u-navbar" }, [
@@ -2405,8 +2405,8 @@ if (uni.restoreGlobal) {
       )
     ]);
   }
-  const __easycom_0 = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["render", _sfc_render$d], ["__scopeId", "data-v-f631659b"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-navbar/u-navbar.vue"]]);
-  const _sfc_main$A = /* @__PURE__ */ vue.defineComponent({
+  const __easycom_0 = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["render", _sfc_render$e], ["__scopeId", "data-v-f631659b"], ["__file", "F:/物流/logPm/uni_modules/uview-plus/components/u-navbar/u-navbar.vue"]]);
+  const _sfc_main$B = /* @__PURE__ */ vue.defineComponent({
     __name: "index",
     setup(__props) {
       let details = vue.reactive({
@@ -2453,6 +2453,17 @@ if (uni.restoreGlobal) {
                 router: "/pagesHome/pages/signinScan/signinScan"
               }
             ]
+          },
+          {
+            type: 1,
+            name: "离线上传",
+            minilist: [
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "离线上传",
+                router: "/pagesHome/pages/OfflineUpload/OfflineUpload"
+              }
+            ]
           }
         ]
       });
@@ -2535,7 +2546,7 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["__file", "F:/物流/logPm/pages/index/index.vue"]]);
+  const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["__file", "F:/物流/logPm/pages/index/index.vue"]]);
   function getDevtoolsGlobalHook() {
     return getTarget().__VUE_DEVTOOLS_GLOBAL_HOOK__;
   }
@@ -3948,7 +3959,98 @@ if (uni.restoreGlobal) {
     }
     return card;
   }
-  const devhost = "http://192.168.10.51:8888/";
+  const Base64 = function() {
+    let _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+    this.encode = function(input) {
+      var output = "";
+      var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+      var i = 0;
+      input = _utf8_encode(input);
+      while (i < input.length) {
+        chr1 = input.charCodeAt(i++);
+        chr2 = input.charCodeAt(i++);
+        chr3 = input.charCodeAt(i++);
+        enc1 = chr1 >> 2;
+        enc2 = (chr1 & 3) << 4 | chr2 >> 4;
+        enc3 = (chr2 & 15) << 2 | chr3 >> 6;
+        enc4 = chr3 & 63;
+        if (isNaN(chr2)) {
+          enc3 = enc4 = 64;
+        } else if (isNaN(chr3)) {
+          enc4 = 64;
+        }
+        output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
+      }
+      return output;
+    };
+    this.decode = function(input) {
+      var output = "";
+      var chr1, chr2, chr3;
+      var enc1, enc2, enc3, enc4;
+      var i = 0;
+      input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+      while (i < input.length) {
+        enc1 = _keyStr.indexOf(input.charAt(i++));
+        enc2 = _keyStr.indexOf(input.charAt(i++));
+        enc3 = _keyStr.indexOf(input.charAt(i++));
+        enc4 = _keyStr.indexOf(input.charAt(i++));
+        chr1 = enc1 << 2 | enc2 >> 4;
+        chr2 = (enc2 & 15) << 4 | enc3 >> 2;
+        chr3 = (enc3 & 3) << 6 | enc4;
+        output = output + String.fromCharCode(chr1);
+        if (enc3 != 64) {
+          output = output + String.fromCharCode(chr2);
+        }
+        if (enc4 != 64) {
+          output = output + String.fromCharCode(chr3);
+        }
+      }
+      output = _utf8_decode(output);
+      return output;
+    };
+    let _utf8_encode = function(string2) {
+      string2 = string2.replace(/\r\n/g, "\n");
+      var utftext = "";
+      for (var n = 0; n < string2.length; n++) {
+        var c = string2.charCodeAt(n);
+        if (c < 128) {
+          utftext += String.fromCharCode(c);
+        } else if (c > 127 && c < 2048) {
+          utftext += String.fromCharCode(c >> 6 | 192);
+          utftext += String.fromCharCode(c & 63 | 128);
+        } else {
+          utftext += String.fromCharCode(c >> 12 | 224);
+          utftext += String.fromCharCode(c >> 6 & 63 | 128);
+          utftext += String.fromCharCode(c & 63 | 128);
+        }
+      }
+      return utftext;
+    };
+    let _utf8_decode = function(utftext) {
+      var string2 = "";
+      var i = 0;
+      var c = c1 = c2 = 0;
+      while (i < utftext.length) {
+        c = utftext.charCodeAt(i);
+        if (c < 128) {
+          string2 += String.fromCharCode(c);
+          i++;
+        } else if (c > 191 && c < 224) {
+          c2 = utftext.charCodeAt(i + 1);
+          string2 += String.fromCharCode((c & 31) << 6 | c2 & 63);
+          i += 2;
+        } else {
+          c2 = utftext.charCodeAt(i + 1);
+          c3 = utftext.charCodeAt(i + 2);
+          string2 += String.fromCharCode((c & 15) << 12 | (c2 & 63) << 6 | c3 & 63);
+          i += 3;
+        }
+      }
+      return string2;
+    };
+  };
+  const base64 = new Base64();
+  const devhost = "http://192.168.10.73:8777/";
   const imghost = "";
   const host = devhost;
   const APPKEY = "h5u:h5u_secret";
@@ -3969,7 +4071,7 @@ if (uni.restoreGlobal) {
           show_fields: "cost"
         },
         success(res) {
-          formatAppLog("log", "at utils/functions.js:28", res);
+          formatAppLog("log", "at utils/functions.js:29", res);
         }
       });
     },
@@ -3984,15 +4086,20 @@ if (uni.restoreGlobal) {
       return obj;
     },
     upfile: (file) => {
+      formatAppLog("log", "at utils/functions.js:44", file);
       return new Promise((relove, reject) => {
         uni.showLoading({
           title: "上传中"
         });
+        let header = {};
+        let token = uni.getStorageSync("access_token");
+        header["Blade-Auth"] = `bearer ${token}`;
+        header.Authorization = `Basic ${base64.encode(APPKEY)}`;
         uni.uploadFile({
-          url: `${host}/other/upload`,
-          //仅为示例，非真实的接口地址
+          url: `${host}blade-resource/oss/endpoint/put-file`,
           filePath: file,
           name: "file",
+          header,
           success: (uploadFileRes) => {
             uni.hideLoading();
             relove(JSON.parse(uploadFileRes.data).data);
@@ -4072,7 +4179,7 @@ if (uni.restoreGlobal) {
             relove(res);
           },
           fail: function(err) {
-            formatAppLog("log", "at utils/functions.js:142", err);
+            formatAppLog("log", "at utils/functions.js:148", err);
             api.error("支付失败");
           }
         });
@@ -4083,112 +4190,21 @@ if (uni.restoreGlobal) {
       if (idCardNumber == "") {
         return false;
       } else if (reg.test(idCardNumber) === false) {
-        formatAppLog("log", "at utils/functions.js:156", "错误1");
+        formatAppLog("log", "at utils/functions.js:162", "错误1");
         return false;
       } else if (checkIDCard_province(idCardNumber) === false) {
-        formatAppLog("log", "at utils/functions.js:159", "错误2");
+        formatAppLog("log", "at utils/functions.js:165", "错误2");
         return false;
       } else if (checkIDCard_birthday(idCardNumber) === false) {
-        formatAppLog("log", "at utils/functions.js:163", "错误3");
+        formatAppLog("log", "at utils/functions.js:169", "错误3");
         return false;
       } else if (checkParity(idCardNumber) === false) {
-        formatAppLog("log", "at utils/functions.js:167", "错误4");
+        formatAppLog("log", "at utils/functions.js:173", "错误4");
         return false;
       }
       return true;
     }
   };
-  const Base64 = function() {
-    let _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-    this.encode = function(input) {
-      var output = "";
-      var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-      var i = 0;
-      input = _utf8_encode(input);
-      while (i < input.length) {
-        chr1 = input.charCodeAt(i++);
-        chr2 = input.charCodeAt(i++);
-        chr3 = input.charCodeAt(i++);
-        enc1 = chr1 >> 2;
-        enc2 = (chr1 & 3) << 4 | chr2 >> 4;
-        enc3 = (chr2 & 15) << 2 | chr3 >> 6;
-        enc4 = chr3 & 63;
-        if (isNaN(chr2)) {
-          enc3 = enc4 = 64;
-        } else if (isNaN(chr3)) {
-          enc4 = 64;
-        }
-        output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
-      }
-      return output;
-    };
-    this.decode = function(input) {
-      var output = "";
-      var chr1, chr2, chr3;
-      var enc1, enc2, enc3, enc4;
-      var i = 0;
-      input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-      while (i < input.length) {
-        enc1 = _keyStr.indexOf(input.charAt(i++));
-        enc2 = _keyStr.indexOf(input.charAt(i++));
-        enc3 = _keyStr.indexOf(input.charAt(i++));
-        enc4 = _keyStr.indexOf(input.charAt(i++));
-        chr1 = enc1 << 2 | enc2 >> 4;
-        chr2 = (enc2 & 15) << 4 | enc3 >> 2;
-        chr3 = (enc3 & 3) << 6 | enc4;
-        output = output + String.fromCharCode(chr1);
-        if (enc3 != 64) {
-          output = output + String.fromCharCode(chr2);
-        }
-        if (enc4 != 64) {
-          output = output + String.fromCharCode(chr3);
-        }
-      }
-      output = _utf8_decode(output);
-      return output;
-    };
-    let _utf8_encode = function(string2) {
-      string2 = string2.replace(/\r\n/g, "\n");
-      var utftext = "";
-      for (var n = 0; n < string2.length; n++) {
-        var c = string2.charCodeAt(n);
-        if (c < 128) {
-          utftext += String.fromCharCode(c);
-        } else if (c > 127 && c < 2048) {
-          utftext += String.fromCharCode(c >> 6 | 192);
-          utftext += String.fromCharCode(c & 63 | 128);
-        } else {
-          utftext += String.fromCharCode(c >> 12 | 224);
-          utftext += String.fromCharCode(c >> 6 & 63 | 128);
-          utftext += String.fromCharCode(c & 63 | 128);
-        }
-      }
-      return utftext;
-    };
-    let _utf8_decode = function(utftext) {
-      var string2 = "";
-      var i = 0;
-      var c = c1 = c2 = 0;
-      while (i < utftext.length) {
-        c = utftext.charCodeAt(i);
-        if (c < 128) {
-          string2 += String.fromCharCode(c);
-          i++;
-        } else if (c > 191 && c < 224) {
-          c2 = utftext.charCodeAt(i + 1);
-          string2 += String.fromCharCode((c & 31) << 6 | c2 & 63);
-          i += 2;
-        } else {
-          c2 = utftext.charCodeAt(i + 1);
-          c3 = utftext.charCodeAt(i + 2);
-          string2 += String.fromCharCode((c & 15) << 12 | (c2 & 63) << 6 | c3 & 63);
-          i += 3;
-        }
-      }
-      return string2;
-    };
-  };
-  const base64 = new Base64();
   function safe_add(x, y) {
     var lsw = (x & 65535) + (y & 65535);
     var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
@@ -4538,6 +4554,13 @@ if (uni.restoreGlobal) {
       data
     });
   }
+  function signforwrapIn(data) {
+    return service({
+      url: `logpm-distribution/app/signfor/wrapIn`,
+      method: "get",
+      data
+    });
+  }
   function signforinventory(data) {
     return service({
       url: `logpm-distribution/app/signfor/inventory`,
@@ -4559,7 +4582,70 @@ if (uni.restoreGlobal) {
       data
     });
   }
-  const _sfc_main$z = /* @__PURE__ */ vue.defineComponent({
+  function signforsignfor(data) {
+    return service({
+      url: `logpm-distribution/app/signfor/signfor`,
+      method: "post",
+      data
+    });
+  }
+  function signforsignforIn(data) {
+    return service({
+      url: `logpm-distribution/app/signfor/signforIn`,
+      method: "post",
+      data
+    });
+  }
+  function signforsignforcontinue(data) {
+    return service({
+      url: `logpm-distribution/app/signfor/signforcontinue`,
+      method: "post",
+      data
+    });
+  }
+  function signforsignforack(data) {
+    return service({
+      url: `logpm-distribution/app/signfor/signforack`,
+      method: "post",
+      data
+    });
+  }
+  function signforpositioning(data) {
+    return service({
+      url: `logpm-distribution/app/signfor/positioning`,
+      method: "post",
+      data
+    });
+  }
+  function signforoneclick(data) {
+    return service({
+      url: `logpm-distribution/app/signfor/oneclick`,
+      method: "post",
+      data
+    });
+  }
+  function billLadinggetInventory(data) {
+    return service({
+      url: `logpm-distribution/app/billLading/getInventory`,
+      method: "get",
+      data
+    });
+  }
+  function billLadinggetInventoryNum(data) {
+    return service({
+      url: `logpm-distribution/app/billLading/getInventoryNum`,
+      method: "get",
+      data
+    });
+  }
+  function billLadingscan(data) {
+    return service({
+      url: `logpm-distribution/app/billLading/scan`,
+      method: "get",
+      data
+    });
+  }
+  const _sfc_main$A = /* @__PURE__ */ vue.defineComponent({
     __name: "login",
     setup(__props) {
       let tip = vue.ref(null);
@@ -4739,8 +4825,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesLoginLogin = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__file", "F:/物流/logPm/pages/login/login.vue"]]);
-  const _sfc_main$y = /* @__PURE__ */ vue.defineComponent({
+  const PagesLoginLogin = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["__file", "F:/物流/logPm/pages/login/login.vue"]]);
+  const _sfc_main$z = /* @__PURE__ */ vue.defineComponent({
     __name: "user",
     setup(__props) {
       function login() {
@@ -4776,8 +4862,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesUserUser = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__file", "F:/物流/logPm/pages/user/user.vue"]]);
-  const _sfc_main$x = /* @__PURE__ */ vue.defineComponent({
+  const PagesUserUser = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__file", "F:/物流/logPm/pages/user/user.vue"]]);
+  const _sfc_main$y = /* @__PURE__ */ vue.defineComponent({
     __name: "news",
     setup(__props) {
       return (_ctx, _cache) => {
@@ -4794,8 +4880,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesNewsNews = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__file", "F:/物流/logPm/pages/news/news.vue"]]);
-  const _sfc_main$w = /* @__PURE__ */ vue.defineComponent({
+  const PagesNewsNews = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__file", "F:/物流/logPm/pages/news/news.vue"]]);
+  const _sfc_main$x = /* @__PURE__ */ vue.defineComponent({
     __name: "taskList",
     setup(__props) {
       return (_ctx, _cache) => {
@@ -4812,8 +4898,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesTaskListTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["__file", "F:/物流/logPm/pages/taskList/taskList.vue"]]);
-  const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
+  const PagesTaskListTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__file", "F:/物流/logPm/pages/taskList/taskList.vue"]]);
+  const _sfc_main$w = /* @__PURE__ */ vue.defineComponent({
     __name: "reportForms",
     setup(__props) {
       return (_ctx, _cache) => {
@@ -4830,7 +4916,7 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesReportFormsReportForms = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__file", "F:/物流/logPm/pages/reportForms/reportForms.vue"]]);
+  const PagesReportFormsReportForms = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["__file", "F:/物流/logPm/pages/reportForms/reportForms.vue"]]);
   let calendar = {
     /**
      * 农历1900-2100的润大小信息表
@@ -5750,7 +5836,7 @@ if (uni.restoreGlobal) {
     solar2lunar: calendar.solar2lunar,
     lunar2solar: calendar.lunar2solar
   };
-  const _sfc_main$u = {
+  const _sfc_main$v = {
     name: "lCalendar",
     model: {
       prop: "value",
@@ -6163,7 +6249,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock(
       "view",
       {
@@ -6404,8 +6490,8 @@ if (uni.restoreGlobal) {
       /* HYDRATE_EVENTS */
     );
   }
-  const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["render", _sfc_render$c], ["__scopeId", "data-v-665735f1"], ["__file", "F:/物流/logPm/uni_modules/l-calendar/components/l-calendar/l-calendar.vue"]]);
-  const _sfc_main$t = /* @__PURE__ */ vue.defineComponent({
+  const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["render", _sfc_render$d], ["__scopeId", "data-v-665735f1"], ["__file", "F:/物流/logPm/uni_modules/l-calendar/components/l-calendar/l-calendar.vue"]]);
+  const _sfc_main$u = /* @__PURE__ */ vue.defineComponent({
     __name: "pickingScan",
     setup(__props) {
       let details = vue.reactive({
@@ -6438,7 +6524,8 @@ if (uni.restoreGlobal) {
         let data = {
           current: details.currentPage,
           size: details.size,
-          stockupDate: details.stockupDate,
+          stockupDateStart: date2.value[0],
+          stockupDateEnd: date2.value[1],
           status: details.status
         };
         let response = await distributionStockuppageList(data);
@@ -6692,8 +6779,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesPickingScanPickingScan = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__file", "F:/物流/logPm/pagesHome/pages/pickingScan/pickingScan.vue"]]);
-  const _sfc_main$s = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesPickingScanPickingScan = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__file", "F:/物流/logPm/pagesHome/pages/pickingScan/pickingScan.vue"]]);
+  const _sfc_main$t = /* @__PURE__ */ vue.defineComponent({
     __name: "SelfPickupScan",
     setup(__props) {
       let details = vue.reactive({
@@ -6714,8 +6801,6 @@ if (uni.restoreGlobal) {
         details.datatime = date2.value[0] + " 至 " + date2.value[1];
       }
       onLoad(() => {
-        date2.value[0] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 3, "yyyy-mm-dd");
-        date2.value[1] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd");
         init();
       });
       function init() {
@@ -6936,8 +7021,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesSelfPickupScanSelfPickupScan = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__file", "F:/物流/logPm/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue"]]);
-  const _sfc_main$r = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesSelfPickupScanSelfPickupScan = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__file", "F:/物流/logPm/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue"]]);
+  const _sfc_main$s = /* @__PURE__ */ vue.defineComponent({
     __name: "LoadingScan",
     setup(__props) {
       let details = vue.reactive({
@@ -6952,29 +7037,37 @@ if (uni.restoreGlobal) {
       function showCalendar() {
         details.show = !details.show;
       }
+      function init() {
+        details.current = 1;
+        initpage();
+      }
+      function jiazai() {
+        details.current++;
+        initpage();
+      }
       function onConfirm(e) {
-        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:117", e);
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:125", e);
         date2.value[0] = e.startDate;
         date2.value[1] = e.endDate;
         details.datatime = date2.value[0] + " 至 " + date2.value[1];
       }
       onLoad(() => {
-        date2.value[0] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 3, "yyyy-mm-dd");
-        date2.value[1] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd");
         details.current = 1;
-        initpage();
+        init();
       });
       function showtime(value) {
-        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:130", value);
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:138", value);
         details.show = value;
       }
       async function initpage() {
         let data = {
           current: details.current,
-          size: details.size
+          size: details.size,
+          taskTime_start: date2.value[0] || "",
+          taskTime_end: date2.value[1] || ""
         };
         let response = await deliverypage(data);
-        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:140", response);
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:149", response);
         details.recordsList = response.data.records;
       }
       async function goselscan(item) {
@@ -6982,6 +7075,13 @@ if (uni.restoreGlobal) {
           deliveryId: item.id
         };
         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;
+        }
         let list = [];
         res.data.map((item2) => {
           list.push(item2.driverName + "---" + item2.vehicleNub);
@@ -7022,7 +7122,14 @@ if (uni.restoreGlobal) {
           deliveryId: item.id
         };
         let res = await deliveryvehicle(data);
-        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:194", res);
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:210", res);
+        if (res.data.length == 1) {
+          uni.setStorageSync("checkvehicle", res.data[0]);
+          uni.navigateTo({
+            url: "/pagesHome/pages/LoadingDetails/LoadingDetails?item=" + JSON.stringify(item)
+          });
+          return;
+        }
         let list = [];
         res.data.map((item2) => {
           list.push(item2.driverName + "---" + item2.vehicleNub);
@@ -7045,7 +7152,7 @@ if (uni.restoreGlobal) {
               return;
             }
             tips2.value.setdetails({ isshow: false });
-            uni.setStorageSync("checkvehicle", res.data[deta.checklist[0]].id);
+            uni.setStorageSync("checkvehicle", res.data[deta.checklist[0]]);
             uni.navigateTo({
               url: "/pagesHome/pages/LoadingDetails/LoadingDetails?item=" + JSON.stringify(item)
             });
@@ -7060,6 +7167,7 @@ if (uni.restoreGlobal) {
       }
       function cleartime() {
         details.datatime = "";
+        date2.value = [];
       }
       const { datatime, recordsList, show } = vue.toRefs(details);
       return (_ctx, _cache) => {
@@ -7110,167 +7218,174 @@ if (uni.restoreGlobal) {
                   }, null, 8, ["onClick"]))
                 ])
               ]),
-              vue.createElementVNode("view", null, " 查询 ")
+              vue.createElementVNode("view", { onClick: init }, " 查询 ")
             ]),
-            vue.createElementVNode("scroll-view", {
-              "scroll-y": "true",
-              class: "scvbx"
-            }, [
-              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.createElementVNode("view", { class: "type1s" }, [
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "配车类型："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.type_name),
-                              1
-                              /* TEXT */
-                            )
-                          ]),
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "配车状态："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.vehicleStatus_name),
-                              1
-                              /* TEXT */
-                            )
-                          ])
-                        ]),
-                        vue.createElementVNode("view", { class: "type1s" }, [
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "车牌号："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.vehicleName),
-                              1
-                              /* TEXT */
-                            )
+            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.createElementVNode("view", { class: "type1s" }, [
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "配车类型："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.type_name),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "配车状态："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.vehicleStatus_name),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ]),
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "司机："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.driverName),
-                              1
-                              /* TEXT */
-                            )
-                          ])
-                        ]),
-                        vue.createElementVNode("view", { class: "type1s" }, [
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "装御班组："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.loadingTeamName),
-                              1
-                              /* TEXT */
-                            )
+                          vue.createElementVNode("view", { class: "type1s" }, [
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "车牌号："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.vehicleName),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "司机："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.driverName),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ]),
-                          vue.createElementVNode("view", { class: "bhcolor" }, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "备货是否完成："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.isstock),
-                              1
-                              /* TEXT */
-                            )
-                          ])
-                        ]),
-                        vue.createElementVNode("view", { class: "type1s" }, [
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "制单时间："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.preparationTime),
-                              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: "type1s",
-                          onClick: ($event) => goloddeta(item)
-                        }, [
-                          vue.createElementVNode("view", { class: "bhcolor" }, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "车次号："),
-                            vue.createElementVNode(
-                              "text",
-                              { style: { "text-decoration": "underline" } },
-                              vue.toDisplayString(item.trainNumber),
-                              1
-                              /* TEXT */
-                            )
-                          ])
-                        ], 8, ["onClick"]),
-                        vue.createElementVNode("view", { class: "liebs" }, [
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("view", null, "配送客户数"),
-                            vue.createElementVNode(
-                              "view",
-                              null,
-                              vue.toDisplayString(item.customersNumber),
-                              1
-                              /* TEXT */
-                            )
+                          vue.createElementVNode("view", { class: "type1s" }, [
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "装御班组："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.loadingTeamName),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", { class: "bhcolor" }, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "备货是否完成："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.isstock),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ]),
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("view", null, "订单总数"),
-                            vue.createElementVNode(
-                              "view",
-                              null,
-                              vue.toDisplayString(item.orderNumber),
-                              1
-                              /* TEXT */
-                            )
+                          vue.createElementVNode("view", { class: "type1s" }, [
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "制单时间："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.preparationTime),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ]),
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("view", null, "计划件数"),
-                            vue.createElementVNode(
-                              "view",
-                              null,
-                              vue.toDisplayString(item.deliveryNumber),
-                              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", null, [
-                            vue.createElementVNode("view", null, "装车件数"),
-                            vue.createElementVNode(
-                              "view",
-                              null,
-                              vue.toDisplayString(item.scannedNumber),
-                              1
-                              /* TEXT */
-                            )
+                          vue.createElementVNode("view", {
+                            class: "type1s",
+                            onClick: ($event) => goloddeta(item)
+                          }, [
+                            vue.createElementVNode("view", { class: "bhcolor" }, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "车次号："),
+                              vue.createElementVNode(
+                                "text",
+                                { style: { "text-decoration": "underline" } },
+                                vue.toDisplayString(item.trainNumber),
+                                1
+                                /* TEXT */
+                              )
+                            ])
+                          ], 8, ["onClick"]),
+                          vue.createElementVNode("view", { class: "liebs" }, [
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("view", null, "配送客户数"),
+                              vue.createElementVNode(
+                                "view",
+                                null,
+                                vue.toDisplayString(item.customersNumber),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("view", null, "订单总数"),
+                              vue.createElementVNode(
+                                "view",
+                                null,
+                                vue.toDisplayString(item.orderNumber),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("view", null, "计划件数"),
+                              vue.createElementVNode(
+                                "view",
+                                null,
+                                vue.toDisplayString(item.deliveryNumber),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("view", null, "装车件数"),
+                              vue.createElementVNode(
+                                "view",
+                                null,
+                                vue.toDisplayString(item.scannedNumber),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ])
+                        ]),
+                        vue.createElementVNode("view", { class: "buts" }, [
+                          vue.createElementVNode("view", {
+                            onClick: _cache[3] || (_cache[3] = () => {
+                            })
+                          }, "发车"),
+                          vue.createElementVNode("view", {
+                            onClick: ($event) => goselscan(item)
+                          }, "装车扫描", 8, ["onClick"])
                         ])
-                      ]),
-                      vue.createElementVNode("view", { class: "buts" }, [
-                        vue.createElementVNode("view", {
-                          onClick: _cache[3] || (_cache[3] = () => {
-                          })
-                        }, "发车"),
-                        vue.createElementVNode("view", {
-                          onClick: ($event) => goselscan(item)
-                        }, "装车扫描", 8, ["onClick"])
-                      ])
-                    ]);
-                  }),
-                  256
-                  /* UNKEYED_FRAGMENT */
-                ))
-              ])
-            ]),
+                      ]);
+                    }),
+                    256
+                    /* UNKEYED_FRAGMENT */
+                  ))
+                ])
+              ],
+              32
+              /* HYDRATE_EVENTS */
+            ),
             vue.createVNode(_component_l_calendar, {
               value: vue.unref(show),
               "onUpdate:value": _cache[4] || (_cache[4] = ($event) => vue.isRef(show) ? show.value = $event : null),
@@ -7298,8 +7413,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesLoadingScanLoadingScan = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__file", "F:/物流/logPm/pagesHome/pages/LoadingScan/LoadingScan.vue"]]);
-  const _sfc_main$q = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesLoadingScanLoadingScan = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__file", "F:/物流/logPm/pagesHome/pages/LoadingScan/LoadingScan.vue"]]);
+  const _sfc_main$r = /* @__PURE__ */ vue.defineComponent({
     __name: "StockUplist",
     setup(__props) {
       let details = vue.reactive({
@@ -7586,8 +7701,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesStockUplistStockUplist = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["__file", "F:/物流/logPm/pagesHome/pages/StockUplist/StockUplist.vue"]]);
-  const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesStockUplistStockUplist = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__file", "F:/物流/logPm/pagesHome/pages/StockUplist/StockUplist.vue"]]);
+  const _sfc_main$q = /* @__PURE__ */ vue.defineComponent({
     __name: "StockUplistScandetails",
     setup(__props) {
       let details = vue.reactive({
@@ -7607,6 +7722,7 @@ if (uni.restoreGlobal) {
         orderCode: "",
         scancode: ""
       });
+      const tiplists = vue.ref(null);
       onLoad((op) => {
         details.stockArticleId = op.stockArticleId;
         details.orderStatus = op.orderStatus;
@@ -7618,12 +7734,32 @@ if (uni.restoreGlobal) {
         scandata();
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:142", code2);
+            formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:144", code2);
             details.scancode = code2;
             scandata();
           }
         });
       });
+      function showsdqs() {
+        tiplists.value.setdetails({
+          isshow: true,
+          tipstate: 1,
+          title: "请输入签收的包条",
+          placeholder: "请输入签收的包条",
+          inputtext: "",
+          success: (detail) => {
+            details.scancode = detail.inputtext;
+            scandata();
+            tiplists.value.setdetails({ isshow: false });
+          },
+          cancel: () => {
+            tiplists.value.setdetails({ isshow: false });
+          },
+          close: () => {
+            tiplists.value.setdetails({ isshow: false });
+          }
+        });
+      }
       async function scandata() {
         let data = {
           scanType: 1,
@@ -7633,7 +7769,7 @@ if (uni.restoreGlobal) {
           reservationId: details.reservationId
         };
         let response = await distributionStockupstockupScan(data);
-        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:157", response);
+        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:179", response);
       }
       async function initpage() {
         let data = {
@@ -7645,7 +7781,7 @@ if (uni.restoreGlobal) {
           pallet: details.pallet
         };
         let response = await distributionStockuporderInfo(data);
-        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:169", response);
+        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:191", response);
         details.dataList = response.data.packageList;
         details.customer = response.data.customer;
         details.stockupArea = response.data.stockupArea;
@@ -7657,6 +7793,7 @@ if (uni.restoreGlobal) {
       const { dataList } = vue.toRefs(details);
       return (_ctx, _cache) => {
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
+        const _component_tiplist = vue.resolveComponent("tiplist");
         const _component_saomiao = vue.resolveComponent("saomiao");
         const _component_saomiao1 = vue.resolveComponent("saomiao1");
         const _component_saomiao2 = vue.resolveComponent("saomiao2");
@@ -7760,7 +7897,10 @@ if (uni.restoreGlobal) {
                     vue.Fragment,
                     null,
                     vue.renderList(vue.unref(dataList), (item) => {
-                      return vue.openBlock(), vue.createElementBlock("view", { class: "ite" }, [
+                      return vue.openBlock(), vue.createElementBlock("view", {
+                        class: "ite",
+                        onClick: showsdqs
+                      }, [
                         vue.createElementVNode("view", null, [
                           vue.createElementVNode(
                             "view",
@@ -7811,9 +7951,19 @@ if (uni.restoreGlobal) {
               ]),
               vue.createElementVNode("view", { class: "prtbut" }, " 打印 ")
             ]),
-            vue.createVNode(_component_saomiao),
-            vue.createVNode(_component_saomiao1),
-            vue.createVNode(_component_saomiao2),
+            vue.createVNode(
+              _component_tiplist,
+              {
+                ref_key: "tiplists",
+                ref: tiplists
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            ),
+            vue.createVNode(_component_saomiao),
+            vue.createVNode(_component_saomiao1),
+            vue.createVNode(_component_saomiao2),
             vue.createVNode(_component_saomiao3),
             vue.createVNode(_component_saomiao4)
           ],
@@ -7823,9 +7973,9 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesStockUplistScandetailsStockUplistScandetails = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__file", "F:/物流/logPm/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue"]]);
-  const _sfc_main$o = {};
-  function _sfc_render$b(_ctx, _cache) {
+  const PagesHomePagesStockUplistScandetailsStockUplistScandetails = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["__file", "F:/物流/logPm/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue"]]);
+  const _sfc_main$p = {};
+  function _sfc_render$c(_ctx, _cache) {
     const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
     return vue.openBlock(), vue.createBlock(_component_u_navbar, {
       title: "下架扫描",
@@ -7835,8 +7985,8 @@ if (uni.restoreGlobal) {
       leftIconSize: "35"
     });
   }
-  const PagesHomePagesDownScanDownScan = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["render", _sfc_render$b], ["__file", "F:/物流/logPm/pagesHome/pages/DownScan/DownScan.vue"]]);
-  const _sfc_main$n = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesDownScanDownScan = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$c], ["__file", "F:/物流/logPm/pagesHome/pages/DownScan/DownScan.vue"]]);
+  const _sfc_main$o = /* @__PURE__ */ vue.defineComponent({
     __name: "signinScan",
     setup(__props) {
       let details = vue.reactive({
@@ -7862,20 +8012,39 @@ if (uni.restoreGlobal) {
         date2.value[0] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 3, "yyyy-mm-dd");
         date2.value[1] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd");
         details.current = 1;
-        initpage();
+        init();
       });
+      function init() {
+        details.current = 1;
+        initpage();
+      }
+      function jiazai() {
+        details.current++;
+        initpage();
+      }
       async function initpage() {
         let data = {
-          current: "",
-          size: "",
-          taskTime_start: "",
-          taskTime_end: ""
+          current: details.current,
+          size: 3,
+          taskTime_start: date2.value[0],
+          taskTime_end: date2.value[1]
         };
         let response = await signforpage(data);
-        details.datalist = response.data.records;
+        if (details.current == 1) {
+          details.datalist = response.data.records;
+        } else {
+          if (response.data.records.lngth == 0) {
+            uni.showToast({
+              title: "已经到底了。",
+              icon: "none"
+            });
+            return;
+          }
+          details.datalist = details.datalist.concat(response.data.records);
+        }
       }
       function showtime(value) {
-        formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:131", value);
+        formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:150", value);
         details.show = value;
       }
       function gocustomersign(item) {
@@ -7889,7 +8058,7 @@ if (uni.restoreGlobal) {
         });
       }
       function cleartime() {
-        formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:151", cleartime);
+        formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:170", cleartime);
         details.datatime = "";
       }
       const { datatime, datalist, show } = vue.toRefs(details);
@@ -7940,147 +8109,154 @@ if (uni.restoreGlobal) {
                   }, null, 8, ["onClick"]))
                 ])
               ]),
-              vue.createElementVNode("view", null, " 查询 ")
+              vue.createElementVNode("view", { onClick: init }, " 查询 ")
             ]),
-            vue.createElementVNode("scroll-view", {
-              "scroll-y": "true",
-              class: "scvbx"
-            }, [
-              vue.createElementVNode("view", { class: "mabxslist" }, [
-                (vue.openBlock(true), vue.createElementBlock(
-                  vue.Fragment,
-                  null,
-                  vue.renderList(vue.unref(datalist), (item) => {
-                    return vue.openBlock(), vue.createElementBlock("view", { class: "item" }, [
-                      vue.createElementVNode("view", { class: "headtop" }, [
-                        vue.createElementVNode("view", { class: "type1s" }, [
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "配车类型："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.type_name),
-                              1
-                              /* TEXT */
-                            )
+            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(datalist), (item) => {
+                      return vue.openBlock(), vue.createElementBlock("view", { class: "item" }, [
+                        vue.createElementVNode("view", { class: "headtop" }, [
+                          vue.createElementVNode("view", { class: "type1s" }, [
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "配车类型："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.type_name),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "配车状态："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.deliStatus_name),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ]),
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "配车状态："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.deliStatus_name),
-                              1
-                              /* TEXT */
-                            )
-                          ])
-                        ]),
-                        vue.createElementVNode("view", { class: "type1s" }, [
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "车牌号："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.vehicleName),
-                              1
-                              /* TEXT */
-                            )
+                          vue.createElementVNode("view", { class: "type1s" }, [
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "车牌号："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.vehicleName),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "司机："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.driverName),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ]),
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "司机："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.driverName),
-                              1
-                              /* TEXT */
-                            )
-                          ])
-                        ]),
-                        vue.createElementVNode("view", { class: "type1s" }, [
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "装御班组："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.loadingTeamName),
-                              1
-                              /* TEXT */
-                            )
+                          vue.createElementVNode("view", { class: "type1s" }, [
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "装御班组："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.loadingTeamName),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", { class: "bhcolor" }, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "备货是否完成："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.isstock),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ]),
-                          vue.createElementVNode("view", { class: "bhcolor" }, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "备货是否完成："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.isstock),
-                              1
-                              /* TEXT */
-                            )
-                          ])
-                        ]),
-                        vue.createElementVNode("view", { class: "type1s" }, [
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "制单时间："),
-                            vue.createTextVNode(
-                              vue.toDisplayString(item.preparationTime),
-                              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", {
-                            onClick: ($event) => gocustomersign(item)
-                          }, [
-                            vue.createElementVNode("view", null, "配送客户数"),
-                            vue.createElementVNode(
-                              "view",
-                              null,
-                              vue.toDisplayString(item.customersNumber),
-                              1
-                              /* TEXT */
-                            )
-                          ], 8, ["onClick"]),
-                          vue.createElementVNode("view", {
-                            onClick: ($event) => goSignDetailScan(item)
-                          }, [
-                            vue.createElementVNode("view", null, "订单总数"),
-                            vue.createElementVNode(
-                              "view",
-                              null,
-                              vue.toDisplayString(item.orderNumber),
-                              1
-                              /* TEXT */
-                            )
-                          ], 8, ["onClick"]),
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("view", null, "配送件数"),
-                            vue.createElementVNode(
-                              "view",
-                              null,
-                              vue.toDisplayString(item.scannedNumber),
-                              1
-                              /* TEXT */
-                            )
+                          vue.createElementVNode("view", { class: "type1s" }, [
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "制单时间："),
+                              vue.createTextVNode(
+                                vue.toDisplayString(item.preparationTime),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ]),
-                          vue.createElementVNode("view", null, [
-                            vue.createElementVNode("view", null, "签收件数"),
-                            vue.createElementVNode(
-                              "view",
-                              null,
-                              vue.toDisplayString(item.signNub),
-                              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", {
+                              onClick: ($event) => gocustomersign(item)
+                            }, [
+                              vue.createElementVNode("view", null, "配送客户数"),
+                              vue.createElementVNode(
+                                "view",
+                                null,
+                                vue.toDisplayString(item.customersNumber),
+                                1
+                                /* TEXT */
+                              )
+                            ], 8, ["onClick"]),
+                            vue.createElementVNode("view", {
+                              onClick: ($event) => goSignDetailScan(item)
+                            }, [
+                              vue.createElementVNode("view", null, "订单总数"),
+                              vue.createElementVNode(
+                                "view",
+                                null,
+                                vue.toDisplayString(item.orderNumber),
+                                1
+                                /* TEXT */
+                              )
+                            ], 8, ["onClick"]),
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("view", null, "配送件数"),
+                              vue.createElementVNode(
+                                "view",
+                                null,
+                                vue.toDisplayString(item.scannedNumber),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", null, [
+                              vue.createElementVNode("view", null, "签收件数"),
+                              vue.createElementVNode(
+                                "view",
+                                null,
+                                vue.toDisplayString(item.signNub),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ])
                         ])
-                      ])
-                    ]);
-                  }),
-                  256
-                  /* UNKEYED_FRAGMENT */
-                ))
-              ])
-            ]),
+                      ]);
+                    }),
+                    256
+                    /* UNKEYED_FRAGMENT */
+                  ))
+                ])
+              ],
+              32
+              /* HYDRATE_EVENTS */
+            ),
             vue.createCommentVNode(` 	<u-datetime-picker :show="show" mode="datetime" @cancel="showtime(false)" @confirm="checktime"\r
 		itemHeight='80'></u-datetime-picker> `),
             vue.createVNode(_component_l_calendar, {
@@ -8098,9 +8274,9 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesSigninScanSigninScan = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__file", "F:/物流/logPm/pagesHome/pages/signinScan/signinScan.vue"]]);
+  const PagesHomePagesSigninScanSigninScan = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["__file", "F:/物流/logPm/pagesHome/pages/signinScan/signinScan.vue"]]);
   const _imports_0 = "/assets/cha.b7e7843e.png";
-  const _sfc_main$m = {
+  const _sfc_main$n = {
     props: {
       data: {
         type: Array,
@@ -8236,7 +8412,7 @@ if (uni.restoreGlobal) {
     beforeDestroy() {
     }
   };
-  function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock(
       "view",
       {
@@ -8348,8 +8524,8 @@ if (uni.restoreGlobal) {
       /* STYLE */
     );
   }
-  const cusSelects = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["render", _sfc_render$a], ["__scopeId", "data-v-7a3666ce"], ["__file", "F:/物流/logPm/compoment/cus-selects-fan/cus-selects-fan.vue"]]);
-  const _sfc_main$l = /* @__PURE__ */ vue.defineComponent({
+  const cusSelects = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$b], ["__scopeId", "data-v-7a3666ce"], ["__file", "F:/物流/logPm/compoment/cus-selects-fan/cus-selects-fan.vue"]]);
+  const _sfc_main$m = /* @__PURE__ */ vue.defineComponent({
     __name: "SelfPScanList",
     setup(__props) {
       let details = vue.reactive({
@@ -8369,26 +8545,105 @@ if (uni.restoreGlobal) {
           }
         ],
         orderStatus: 0,
+        orderType: 1,
         billLadingId: "",
         datalist: [],
         orderCode: "",
         orderNum: "",
         completeNum: "",
         planNum: "",
-        signedNum: ""
+        signedNum: "",
+        scancode: ""
       });
+      const tiplists = vue.ref(null);
       onLoad((op) => {
         details.billLadingId = op.billLadingId;
         initpage();
+        details.scancode = "TESTCodeBJ2308030001";
+        uni.$on("scancodedate", function(code2) {
+          if (code2) {
+            formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:124", code2);
+            details.scancode = code2;
+            sacn();
+          }
+        });
       });
-      async function initpage() {
+      function showsdqs() {
+        tiplists.value.setdetails({
+          isshow: true,
+          tipstate: 1,
+          title: "请输入签收的包条",
+          placeholder: "请输入签收的包条",
+          inputtext: "",
+          success: (detail) => {
+            details.scancode = detail.inputtext;
+            sacn();
+            tiplists.value.setdetails({ isshow: false });
+          },
+          cancel: () => {
+            tiplists.value.setdetails({ isshow: false });
+          },
+          close: () => {
+            tiplists.value.setdetails({ isshow: false });
+          }
+        });
+      }
+      async function sacn() {
         let data = {
-          orderStatus: details.orderStatus,
-          billLadingId: details.billLadingId,
-          orderCode: details.orderCode
+          id: details.billLadingId,
+          coding: details.scancode,
+          type: details.orderType == 1 ? "2" : "1"
         };
-        let response = await billLadingorderList(data);
-        details.datalist = response.data.list;
+        let res = await billLadingscan(data);
+        formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:157", res);
+        if (res.code == 200) {
+          uni.showToast({
+            title: "签收成功",
+            icon: "none"
+          });
+          initpage();
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: "none"
+          });
+        }
+      }
+      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);
+          details.datalist = response.data.list;
+          details.orderNum = response.data.orderNum;
+          details.completeNum = response.data.completeNum;
+          details.planNum = response.data.planNum;
+          details.signedNum = response.data.signedNum;
+        } else if (details.orderType == 2) {
+          let date2 = {
+            id: details.billLadingId,
+            current: 1,
+            size: 10
+          };
+          let response = await billLadinggetInventory(date2);
+          details.datalist.map((item) => {
+            if (item.esauInventoryNum == -1) {
+              uni.showToast({
+                title: "物品备货未完成，请前往备货",
+                icon: "none"
+              });
+            }
+          });
+          details.datalist = response.data.records;
+        }
+      }
+      function setorderStatus(state) {
+        details.orderType = state;
+        initpage();
       }
       function checktype(e) {
         if (e == "") {
@@ -8400,13 +8655,19 @@ if (uni.restoreGlobal) {
           if (item.value == e) {
             details.schanvalue = item.label;
             details.orderStatus = item.value;
-            formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:106", details.schanvalue);
+            formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:222", details.schanvalue);
           }
         });
       }
-      const { schanvalue, typearr, orderCode, datalist } = vue.toRefs(details);
+      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_tiplist = vue.resolveComponent("tiplist");
+        const _component_saomiao = vue.resolveComponent("saomiao");
+        const _component_saomiao1 = vue.resolveComponent("saomiao1");
+        const _component_saomiao2 = vue.resolveComponent("saomiao2");
+        const _component_saomiao3 = vue.resolveComponent("saomiao3");
+        const _component_saomiao4 = vue.resolveComponent("saomiao4");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
@@ -8488,20 +8749,51 @@ if (uni.restoreGlobal) {
                 ])
               ]),
               vue.createElementVNode("view", {
-                class: "btscan",
-                onClick: initpage
-              }, "查询")
+                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("scroll-view", {
               class: "scve",
               "scroll-y": "true"
             }, [
               vue.createElementVNode("view", { class: "mabx" }, [
-                (vue.openBlock(true), vue.createElementBlock(
+                vue.unref(orderType) == 1 ? (vue.openBlock(true), vue.createElementBlock(
                   vue.Fragment,
-                  null,
+                  { key: 0 },
                   vue.renderList(vue.unref(datalist), (item) => {
-                    return vue.openBlock(), vue.createElementBlock("view", { class: "itec" }, [
+                    return vue.openBlock(), vue.createElementBlock("view", {
+                      class: "itec",
+                      onClick: showsdqs
+                    }, [
                       vue.createElementVNode("view", { class: "contenbx1" }, [
                         vue.createElementVNode("view", null, [
                           vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "订单编号："),
@@ -8543,9 +8835,84 @@ if (uni.restoreGlobal) {
                   }),
                   256
                   /* UNKEYED_FRAGMENT */
-                ))
+                )) : vue.createCommentVNode("v-if", true),
+                vue.unref(orderType) == 2 ? (vue.openBlock(true), vue.createElementBlock(
+                  vue.Fragment,
+                  { key: 1 },
+                  vue.renderList(vue.unref(datalist), (item) => {
+                    return vue.openBlock(), vue.createElementBlock("view", {
+                      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> `)
+                    ]);
+                  }),
+                  256
+                  /* UNKEYED_FRAGMENT */
+                )) : vue.createCommentVNode("v-if", true)
               ])
-            ])
+            ]),
+            vue.createVNode(
+              _component_tiplist,
+              {
+                ref_key: "tiplists",
+                ref: tiplists
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            ),
+            vue.createVNode(_component_saomiao),
+            vue.createVNode(_component_saomiao1),
+            vue.createVNode(_component_saomiao2),
+            vue.createVNode(_component_saomiao3),
+            vue.createVNode(_component_saomiao4)
           ],
           64
           /* STABLE_FRAGMENT */
@@ -8553,8 +8920,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesSelfPScanListSelfPScanList = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__file", "F:/物流/logPm/pagesHome/pages/SelfPScanList/SelfPScanList.vue"]]);
-  const _sfc_main$k = {
+  const PagesHomePagesSelfPScanListSelfPScanList = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__file", "F:/物流/logPm/pagesHome/pages/SelfPScanList/SelfPScanList.vue"]]);
+  const _sfc_main$l = {
     name: "uniTh",
     options: {
       virtualHost: true
@@ -8715,7 +9082,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock(
       "view",
       {
@@ -8729,8 +9096,8 @@ if (uni.restoreGlobal) {
       /* CLASS, STYLE */
     );
   }
-  const __easycom_1 = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["render", _sfc_render$9], ["__scopeId", "data-v-bf970acd"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-th/uni-th.vue"]]);
-  const _sfc_main$j = {
+  const __easycom_1 = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$a], ["__scopeId", "data-v-bf970acd"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-th/uni-th.vue"]]);
+  const _sfc_main$k = {
     name: "TableCheckbox",
     emits: ["checkboxSelected"],
     props: {
@@ -8795,7 +9162,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", {
       class: "uni-table-checkbox",
       onClick: _cache[0] || (_cache[0] = (...args) => $options.selected && $options.selected(...args))
@@ -8819,8 +9186,8 @@ if (uni.restoreGlobal) {
       ]))
     ]);
   }
-  const tableCheckbox = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$8], ["__scopeId", "data-v-25e435b1"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-tr/table-checkbox.vue"]]);
-  const _sfc_main$i = {
+  const tableCheckbox = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["render", _sfc_render$9], ["__scopeId", "data-v-25e435b1"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-tr/table-checkbox.vue"]]);
+  const _sfc_main$j = {
     name: "uniTr",
     components: { tableCheckbox },
     props: {
@@ -8907,7 +9274,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_table_checkbox = vue.resolveComponent("table-checkbox");
     return vue.openBlock(), vue.createElementBlock("view", { class: "uni-table-tr" }, [
       $data.selection === "selection" ? (vue.openBlock(), vue.createElementBlock(
@@ -8930,8 +9297,8 @@ if (uni.restoreGlobal) {
       vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
     ]);
   }
-  const __easycom_2 = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$7], ["__scopeId", "data-v-b48b3e32"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-tr/uni-tr.vue"]]);
-  const _sfc_main$h = {
+  const __easycom_2 = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$8], ["__scopeId", "data-v-b48b3e32"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-tr/uni-tr.vue"]]);
+  const _sfc_main$i = {
     name: "uniTd",
     options: {
       virtualHost: true
@@ -8980,7 +9347,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock(
       vue.Fragment,
       null,
@@ -9003,8 +9370,8 @@ if (uni.restoreGlobal) {
       /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
     );
   }
-  const __easycom_3 = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$6], ["__scopeId", "data-v-edae4802"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-td/uni-td.vue"]]);
-  const _sfc_main$g = {
+  const __easycom_3 = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$7], ["__scopeId", "data-v-edae4802"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-td/uni-td.vue"]]);
+  const _sfc_main$h = {
     name: "uniTable",
     options: {
       virtualHost: true
@@ -9245,7 +9612,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock(
       "view",
       {
@@ -9295,8 +9662,8 @@ if (uni.restoreGlobal) {
       /* CLASS */
     );
   }
-  const __easycom_4 = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$5], ["__scopeId", "data-v-c1ea9b5d"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-table/uni-table.vue"]]);
-  const _sfc_main$f = /* @__PURE__ */ vue.defineComponent({
+  const __easycom_4 = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$6], ["__scopeId", "data-v-c1ea9b5d"], ["__file", "F:/物流/logPm/uni_modules/uni-table/components/uni-table/uni-table.vue"]]);
+  const _sfc_main$g = /* @__PURE__ */ vue.defineComponent({
     __name: "SelfPickupDetails",
     setup(__props) {
       let details = vue.reactive({
@@ -9317,6 +9684,7 @@ if (uni.restoreGlobal) {
         ],
         dataList: [],
         orderStatus: 0,
+        orderType: 1,
         billLadingId: "",
         orderCode: "",
         consignee: "",
@@ -9325,27 +9693,86 @@ if (uni.restoreGlobal) {
         orderNum: "",
         planNum: "",
         completeNum: "",
-        signedNum: ""
+        signedNum: "",
+        scancode: ""
       });
+      const tiplists = vue.ref(null);
       onLoad((op) => {
         details.billLadingId = op.billLadingId;
         initpage();
+        details.scancode = "1686568463442280450";
+        uni.$on("scancodedate", function(code2) {
+          if (code2) {
+            formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:135", code2);
+            details.scancode = code2;
+            sacn();
+          }
+        });
       });
-      async function initpage() {
+      function showsdqs() {
+        tiplists.value.setdetails({
+          isshow: true,
+          tipstate: 1,
+          title: "请输入签收的包条",
+          placeholder: "请输入签收的包条",
+          inputtext: "",
+          success: (detail) => {
+            details.scancode = detail.inputtext;
+            sacn();
+            tiplists.value.setdetails({ isshow: false });
+          },
+          cancel: () => {
+            tiplists.value.setdetails({ isshow: false });
+          },
+          close: () => {
+            tiplists.value.setdetails({ isshow: false });
+          }
+        });
+      }
+      async function sacn() {
         let data = {
-          orderStatus: details.orderStatus,
-          billLadingId: details.billLadingId,
-          orderCode: details.orderCode
+          id: details.billLadingId,
+          coding: details.scancode,
+          type: details.orderType == 1 ? "2" : "1"
         };
-        let response = await billLadingdetailList(data);
-        details.dataList = 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;
+        let res = await billLadingscan(data);
+        formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:168", res);
+        uni.showToast({
+          title: res.msg,
+          icon: "none"
+        });
+      }
+      async function initpage() {
+        if (details.orderType == 1) {
+          let data = {
+            orderStatus: details.orderStatus,
+            billLadingId: details.billLadingId,
+            orderCode: details.orderCode
+          };
+          let response = await billLadingdetailList(data);
+          details.dataList = 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);
+          details.dataList = response.data.records;
+        }
+      }
+      function setorderStatus(state) {
+        details.orderType = state;
+        initpage();
       }
       function checktype(e) {
         if (e == "") {
@@ -9354,17 +9781,24 @@ if (uni.restoreGlobal) {
         details.typearr.map((item) => {
           if (item.value == e) {
             details.schanvalue = item.label;
-            formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:120", details.schanvalue);
+            details.orderStatus = item.value;
+            formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:222", details.schanvalue);
           }
         });
       }
-      const { schanvalue, typearr, dataList } = vue.toRefs(details);
+      const { orderType, schanvalue, typearr, dataList } = vue.toRefs(details);
       return (_ctx, _cache) => {
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
         const _component_uni_th = resolveEasycom(vue.resolveDynamicComponent("uni-th"), __easycom_1);
         const _component_uni_tr = resolveEasycom(vue.resolveDynamicComponent("uni-tr"), __easycom_2);
         const _component_uni_td = resolveEasycom(vue.resolveDynamicComponent("uni-td"), __easycom_3);
         const _component_uni_table = resolveEasycom(vue.resolveDynamicComponent("uni-table"), __easycom_4);
+        const _component_tiplist = vue.resolveComponent("tiplist");
+        const _component_saomiao = vue.resolveComponent("saomiao");
+        const _component_saomiao1 = vue.resolveComponent("saomiao1");
+        const _component_saomiao2 = vue.resolveComponent("saomiao2");
+        const _component_saomiao3 = vue.resolveComponent("saomiao3");
+        const _component_saomiao4 = vue.resolveComponent("saomiao4");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
@@ -9378,11 +9812,29 @@ if (uni.restoreGlobal) {
             }),
             vue.createElementVNode("view", { class: "headtop" }, [
               vue.createElementVNode("view", null, [
-                vue.createElementVNode("view", null, "配车类型：自提")
+                vue.createElementVNode(
+                  "view",
+                  null,
+                  "配车类型：" + vue.toDisplayString(vue.unref(details).carTypeStr),
+                  1
+                  /* TEXT */
+                )
               ]),
               vue.createElementVNode("view", null, [
-                vue.createElementVNode("view", null, "车牌号：川A88888"),
-                vue.createElementVNode("view", null, "司机：张琪、罗翔")
+                vue.createElementVNode(
+                  "view",
+                  null,
+                  "车牌号：" + vue.toDisplayString(vue.unref(details).pickUpPlate),
+                  1
+                  /* TEXT */
+                ),
+                vue.createElementVNode(
+                  "view",
+                  null,
+                  "司机：" + vue.toDisplayString(vue.unref(details).consignee),
+                  1
+                  /* TEXT */
+                )
               ])
             ]),
             vue.createElementVNode("view", { class: "tabmabx" }, [
@@ -9512,30 +9964,125 @@ if (uni.restoreGlobal) {
               vue.createElementVNode("view", { class: "inputs" }, [
                 vue.createElementVNode("input", { placeholder: "请输入查询的订单号" })
               ]),
-              vue.createElementVNode("view", { class: "btscan" }, "查询")
+              vue.createElementVNode("view", {
+                class: "btscan",
+                onClick: initpage
+              }, "查询")
+            ]),
+            vue.createElementVNode("view", { class: "tabtip" }, [
+              vue.createElementVNode("view", {
+                onClick: _cache[0] || (_cache[0] = ($event) => setorderStatus(1))
+              }, [
+                vue.createElementVNode(
+                  "view",
+                  {
+                    class: vue.normalizeClass(vue.unref(orderType) == 1 ? "xz" : "")
+                  },
+                  "定制品",
+                  2
+                  /* CLASS */
+                )
+              ]),
+              vue.createElementVNode("view", {
+                onClick: _cache[1] || (_cache[1] = ($event) => setorderStatus(2))
+              }, [
+                vue.createElementVNode(
+                  "view",
+                  {
+                    class: vue.normalizeClass(vue.unref(orderType) == 2 ? "xz" : "")
+                  },
+                  "库存品",
+                  2
+                  /* CLASS */
+                )
+              ])
             ]),
             vue.createElementVNode("scroll-view", {
               "scroll-y": "true",
               class: "scrollv"
             }, [
               vue.createElementVNode("view", { class: "mabxs" }, [
-                (vue.openBlock(true), vue.createElementBlock(
+                vue.unref(orderType) == 1 ? (vue.openBlock(true), vue.createElementBlock(
                   vue.Fragment,
-                  null,
+                  { key: 0 },
                   vue.renderList(vue.unref(dataList), (item) => {
-                    return vue.openBlock(), vue.createElementBlock("view", { class: "ite" }, [
+                    return vue.openBlock(), vue.createElementBlock("view", {
+                      class: "ite",
+                      onClick: showsdqs
+                    }, [
+                      vue.createElementVNode("view", null, [
+                        vue.createElementVNode(
+                          "view",
+                          null,
+                          "订单号：" + vue.toDisplayString(item.orderCode),
+                          1
+                          /* TEXT */
+                        ),
+                        vue.createElementVNode(
+                          "view",
+                          null,
+                          "包装号：" + vue.toDisplayString(item.orderPackageCode),
+                          1
+                          /* TEXT */
+                        )
+                      ]),
+                      vue.createElementVNode("view", null, [
+                        vue.createElementVNode(
+                          "view",
+                          null,
+                          "是否扫描：" + vue.toDisplayString(item.scanStatusStr),
+                          1
+                          /* TEXT */
+                        ),
+                        vue.createElementVNode(
+                          "view",
+                          null,
+                          "异常：" + vue.toDisplayString(item.errorStatusStr),
+                          1
+                          /* TEXT */
+                        )
+                      ])
+                    ]);
+                  }),
+                  256
+                  /* UNKEYED_FRAGMENT */
+                )) : vue.createCommentVNode("v-if", true),
+                vue.unref(orderType) == 2 ? (vue.openBlock(true), vue.createElementBlock(
+                  vue.Fragment,
+                  { key: 1 },
+                  vue.renderList(vue.unref(dataList), (item) => {
+                    return vue.openBlock(), vue.createElementBlock("view", {
+                      class: "ite",
+                      onClick: showsdqs
+                    }, [
+                      vue.createElementVNode("view", null, [
+                        vue.createElementVNode(
+                          "view",
+                          null,
+                          "SKU：" + vue.toDisplayString(item.sku),
+                          1
+                          /* TEXT */
+                        ),
+                        vue.createElementVNode(
+                          "view",
+                          null,
+                          "包件号：" + vue.toDisplayString(item.coding),
+                          1
+                          /* TEXT */
+                        )
+                      ]),
                       vue.createElementVNode("view", null, [
                         vue.createElementVNode(
                           "view",
                           null,
-                          "订单号：" + vue.toDisplayString(item.orderCode),
+                          "物品：" + vue.toDisplayString(item.descriptionGoods),
                           1
                           /* TEXT */
                         ),
                         vue.createElementVNode(
                           "view",
                           null,
-                          "包装号：" + vue.toDisplayString(item.packetBarCode),
+                          "规格：" + vue.toDisplayString(item.specification),
                           1
                           /* TEXT */
                         )
@@ -9544,25 +10091,41 @@ if (uni.restoreGlobal) {
                         vue.createElementVNode(
                           "view",
                           null,
-                          "是否扫描：" + vue.toDisplayString(item.scanStatusStr),
+                          "单位：" + vue.toDisplayString(item.cargoUnit),
                           1
                           /* TEXT */
                         ),
                         vue.createElementVNode(
                           "view",
                           null,
-                          "异常：" + vue.toDisplayString(item.errorStatusStr),
+                          "扫描：" + vue.toDisplayString(item.scanStatus == 1 ? "未扫描" : item.scanStatus == "" ? "未扫描" : "扫描"),
                           1
                           /* TEXT */
-                        )
+                        ),
+                        vue.createCommentVNode(" <view>规格：{{item.specification}}</view> ")
                       ])
                     ]);
                   }),
                   256
                   /* UNKEYED_FRAGMENT */
-                ))
+                )) : vue.createCommentVNode("v-if", true)
               ])
-            ])
+            ]),
+            vue.createVNode(
+              _component_tiplist,
+              {
+                ref_key: "tiplists",
+                ref: tiplists
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            ),
+            vue.createVNode(_component_saomiao),
+            vue.createVNode(_component_saomiao1),
+            vue.createVNode(_component_saomiao2),
+            vue.createVNode(_component_saomiao3),
+            vue.createVNode(_component_saomiao4)
           ],
           64
           /* STABLE_FRAGMENT */
@@ -9570,23 +10133,19 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesSelfPickupDetailsSelfPickupDetails = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__file", "F:/物流/logPm/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue"]]);
-  const _sfc_main$e = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesSelfPickupDetailsSelfPickupDetails = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__file", "F:/物流/logPm/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue"]]);
+  const _sfc_main$f = /* @__PURE__ */ vue.defineComponent({
     __name: "LoadingDetails",
     setup(__props) {
       let details = vue.reactive({
         schanvalue: "",
         typearr: [
-          {
-            value: 1,
-            label: "齐套"
-          },
           {
             value: 2,
-            label: "部分扫"
+            label: "已扫"
           },
           {
-            value: 3,
+            value: 1,
             label: "未扫"
           }
         ],
@@ -9595,7 +10154,9 @@ if (uni.restoreGlobal) {
         items: null,
         current: 1,
         size: 10,
-        orderStatus: 1
+        orderStatus: 1,
+        scanStatus: "",
+        orderCode: ""
       });
       onLoad((op) => {
         details.items = JSON.parse(op.item);
@@ -9610,7 +10171,9 @@ if (uni.restoreGlobal) {
         let data = {
           current: details.current,
           size: details.size,
-          id: details.id
+          id: details.id,
+          scanStatus: details.scanStatus,
+          orderCode: details.orderCode
         };
         let response = null;
         if (details.orderStatus == 1) {
@@ -9627,15 +10190,17 @@ if (uni.restoreGlobal) {
       function checktype(e) {
         if (e == "") {
           details.schanvalue = "";
+          details.scanStatus = "";
         }
         details.typearr.map((item) => {
           if (item.value == e) {
             details.schanvalue = item.label;
-            formatAppLog("log", "at pagesHome/pages/LoadingDetails/LoadingDetails.vue:156", details.schanvalue);
+            details.scanStatus = item.value;
+            formatAppLog("log", "at pagesHome/pages/LoadingDetails/LoadingDetails.vue:158", details.schanvalue);
           }
         });
       }
-      const { orderStatus, schanvalue, typearr, dataList, items } = vue.toRefs(details);
+      const { orderCode, orderStatus, schanvalue, typearr, dataList, items } = vue.toRefs(details);
       return (_ctx, _cache) => {
         var _a, _b, _c;
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
@@ -9835,7 +10400,7 @@ if (uni.restoreGlobal) {
               ])
             ]),
             vue.createElementVNode("view", { class: "scinp" }, [
-              vue.createElementVNode("view", null, "齐套状态"),
+              vue.createElementVNode("view", null, "扫描状态"),
               vue.createElementVNode("view", null, [
                 vue.createVNode(cusSelects, {
                   onChange: checktype,
@@ -9848,13 +10413,27 @@ if (uni.restoreGlobal) {
                 }, null, 8, ["data", "value"])
               ]),
               vue.createElementVNode("view", { class: "inputs" }, [
-                vue.createElementVNode("input", { placeholder: "请输入查询的订单号" })
+                vue.withDirectives(vue.createElementVNode(
+                  "input",
+                  {
+                    placeholder: "请输入查询的订单号",
+                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(orderCode) ? orderCode.value = $event : null)
+                  },
+                  null,
+                  512
+                  /* NEED_PATCH */
+                ), [
+                  [vue.vModelText, vue.unref(orderCode)]
+                ])
               ]),
-              vue.createElementVNode("view", { class: "btscan" }, "查询")
+              vue.createElementVNode("view", {
+                onClick: initpage,
+                class: "btscan"
+              }, "查询")
             ]),
             vue.createElementVNode("view", { class: "tabtip" }, [
               vue.createElementVNode("view", {
-                onClick: _cache[0] || (_cache[0] = ($event) => setorderStatus(1))
+                onClick: _cache[1] || (_cache[1] = ($event) => setorderStatus(1))
               }, [
                 vue.createElementVNode(
                   "view",
@@ -9867,7 +10446,7 @@ if (uni.restoreGlobal) {
                 )
               ]),
               vue.createElementVNode("view", {
-                onClick: _cache[1] || (_cache[1] = ($event) => setorderStatus(2))
+                onClick: _cache[2] || (_cache[2] = ($event) => setorderStatus(2))
               }, [
                 vue.createElementVNode(
                   "view",
@@ -9910,7 +10489,7 @@ if (uni.restoreGlobal) {
                         vue.createElementVNode(
                           "view",
                           null,
-                          "是否扫描：" + vue.toDisplayString(item.scanStatus),
+                          "是否扫描：" + vue.toDisplayString(item.scanStatus == 1 ? "未扫描" : item.scanStatus == "" ? "未扫描" : item.scanStatus == 4 ? "未扫描" : "扫描"),
                           1
                           /* TEXT */
                         ),
@@ -9969,7 +10548,7 @@ if (uni.restoreGlobal) {
                         vue.createElementVNode(
                           "view",
                           null,
-                          "扫描：" + vue.toDisplayString(item.scanStatus == 1 ? "未扫描" : item.scanStatus == "" ? "未扫描" : "扫描"),
+                          "扫描：" + vue.toDisplayString(item.scanStatus == 1 ? "未扫描" : item.scanStatus == "" ? "未扫描" : item.scanStatus == 4 ? "未扫描" : "扫描"),
                           1
                           /* TEXT */
                         ),
@@ -9989,15 +10568,15 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesLoadingDetailsLoadingDetails = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__file", "F:/物流/logPm/pagesHome/pages/LoadingDetails/LoadingDetails.vue"]]);
-  const _sfc_main$d = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesLoadingDetailsLoadingDetails = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__file", "F:/物流/logPm/pagesHome/pages/LoadingDetails/LoadingDetails.vue"]]);
+  const _sfc_main$e = /* @__PURE__ */ vue.defineComponent({
     __name: "CustomerOrdersDetails",
     setup(__props) {
       let details = vue.reactive({
         schanvalue: "",
         typearr: [
           {
-            value: 1,
+            value: 3,
             label: "齐套"
           },
           {
@@ -10005,7 +10584,7 @@ if (uni.restoreGlobal) {
             label: "部分扫"
           },
           {
-            value: 3,
+            value: 1,
             label: "未扫"
           }
         ],
@@ -10013,23 +10592,48 @@ if (uni.restoreGlobal) {
         datalist: [],
         scancode: "",
         orderStatus: 1,
-        id: ""
+        id: "",
+        orderType: 0,
+        inputtxt: ""
       });
+      const tiplists = vue.ref(null);
       onLoad((op) => {
         details.items = JSON.parse(op.item);
         details.id = op.id;
         initpage();
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:129", code2);
+            formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:133", code2);
             details.scancode = code2;
             scandata();
           }
         });
       });
+      function showsdqs() {
+        tiplists.value.setdetails({
+          isshow: true,
+          tipstate: 1,
+          title: "请输入签收的包条",
+          placeholder: "请输入签收的包条",
+          inputtext: "",
+          success: (detail) => {
+            details.scancode = detail.inputtext;
+            scandata();
+            tiplists.value.setdetails({ isshow: false });
+          },
+          cancel: () => {
+            tiplists.value.setdetails({ isshow: false });
+          },
+          close: () => {
+            tiplists.value.setdetails({ isshow: false });
+          }
+        });
+      }
       async function initpage() {
         let data = {
-          reservationId: details.items.id
+          reservationId: details.items.id,
+          completecode: details.orderType,
+          orderCode: details.inputtxt
         };
         details.datalist = [];
         let response = null;
@@ -10043,11 +10647,13 @@ if (uni.restoreGlobal) {
       function checktype(e) {
         if (e == "") {
           details.schanvalue = "";
+          details.orderType = 0;
         }
         details.typearr.map((item) => {
           if (item.value == e) {
             details.schanvalue = item.label;
-            formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:155", details.schanvalue);
+            details.orderType = item.value;
+            formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:183", details.schanvalue);
           }
         });
       }
@@ -10065,7 +10671,7 @@ if (uni.restoreGlobal) {
             barcode: details.scancode
           };
           let res = await deliveryloadingscan(data);
-          formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:175", res);
+          formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:203", res);
         } else if (details.orderStatus == 2) {
           let data = {
             reservationId: details.items.id,
@@ -10075,13 +10681,14 @@ if (uni.restoreGlobal) {
             barcode: details.scancode
           };
           let res = await deliveryloadinginventory(data);
-          formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:185", res);
+          formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:213", res);
         }
         initpage();
       }
-      const { orderStatus, schanvalue, typearr, items, datalist } = vue.toRefs(details);
+      const { inputtxt, orderStatus, schanvalue, typearr, items, datalist } = vue.toRefs(details);
       return (_ctx, _cache) => {
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
+        const _component_tiplist = vue.resolveComponent("tiplist");
         const _component_saomiao = vue.resolveComponent("saomiao");
         const _component_saomiao1 = vue.resolveComponent("saomiao1");
         const _component_saomiao2 = vue.resolveComponent("saomiao2");
@@ -10169,7 +10776,18 @@ if (uni.restoreGlobal) {
                 }, null, 8, ["data", "value"])
               ]),
               vue.createElementVNode("view", { class: "inputs" }, [
-                vue.createElementVNode("input", { placeholder: "请输入查询的订单号" })
+                vue.withDirectives(vue.createElementVNode(
+                  "input",
+                  {
+                    placeholder: "请输入查询的订单号",
+                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(inputtxt) ? inputtxt.value = $event : null)
+                  },
+                  null,
+                  512
+                  /* NEED_PATCH */
+                ), [
+                  [vue.vModelText, vue.unref(inputtxt)]
+                ])
               ]),
               vue.createElementVNode("view", {
                 onClick: initpage,
@@ -10178,7 +10796,7 @@ if (uni.restoreGlobal) {
             ]),
             vue.createElementVNode("view", { class: "tabtip" }, [
               vue.createElementVNode("view", {
-                onClick: _cache[0] || (_cache[0] = ($event) => setorderStatus(1))
+                onClick: _cache[1] || (_cache[1] = ($event) => setorderStatus(1))
               }, [
                 vue.createElementVNode(
                   "view",
@@ -10191,7 +10809,7 @@ if (uni.restoreGlobal) {
                 )
               ]),
               vue.createElementVNode("view", {
-                onClick: _cache[1] || (_cache[1] = ($event) => setorderStatus(2))
+                onClick: _cache[2] || (_cache[2] = ($event) => setorderStatus(2))
               }, [
                 vue.createElementVNode(
                   "view",
@@ -10213,7 +10831,10 @@ if (uni.restoreGlobal) {
                   vue.Fragment,
                   { key: 0 },
                   vue.renderList(vue.unref(datalist), (item) => {
-                    return vue.openBlock(), vue.createElementBlock("view", { class: "itec" }, [
+                    return vue.openBlock(), vue.createElementBlock("view", {
+                      class: "itec",
+                      onClick: showsdqs
+                    }, [
                       vue.createElementVNode("view", { class: "contenbx1" }, [
                         vue.createElementVNode("view", null, [
                           vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "订单编号："),
@@ -10260,7 +10881,10 @@ if (uni.restoreGlobal) {
                   vue.Fragment,
                   { key: 1 },
                   vue.renderList(vue.unref(datalist), (item) => {
-                    return vue.openBlock(), vue.createElementBlock("view", { class: "itec" }, [
+                    return vue.openBlock(), vue.createElementBlock("view", {
+                      class: "itec",
+                      onClick: showsdqs
+                    }, [
                       vue.createElementVNode("view", { class: "contenbx1" }, [
                         vue.createElementVNode("view", null, [
                           vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "SKU："),
@@ -10308,6 +10932,16 @@ if (uni.restoreGlobal) {
                 )) : vue.createCommentVNode("v-if", true)
               ])
             ]),
+            vue.createVNode(
+              _component_tiplist,
+              {
+                ref_key: "tiplists",
+                ref: tiplists
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            ),
             vue.createVNode(_component_saomiao),
             vue.createVNode(_component_saomiao1),
             vue.createVNode(_component_saomiao2),
@@ -10320,8 +10954,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesCustomerOrdersDetailsCustomerOrdersDetails = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__file", "F:/物流/logPm/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue"]]);
-  const _sfc_main$c = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesCustomerOrdersDetailsCustomerOrdersDetails = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__file", "F:/物流/logPm/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue"]]);
+  const _sfc_main$d = /* @__PURE__ */ vue.defineComponent({
     __name: "DeliveryCustomerScan",
     setup(__props) {
       let details = vue.reactive({
@@ -10331,12 +10965,13 @@ if (uni.restoreGlobal) {
         scancode: ""
       });
       const tip = vue.ref(null);
+      const tiplists = vue.ref(null);
       onLoad((op) => {
         details.id = op.id;
         details.items = JSON.parse(op.item);
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue:101", code2);
+            formatAppLog("log", "at pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue:103", code2);
             details.scancode = code2;
             scandata();
           }
@@ -10345,6 +10980,26 @@ if (uni.restoreGlobal) {
       onShow(() => {
         initpage();
       });
+      function showsdqs() {
+        tiplists.value.setdetails({
+          isshow: true,
+          tipstate: 1,
+          title: "请输入签收的包条",
+          placeholder: "请输入签收的包条",
+          inputtext: "",
+          success: (detail) => {
+            details.scancode = detail.inputtext;
+            scandata();
+            tiplists.value.setdetails({ isshow: false });
+          },
+          cancel: () => {
+            tiplists.value.setdetails({ isshow: false });
+          },
+          close: () => {
+            tiplists.value.setdetails({ isshow: false });
+          }
+        });
+      }
       async function ckoneloading(item) {
         tip.value.setdetails({
           title: "提示",
@@ -10380,7 +11035,7 @@ if (uni.restoreGlobal) {
           barcode: details.scancode
         };
         let res = await deliveryloadingscan(data);
-        formatAppLog("log", "at pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue:147", res);
+        formatAppLog("log", "at pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue:169", res);
       }
       async function initpage() {
         let data = {
@@ -10397,6 +11052,7 @@ if (uni.restoreGlobal) {
       const { items, datalist } = vue.toRefs(details);
       return (_ctx, _cache) => {
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
+        const _component_tiplist = vue.resolveComponent("tiplist");
         const _component_saomiao = vue.resolveComponent("saomiao");
         const _component_saomiao1 = vue.resolveComponent("saomiao1");
         const _component_saomiao2 = vue.resolveComponent("saomiao2");
@@ -10515,7 +11171,10 @@ if (uni.restoreGlobal) {
                   vue.Fragment,
                   null,
                   vue.renderList(vue.unref(datalist), (item) => {
-                    return vue.openBlock(), vue.createElementBlock("view", { class: "its" }, [
+                    return vue.openBlock(), vue.createElementBlock("view", {
+                      class: "its",
+                      onClick: showsdqs
+                    }, [
                       vue.createElementVNode(
                         "view",
                         { class: "titl" },
@@ -10582,7 +11241,7 @@ if (uni.restoreGlobal) {
                       ]),
                       vue.createElementVNode("view", { class: "bts" }, [
                         vue.createElementVNode("view", {
-                          onClick: ($event) => ckoneloading(item)
+                          onClick: vue.withModifiers(($event) => ckoneloading(item), ["stop"])
                         }, "一键装车", 8, ["onClick"])
                       ])
                     ]);
@@ -10592,6 +11251,16 @@ if (uni.restoreGlobal) {
                 ))
               ])
             ]),
+            vue.createVNode(
+              _component_tiplist,
+              {
+                ref_key: "tiplists",
+                ref: tiplists
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            ),
             vue.createVNode(_component_saomiao),
             vue.createVNode(_component_saomiao1),
             vue.createVNode(_component_saomiao2),
@@ -10614,8 +11283,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesDeliveryCustomerScanDeliveryCustomerScan = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__file", "F:/物流/logPm/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue"]]);
-  const _sfc_main$b = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesDeliveryCustomerScanDeliveryCustomerScan = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__file", "F:/物流/logPm/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue"]]);
+  const _sfc_main$c = /* @__PURE__ */ vue.defineComponent({
     __name: "CustomerSign",
     setup(__props) {
       let details = vue.reactive({
@@ -10623,6 +11292,7 @@ if (uni.restoreGlobal) {
         id: "",
         datalist: []
       });
+      const tiplists = vue.ref(null);
       onLoad((op) => {
         details.items = JSON.parse(op.item);
         details.id = JSON.parse(op.item).id;
@@ -10635,14 +11305,131 @@ if (uni.restoreGlobal) {
         let response = await signforcustom(data);
         details.datalist = response.data.records;
       }
+      function uplodimg(item) {
+        tiplists.value.setdetails({
+          isshow: true,
+          tipstate: 3,
+          placeholder: "请填写备注",
+          confirmTxt: "确认签收",
+          inputtext: "",
+          imglist: [],
+          maximglength: 3,
+          success: async (detail) => {
+            let data = {
+              deliveryId: details.id,
+              reservationId: item.id,
+              deliverySignPictures: detail.imglist.join(","),
+              driverRemarks: detail.inputtext
+            };
+            let res = await signforsignforack(data);
+            formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:127", res);
+            if (res.code == 200) {
+              uni.showToast({
+                title: "上传签收图片",
+                icon: "none"
+              });
+              initpage();
+            } else {
+              uni.showToast({
+                title: res.msg,
+                icon: "none"
+              });
+            }
+            tiplists.value.setdetails({ isshow: false });
+          },
+          cancel: () => {
+            tiplists.value.setdetails({ isshow: false });
+          },
+          close: () => {
+            tiplists.value.setdetails({ isshow: false });
+          }
+        });
+      }
+      async function allclick(item) {
+        tiplists.value.setdetails({
+          isshow: true,
+          tipstate: 3,
+          placeholder: "请填写备注",
+          confirmTxt: "确认批量签收",
+          inputtext: "",
+          imglist: [],
+          maximglength: 3,
+          success: async (detail) => {
+            let data = {
+              deliveryId: details.id,
+              reservationId: item.id,
+              deliverySignPictures: detail.imglist.join(","),
+              driverRemarks: detail.inputtext
+            };
+            let res = await signforoneclick(data);
+            formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:168", res);
+            if (res.code == 200) {
+              uni.showToast({
+                title: "批量签收成功",
+                icon: "none"
+              });
+              initpage();
+            } else {
+              uni.showToast({
+                title: res.msg,
+                icon: "none"
+              });
+            }
+            tiplists.value.setdetails({ isshow: false });
+          },
+          cancel: () => {
+            tiplists.value.setdetails({ isshow: false });
+          },
+          close: () => {
+            tiplists.value.setdetails({ isshow: false });
+          }
+        });
+      }
+      function getLocation(item) {
+        formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:193", "getLocation-------");
+        uni.getLocation({
+          type: "wgs84",
+          geocode: true,
+          isHighAccuracy: true,
+          success: async function(res) {
+            formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:199", JSON.stringify(res));
+            formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:202", "当前位置的经度：" + res.longitude);
+            formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:203", "当前位置的纬度：" + res.latitude);
+            let data = {
+              deliveryId: details.id,
+              reservationId: item.id,
+              positioning: res.longitude + "," + res.latitude,
+              positioningAdr: ""
+            };
+            let response = await signforpositioning(data);
+            formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:211", response);
+            if (response.code == 200) {
+              uni.showToast({
+                title: "定位打卡成功",
+                icon: "none"
+              });
+              initpage();
+            } else {
+              uni.showToast({
+                title: response.msg,
+                icon: "none"
+              });
+            }
+          },
+          fail: (err) => {
+            formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:226", err);
+          }
+        });
+      }
       function gosinorderscan(item) {
         uni.navigateTo({
-          url: "/pagesHome/pages/signOrderScan/signOrderScan?item=" + JSON.stringify(item)
+          url: "/pagesHome/pages/signOrderScan/signOrderScan?item=" + JSON.stringify(item) + "&deliveryId=" + details.id
         });
       }
       const { items, datalist } = vue.toRefs(details);
       return (_ctx, _cache) => {
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
+        const _component_tiplist = vue.resolveComponent("tiplist");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
@@ -10806,13 +11593,19 @@ if (uni.restoreGlobal) {
                       ]),
                       vue.createElementVNode("view", { class: "tbck" }, [
                         vue.createElementVNode("view", null, [
-                          vue.createElementVNode("view", null, "定位打卡"),
+                          vue.createElementVNode("view", {
+                            onClick: ($event) => getLocation(item)
+                          }, "定位打卡", 8, ["onClick"]),
                           vue.createElementVNode("view", {
                             onClick: vue.withModifiers(($event) => gosinorderscan(item), ["stop"])
                           }, "签到扫描", 8, ["onClick"]),
-                          vue.createElementVNode("view", null, "上传签收图片")
+                          vue.createElementVNode("view", {
+                            onClick: ($event) => uplodimg(item)
+                          }, "上传签收图片", 8, ["onClick"])
                         ]),
-                        vue.createElementVNode("view", null, " 批量签收 ")
+                        vue.createElementVNode("view", {
+                          onClick: ($event) => allclick(item)
+                        }, " 批量签收 ", 8, ["onClick"])
                       ])
                     ]);
                   }),
@@ -10820,7 +11613,17 @@ if (uni.restoreGlobal) {
                   /* UNKEYED_FRAGMENT */
                 ))
               ])
-            ])
+            ]),
+            vue.createVNode(
+              _component_tiplist,
+              {
+                ref_key: "tiplists",
+                ref: tiplists
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            )
           ],
           64
           /* STABLE_FRAGMENT */
@@ -10828,43 +11631,155 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesCustomerSignCustomerSign = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__file", "F:/物流/logPm/pagesHome/pages/CustomerSign/CustomerSign.vue"]]);
-  const _sfc_main$a = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesCustomerSignCustomerSign = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__file", "F:/物流/logPm/pagesHome/pages/CustomerSign/CustomerSign.vue"]]);
+  const _sfc_main$b = /* @__PURE__ */ vue.defineComponent({
     __name: "signOrderScan",
     setup(__props) {
       let details = vue.reactive({
         schanvalue: "",
         typearr: [
           {
-            value: 1,
+            value: 3,
             label: "齐套"
           },
-          {
-            value: 2,
-            label: "部分扫"
+          {
+            value: 2,
+            label: "部分扫"
+          },
+          {
+            value: 1,
+            label: "未扫"
+          }
+        ],
+        items: {},
+        datalist: [],
+        id: "",
+        orderStatus: 1,
+        scancode: "",
+        deliveryId: "",
+        orderType: "",
+        inputtxt: ""
+      });
+      const tiplists = vue.ref(null);
+      const tip = vue.ref(null);
+      onLoad((op) => {
+        details.items = JSON.parse(op.item);
+        details.id = JSON.parse(op.item).id;
+        details.deliveryId = op.deliveryId;
+        initpage();
+        uni.$on("scancodedate", function(code2) {
+          if (code2) {
+            formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:137", code2);
+            details.scancode = code2;
+            scandata();
+          }
+        });
+      });
+      async function scandata() {
+        let data = {
+          barcode: details.scancode,
+          deliveryId: details.deliveryId,
+          reservationId: details.id
+        };
+        if (details.orderStatus == 1) {
+          let response = await signforsignfor(data);
+          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:151", response);
+          if (response.code == 3006) {
+            tip.value.setdetails({
+              isshow: true,
+              content: "请确认是否异常签收",
+              success: async () => {
+                let data2 = {
+                  barcode: details.scancode,
+                  deliveryId: details.deliveryId,
+                  reservationId: details.id
+                };
+                let response2 = await signforsignforcontinue(data2);
+                formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:163", response2);
+                uni.showToast({
+                  title: response2.msg,
+                  icon: "none"
+                });
+                tip.value.setdetails({ isshow: false });
+              },
+              cancel: () => {
+                tip.value.setdetails({ isshow: false });
+              },
+              close: () => {
+                tip.value.setdetails({ isshow: false });
+              }
+            });
+          } else {
+            uni.showToast({
+              title: response.msg,
+              icon: "none"
+            });
+          }
+        } else if (details.orderStatus == 2) {
+          let response = await signforsignforIn(data);
+          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:186", response);
+          if (response.code == 3006) {
+            tip.value.setdetails({
+              isshow: true,
+              content: "请确认是否异常签收",
+              success: async () => {
+                let data2 = {
+                  barcode: details.scancode,
+                  deliveryId: details.deliveryId,
+                  reservationId: details.id
+                };
+                let response2 = await signforsignforcontinue(data2);
+                formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:198", response2);
+                uni.showToast({
+                  title: response2.msg,
+                  icon: "none"
+                });
+                tip.value.setdetails({ isshow: false });
+              },
+              cancel: () => {
+                tip.value.setdetails({ isshow: false });
+              },
+              close: () => {
+                tip.value.setdetails({ isshow: false });
+              }
+            });
+          } else {
+            uni.showToast({
+              title: response.msg,
+              icon: "none"
+            });
+          }
+        }
+      }
+      function showsdqs() {
+        tiplists.value.setdetails({
+          isshow: true,
+          tipstate: 1,
+          title: "请输入签收的包条",
+          placeholder: "请输入签收的包条",
+          inputtext: "",
+          success: (detail) => {
+            details.scancode = detail.inputtext;
+            scandata();
+            tiplists.value.setdetails({ isshow: false });
+          },
+          cancel: () => {
+            tiplists.value.setdetails({ isshow: false });
           },
-          {
-            value: 3,
-            label: "未扫"
+          close: () => {
+            tiplists.value.setdetails({ isshow: false });
           }
-        ],
-        items: {},
-        datalist: [],
-        id: "",
-        orderStatus: 1
-      });
-      onLoad((op) => {
-        details.items = JSON.parse(op.item);
-        details.id = JSON.parse(op.item).id;
-        initpage();
-      });
+        });
+      }
       function setorderStatus(state) {
         details.orderStatus = state;
         initpage();
       }
       async function initpage() {
         let data = {
-          reservationId: details.id
+          reservationId: details.id,
+          completecode: details.orderType,
+          orderCode: details.inputtxt
         };
         let response = null;
         if (details.orderStatus == 1) {
@@ -10875,10 +11790,29 @@ if (uni.restoreGlobal) {
         details.datalist = response.data.records;
       }
       function checktype(e) {
+        if (e == "") {
+          details.schanvalue = "";
+          details.orderType = "";
+          return;
+        }
+        details.typearr.map((item) => {
+          if (item.value == e) {
+            details.schanvalue = item.label;
+            details.orderType = item.value;
+            formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:270", details.schanvalue);
+          }
+        });
       }
-      const { orderStatus, datalist, items, typearr, schanvalue } = vue.toRefs(details);
+      const { inputtxt, orderStatus, datalist, items, typearr, schanvalue } = vue.toRefs(details);
       return (_ctx, _cache) => {
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
+        const _component_tips = vue.resolveComponent("tips");
+        const _component_tiplist = vue.resolveComponent("tiplist");
+        const _component_saomiao = vue.resolveComponent("saomiao");
+        const _component_saomiao1 = vue.resolveComponent("saomiao1");
+        const _component_saomiao2 = vue.resolveComponent("saomiao2");
+        const _component_saomiao3 = vue.resolveComponent("saomiao3");
+        const _component_saomiao4 = vue.resolveComponent("saomiao4");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
@@ -10951,13 +11885,27 @@ if (uni.restoreGlobal) {
                 }, null, 8, ["data", "value"])
               ]),
               vue.createElementVNode("view", { class: "inputs" }, [
-                vue.createElementVNode("input", { placeholder: "请输入查询的订单号" })
+                vue.withDirectives(vue.createElementVNode(
+                  "input",
+                  {
+                    placeholder: "请输入查询的订单号",
+                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(inputtxt) ? inputtxt.value = $event : null)
+                  },
+                  null,
+                  512
+                  /* NEED_PATCH */
+                ), [
+                  [vue.vModelText, vue.unref(inputtxt)]
+                ])
               ]),
-              vue.createElementVNode("view", { class: "btscan" }, "查询")
+              vue.createElementVNode("view", {
+                class: "btscan",
+                onClick: initpage
+              }, "查询")
             ]),
             vue.createElementVNode("view", { class: "tabtip" }, [
               vue.createElementVNode("view", {
-                onClick: _cache[0] || (_cache[0] = ($event) => setorderStatus(1))
+                onClick: _cache[1] || (_cache[1] = ($event) => setorderStatus(1))
               }, [
                 vue.createElementVNode(
                   "view",
@@ -10970,7 +11918,7 @@ if (uni.restoreGlobal) {
                 )
               ]),
               vue.createElementVNode("view", {
-                onClick: _cache[1] || (_cache[1] = ($event) => setorderStatus(2))
+                onClick: _cache[2] || (_cache[2] = ($event) => setorderStatus(2))
               }, [
                 vue.createElementVNode(
                   "view",
@@ -10992,7 +11940,10 @@ if (uni.restoreGlobal) {
                   vue.Fragment,
                   { key: 0 },
                   vue.renderList(vue.unref(datalist), (item) => {
-                    return vue.openBlock(), vue.createElementBlock("view", { class: "itec" }, [
+                    return vue.openBlock(), vue.createElementBlock("view", {
+                      class: "itec",
+                      onClick: showsdqs
+                    }, [
                       vue.createElementVNode("view", { class: "contenbx1" }, [
                         vue.createElementVNode("view", null, [
                           vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "订单编号："),
@@ -11057,7 +12008,10 @@ if (uni.restoreGlobal) {
                   vue.Fragment,
                   { key: 1 },
                   vue.renderList(vue.unref(datalist), (item) => {
-                    return vue.openBlock(), vue.createElementBlock("view", { class: "itec" }, [
+                    return vue.openBlock(), vue.createElementBlock("view", {
+                      class: "itec",
+                      onClick: showsdqs
+                    }, [
                       vue.createElementVNode("view", { class: "contenbx1" }, [
                         vue.createElementVNode("view", null, [
                           vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "SKU："),
@@ -11104,7 +12058,32 @@ if (uni.restoreGlobal) {
                   /* UNKEYED_FRAGMENT */
                 )) : vue.createCommentVNode("v-if", true)
               ])
-            ])
+            ]),
+            vue.createVNode(
+              _component_tips,
+              {
+                ref_key: "tip",
+                ref: tip
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            ),
+            vue.createVNode(
+              _component_tiplist,
+              {
+                ref_key: "tiplists",
+                ref: tiplists
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            ),
+            vue.createVNode(_component_saomiao),
+            vue.createVNode(_component_saomiao1),
+            vue.createVNode(_component_saomiao2),
+            vue.createVNode(_component_saomiao3),
+            vue.createVNode(_component_saomiao4)
           ],
           64
           /* STABLE_FRAGMENT */
@@ -11112,13 +12091,28 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesSignOrderScanSignOrderScan = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__file", "F:/物流/logPm/pagesHome/pages/signOrderScan/signOrderScan.vue"]]);
-  const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesSignOrderScanSignOrderScan = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__file", "F:/物流/logPm/pagesHome/pages/signOrderScan/signOrderScan.vue"]]);
+  const _sfc_main$a = /* @__PURE__ */ vue.defineComponent({
     __name: "SignDetailScan",
     setup(__props) {
       let details = vue.reactive({
-        schanvalue: "",
-        typearr: [
+        orderCodevalue: "",
+        signforStatevalue: "",
+        signforStatearr: [
+          {
+            value: 1,
+            label: "齐套"
+          },
+          {
+            value: 2,
+            label: "部分扫"
+          },
+          {
+            value: 3,
+            label: "未扫"
+          }
+        ],
+        statearr: [
           {
             value: 1,
             label: "齐套"
@@ -11134,24 +12128,52 @@ if (uni.restoreGlobal) {
         ],
         items: {},
         id: "",
-        datalist: []
+        datalist: [],
+        orderStatus: 1,
+        signforState: ""
       });
       onLoad((op) => {
         details.items = JSON.parse(op.item);
         details.id = JSON.parse(op.item).id;
         initpage();
       });
+      function setorderStatus(state) {
+        details.orderStatus = state;
+        initpage();
+      }
       async function initpage() {
         let data = {
-          id: details.id
+          id: details.id,
+          signforState: details.signforState
         };
-        let res = await signforwrap(data);
-        formatAppLog("log", "at pagesHome/pages/SignDetailScan/SignDetailScan.vue:116", res);
-        details.datalist = res.data.records;
+        if (details.orderStatus == 1) {
+          let res = await signforwrap(data);
+          formatAppLog("log", "at pagesHome/pages/SignDetailScan/SignDetailScan.vue:151", res);
+          details.datalist = res.data.records;
+        } else if (details.orderStatus == 2) {
+          let res = await signforwrapIn(data);
+          formatAppLog("log", "at pagesHome/pages/SignDetailScan/SignDetailScan.vue:155", res);
+          details.datalist = res.data.records;
+        }
       }
-      function checktype(e) {
+      function checktype(type, e) {
+        formatAppLog("log", "at pagesHome/pages/SignDetailScan/SignDetailScan.vue:161", type, e);
+        if (type == 1) {
+          if (e == "") {
+            details.signforStatevalue = "";
+            details.signforState = "";
+          }
+          details.signforStatearr.map((item) => {
+            if (item.value == e) {
+              details.signforStatevalue = item.label;
+              details.signforState = item.value;
+              formatAppLog("log", "at pagesHome/pages/SignDetailScan/SignDetailScan.vue:171", details.signforStatevalue);
+            }
+          });
+          initpage();
+        }
       }
-      const { typearr, schanvalue, items, datalist } = vue.toRefs(details);
+      const { orderStatus, signforStatearr, signforStatevalue, items, datalist } = vue.toRefs(details);
       return (_ctx, _cache) => {
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
         const _component_uni_th = resolveEasycom(vue.resolveDynamicComponent("uni-th"), __easycom_1);
@@ -11341,31 +12363,57 @@ if (uni.restoreGlobal) {
               ])
             ]),
             vue.createElementVNode("view", { class: "scinp" }, [
-              vue.createElementVNode("view", { class: "titl" }, "齐套状态"),
-              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: "left" }, [
+                vue.createElementVNode("view", { class: "titl" }, "齐套状态"),
+                vue.createElementVNode("view", null, [
+                  vue.createVNode(cusSelects, {
+                    onChange: _cache[0] || (_cache[0] = ($event) => checktype(1, $event)),
+                    data: vue.unref(signforStatearr),
+                    value: vue.unref(signforStatevalue),
+                    placeholder: "全部",
+                    arrLeft: 5,
+                    size: "145",
+                    clearable: true
+                  }, null, 8, ["data", "value"])
+                ])
               ]),
-              vue.createElementVNode("view", { class: "titl" }, "包件类型"),
-              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.createCommentVNode(` <view class="titl">包件类型</view>\r
+		<view>\r
+			<cusSelects @change='checktype(2,$event)' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5' size='145'\r
+				:clearable='true'></cusSelects>\r
+		</view> `),
+              vue.createElementVNode("view", {
+                onClick: initpage,
+                class: "btscan"
+              }, "查询")
+            ]),
+            vue.createElementVNode("view", { class: "tabtip" }, [
+              vue.createElementVNode("view", {
+                onClick: _cache[1] || (_cache[1] = ($event) => setorderStatus(1))
+              }, [
+                vue.createElementVNode(
+                  "view",
+                  {
+                    class: vue.normalizeClass(vue.unref(orderStatus) == 1 ? "xz" : "")
+                  },
+                  "定制品",
+                  2
+                  /* CLASS */
+                )
               ]),
-              vue.createElementVNode("view", { class: "btscan" }, "查询")
+              vue.createElementVNode("view", {
+                onClick: _cache[2] || (_cache[2] = ($event) => setorderStatus(2))
+              }, [
+                vue.createElementVNode(
+                  "view",
+                  {
+                    class: vue.normalizeClass(vue.unref(orderStatus) == 2 ? "xz" : "")
+                  },
+                  "库存品",
+                  2
+                  /* CLASS */
+                )
+              ])
             ]),
             vue.createElementVNode("scroll-view", {
               class: "scbx",
@@ -11451,8 +12499,8 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesSignDetailScanSignDetailScan = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__file", "F:/物流/logPm/pagesHome/pages/SignDetailScan/SignDetailScan.vue"]]);
-  const _sfc_main$8 = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesSignDetailScanSignDetailScan = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__file", "F:/物流/logPm/pagesHome/pages/SignDetailScan/SignDetailScan.vue"]]);
+  const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({
     __name: "setbarcode",
     setup(__props) {
       let details = vue.reactive({
@@ -11470,7 +12518,7 @@ if (uni.restoreGlobal) {
         details.goodsAreaName = op.goodsAreaName;
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:66", code2);
+            formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:73", code2);
             scandata(code2);
           }
         });
@@ -11492,7 +12540,7 @@ if (uni.restoreGlobal) {
           tipstate: 1,
           placeholder: "请输入需要生成的包条码数量",
           success: (deta) => {
-            formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:88", deta);
+            formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:115", deta);
             details.packageNum = deta.inputtext;
             if (Number(details.packageNum) > Number(details.items.planNum)) {
               uni.showToast({
@@ -11519,7 +12567,7 @@ if (uni.restoreGlobal) {
           packageNum: details.packageNum
         };
         let response = await distributionStockupstockupStockListPackageCode(data);
-        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:116", response);
+        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:143", response);
         details.printlist = response.data;
         tips2.value.setdetails({
           title: "请选择要打印的包条",
@@ -11556,15 +12604,28 @@ if (uni.restoreGlobal) {
           reservationId: details.reservationId
         };
         let response = await distributionStockupstockupScan(data);
-        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:153", response);
+        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:180", response);
       }
       const { items, codelist, printlist } = vue.toRefs(details);
       return (_ctx, _cache) => {
+        const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
         const _component_tiplist = vue.resolveComponent("tiplist");
+        const _component_saomiao = vue.resolveComponent("saomiao");
+        const _component_saomiao1 = vue.resolveComponent("saomiao1");
+        const _component_saomiao2 = vue.resolveComponent("saomiao2");
+        const _component_saomiao3 = vue.resolveComponent("saomiao3");
+        const _component_saomiao4 = vue.resolveComponent("saomiao4");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
           [
+            vue.createVNode(_component_u_navbar, {
+              title: "配置包条码",
+              placeholder: "",
+              border: "true",
+              autoBack: true,
+              leftIconSize: "35"
+            }),
             vue.createElementVNode("view", { class: "head" }, [
               vue.createElementVNode("view", { class: "type1" }, [
                 vue.createElementVNode("view", null, [
@@ -11683,7 +12744,12 @@ if (uni.restoreGlobal) {
               null,
               512
               /* NEED_PATCH */
-            )
+            ),
+            vue.createVNode(_component_saomiao),
+            vue.createVNode(_component_saomiao1),
+            vue.createVNode(_component_saomiao2),
+            vue.createVNode(_component_saomiao3),
+            vue.createVNode(_component_saomiao4)
           ],
           64
           /* STABLE_FRAGMENT */
@@ -11691,7 +12757,35 @@ if (uni.restoreGlobal) {
       };
     }
   });
-  const PagesHomePagesSetbarcodeSetbarcode = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__file", "F:/物流/logPm/pagesHome/pages/setbarcode/setbarcode.vue"]]);
+  const PagesHomePagesSetbarcodeSetbarcode = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__file", "F:/物流/logPm/pagesHome/pages/setbarcode/setbarcode.vue"]]);
+  const _sfc_main$8 = {};
+  function _sfc_render$5(_ctx, _cache) {
+    const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
+    return vue.openBlock(), vue.createElementBlock(
+      vue.Fragment,
+      null,
+      [
+        vue.createVNode(_component_u_navbar, {
+          title: "离线上传",
+          placeholder: "",
+          border: "true",
+          autoBack: true,
+          leftIconSize: "35"
+        }),
+        vue.createElementVNode("scroll-view", {
+          "scroll-y": "true",
+          class: "scview"
+        }),
+        vue.createElementVNode("view", { class: "buts" }, [
+          vue.createElementVNode("view", null, "创建任务"),
+          vue.createElementVNode("view", null, "一键上传")
+        ])
+      ],
+      64
+      /* STABLE_FRAGMENT */
+    );
+  }
+  const PagesHomePagesOfflineUploadOfflineUpload = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$5], ["__file", "F:/物流/logPm/pagesHome/pages/OfflineUpload/OfflineUpload.vue"]]);
   __definePage("pages/index/index", PagesIndexIndex);
   __definePage("pages/login/login", PagesLoginLogin);
   __definePage("pages/user/user", PagesUserUser);
@@ -11714,6 +12808,7 @@ if (uni.restoreGlobal) {
   __definePage("pagesHome/pages/signOrderScan/signOrderScan", PagesHomePagesSignOrderScanSignOrderScan);
   __definePage("pagesHome/pages/SignDetailScan/SignDetailScan", PagesHomePagesSignDetailScanSignDetailScan);
   __definePage("pagesHome/pages/setbarcode/setbarcode", PagesHomePagesSetbarcodeSetbarcode);
+  __definePage("pagesHome/pages/OfflineUpload/OfflineUpload", PagesHomePagesOfflineUploadOfflineUpload);
   const _sfc_main$7 = {
     setup() {
       onLaunch(() => {
@@ -15170,7 +16265,9 @@ if (uni.restoreGlobal) {
         list: ["12341131212"],
         checklist: [],
         inputtext: "",
-        isonecheck: false
+        isonecheck: false,
+        imglist: [],
+        maximglength: 3
       });
       function setdetails(objs) {
         for (let key in objs) {
@@ -15211,13 +16308,23 @@ if (uni.restoreGlobal) {
             break;
         }
       }
+      function updateimg() {
+        uni.chooseImage({
+          count: details.maximglength,
+          success: async (chooseImageRes) => {
+            const tempFilePaths = chooseImageRes.tempFilePaths;
+            let url2 = await api.upfile(tempFilePaths[0]);
+            details.imglist.push(url2.link);
+          }
+        });
+      }
       expose({ setdetails });
-      const { inputtext, checklist, list, isshow, tipstate, title, isshowcancel, placeholder, confirmTxt, cancelTxt } = vue.toRefs(details);
+      const { imglist, inputtext, checklist, list, isshow, tipstate, title, isshowcancel, placeholder, confirmTxt, cancelTxt } = vue.toRefs(details);
       return (_ctx, _cache) => {
         return vue.unref(isshow) ? (vue.openBlock(), vue.createElementBlock("view", {
           key: 0,
           class: "maboxbg",
-          onClick: _cache[7] || (_cache[7] = ($event) => checkbox(0))
+          onClick: _cache[11] || (_cache[11] = ($event) => checkbox(0))
         }, [
           vue.unref(tipstate) == 1 ? (vue.openBlock(), vue.createElementBlock("view", {
             key: 0,
@@ -15330,6 +16437,73 @@ if (uni.restoreGlobal) {
                 /* TEXT */
               )
             ])
+          ])) : vue.createCommentVNode("v-if", true),
+          vue.unref(tipstate) == 3 ? (vue.openBlock(), vue.createElementBlock("view", {
+            key: 2,
+            class: "modtips",
+            onClick: _cache[10] || (_cache[10] = vue.withModifiers(() => {
+            }, ["stop"]))
+          }, [
+            vue.createElementVNode(
+              "view",
+              { class: "title" },
+              vue.toDisplayString(vue.unref(title) || "提示"),
+              1
+              /* TEXT */
+            ),
+            vue.createCommentVNode(` <view class="contents">\r
+				{{content||'提示内容模板'}}\r
+			</view> `),
+            vue.createElementVNode("view", { class: "imgbx" }, [
+              (vue.openBlock(true), vue.createElementBlock(
+                vue.Fragment,
+                null,
+                vue.renderList(vue.unref(details).imglist, (item) => {
+                  return vue.openBlock(), vue.createElementBlock("view", null, [
+                    vue.createElementVNode("image", { src: item }, null, 8, ["src"])
+                  ]);
+                }),
+                256
+                /* UNKEYED_FRAGMENT */
+              )),
+              vue.unref(details).imglist.length != vue.unref(details).maximglength ? (vue.openBlock(), vue.createElementBlock("view", {
+                key: 0,
+                onClick: updateimg
+              }, [
+                vue.createElementVNode("image", { src: "/static/add.png" })
+              ])) : vue.createCommentVNode("v-if", true)
+            ]),
+            vue.createElementVNode("view", { class: "inputbx" }, [
+              vue.withDirectives(vue.createElementVNode("input", {
+                "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => vue.isRef(inputtext) ? inputtext.value = $event : null),
+                placeholder: vue.unref(placeholder)
+              }, null, 8, ["placeholder"]), [
+                [vue.vModelText, vue.unref(inputtext)]
+              ])
+            ]),
+            vue.createElementVNode("view", { class: "buts" }, [
+              vue.unref(isshowcancel) ? (vue.openBlock(), vue.createElementBlock(
+                "view",
+                {
+                  key: 0,
+                  onClick: _cache[8] || (_cache[8] = ($event) => checkbox(1)),
+                  class: "cancel"
+                },
+                vue.toDisplayString(vue.unref(cancelTxt) || "取消"),
+                1
+                /* TEXT */
+              )) : vue.createCommentVNode("v-if", true),
+              vue.createElementVNode(
+                "view",
+                {
+                  onClick: _cache[9] || (_cache[9] = ($event) => checkbox(2)),
+                  class: "confirm"
+                },
+                vue.toDisplayString(vue.unref(confirmTxt) || "确认"),
+                1
+                /* TEXT */
+              )
+            ])
           ])) : vue.createCommentVNode("v-if", true)
         ])) : vue.createCommentVNode("v-if", true);
       };
diff --git a/unpackage/dist/dev/app-plus/app.css b/unpackage/dist/dev/app-plus/app.css
index 8a946b8..2c51f87 100644
--- a/unpackage/dist/dev/app-plus/app.css
+++ b/unpackage/dist/dev/app-plus/app.css
@@ -684,6 +684,7 @@ body {
   left: 0;
   top: 0;
   background-color: #00000050;
+  z-index: 9999;
 }
 .modtips[data-v-a3a2f036] {
   width: 19.6875rem;
@@ -709,6 +710,25 @@ body {
   color: #90A0AF;
   margin-top: 0.9375rem;
 }
+.modtips .imgbx[data-v-a3a2f036] {
+  width: 17.1875rem;
+  display: grid;
+  grid-template-columns: 33% 33% 33%;
+  margin-top: 0.9375rem;
+}
+.modtips .imgbx > uni-view[data-v-a3a2f036] {
+  width: 4.6875rem;
+  height: 4.6875rem;
+  padding: 0.3125rem;
+  box-sizing: border-box;
+  border: 0.03125rem solid #e6e6e6;
+  margin-bottom: 0.46875rem;
+  border-radius: 0.25rem;
+}
+.modtips .imgbx > uni-view > uni-image[data-v-a3a2f036] {
+  width: 100%;
+  height: 100%;
+}
 .modtips .buts[data-v-a3a2f036] {
   display: flex;
   align-items: center;
@@ -748,7 +768,7 @@ body {
   color: #092C4D;
 }
 .modtips .inputbx > uni-input[data-v-a3a2f036] {
-  width: 12.1875rem;
+  width: 15rem;
   flex: 1;
 }
 .modtips .listcheck[data-v-a3a2f036] {
diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json
index 72b3bd4..ec24024 100644
--- a/unpackage/dist/dev/app-plus/manifest.json
+++ b/unpackage/dist/dev/app-plus/manifest.json
@@ -47,20 +47,20 @@
     "distribute": {
       "google": {
         "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
           "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
           "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
           "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
           "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
           "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
           "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
           "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
         ]
       },
@@ -68,7 +68,21 @@
         "dSYMs": false
       },
       "plugins": {
-        "geolocation": {},
+        "geolocation": {
+          "system": {
+            "__platform__": [
+              "ios",
+              "android"
+            ]
+          },
+          "amap": {
+            "__platform__": [
+              "android"
+            ],
+            "appkey_ios": "382bfd7864cb0b0d53fddc58b56281d6",
+            "appkey_android": "382bfd7864cb0b0d53fddc58b56281d6"
+          }
+        },
         "ad": {},
         "audio": {
           "mp3": {
diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/OfflineUpload/OfflineUpload.css b/unpackage/dist/dev/app-plus/pagesHome/pages/OfflineUpload/OfflineUpload.css
new file mode 100644
index 0000000..25baf21
--- /dev/null
+++ b/unpackage/dist/dev/app-plus/pagesHome/pages/OfflineUpload/OfflineUpload.css
@@ -0,0 +1,250 @@
+/**
+ * 这里是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;
+}
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.scview {
+  width: 100%;
+  height: 70vh;
+  background-color: #ffffff;
+}
+.buts {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.buts > uni-view {
+  width: 10rem;
+  height: 2.75rem;
+  background: #D3832A;
+  border-radius: 0.25rem;
+  font-size: 1rem;
+  font-weight: 400;
+  color: #FFFFFF;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
\ No newline at end of file
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 ab5289c..e0dd6ac 100644
--- a/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPScanList/SelfPScanList.css
+++ b/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPScanList/SelfPScanList.css
@@ -385,6 +385,32 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.tabtip {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.tabtip > uni-view {
+  width: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #ffffff;
+  font-size: 1rem;
+  font-weight: 400;
+  color: #90A0AF;
+}
+.tabtip > uni-view > uni-view {
+  height: 2.5rem;
+  border-bottom: 0.25rem solid #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.tabtip .xz {
+  color: #D3832A;
+  border-bottom: 0.25rem solid #D3832A;
+}
 .scve {
   width: 100%;
   height: 69vh;
@@ -409,7 +435,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 }
 .scve .mabx > .itec > .contenbx1 {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   justify-content: space-between;
   font-size: 0.875rem;
   color: #092C4D;
@@ -420,6 +446,8 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 }
 .scve .mabx > .itec > .contenbx1 > uni-view {
   flex: 1;
+  word-wrap: break-word;
+  word-break: break-all;
 }
 .scve .mabx > .itec .tip {
   position: absolute;
diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.css b/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.css
index c969cf5..7792cb7 100644
--- a/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.css
+++ b/unpackage/dist/dev/app-plus/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.css
@@ -781,6 +781,32 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.tabtip {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.tabtip > uni-view {
+  width: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #ffffff;
+  font-size: 1rem;
+  font-weight: 400;
+  color: #90A0AF;
+}
+.tabtip > uni-view > uni-view {
+  height: 2.5rem;
+  border-bottom: 0.25rem solid #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.tabtip .xz {
+  color: #D3832A;
+  border-bottom: 0.25rem solid #D3832A;
+}
 .scrollv {
   width: 21.4375rem;
   height: 48.5vh;
diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/SignDetailScan/SignDetailScan.css b/unpackage/dist/dev/app-plus/pagesHome/pages/SignDetailScan/SignDetailScan.css
index 5a234ff..bf436cb 100644
--- a/unpackage/dist/dev/app-plus/pagesHome/pages/SignDetailScan/SignDetailScan.css
+++ b/unpackage/dist/dev/app-plus/pagesHome/pages/SignDetailScan/SignDetailScan.css
@@ -781,6 +781,32 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.tabtip {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.tabtip > uni-view {
+  width: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #ffffff;
+  font-size: 1rem;
+  font-weight: 400;
+  color: #90A0AF;
+}
+.tabtip > uni-view > uni-view {
+  height: 2.5rem;
+  border-bottom: 0.25rem solid #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.tabtip .xz {
+  color: #D3832A;
+  border-bottom: 0.25rem solid #D3832A;
+}
 .scbx {
   width: 100%;
   height: 45vh;
@@ -809,7 +835,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 .scbx .mabox > .item .toptitl {
   width: 100%;
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   justify-content: space-between;
   border-bottom: 0.0625rem solid #EEEEEE;
   padding: 1.0625rem 0.75rem;
@@ -819,11 +845,16 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   font-size: 1rem;
   font-weight: 400;
   color: #092C4D;
+  word-wrap: break-word;
+  word-break: break-all;
 }
 .scbx .mabox > .item .toptitl .tis {
+  width: 5.625rem;
   font-size: 1rem;
   font-weight: 400;
   color: #0086F1;
+  display: flex;
+  justify-content: flex-end;
 }
 .scbx .mabox > .item .toptitl .bf {
   color: #D3832A;
@@ -891,12 +922,18 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   box-sizing: border-box;
   background-color: #ffffff;
 }
-.scinp > .titl {
+.scinp > .left {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.scinp > .left > .titl {
   font-size: 0.875rem;
   font-weight: 400;
   color: #092C4D;
+  margin-right: 0.9375rem;
 }
-.scinp .inputs {
+.scinp > .left .inputs {
   width: 8.625rem;
   height: 2rem;
   background: #F5F5F6;
@@ -909,7 +946,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   font-weight: 400;
   color: #AFB4BA;
 }
-.scinp .inputs > uni-input {
+.scinp > .left .inputs > uni-input {
   flex: 1;
   font-size: 0.75rem;
   color: #092C4D;
diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/setbarcode/setbarcode.css b/unpackage/dist/dev/app-plus/pagesHome/pages/setbarcode/setbarcode.css
index 3c3b7dc..11b7210 100644
--- a/unpackage/dist/dev/app-plus/pagesHome/pages/setbarcode/setbarcode.css
+++ b/unpackage/dist/dev/app-plus/pagesHome/pages/setbarcode/setbarcode.css
@@ -23,6 +23,208 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.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;
+}
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
 .scrollv {
   width: 21.4375rem;
   height: 74vh;
diff --git a/unpackage/dist/dev/app-plus/static/add.png b/unpackage/dist/dev/app-plus/static/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f11301617d2983de2cfeb558d3b95d143fd484d
GIT binary patch
literal 785
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV7lSy;uum9_x8^2K;}T6)`z9+
zQyet&8mDk5WgH0I!Ps$PjuYn;2hNhDYY(=bRlaO+-1^rEj<R!8OD5FaHI3t`i%L(p
zXjOHPpXb6I7M=qPXN@n|)W|k4&PrcU`NN8V+2p*#=MSX}Y#H+!pFModz;nTd`Rw8A
zj1mhf*=Dt`XEt!y&l7Wh{k&r<^7py!lZ`X$f4w^IX2wlMi3b_QY%_`$GJnaevufaL
zVEiU$z|_-Vx3<3P3I~wIpnSmgz&U0K2Iho@^E^A)UnH{#a4<P4aIiEgd?<O9$iVZU
zv_P1@!2vFMA@svR=4}mXEEa8?P=x|4O(6N-8}2Ix!PP+p_ZvOX+R-nZ!?=whx<U7V
zSOWJ3)*DPYjI}q;hklUX`tAI};Gi{)wNZ_x7o;+Hx3EPquWh{MkiEck1OM+x=KsmO
zcZ9#*$=M>qU-R?vh4+u&uP^3K`MhD@+BrLG_zk2IqAeTJvn3^X16C!ze0cYw<btpR
zuP*ZhoPBU+etN@9@eNgf_AtH+JAYMy>Ae1N)*p|=S@PPqABgmtbank!O=E|bUlz9S
z<+f0p$G9w}LR#WiG0%xt3|0->8>{&x7~LEeu(zxB0)q$`QZ))G&l!0d7!NU9D)ciN
zFt8n900!EeKKby2jfpaoj(~Ux3_t}24c!Zx*&Px(PB3j!fCd62JPjBUGd)qmXNKCQ
z20Kt#BNXyDL_`U(fCChwO@L)tr_KU?CKwMa#Vjyw8dzId+kp~xEA_wA?hBRqv3ksJ
zWxOQH@!Hs72Sa8hn@709n)3_~nU*}2RETZdV8`6TJz-jULka7lUpxYO4pH+6D*n%~
XYL?}EM(3br1|aZs^>bP0l+XkK@6H_v

literal 0
HcmV?d00001

diff --git a/unpackage/dist/dev/mp-weixin/api/user.js b/unpackage/dist/dev/mp-weixin/api/user.js
index fc628ae..0d34dd9 100644
--- a/unpackage/dist/dev/mp-weixin/api/user.js
+++ b/unpackage/dist/dev/mp-weixin/api/user.js
@@ -140,6 +140,13 @@ function signforwrap(data) {
     data
   });
 }
+function signforwrapIn(data) {
+  return utils_request.service({
+    url: `logpm-distribution/app/signfor/wrapIn`,
+    method: "get",
+    data
+  });
+}
 function signforinventory(data) {
   return utils_request.service({
     url: `logpm-distribution/app/signfor/inventory`,
@@ -161,9 +168,75 @@ function deliveryloadinginventory(data) {
     data
   });
 }
+function signforsignfor(data) {
+  return utils_request.service({
+    url: `logpm-distribution/app/signfor/signfor`,
+    method: "post",
+    data
+  });
+}
+function signforsignforIn(data) {
+  return utils_request.service({
+    url: `logpm-distribution/app/signfor/signforIn`,
+    method: "post",
+    data
+  });
+}
+function signforsignforcontinue(data) {
+  return utils_request.service({
+    url: `logpm-distribution/app/signfor/signforcontinue`,
+    method: "post",
+    data
+  });
+}
+function signforsignforack(data) {
+  return utils_request.service({
+    url: `logpm-distribution/app/signfor/signforack`,
+    method: "post",
+    data
+  });
+}
+function signforpositioning(data) {
+  return utils_request.service({
+    url: `logpm-distribution/app/signfor/positioning`,
+    method: "post",
+    data
+  });
+}
+function signforoneclick(data) {
+  return utils_request.service({
+    url: `logpm-distribution/app/signfor/oneclick`,
+    method: "post",
+    data
+  });
+}
+function billLadinggetInventory(data) {
+  return utils_request.service({
+    url: `logpm-distribution/app/billLading/getInventory`,
+    method: "get",
+    data
+  });
+}
+function billLadinggetInventoryNum(data) {
+  return utils_request.service({
+    url: `logpm-distribution/app/billLading/getInventoryNum`,
+    method: "get",
+    data
+  });
+}
+function billLadingscan(data) {
+  return utils_request.service({
+    url: `logpm-distribution/app/billLading/scan`,
+    method: "get",
+    data
+  });
+}
 exports.billLadingdetailList = billLadingdetailList;
+exports.billLadinggetInventory = billLadinggetInventory;
+exports.billLadinggetInventoryNum = billLadinggetInventoryNum;
 exports.billLadingorderList = billLadingorderList;
 exports.billLadingpageList = billLadingpageList;
+exports.billLadingscan = billLadingscan;
 exports.deliverycustom = deliverycustom;
 exports.deliveryloadinginventory = deliveryloadinginventory;
 exports.deliveryloadingscan = deliveryloadingscan;
@@ -181,6 +254,13 @@ exports.distributionStockupstockupStockListPackageCode = distributionStockupstoc
 exports.oauthtoken = oauthtoken;
 exports.signforcustom = signforcustom;
 exports.signforinventory = signforinventory;
+exports.signforoneclick = signforoneclick;
 exports.signfororder = signfororder;
 exports.signforpage = signforpage;
+exports.signforpositioning = signforpositioning;
+exports.signforsignfor = signforsignfor;
+exports.signforsignforIn = signforsignforIn;
+exports.signforsignforack = signforsignforack;
+exports.signforsignforcontinue = signforsignforcontinue;
 exports.signforwrap = signforwrap;
+exports.signforwrapIn = signforwrapIn;
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 3f75a91..968cd1d 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -6,6 +6,7 @@ const utils_functions = require("./utils/functions.js");
 const utils_utils = require("./utils/utils.js");
 const store_index = require("./store/index.js");
 require("./utils/IDCardVerification.js");
+require("./utils/base64.js");
 require("./config/host.js");
 if (!Math) {
   "./pages/index/index.js";
@@ -30,6 +31,7 @@ if (!Math) {
   "./pagesHome/pages/signOrderScan/signOrderScan.js";
   "./pagesHome/pages/SignDetailScan/SignDetailScan.js";
   "./pagesHome/pages/setbarcode/setbarcode.js";
+  "./pagesHome/pages/OfflineUpload/OfflineUpload.js";
 }
 const _sfc_main = {
   setup() {
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 1266edb..2bd1581 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -26,7 +26,8 @@
         "pages/CustomerSign/CustomerSign",
         "pages/signOrderScan/signOrderScan",
         "pages/SignDetailScan/SignDetailScan",
-        "pages/setbarcode/setbarcode"
+        "pages/setbarcode/setbarcode",
+        "pages/OfflineUpload/OfflineUpload"
       ]
     }
   ],
diff --git a/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.js b/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.js
index a1294cb..d42fbdd 100644
--- a/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.js
+++ b/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.js
@@ -1,5 +1,9 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
+const utils_functions = require("../../utils/functions.js");
+require("../../utils/IDCardVerification.js");
+require("../../utils/base64.js");
+require("../../config/host.js");
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "tiplist",
   setup(__props, { expose }) {
@@ -17,7 +21,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       list: ["12341131212"],
       checklist: [],
       inputtext: "",
-      isonecheck: false
+      isonecheck: false,
+      imglist: [],
+      maximglength: 3
     });
     function setdetails(objs) {
       for (let key in objs) {
@@ -58,8 +64,18 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           break;
       }
     }
+    function updateimg() {
+      common_vendor.index.chooseImage({
+        count: details.maximglength,
+        success: async (chooseImageRes) => {
+          const tempFilePaths = chooseImageRes.tempFilePaths;
+          let url = await utils_functions.api.upfile(tempFilePaths[0]);
+          details.imglist.push(url.link);
+        }
+      });
+    }
     expose({ setdetails });
-    const { inputtext, checklist, list, isshow, tipstate, title, isshowcancel, placeholder, confirmTxt, cancelTxt } = common_vendor.toRefs(details);
+    const { imglist, inputtext, checklist, list, isshow, tipstate, title, isshowcancel, placeholder, confirmTxt, cancelTxt } = common_vendor.toRefs(details);
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.unref(isshow)
@@ -100,7 +116,32 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         v: common_vendor.o(() => {
         })
       }) : {}, {
-        w: common_vendor.o(($event) => checkbox(0))
+        w: common_vendor.unref(tipstate) == 3
+      }, common_vendor.unref(tipstate) == 3 ? common_vendor.e({
+        x: common_vendor.t(common_vendor.unref(title) || "提示"),
+        y: common_vendor.f(common_vendor.unref(details).imglist, (item, k0, i0) => {
+          return {
+            a: item
+          };
+        }),
+        z: common_vendor.unref(details).imglist.length != common_vendor.unref(details).maximglength
+      }, common_vendor.unref(details).imglist.length != common_vendor.unref(details).maximglength ? {
+        A: common_vendor.o(updateimg)
+      } : {}, {
+        B: common_vendor.unref(placeholder),
+        C: common_vendor.unref(inputtext),
+        D: common_vendor.o(($event) => common_vendor.isRef(inputtext) ? inputtext.value = $event.detail.value : null),
+        E: common_vendor.unref(isshowcancel)
+      }, common_vendor.unref(isshowcancel) ? {
+        F: common_vendor.t(common_vendor.unref(cancelTxt) || "取消"),
+        G: common_vendor.o(($event) => checkbox(1))
+      } : {}, {
+        H: common_vendor.t(common_vendor.unref(confirmTxt) || "确认"),
+        I: common_vendor.o(($event) => checkbox(2)),
+        J: common_vendor.o(() => {
+        })
+      }) : {}, {
+        K: common_vendor.o(($event) => checkbox(0))
       }) : {});
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxml b/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxml
index 9e86e8c..513b2a2 100644
--- a/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxml
+++ b/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxml
@@ -1 +1 @@
-<view wx:if="{{a}}" class="maboxbg" bindtap="{{w}}"><view wx:if="{{b}}" class="modtips" catchtap="{{l}}"><view class="title">{{c}}</view><view class="inputbx"><input placeholder="{{d}}" value="{{e}}" bindinput="{{f}}"/></view><view class="buts"><view wx:if="{{g}}" bindtap="{{i}}" class="cancel">{{h}}</view><view bindtap="{{k}}" class="confirm">{{j}}</view></view></view><view wx:if="{{m}}" class="modtips" catchtap="{{v}}"><view class="title">{{n}}</view><view class="listcheck"><view wx:for="{{o}}" wx:for-item="item" bindtap="{{item.c}}"><image src="{{item.a}}"></image><view>{{item.b}}</view></view></view><view class="buts"><view wx:if="{{p}}" bindtap="{{r}}" class="cancel">{{q}}</view><view bindtap="{{t}}" class="confirm">{{s}}</view></view></view></view>
\ No newline at end of file
+<view wx:if="{{a}}" class="maboxbg" bindtap="{{K}}"><view wx:if="{{b}}" class="modtips" catchtap="{{l}}"><view class="title">{{c}}</view><view class="inputbx"><input placeholder="{{d}}" value="{{e}}" bindinput="{{f}}"/></view><view class="buts"><view wx:if="{{g}}" bindtap="{{i}}" class="cancel">{{h}}</view><view bindtap="{{k}}" class="confirm">{{j}}</view></view></view><view wx:if="{{m}}" class="modtips" catchtap="{{v}}"><view class="title">{{n}}</view><view class="listcheck"><view wx:for="{{o}}" wx:for-item="item" bindtap="{{item.c}}"><image src="{{item.a}}"></image><view>{{item.b}}</view></view></view><view class="buts"><view wx:if="{{p}}" bindtap="{{r}}" class="cancel">{{q}}</view><view bindtap="{{t}}" class="confirm">{{s}}</view></view></view><view wx:if="{{w}}" class="modtips" catchtap="{{J}}"><view class="title">{{x}}</view><view class="imgbx"><view wx:for="{{y}}" wx:for-item="item"><image src="{{item.a}}"></image></view><view wx:if="{{z}}" bindtap="{{A}}"><image src="/static/add.png"></image></view></view><view class="inputbx"><input placeholder="{{B}}" value="{{C}}" bindinput="{{D}}"/></view><view class="buts"><view wx:if="{{E}}" bindtap="{{G}}" class="cancel">{{F}}</view><view bindtap="{{I}}" class="confirm">{{H}}</view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxss b/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxss
index 9a9654b..1d0052e 100644
--- a/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxss
+++ b/unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxss
@@ -30,6 +30,7 @@
   left: 0;
   top: 0;
   background-color: #00000050;
+  z-index: 9999;
 }
 .modtips {
   width: 630rpx;
@@ -55,6 +56,25 @@
   color: #90A0AF;
   margin-top: 30rpx;
 }
+.modtips .imgbx {
+  width: 550rpx;
+  display: grid;
+  grid-template-columns: 33% 33% 33%;
+  margin-top: 30rpx;
+}
+.modtips .imgbx > view {
+  width: 150rpx;
+  height: 150rpx;
+  padding: 10rpx;
+  box-sizing: border-box;
+  border: 1rpx solid #e6e6e6;
+  margin-bottom: 15rpx;
+  border-radius: 8rpx;
+}
+.modtips .imgbx > view > image {
+  width: 100%;
+  height: 100%;
+}
 .modtips .buts {
   display: flex;
   align-items: center;
@@ -94,7 +114,7 @@
   color: #092C4D;
 }
 .modtips .inputbx > input {
-  width: 390rpx;
+  width: 480rpx;
   flex: 1;
 }
 .modtips .listcheck {
diff --git a/unpackage/dist/dev/mp-weixin/config/host.js b/unpackage/dist/dev/mp-weixin/config/host.js
index 28b8d8c..b32428a 100644
--- a/unpackage/dist/dev/mp-weixin/config/host.js
+++ b/unpackage/dist/dev/mp-weixin/config/host.js
@@ -1,5 +1,5 @@
 "use strict";
-const devhost = "http://192.168.10.51:8888/";
+const devhost = "http://192.168.10.73:8777/";
 const imghost = "";
 const host = devhost;
 const APPKEY = "h5u:h5u_secret";
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index d73fce3..f605003 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -55,6 +55,17 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
               router: "/pagesHome/pages/signinScan/signinScan"
             }
           ]
+        },
+        {
+          type: 1,
+          name: "离线上传",
+          minilist: [
+            {
+              icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+              name: "离线上传",
+              router: "/pagesHome/pages/OfflineUpload/OfflineUpload"
+            }
+          ]
         }
       ]
     });
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.js b/unpackage/dist/dev/mp-weixin/pages/login/login.js
index db9a66e..d5040f2 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.js
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.js
@@ -5,8 +5,8 @@ require("../../utils/request.js");
 require("../../store/index.js");
 require("../../utils/functions.js");
 require("../../utils/IDCardVerification.js");
-require("../../config/host.js");
 require("../../utils/base64.js");
+require("../../config/host.js");
 require("../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js
index 07bc75c..c6570c1 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js
@@ -5,17 +5,18 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
+  const _component_tiplist = common_vendor.resolveComponent("tiplist");
   const _component_saomiao = common_vendor.resolveComponent("saomiao");
   const _component_saomiao1 = common_vendor.resolveComponent("saomiao1");
   const _component_saomiao2 = common_vendor.resolveComponent("saomiao2");
   const _component_saomiao3 = common_vendor.resolveComponent("saomiao3");
   const _component_saomiao4 = common_vendor.resolveComponent("saomiao4");
-  (_easycom_u_navbar2 + _component_saomiao + _component_saomiao1 + _component_saomiao2 + _component_saomiao3 + _component_saomiao4)();
+  (_easycom_u_navbar2 + _component_tiplist + _component_saomiao + _component_saomiao1 + _component_saomiao2 + _component_saomiao3 + _component_saomiao4)();
 }
 const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
 if (!Math) {
@@ -29,7 +30,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       schanvalue: "",
       typearr: [
         {
-          value: 1,
+          value: 3,
           label: "齐套"
         },
         {
@@ -37,7 +38,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           label: "部分扫"
         },
         {
-          value: 3,
+          value: 1,
           label: "未扫"
         }
       ],
@@ -45,8 +46,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       datalist: [],
       scancode: "",
       orderStatus: 1,
-      id: ""
+      id: "",
+      orderType: 0,
+      inputtxt: ""
     });
+    const tiplists = common_vendor.ref(null);
     common_vendor.onLoad((op) => {
       details.items = JSON.parse(op.item);
       details.id = op.id;
@@ -59,9 +63,31 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         }
       });
     });
+    function showsdqs() {
+      tiplists.value.setdetails({
+        isshow: true,
+        tipstate: 1,
+        title: "请输入签收的包条",
+        placeholder: "请输入签收的包条",
+        inputtext: "",
+        success: (detail) => {
+          details.scancode = detail.inputtext;
+          scandata();
+          tiplists.value.setdetails({ isshow: false });
+        },
+        cancel: () => {
+          tiplists.value.setdetails({ isshow: false });
+        },
+        close: () => {
+          tiplists.value.setdetails({ isshow: false });
+        }
+      });
+    }
     async function initpage() {
       let data = {
-        reservationId: details.items.id
+        reservationId: details.items.id,
+        completecode: details.orderType,
+        orderCode: details.inputtxt
       };
       details.datalist = [];
       let response = null;
@@ -75,10 +101,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     function checktype(e) {
       if (e == "") {
         details.schanvalue = "";
+        details.orderType = 0;
       }
       details.typearr.map((item) => {
         if (item.value == e) {
           details.schanvalue = item.label;
+          details.orderType = item.value;
           console.log(details.schanvalue);
         }
       });
@@ -111,7 +139,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       }
       initpage();
     }
-    const { orderStatus, schanvalue, typearr, items, datalist } = common_vendor.toRefs(details);
+    const { inputtxt, orderStatus, schanvalue, typearr, items, datalist } = common_vendor.toRefs(details);
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.p({
@@ -135,14 +163,16 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           size: "145",
           clearable: true
         }),
-        i: common_vendor.o(initpage),
-        j: common_vendor.n(common_vendor.unref(orderStatus) == 1 ? "xz" : ""),
-        k: common_vendor.o(($event) => setorderStatus(1)),
-        l: common_vendor.n(common_vendor.unref(orderStatus) == 2 ? "xz" : ""),
-        m: common_vendor.o(($event) => setorderStatus(2)),
-        n: common_vendor.unref(orderStatus) == 1
+        i: common_vendor.unref(inputtxt),
+        j: common_vendor.o(($event) => common_vendor.isRef(inputtxt) ? inputtxt.value = $event.detail.value : null),
+        k: common_vendor.o(initpage),
+        l: common_vendor.n(common_vendor.unref(orderStatus) == 1 ? "xz" : ""),
+        m: common_vendor.o(($event) => setorderStatus(1)),
+        n: common_vendor.n(common_vendor.unref(orderStatus) == 2 ? "xz" : ""),
+        o: common_vendor.o(($event) => setorderStatus(2)),
+        p: common_vendor.unref(orderStatus) == 1
       }, common_vendor.unref(orderStatus) == 1 ? {
-        o: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
+        q: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.orderCode),
             b: common_vendor.t(item.reservationNum),
@@ -150,19 +180,25 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             d: common_vendor.t(item.complete),
             e: common_vendor.n(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
           };
-        })
+        }),
+        r: common_vendor.o(showsdqs)
       } : {}, {
-        p: common_vendor.unref(orderStatus) == 2
+        s: common_vendor.unref(orderStatus) == 2
       }, common_vendor.unref(orderStatus) == 2 ? {
-        q: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
+        t: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.sku),
             b: common_vendor.t(item.descriptionGoods),
             c: common_vendor.t(item.specification),
             d: common_vendor.t(item.logpmUnit)
           };
+        }),
+        v: common_vendor.o(showsdqs)
+      } : {}, {
+        w: common_vendor.sr(tiplists, "dfa68ca0-2", {
+          "k": "tiplists"
         })
-      } : {});
+      });
     };
   }
 });
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.wxml
index 6173b0f..8f46a76 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="dfa68ca0-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hdtp"><view><view> 客户：{{b}}</view></view><view><view>备货是否完成：{{c}}</view><view>装车是否完成：{{d}}</view></view></view><view class="hdtpnum"><view><view>订单总数</view><view>{{e}}</view></view><view><view>齐套数</view><view>15</view></view><view><view>自提件数</view><view>15</view></view><view><view>签收件数</view><view>{{f}}</view></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{h}}" bindchange="{{g}}" u-i="dfa68ca0-1" bind:__l="__l" u-p="{{h}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号"/></view><view bindtap="{{i}}" class="btscan">查询</view></view><view class="tabtip"><view bindtap="{{k}}"><view class="{{j}}">定制品</view></view><view bindtap="{{m}}"><view class="{{l}}">库存品</view></view></view><scroll-view class="scve" scroll-y="true"><view class="mabx"><block wx:if="{{n}}"><view wx:for="{{o}}" wx:for-item="item" class="itec"><view class="contenbx1"><view><text style="color:#90A0AF">订单编号：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">配送数：</text>{{item.b}}</view><view><text style="color:#90A0AF">已扫码数：</text>{{item.c}}</view></view><view class="{{item.e}}">{{item.d}}</view></view></block><block wx:if="{{p}}"><view wx:for="{{q}}" wx:for-item="item" class="itec"><view class="contenbx1"><view><text style="color:#90A0AF">SKU：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">物品：</text>{{item.b}}</view><view><text style="color:#90A0AF">规格：</text>{{item.c}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">单位：</text>{{item.d}}</view></view></view></block></view></scroll-view><saomiao u-i="dfa68ca0-2" bind:__l="__l"></saomiao><saomiao1 u-i="dfa68ca0-3" bind:__l="__l"></saomiao1><saomiao2 u-i="dfa68ca0-4" bind:__l="__l"></saomiao2><saomiao3 u-i="dfa68ca0-5" bind:__l="__l"></saomiao3><saomiao4 u-i="dfa68ca0-6" bind:__l="__l"></saomiao4>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="dfa68ca0-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hdtp"><view><view> 客户：{{b}}</view></view><view><view>备货是否完成：{{c}}</view><view>装车是否完成：{{d}}</view></view></view><view class="hdtpnum"><view><view>订单总数</view><view>{{e}}</view></view><view><view>齐套数</view><view>15</view></view><view><view>自提件数</view><view>15</view></view><view><view>签收件数</view><view>{{f}}</view></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{h}}" bindchange="{{g}}" u-i="dfa68ca0-1" bind:__l="__l" u-p="{{h}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号" value="{{i}}" bindinput="{{j}}"/></view><view bindtap="{{k}}" class="btscan">查询</view></view><view class="tabtip"><view bindtap="{{m}}"><view class="{{l}}">定制品</view></view><view bindtap="{{o}}"><view class="{{n}}">库存品</view></view></view><scroll-view class="scve" scroll-y="true"><view class="mabx"><block wx:if="{{p}}"><view wx:for="{{q}}" wx:for-item="item" class="itec" bindtap="{{r}}"><view class="contenbx1"><view><text style="color:#90A0AF">订单编号：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">配送数：</text>{{item.b}}</view><view><text style="color:#90A0AF">已扫码数：</text>{{item.c}}</view></view><view class="{{item.e}}">{{item.d}}</view></view></block><block wx:if="{{s}}"><view wx:for="{{t}}" wx:for-item="item" class="itec" bindtap="{{v}}"><view class="contenbx1"><view><text style="color:#90A0AF">SKU：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">物品：</text>{{item.b}}</view><view><text style="color:#90A0AF">规格：</text>{{item.c}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">单位：</text>{{item.d}}</view></view></view></block></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="dfa68ca0-2" bind:__l="__l"></tiplist><saomiao u-i="dfa68ca0-3" bind:__l="__l"></saomiao><saomiao1 u-i="dfa68ca0-4" bind:__l="__l"></saomiao1><saomiao2 u-i="dfa68ca0-5" bind:__l="__l"></saomiao2><saomiao3 u-i="dfa68ca0-6" bind:__l="__l"></saomiao3><saomiao4 u-i="dfa68ca0-7" bind:__l="__l"></saomiao4>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js
index 747af7b..f35c0b3 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js
@@ -5,12 +5,13 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
-  _easycom_u_navbar2();
+  const _component_tiplist = common_vendor.resolveComponent("tiplist");
+  (_easycom_u_navbar2 + _component_tiplist)();
 }
 const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
 if (!Math) {
@@ -24,6 +25,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       id: "",
       datalist: []
     });
+    const tiplists = common_vendor.ref(null);
     common_vendor.onLoad((op) => {
       details.items = JSON.parse(op.item);
       details.id = JSON.parse(op.item).id;
@@ -36,9 +38,125 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       let response = await api_user.signforcustom(data);
       details.datalist = response.data.records;
     }
+    function uplodimg(item) {
+      tiplists.value.setdetails({
+        isshow: true,
+        tipstate: 3,
+        placeholder: "请填写备注",
+        confirmTxt: "确认签收",
+        inputtext: "",
+        imglist: [],
+        maximglength: 3,
+        success: async (detail) => {
+          let data = {
+            deliveryId: details.id,
+            reservationId: item.id,
+            deliverySignPictures: detail.imglist.join(","),
+            driverRemarks: detail.inputtext
+          };
+          let res = await api_user.signforsignforack(data);
+          console.log(res);
+          if (res.code == 200) {
+            common_vendor.index.showToast({
+              title: "上传签收图片",
+              icon: "none"
+            });
+            initpage();
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+          tiplists.value.setdetails({ isshow: false });
+        },
+        cancel: () => {
+          tiplists.value.setdetails({ isshow: false });
+        },
+        close: () => {
+          tiplists.value.setdetails({ isshow: false });
+        }
+      });
+    }
+    async function allclick(item) {
+      tiplists.value.setdetails({
+        isshow: true,
+        tipstate: 3,
+        placeholder: "请填写备注",
+        confirmTxt: "确认批量签收",
+        inputtext: "",
+        imglist: [],
+        maximglength: 3,
+        success: async (detail) => {
+          let data = {
+            deliveryId: details.id,
+            reservationId: item.id,
+            deliverySignPictures: detail.imglist.join(","),
+            driverRemarks: detail.inputtext
+          };
+          let res = await api_user.signforoneclick(data);
+          console.log(res);
+          if (res.code == 200) {
+            common_vendor.index.showToast({
+              title: "批量签收成功",
+              icon: "none"
+            });
+            initpage();
+          } else {
+            common_vendor.index.showToast({
+              title: res.msg,
+              icon: "none"
+            });
+          }
+          tiplists.value.setdetails({ isshow: false });
+        },
+        cancel: () => {
+          tiplists.value.setdetails({ isshow: false });
+        },
+        close: () => {
+          tiplists.value.setdetails({ isshow: false });
+        }
+      });
+    }
+    function getLocation(item) {
+      console.log("getLocation-------");
+      common_vendor.index.getLocation({
+        type: "wgs84",
+        geocode: true,
+        isHighAccuracy: true,
+        success: async function(res) {
+          console.log(JSON.stringify(res));
+          console.log("当前位置的经度：" + res.longitude);
+          console.log("当前位置的纬度：" + res.latitude);
+          let data = {
+            deliveryId: details.id,
+            reservationId: item.id,
+            positioning: res.longitude + "," + res.latitude,
+            positioningAdr: ""
+          };
+          let response = await api_user.signforpositioning(data);
+          console.log(response);
+          if (response.code == 200) {
+            common_vendor.index.showToast({
+              title: "定位打卡成功",
+              icon: "none"
+            });
+            initpage();
+          } else {
+            common_vendor.index.showToast({
+              title: response.msg,
+              icon: "none"
+            });
+          }
+        },
+        fail: (err) => {
+          console.log(err);
+        }
+      });
+    }
     function gosinorderscan(item) {
       common_vendor.index.navigateTo({
-        url: "/pagesHome/pages/signOrderScan/signOrderScan?item=" + JSON.stringify(item)
+        url: "/pagesHome/pages/signOrderScan/signOrderScan?item=" + JSON.stringify(item) + "&deliveryId=" + details.id
       });
     }
     const { items, datalist } = common_vendor.toRefs(details);
@@ -68,8 +186,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             c: common_vendor.t(item.ordNub),
             d: common_vendor.t(item.reservationNum),
             e: common_vendor.t(item.signNub),
-            f: common_vendor.o(($event) => gosinorderscan(item))
+            f: common_vendor.o(($event) => getLocation(item)),
+            g: common_vendor.o(($event) => gosinorderscan(item)),
+            h: common_vendor.o(($event) => uplodimg(item)),
+            i: common_vendor.o(($event) => allclick(item))
           };
+        }),
+        m: common_vendor.sr(tiplists, "aed605e0-1", {
+          "k": "tiplists"
         })
       };
     };
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml
index c2e3950..e505346 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="aed605e0-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hedtopt"><view class="typto"><view>配车类型：{{b}}</view><view>配车状态：{{c}}</view></view><view class="typto"><view>车牌号：{{d}}</view><view>司机：{{e}}</view></view><view class="typto"><view>装卸班组：{{f}}</view><view>备货是否完成：{{g}}</view></view><view class="kehupeison"><view><view>配送客户数</view><view>{{h}}</view></view><view><view>订单总数</view><view>{{i}}</view></view><view><view>配送件数</view><view>{{j}}</view></view><view><view>签收件数</view><view>{{k}}</view></view></view></view><scroll-view scroll-y="true" class="scvbx"><view class="mabx"><view wx:for="{{l}}" wx:for-item="item" class="its"><view class="title"><view>客户：{{item.a}}</view><view class="statetype">{{item.b}}</view></view><view class="conxb"><view><view>订单总数</view><view>{{item.c}}</view></view><view><view>配送件数</view><view>{{item.d}}</view></view><view><view>扫描件数</view><view>{{item.e}}</view></view></view><view class="tbck"><view><view>定位打卡</view><view catchtap="{{item.f}}">签到扫描</view><view>上传签收图片</view></view><view> 批量签收 </view></view></view></view></scroll-view>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="aed605e0-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hedtopt"><view class="typto"><view>配车类型：{{b}}</view><view>配车状态：{{c}}</view></view><view class="typto"><view>车牌号：{{d}}</view><view>司机：{{e}}</view></view><view class="typto"><view>装卸班组：{{f}}</view><view>备货是否完成：{{g}}</view></view><view class="kehupeison"><view><view>配送客户数</view><view>{{h}}</view></view><view><view>订单总数</view><view>{{i}}</view></view><view><view>配送件数</view><view>{{j}}</view></view><view><view>签收件数</view><view>{{k}}</view></view></view></view><scroll-view scroll-y="true" class="scvbx"><view class="mabx"><view wx:for="{{l}}" wx:for-item="item" class="its"><view class="title"><view>客户：{{item.a}}</view><view class="statetype">{{item.b}}</view></view><view class="conxb"><view><view>订单总数</view><view>{{item.c}}</view></view><view><view>配送件数</view><view>{{item.d}}</view></view><view><view>扫描件数</view><view>{{item.e}}</view></view></view><view class="tbck"><view><view bindtap="{{item.f}}">定位打卡</view><view catchtap="{{item.g}}">签到扫描</view><view bindtap="{{item.h}}">上传签收图片</view></view><view bindtap="{{item.i}}"> 批量签收 </view></view></view></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="aed605e0-1" bind:__l="__l"></tiplist>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js
index e3bec4d..e619b65 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js
@@ -5,18 +5,19 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
+  const _component_tiplist = common_vendor.resolveComponent("tiplist");
   const _component_saomiao = common_vendor.resolveComponent("saomiao");
   const _component_saomiao1 = common_vendor.resolveComponent("saomiao1");
   const _component_saomiao2 = common_vendor.resolveComponent("saomiao2");
   const _component_saomiao3 = common_vendor.resolveComponent("saomiao3");
   const _component_saomiao4 = common_vendor.resolveComponent("saomiao4");
   const _component_tips = common_vendor.resolveComponent("tips");
-  (_easycom_u_navbar2 + _component_saomiao + _component_saomiao1 + _component_saomiao2 + _component_saomiao3 + _component_saomiao4 + _component_tips)();
+  (_easycom_u_navbar2 + _component_tiplist + _component_saomiao + _component_saomiao1 + _component_saomiao2 + _component_saomiao3 + _component_saomiao4 + _component_tips)();
 }
 const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
 if (!Math) {
@@ -32,6 +33,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       scancode: ""
     });
     const tip = common_vendor.ref(null);
+    const tiplists = common_vendor.ref(null);
     common_vendor.onLoad((op) => {
       details.id = op.id;
       details.items = JSON.parse(op.item);
@@ -46,6 +48,26 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     common_vendor.onShow(() => {
       initpage();
     });
+    function showsdqs() {
+      tiplists.value.setdetails({
+        isshow: true,
+        tipstate: 1,
+        title: "请输入签收的包条",
+        placeholder: "请输入签收的包条",
+        inputtext: "",
+        success: (detail) => {
+          details.scancode = detail.inputtext;
+          scandata();
+          tiplists.value.setdetails({ isshow: false });
+        },
+        cancel: () => {
+          tiplists.value.setdetails({ isshow: false });
+        },
+        close: () => {
+          tiplists.value.setdetails({ isshow: false });
+        }
+      });
+    }
     async function ckoneloading(item) {
       tip.value.setdetails({
         title: "提示",
@@ -129,7 +151,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         }),
         m: common_vendor.o(() => {
         }),
-        n: common_vendor.sr(tip, "69b5a390-6", {
+        n: common_vendor.o(showsdqs),
+        o: common_vendor.sr(tiplists, "69b5a390-1", {
+          "k": "tiplists"
+        }),
+        p: common_vendor.sr(tip, "69b5a390-7", {
           "k": "tip"
         })
       };
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.wxml
index 733569a..b58f1f7 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="69b5a390-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hedtopt"><view class="typto"><view>配车类型：{{b}}</view><view>配车状态：{{c}}</view></view><view class="typto"><view>车牌号：{{d}}</view><view>司机：{{e}}</view></view><view class="typto"><view>装卸班组：{{f}}</view><view>备货是否完成：{{g}}</view></view><view class="kehupeison"><view><view>配送客户数</view><view>{{h}}</view></view><view><view>订单总数</view><view>{{i}}</view></view><view><view>计划件数</view><view>{{j}}</view></view><view><view>装车件数</view><view>{{k}}</view></view></view></view><scroll-view class="scoolv" scroll-y="true"><view class="minbx"><view wx:for="{{l}}" wx:for-item="item" class="its"><view class="titl"> 客户：{{item.a}}</view><view class="contsx"><view><view><text style="color:#90A0AF">备货是否完成：</text>{{item.b}}</view><view><text style="color:#90A0AF">装车是否完成：</text>{{item.c}}</view></view><view><view bindtap="{{item.e}}"><view>订单总数</view><view>{{item.d}}</view></view><view bindtap="{{m}}"><view>计划件数</view><view>{{item.f}}</view></view><view><view>装车件数</view><view>{{item.g}}</view></view></view></view><view class="bts"><view bindtap="{{item.h}}">一键装车</view></view></view></view></scroll-view><saomiao u-i="69b5a390-1" bind:__l="__l"></saomiao><saomiao1 u-i="69b5a390-2" bind:__l="__l"></saomiao1><saomiao2 u-i="69b5a390-3" bind:__l="__l"></saomiao2><saomiao3 u-i="69b5a390-4" bind:__l="__l"></saomiao3><saomiao4 u-i="69b5a390-5" bind:__l="__l"></saomiao4><tips class="r" u-r="tip" u-i="69b5a390-6" bind:__l="__l"></tips>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="69b5a390-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hedtopt"><view class="typto"><view>配车类型：{{b}}</view><view>配车状态：{{c}}</view></view><view class="typto"><view>车牌号：{{d}}</view><view>司机：{{e}}</view></view><view class="typto"><view>装卸班组：{{f}}</view><view>备货是否完成：{{g}}</view></view><view class="kehupeison"><view><view>配送客户数</view><view>{{h}}</view></view><view><view>订单总数</view><view>{{i}}</view></view><view><view>计划件数</view><view>{{j}}</view></view><view><view>装车件数</view><view>{{k}}</view></view></view></view><scroll-view class="scoolv" scroll-y="true"><view class="minbx"><view wx:for="{{l}}" wx:for-item="item" class="its" bindtap="{{n}}"><view class="titl"> 客户：{{item.a}}</view><view class="contsx"><view><view><text style="color:#90A0AF">备货是否完成：</text>{{item.b}}</view><view><text style="color:#90A0AF">装车是否完成：</text>{{item.c}}</view></view><view><view bindtap="{{item.e}}"><view>订单总数</view><view>{{item.d}}</view></view><view bindtap="{{m}}"><view>计划件数</view><view>{{item.f}}</view></view><view><view>装车件数</view><view>{{item.g}}</view></view></view></view><view class="bts"><view catchtap="{{item.h}}">一键装车</view></view></view></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="69b5a390-1" bind:__l="__l"></tiplist><saomiao u-i="69b5a390-2" bind:__l="__l"></saomiao><saomiao1 u-i="69b5a390-3" bind:__l="__l"></saomiao1><saomiao2 u-i="69b5a390-4" bind:__l="__l"></saomiao2><saomiao3 u-i="69b5a390-5" bind:__l="__l"></saomiao3><saomiao4 u-i="69b5a390-6" bind:__l="__l"></saomiao4><tips class="r" u-r="tip" u-i="69b5a390-7" bind:__l="__l"></tips>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingDetails/LoadingDetails.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingDetails/LoadingDetails.js
index 5737500..e463a70 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingDetails/LoadingDetails.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingDetails/LoadingDetails.js
@@ -5,8 +5,8 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
@@ -31,16 +31,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     let details = common_vendor.reactive({
       schanvalue: "",
       typearr: [
-        {
-          value: 1,
-          label: "齐套"
-        },
         {
           value: 2,
-          label: "部分扫"
+          label: "已扫"
         },
         {
-          value: 3,
+          value: 1,
           label: "未扫"
         }
       ],
@@ -49,7 +45,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       items: null,
       current: 1,
       size: 10,
-      orderStatus: 1
+      orderStatus: 1,
+      scanStatus: "",
+      orderCode: ""
     });
     common_vendor.onLoad((op) => {
       details.items = JSON.parse(op.item);
@@ -64,7 +62,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       let data = {
         current: details.current,
         size: details.size,
-        id: details.id
+        id: details.id,
+        scanStatus: details.scanStatus,
+        orderCode: details.orderCode
       };
       let response = null;
       if (details.orderStatus == 1) {
@@ -81,15 +81,17 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     function checktype(e) {
       if (e == "") {
         details.schanvalue = "";
+        details.scanStatus = "";
       }
       details.typearr.map((item) => {
         if (item.value == e) {
           details.schanvalue = item.label;
+          details.scanStatus = item.value;
           console.log(details.schanvalue);
         }
       });
     }
-    const { orderStatus, schanvalue, typearr, dataList, items } = common_vendor.toRefs(details);
+    const { orderCode, orderStatus, schanvalue, typearr, dataList, items } = common_vendor.toRefs(details);
     return (_ctx, _cache) => {
       var _a, _b, _c;
       return common_vendor.e({
@@ -158,30 +160,33 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           size: "145",
           clearable: true
         }),
-        q: common_vendor.n(common_vendor.unref(orderStatus) == 1 ? "xz" : ""),
-        r: common_vendor.o(($event) => setorderStatus(1)),
-        s: common_vendor.n(common_vendor.unref(orderStatus) == 2 ? "xz" : ""),
-        t: common_vendor.o(($event) => setorderStatus(2)),
-        v: common_vendor.unref(orderStatus) == 1
+        q: common_vendor.unref(orderCode),
+        r: common_vendor.o(($event) => common_vendor.isRef(orderCode) ? orderCode.value = $event.detail.value : null),
+        s: common_vendor.o(initpage),
+        t: common_vendor.n(common_vendor.unref(orderStatus) == 1 ? "xz" : ""),
+        v: common_vendor.o(($event) => setorderStatus(1)),
+        w: common_vendor.n(common_vendor.unref(orderStatus) == 2 ? "xz" : ""),
+        x: common_vendor.o(($event) => setorderStatus(2)),
+        y: common_vendor.unref(orderStatus) == 1
       }, common_vendor.unref(orderStatus) == 1 ? {
-        w: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
+        z: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.orderCode),
             b: common_vendor.t(item.packageBarCode),
-            c: common_vendor.t(item.scanStatus)
+            c: common_vendor.t(item.scanStatus == 1 ? "未扫描" : item.scanStatus == "" ? "未扫描" : item.scanStatus == 4 ? "未扫描" : "扫描")
           };
         })
       } : {}, {
-        x: common_vendor.unref(orderStatus) == 2
+        A: common_vendor.unref(orderStatus) == 2
       }, common_vendor.unref(orderStatus) == 2 ? {
-        y: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
+        B: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.sku),
             b: common_vendor.t(item.coding),
             c: common_vendor.t(item.goodsName),
             d: common_vendor.t(item.specification),
             e: common_vendor.t(item.cargoUnit),
-            f: common_vendor.t(item.scanStatus == 1 ? "未扫描" : item.scanStatus == "" ? "未扫描" : "扫描")
+            f: common_vendor.t(item.scanStatus == 1 ? "未扫描" : item.scanStatus == "" ? "未扫描" : item.scanStatus == 4 ? "未扫描" : "扫描")
           };
         })
       } : {});
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingDetails/LoadingDetails.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingDetails/LoadingDetails.wxml
index d3e3bb7..ad8024d 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingDetails/LoadingDetails.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingDetails/LoadingDetails.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="521be830-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="headtop"><view><view>配车类型：{{b}}</view></view><view><view>车牌号：{{c}}</view><view>司机：{{d}}</view></view></view><view class="tabmabx"><view><uni-table wx:if="{{n}}" u-s="{{['d']}}" u-i="521be830-1" bind:__l="__l" u-p="{{n}}"><uni-tr u-s="{{['d']}}" u-i="521be830-2,521be830-1" bind:__l="__l"><uni-th wx:if="{{e}}" u-i="521be830-3,521be830-2" bind:__l="__l" u-p="{{e}}"></uni-th><uni-th wx:if="{{f}}" u-s="{{['d']}}" u-i="521be830-4,521be830-2" bind:__l="__l" u-p="{{f}}">配送客户数</uni-th><uni-th wx:if="{{g}}" u-s="{{['d']}}" u-i="521be830-5,521be830-2" bind:__l="__l" u-p="{{g}}">订单总数</uni-th><uni-th wx:if="{{h}}" u-s="{{['d']}}" u-i="521be830-6,521be830-2" bind:__l="__l" u-p="{{h}}">装车件数</uni-th></uni-tr><uni-tr wx:for="{{i}}" wx:for-item="item" u-s="{{['d']}}" u-i="{{item.i}}" bind:__l="__l"><uni-td wx:if="{{j}}" u-s="{{['d']}}" class="jhjs" u-i="{{item.b}}" bind:__l="__l" u-p="{{j}}">{{item.a}}</uni-td><uni-td wx:if="{{k}}" u-s="{{['d']}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{k}}">{{item.c}}</uni-td><uni-td wx:if="{{l}}" u-s="{{['d']}}" u-i="{{item.f}}" bind:__l="__l" u-p="{{l}}">{{item.e}}</uni-td><uni-td wx:if="{{m}}" u-s="{{['d']}}" u-i="{{item.h}}" bind:__l="__l" u-p="{{m}}">{{item.g}}</uni-td></uni-tr></uni-table></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{p}}" bindchange="{{o}}" u-i="521be830-12" bind:__l="__l" u-p="{{p}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号"/></view><view class="btscan">查询</view></view><view class="tabtip"><view bindtap="{{r}}"><view class="{{q}}">定制品</view></view><view bindtap="{{t}}"><view class="{{s}}">库存品</view></view></view><scroll-view scroll-y="true" class="scrollv"><view class="mabxs"><block wx:if="{{v}}"><view wx:for="{{w}}" wx:for-item="item" class="ite"><view><view>订单号：{{item.a}}</view><view>包装号：{{item.b}}</view></view><view><view>是否扫描：{{item.c}}</view></view></view></block><block wx:if="{{x}}"><view wx:for="{{y}}" wx:for-item="item" class="ite"><view><view>SKU：{{item.a}}</view><view>包件号：{{item.b}}</view></view><view><view>物品：{{item.c}}</view><view>规格：{{item.d}}</view></view><view><view>单位：{{item.e}}</view><view>扫描：{{item.f}}</view></view></view></block></view></scroll-view>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="521be830-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="headtop"><view><view>配车类型：{{b}}</view></view><view><view>车牌号：{{c}}</view><view>司机：{{d}}</view></view></view><view class="tabmabx"><view><uni-table wx:if="{{n}}" u-s="{{['d']}}" u-i="521be830-1" bind:__l="__l" u-p="{{n}}"><uni-tr u-s="{{['d']}}" u-i="521be830-2,521be830-1" bind:__l="__l"><uni-th wx:if="{{e}}" u-i="521be830-3,521be830-2" bind:__l="__l" u-p="{{e}}"></uni-th><uni-th wx:if="{{f}}" u-s="{{['d']}}" u-i="521be830-4,521be830-2" bind:__l="__l" u-p="{{f}}">配送客户数</uni-th><uni-th wx:if="{{g}}" u-s="{{['d']}}" u-i="521be830-5,521be830-2" bind:__l="__l" u-p="{{g}}">订单总数</uni-th><uni-th wx:if="{{h}}" u-s="{{['d']}}" u-i="521be830-6,521be830-2" bind:__l="__l" u-p="{{h}}">装车件数</uni-th></uni-tr><uni-tr wx:for="{{i}}" wx:for-item="item" u-s="{{['d']}}" u-i="{{item.i}}" bind:__l="__l"><uni-td wx:if="{{j}}" u-s="{{['d']}}" class="jhjs" u-i="{{item.b}}" bind:__l="__l" u-p="{{j}}">{{item.a}}</uni-td><uni-td wx:if="{{k}}" u-s="{{['d']}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{k}}">{{item.c}}</uni-td><uni-td wx:if="{{l}}" u-s="{{['d']}}" u-i="{{item.f}}" bind:__l="__l" u-p="{{l}}">{{item.e}}</uni-td><uni-td wx:if="{{m}}" u-s="{{['d']}}" u-i="{{item.h}}" bind:__l="__l" u-p="{{m}}">{{item.g}}</uni-td></uni-tr></uni-table></view></view><view class="scinp"><view>扫描状态</view><view><cus-selects wx:if="{{p}}" bindchange="{{o}}" u-i="521be830-12" bind:__l="__l" u-p="{{p}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号" value="{{q}}" bindinput="{{r}}"/></view><view bindtap="{{s}}" class="btscan">查询</view></view><view class="tabtip"><view bindtap="{{v}}"><view class="{{t}}">定制品</view></view><view bindtap="{{x}}"><view class="{{w}}">库存品</view></view></view><scroll-view scroll-y="true" class="scrollv"><view class="mabxs"><block wx:if="{{y}}"><view wx:for="{{z}}" wx:for-item="item" class="ite"><view><view>订单号：{{item.a}}</view><view>包装号：{{item.b}}</view></view><view><view>是否扫描：{{item.c}}</view></view></view></block><block wx:if="{{A}}"><view wx:for="{{B}}" wx:for-item="item" class="ite"><view><view>SKU：{{item.a}}</view><view>包件号：{{item.b}}</view></view><view><view>物品：{{item.c}}</view><view>规格：{{item.d}}</view></view><view><view>单位：{{item.e}}</view><view>扫描：{{item.f}}</view></view></view></block></view></scroll-view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.js
index 9fb20cc..fd94e49 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.js
@@ -5,8 +5,8 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
@@ -36,6 +36,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     function showCalendar() {
       details.show = !details.show;
     }
+    function init() {
+      details.current = 1;
+      initpage();
+    }
+    function jiazai() {
+      details.current++;
+      initpage();
+    }
     function onConfirm(e) {
       console.log(e);
       date.value[0] = e.startDate;
@@ -43,10 +51,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       details.datatime = date.value[0] + " 至 " + date.value[1];
     }
     common_vendor.onLoad(() => {
-      date.value[0] = common_vendor.index.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 3, "yyyy-mm-dd");
-      date.value[1] = common_vendor.index.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd");
       details.current = 1;
-      initpage();
+      init();
     });
     function showtime(value) {
       console.log(value);
@@ -55,7 +61,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     async function initpage() {
       let data = {
         current: details.current,
-        size: details.size
+        size: details.size,
+        taskTime_start: date.value[0] || "",
+        taskTime_end: date.value[1] || ""
       };
       let response = await api_user.deliverypage(data);
       console.log(response);
@@ -66,6 +74,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         deliveryId: item.id
       };
       let res = await api_user.deliveryvehicle(data);
+      if (res.data.length == 1) {
+        common_vendor.index.setStorageSync("checkvehicle", res.data[0]);
+        common_vendor.index.navigateTo({
+          url: "/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan?id=" + item.id + "&item=" + JSON.stringify(item)
+        });
+        return;
+      }
       let list = [];
       res.data.map((item2) => {
         list.push(item2.driverName + "---" + item2.vehicleNub);
@@ -107,6 +122,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       };
       let res = await api_user.deliveryvehicle(data);
       console.log(res);
+      if (res.data.length == 1) {
+        common_vendor.index.setStorageSync("checkvehicle", res.data[0]);
+        common_vendor.index.navigateTo({
+          url: "/pagesHome/pages/LoadingDetails/LoadingDetails?item=" + JSON.stringify(item)
+        });
+        return;
+      }
       let list = [];
       res.data.map((item2) => {
         list.push(item2.driverName + "---" + item2.vehicleNub);
@@ -129,7 +151,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             return;
           }
           tips.value.setdetails({ isshow: false });
-          common_vendor.index.setStorageSync("checkvehicle", res.data[deta.checklist[0]].id);
+          common_vendor.index.setStorageSync("checkvehicle", res.data[deta.checklist[0]]);
           common_vendor.index.navigateTo({
             url: "/pagesHome/pages/LoadingDetails/LoadingDetails?item=" + JSON.stringify(item)
           });
@@ -144,6 +166,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     }
     function cleartime() {
       details.datatime = "";
+      date.value = [];
     }
     const { datatime, recordsList, show } = common_vendor.toRefs(details);
     return (_ctx, _cache) => {
@@ -175,7 +198,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         h: common_vendor.o(() => {
         }),
         i: common_vendor.o(($event) => showtime(true)),
-        j: common_vendor.f(common_vendor.unref(recordsList), (item, k0, i0) => {
+        j: common_vendor.o(init),
+        k: common_vendor.f(common_vendor.unref(recordsList), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.type_name),
             b: common_vendor.t(item.vehicleStatus_name),
@@ -194,17 +218,18 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             o: common_vendor.o(($event) => goselscan(item))
           };
         }),
-        k: common_vendor.o(() => {
+        l: common_vendor.o(() => {
         }),
-        l: common_vendor.o(showCalendar),
-        m: common_vendor.o(onConfirm),
-        n: common_vendor.o(($event) => common_vendor.isRef(show) ? show.value = $event : null),
-        o: common_vendor.p({
+        m: common_vendor.o(jiazai),
+        n: common_vendor.o(showCalendar),
+        o: common_vendor.o(onConfirm),
+        p: common_vendor.o(($event) => common_vendor.isRef(show) ? show.value = $event : null),
+        q: common_vendor.p({
           initStartDate: date.value[0],
           initEndDate: date.value[1],
           value: common_vendor.unref(show)
         }),
-        p: common_vendor.sr(tips, "20682624-4", {
+        r: common_vendor.sr(tips, "20682624-4", {
           "k": "tips"
         })
       });
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.wxml
index c85afc2..3ac4db2 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="20682624-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="schbox"><view>配车日期：</view><view catchtap="{{i}}" class="inputsr"><input value="{{b}}" disabled placeholder="请选择时间"/><view catchtap="{{h}}"><u-icon wx:if="{{c}}" catchclick="{{d}}" style="margin-right:10rpx" u-i="20682624-1" bind:__l="__l" u-p="{{e}}"></u-icon><u-icon wx:else catchclick="{{f}}" style="margin-right:10rpx" u-i="20682624-2" bind:__l="__l" u-p="{{g||''}}"></u-icon></view></view><view> 查询 </view></view><scroll-view scroll-y="true" class="scvbx"><view class="mabxslist"><view wx:for="{{j}}" wx:for-item="item" class="item"><view class="headtop"><view class="type1s"><view><text style="color:#90A0AF">配车类型：</text>{{item.a}}</view><view><text style="color:#90A0AF">配车状态：</text>{{item.b}}</view></view><view class="type1s"><view><text style="color:#90A0AF">车牌号：</text>{{item.c}}</view><view><text style="color:#90A0AF">司机：</text>{{item.d}}</view></view><view class="type1s"><view><text style="color:#90A0AF">装御班组：</text>{{item.e}}</view><view class="bhcolor"><text style="color:#90A0AF">备货是否完成：</text>{{item.f}}</view></view><view class="type1s"><view><text style="color:#90A0AF">制单时间：</text>{{item.g}}</view></view><view class="type1s"><view><text style="color:#90A0AF">任务时间：</text>{{item.h}}</view></view><view class="type1s" bindtap="{{item.j}}"><view class="bhcolor"><text style="color:#90A0AF">车次号：</text><text style="text-decoration:underline">{{item.i}}</text></view></view><view class="liebs"><view><view>配送客户数</view><view>{{item.k}}</view></view><view><view>订单总数</view><view>{{item.l}}</view></view><view><view>计划件数</view><view>{{item.m}}</view></view><view><view>装车件数</view><view>{{item.n}}</view></view></view></view><view class="buts"><view bindtap="{{k}}">发车</view><view bindtap="{{item.o}}">装车扫描</view></view></view></view></scroll-view><l-calendar wx:if="{{o}}" bindhide="{{l}}" bindchange="{{m}}" u-i="20682624-3" bind:__l="__l" bindupdateValue="{{n}}" u-p="{{o}}"></l-calendar><tiplist class="r" u-r="tips" u-i="20682624-4" bind:__l="__l"></tiplist>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="20682624-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="schbox"><view>配车日期：</view><view catchtap="{{i}}" class="inputsr"><input value="{{b}}" disabled placeholder="请选择时间"/><view catchtap="{{h}}"><u-icon wx:if="{{c}}" catchclick="{{d}}" style="margin-right:10rpx" u-i="20682624-1" bind:__l="__l" u-p="{{e}}"></u-icon><u-icon wx:else catchclick="{{f}}" style="margin-right:10rpx" u-i="20682624-2" bind:__l="__l" u-p="{{g||''}}"></u-icon></view></view><view bindtap="{{j}}"> 查询 </view></view><scroll-view scroll-y="true" class="scvbx" bindscrolltolower="{{m}}"><view class="mabxslist"><view wx:for="{{k}}" wx:for-item="item" class="item"><view class="headtop"><view class="type1s"><view><text style="color:#90A0AF">配车类型：</text>{{item.a}}</view><view><text style="color:#90A0AF">配车状态：</text>{{item.b}}</view></view><view class="type1s"><view><text style="color:#90A0AF">车牌号：</text>{{item.c}}</view><view><text style="color:#90A0AF">司机：</text>{{item.d}}</view></view><view class="type1s"><view><text style="color:#90A0AF">装御班组：</text>{{item.e}}</view><view class="bhcolor"><text style="color:#90A0AF">备货是否完成：</text>{{item.f}}</view></view><view class="type1s"><view><text style="color:#90A0AF">制单时间：</text>{{item.g}}</view></view><view class="type1s"><view><text style="color:#90A0AF">任务时间：</text>{{item.h}}</view></view><view class="type1s" bindtap="{{item.j}}"><view class="bhcolor"><text style="color:#90A0AF">车次号：</text><text style="text-decoration:underline">{{item.i}}</text></view></view><view class="liebs"><view><view>配送客户数</view><view>{{item.k}}</view></view><view><view>订单总数</view><view>{{item.l}}</view></view><view><view>计划件数</view><view>{{item.m}}</view></view><view><view>装车件数</view><view>{{item.n}}</view></view></view></view><view class="buts"><view bindtap="{{l}}">发车</view><view bindtap="{{item.o}}">装车扫描</view></view></view></view></scroll-view><l-calendar wx:if="{{q}}" bindhide="{{n}}" bindchange="{{o}}" u-i="20682624-3" bind:__l="__l" bindupdateValue="{{p}}" u-p="{{q}}"></l-calendar><tiplist class="r" u-r="tips" u-i="20682624-4" bind:__l="__l"></tiplist>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.js
new file mode 100644
index 0000000..a39b13b
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.js
@@ -0,0 +1,24 @@
+"use strict";
+const common_vendor = require("../../../common/vendor.js");
+const _sfc_main = {};
+if (!Array) {
+  const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
+  _easycom_u_navbar2();
+}
+const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
+if (!Math) {
+  _easycom_u_navbar();
+}
+function _sfc_render(_ctx, _cache) {
+  return {
+    a: common_vendor.p({
+      title: "离线上传",
+      placeholder: true,
+      border: "true",
+      autoBack: true,
+      leftIconSize: "35"
+    })
+  };
+}
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "F:/物流/logPm/pagesHome/pages/OfflineUpload/OfflineUpload.vue"]]);
+wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.json b/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.json
new file mode 100644
index 0000000..92e6e9c
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.json
@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "离线上传",
+  "enablePullDownRefresh": false,
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "u-navbar": "../../../uni_modules/uview-plus/components/u-navbar/u-navbar"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.wxml
new file mode 100644
index 0000000..111d302
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.wxml
@@ -0,0 +1 @@
+<u-navbar wx:if="{{a}}" u-i="ba2e268c-0" bind:__l="__l" u-p="{{a}}"></u-navbar><scroll-view scroll-y="true" class="scview"></scroll-view><view class="buts"><view>创建任务</view><view>一键上传</view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.wxss
new file mode 100644
index 0000000..7d57d53
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/OfflineUpload/OfflineUpload.wxss
@@ -0,0 +1,48 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.scview {
+  width: 100%;
+  height: 70vh;
+  background-color: #ffffff;
+}
+.buts {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.buts > view {
+  width: 320rpx;
+  height: 88rpx;
+  background: #D3832A;
+  border-radius: 8rpx;
+  font-size: 32rpx;
+  font-weight: 400;
+  color: #FFFFFF;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.js
index 7b219b4..0e1d5c4 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.js
@@ -5,12 +5,18 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
-  _easycom_u_navbar2();
+  const _component_tiplist = common_vendor.resolveComponent("tiplist");
+  const _component_saomiao = common_vendor.resolveComponent("saomiao");
+  const _component_saomiao1 = common_vendor.resolveComponent("saomiao1");
+  const _component_saomiao2 = common_vendor.resolveComponent("saomiao2");
+  const _component_saomiao3 = common_vendor.resolveComponent("saomiao3");
+  const _component_saomiao4 = common_vendor.resolveComponent("saomiao4");
+  (_easycom_u_navbar2 + _component_tiplist + _component_saomiao + _component_saomiao1 + _component_saomiao2 + _component_saomiao3 + _component_saomiao4)();
 }
 const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
 if (!Math) {
@@ -37,26 +43,105 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         }
       ],
       orderStatus: 0,
+      orderType: 1,
       billLadingId: "",
       datalist: [],
       orderCode: "",
       orderNum: "",
       completeNum: "",
       planNum: "",
-      signedNum: ""
+      signedNum: "",
+      scancode: ""
     });
+    const tiplists = common_vendor.ref(null);
     common_vendor.onLoad((op) => {
       details.billLadingId = op.billLadingId;
       initpage();
+      details.scancode = "TESTCodeBJ2308030001";
+      common_vendor.index.$on("scancodedate", function(code) {
+        if (code) {
+          console.log(code);
+          details.scancode = code;
+          sacn();
+        }
+      });
     });
-    async function initpage() {
+    function showsdqs() {
+      tiplists.value.setdetails({
+        isshow: true,
+        tipstate: 1,
+        title: "请输入签收的包条",
+        placeholder: "请输入签收的包条",
+        inputtext: "",
+        success: (detail) => {
+          details.scancode = detail.inputtext;
+          sacn();
+          tiplists.value.setdetails({ isshow: false });
+        },
+        cancel: () => {
+          tiplists.value.setdetails({ isshow: false });
+        },
+        close: () => {
+          tiplists.value.setdetails({ isshow: false });
+        }
+      });
+    }
+    async function sacn() {
       let data = {
-        orderStatus: details.orderStatus,
-        billLadingId: details.billLadingId,
-        orderCode: details.orderCode
+        id: details.billLadingId,
+        coding: details.scancode,
+        type: details.orderType == 1 ? "2" : "1"
       };
-      let response = await api_user.billLadingorderList(data);
-      details.datalist = response.data.list;
+      let res = await api_user.billLadingscan(data);
+      console.log(res);
+      if (res.code == 200) {
+        common_vendor.index.showToast({
+          title: "签收成功",
+          icon: "none"
+        });
+        initpage();
+      } else {
+        common_vendor.index.showToast({
+          title: res.msg,
+          icon: "none"
+        });
+      }
+    }
+    async function initpage() {
+      details.datalist = [];
+      if (details.orderType == 1) {
+        let data = {
+          orderStatus: details.orderStatus,
+          billLadingId: details.billLadingId,
+          orderCode: details.orderCode
+        };
+        let response = await api_user.billLadingorderList(data);
+        details.datalist = response.data.list;
+        details.orderNum = response.data.orderNum;
+        details.completeNum = response.data.completeNum;
+        details.planNum = response.data.planNum;
+        details.signedNum = response.data.signedNum;
+      } else if (details.orderType == 2) {
+        let date = {
+          id: details.billLadingId,
+          current: 1,
+          size: 10
+        };
+        let response = await api_user.billLadinggetInventory(date);
+        details.datalist.map((item) => {
+          if (item.esauInventoryNum == -1) {
+            common_vendor.index.showToast({
+              title: "物品备货未完成，请前往备货",
+              icon: "none"
+            });
+          }
+        });
+        details.datalist = response.data.records;
+      }
+    }
+    function setorderStatus(state) {
+      details.orderType = state;
+      initpage();
     }
     function checktype(e) {
       if (e == "") {
@@ -72,9 +157,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         }
       });
     }
-    const { schanvalue, typearr, orderCode, datalist } = common_vendor.toRefs(details);
+    const { orderType, schanvalue, typearr, orderCode, datalist } = common_vendor.toRefs(details);
     return (_ctx, _cache) => {
-      return {
+      return common_vendor.e({
         a: common_vendor.p({
           title: "自提扫描",
           placeholder: true,
@@ -98,7 +183,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         h: common_vendor.unref(orderCode),
         i: common_vendor.o(($event) => common_vendor.isRef(orderCode) ? orderCode.value = $event.detail.value : null),
         j: common_vendor.o(initpage),
-        k: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
+        k: common_vendor.n(common_vendor.unref(orderType) == 1 ? "xz" : ""),
+        l: common_vendor.o(($event) => setorderStatus(1)),
+        m: common_vendor.n(common_vendor.unref(orderType) == 2 ? "xz" : ""),
+        n: common_vendor.o(($event) => setorderStatus(2)),
+        o: common_vendor.unref(orderType) == 1
+      }, common_vendor.unref(orderType) == 1 ? {
+        p: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.orderCode),
             b: common_vendor.t(item.planNum),
@@ -106,8 +197,26 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             d: common_vendor.t(item.orderStatusStr),
             e: common_vendor.n(item.orderStatusStr == "齐套" ? "tip tp1" : item.orderStatusStr == "部分扫" ? "tip tp3" : "tip tp2")
           };
+        }),
+        q: common_vendor.o(showsdqs)
+      } : {}, {
+        r: common_vendor.unref(orderType) == 2
+      }, common_vendor.unref(orderType) == 2 ? {
+        s: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
+          return {
+            a: common_vendor.t(item.sku),
+            b: common_vendor.t(item.descriptionGoods),
+            c: common_vendor.t(item.specification),
+            d: common_vendor.t(item.cargoUnit),
+            e: common_vendor.t(item.quantity)
+          };
+        }),
+        t: common_vendor.o(showsdqs)
+      } : {}, {
+        v: common_vendor.sr(tiplists, "52919ca0-2", {
+          "k": "tiplists"
         })
-      };
+      });
     };
   }
 });
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxml
index b43dea6..dcc8981 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="52919ca0-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hdtpnum"><view><view>订单总数</view><view>{{b}}</view></view><view><view>齐套数</view><view>{{c}}</view></view><view><view>自提件数</view><view>{{d}}</view></view><view><view>签收件数</view><view>{{e}}</view></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{g}}" bindchange="{{f}}" u-i="52919ca0-1" bind:__l="__l" u-p="{{g}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号" value="{{h}}" bindinput="{{i}}"/></view><view class="btscan" bindtap="{{j}}">查询</view></view><scroll-view class="scve" scroll-y="true"><view class="mabx"><view wx:for="{{k}}" wx:for-item="item" class="itec"><view class="contenbx1"><view><text style="color:#90A0AF">订单编号：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">配送数：</text>{{item.b}}</view><view><text style="color:#90A0AF">已扫码数：</text>{{item.c}}</view></view><view class="{{item.e}}">{{item.d}}</view></view></view></scroll-view>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="52919ca0-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hdtpnum"><view><view>订单总数</view><view>{{b}}</view></view><view><view>齐套数</view><view>{{c}}</view></view><view><view>自提件数</view><view>{{d}}</view></view><view><view>签收件数</view><view>{{e}}</view></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{g}}" bindchange="{{f}}" u-i="52919ca0-1" bind:__l="__l" u-p="{{g}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号" value="{{h}}" bindinput="{{i}}"/></view><view class="btscan" bindtap="{{j}}">查询</view></view><view class="tabtip"><view bindtap="{{l}}"><view class="{{k}}">定制品</view></view><view bindtap="{{n}}"><view class="{{m}}">库存品</view></view></view><scroll-view class="scve" scroll-y="true"><view class="mabx"><block wx:if="{{o}}"><view wx:for="{{p}}" wx:for-item="item" class="itec" bindtap="{{q}}"><view class="contenbx1"><view><text style="color:#90A0AF">订单编号：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">配送数：</text>{{item.b}}</view><view><text style="color:#90A0AF">已扫码数：</text>{{item.c}}</view></view><view class="{{item.e}}">{{item.d}}</view></view></block><block wx:if="{{r}}"><view wx:for="{{s}}" wx:for-item="item" class="itec" bindtap="{{t}}"><view class="contenbx1"><view><text style="color:#90A0AF">SKU：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">物品：</text>{{item.b}}</view><view><text style="color:#90A0AF">规格：</text>{{item.c}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">单位：</text>{{item.d}}</view><view><text style="color:#90A0AF">自提数：</text>{{item.e}}</view></view></view></block></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="52919ca0-2" bind:__l="__l"></tiplist><saomiao u-i="52919ca0-3" bind:__l="__l"></saomiao><saomiao1 u-i="52919ca0-4" bind:__l="__l"></saomiao1><saomiao2 u-i="52919ca0-5" bind:__l="__l"></saomiao2><saomiao3 u-i="52919ca0-6" bind:__l="__l"></saomiao3><saomiao4 u-i="52919ca0-7" bind:__l="__l"></saomiao4>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxss
index 57f2dbe..23878f0 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxss
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxss
@@ -23,6 +23,32 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.tabtip {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.tabtip > view {
+  width: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #ffffff;
+  font-size: 32rpx;
+  font-weight: 400;
+  color: #90A0AF;
+}
+.tabtip > view > view {
+  height: 80rpx;
+  border-bottom: 8rpx solid #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.tabtip .xz {
+  color: #D3832A;
+  border-bottom: 8rpx solid #D3832A;
+}
 .scve {
   width: 100%;
   height: 69vh;
@@ -47,7 +73,7 @@
 }
 .scve .mabx > .itec > .contenbx1 {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   justify-content: space-between;
   font-size: 28rpx;
   color: #092C4D;
@@ -58,6 +84,8 @@
 }
 .scve .mabx > .itec > .contenbx1 > view {
   flex: 1;
+  word-wrap: break-word;
+  word-break: break-all;
 }
 .scve .mabx > .itec .tip {
   position: absolute;
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js
index e2ce322..99291df 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js
@@ -5,8 +5,8 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
@@ -14,7 +14,13 @@ if (!Array) {
   const _easycom_uni_tr2 = common_vendor.resolveComponent("uni-tr");
   const _easycom_uni_td2 = common_vendor.resolveComponent("uni-td");
   const _easycom_uni_table2 = common_vendor.resolveComponent("uni-table");
-  (_easycom_u_navbar2 + _easycom_uni_th2 + _easycom_uni_tr2 + _easycom_uni_td2 + _easycom_uni_table2)();
+  const _component_tiplist = common_vendor.resolveComponent("tiplist");
+  const _component_saomiao = common_vendor.resolveComponent("saomiao");
+  const _component_saomiao1 = common_vendor.resolveComponent("saomiao1");
+  const _component_saomiao2 = common_vendor.resolveComponent("saomiao2");
+  const _component_saomiao3 = common_vendor.resolveComponent("saomiao3");
+  const _component_saomiao4 = common_vendor.resolveComponent("saomiao4");
+  (_easycom_u_navbar2 + _easycom_uni_th2 + _easycom_uni_tr2 + _easycom_uni_td2 + _easycom_uni_table2 + _component_tiplist + _component_saomiao + _component_saomiao1 + _component_saomiao2 + _component_saomiao3 + _component_saomiao4)();
 }
 const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
 const _easycom_uni_th = () => "../../../uni_modules/uni-table/components/uni-th/uni-th.js";
@@ -46,6 +52,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       ],
       dataList: [],
       orderStatus: 0,
+      orderType: 1,
       billLadingId: "",
       orderCode: "",
       consignee: "",
@@ -54,27 +61,86 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       orderNum: "",
       planNum: "",
       completeNum: "",
-      signedNum: ""
+      signedNum: "",
+      scancode: ""
     });
+    const tiplists = common_vendor.ref(null);
     common_vendor.onLoad((op) => {
       details.billLadingId = op.billLadingId;
       initpage();
+      details.scancode = "1686568463442280450";
+      common_vendor.index.$on("scancodedate", function(code) {
+        if (code) {
+          console.log(code);
+          details.scancode = code;
+          sacn();
+        }
+      });
     });
-    async function initpage() {
+    function showsdqs() {
+      tiplists.value.setdetails({
+        isshow: true,
+        tipstate: 1,
+        title: "请输入签收的包条",
+        placeholder: "请输入签收的包条",
+        inputtext: "",
+        success: (detail) => {
+          details.scancode = detail.inputtext;
+          sacn();
+          tiplists.value.setdetails({ isshow: false });
+        },
+        cancel: () => {
+          tiplists.value.setdetails({ isshow: false });
+        },
+        close: () => {
+          tiplists.value.setdetails({ isshow: false });
+        }
+      });
+    }
+    async function sacn() {
       let data = {
-        orderStatus: details.orderStatus,
-        billLadingId: details.billLadingId,
-        orderCode: details.orderCode
+        id: details.billLadingId,
+        coding: details.scancode,
+        type: details.orderType == 1 ? "2" : "1"
       };
-      let response = await api_user.billLadingdetailList(data);
-      details.dataList = 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;
+      let res = await api_user.billLadingscan(data);
+      console.log(res);
+      common_vendor.index.showToast({
+        title: res.msg,
+        icon: "none"
+      });
+    }
+    async function initpage() {
+      if (details.orderType == 1) {
+        let data = {
+          orderStatus: details.orderStatus,
+          billLadingId: details.billLadingId,
+          orderCode: details.orderCode
+        };
+        let response = await api_user.billLadingdetailList(data);
+        details.dataList = 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 api_user.billLadinggetInventoryNum(data);
+        details.dataList = response.data.records;
+      }
+    }
+    function setorderStatus(state) {
+      details.orderType = state;
+      initpage();
     }
     function checktype(e) {
       if (e == "") {
@@ -83,13 +149,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       details.typearr.map((item) => {
         if (item.value == e) {
           details.schanvalue = item.label;
+          details.orderStatus = item.value;
           console.log(details.schanvalue);
         }
       });
     }
-    const { schanvalue, typearr, dataList } = common_vendor.toRefs(details);
+    const { orderType, schanvalue, typearr, dataList } = common_vendor.toRefs(details);
     return (_ctx, _cache) => {
-      return {
+      return common_vendor.e({
         a: common_vendor.p({
           title: "自提明细扫描",
           placeholder: true,
@@ -97,17 +164,20 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           autoBack: true,
           leftIconSize: "35"
         }),
-        b: common_vendor.p({
+        b: common_vendor.t(common_vendor.unref(details).carTypeStr),
+        c: common_vendor.t(common_vendor.unref(details).pickUpPlate),
+        d: common_vendor.t(common_vendor.unref(details).consignee),
+        e: common_vendor.p({
           width: "70",
           align: "center"
         }),
-        c: common_vendor.p({
+        f: common_vendor.p({
           align: "center"
         }),
-        d: common_vendor.p({
+        g: common_vendor.p({
           align: "center"
         }),
-        e: common_vendor.f([1, 2], (item, k0, i0) => {
+        h: common_vendor.f([1, 2], (item, k0, i0) => {
           return {
             a: common_vendor.t(item == 1 ? "计划" : "完成"),
             b: "e4b7b2b4-7-" + i0 + "," + ("e4b7b2b4-6-" + i0),
@@ -118,21 +188,21 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             g: "e4b7b2b4-6-" + i0 + ",e4b7b2b4-1"
           };
         }),
-        f: common_vendor.p({
+        i: common_vendor.p({
           align: "center"
         }),
-        g: common_vendor.p({
+        j: common_vendor.p({
           align: "center"
         }),
-        h: common_vendor.p({
+        k: common_vendor.p({
           align: "center"
         }),
-        i: common_vendor.p({
+        l: common_vendor.p({
           loading: false,
           emptyText: "暂无更多数据"
         }),
-        j: common_vendor.o(checktype),
-        k: common_vendor.p({
+        m: common_vendor.o(checktype),
+        n: common_vendor.p({
           data: common_vendor.unref(typearr),
           value: common_vendor.unref(schanvalue),
           placeholder: "全部",
@@ -140,15 +210,41 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           size: "145",
           clearable: true
         }),
-        l: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
+        o: common_vendor.o(initpage),
+        p: common_vendor.n(common_vendor.unref(orderType) == 1 ? "xz" : ""),
+        q: common_vendor.o(($event) => setorderStatus(1)),
+        r: common_vendor.n(common_vendor.unref(orderType) == 2 ? "xz" : ""),
+        s: common_vendor.o(($event) => setorderStatus(2)),
+        t: common_vendor.unref(orderType) == 1
+      }, common_vendor.unref(orderType) == 1 ? {
+        v: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.orderCode),
-            b: common_vendor.t(item.packetBarCode),
+            b: common_vendor.t(item.orderPackageCode),
             c: common_vendor.t(item.scanStatusStr),
             d: common_vendor.t(item.errorStatusStr)
           };
+        }),
+        w: common_vendor.o(showsdqs)
+      } : {}, {
+        x: common_vendor.unref(orderType) == 2
+      }, common_vendor.unref(orderType) == 2 ? {
+        y: common_vendor.f(common_vendor.unref(dataList), (item, k0, i0) => {
+          return {
+            a: common_vendor.t(item.sku),
+            b: common_vendor.t(item.coding),
+            c: common_vendor.t(item.descriptionGoods),
+            d: common_vendor.t(item.specification),
+            e: common_vendor.t(item.cargoUnit),
+            f: common_vendor.t(item.scanStatus == 1 ? "未扫描" : item.scanStatus == "" ? "未扫描" : "扫描")
+          };
+        }),
+        z: common_vendor.o(showsdqs)
+      } : {}, {
+        A: common_vendor.sr(tiplists, "e4b7b2b4-11", {
+          "k": "tiplists"
         })
-      };
+      });
     };
   }
 });
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxml
index 4da5e65..8f72e06 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="e4b7b2b4-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="headtop"><view><view>配车类型：自提</view></view><view><view>车牌号：川A88888</view><view>司机：张琪、罗翔</view></view></view><view class="tabmabx"><view><uni-table wx:if="{{i}}" u-s="{{['d']}}" u-i="e4b7b2b4-1" bind:__l="__l" u-p="{{i}}"><uni-tr u-s="{{['d']}}" u-i="e4b7b2b4-2,e4b7b2b4-1" bind:__l="__l"><uni-th wx:if="{{b}}" u-i="e4b7b2b4-3,e4b7b2b4-2" bind:__l="__l" u-p="{{b}}"></uni-th><uni-th wx:if="{{c}}" u-s="{{['d']}}" u-i="e4b7b2b4-4,e4b7b2b4-2" bind:__l="__l" u-p="{{c}}">订单总数</uni-th><uni-th wx:if="{{d}}" u-s="{{['d']}}" u-i="e4b7b2b4-5,e4b7b2b4-2" bind:__l="__l" u-p="{{d}}">签收件数</uni-th></uni-tr><uni-tr wx:for="{{e}}" wx:for-item="item" u-s="{{['d']}}" u-i="{{item.g}}" bind:__l="__l"><uni-td wx:if="{{f}}" u-s="{{['d']}}" class="jhjs" u-i="{{item.b}}" bind:__l="__l" u-p="{{f}}">{{item.a}}</uni-td><uni-td wx:if="{{g}}" u-s="{{['d']}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{g}}">{{item.c}}</uni-td><uni-td wx:if="{{h}}" u-s="{{['d']}}" u-i="{{item.f}}" bind:__l="__l" u-p="{{h}}">{{item.e}}</uni-td></uni-tr></uni-table></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{k}}" bindchange="{{j}}" u-i="e4b7b2b4-10" bind:__l="__l" u-p="{{k}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号"/></view><view class="btscan">查询</view></view><scroll-view scroll-y="true" class="scrollv"><view class="mabxs"><view wx:for="{{l}}" wx:for-item="item" class="ite"><view><view>订单号：{{item.a}}</view><view>包装号：{{item.b}}</view></view><view><view>是否扫描：{{item.c}}</view><view>异常：{{item.d}}</view></view></view></view></scroll-view>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="e4b7b2b4-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="headtop"><view><view>配车类型：{{b}}</view></view><view><view>车牌号：{{c}}</view><view>司机：{{d}}</view></view></view><view class="tabmabx"><view><uni-table wx:if="{{l}}" u-s="{{['d']}}" u-i="e4b7b2b4-1" bind:__l="__l" u-p="{{l}}"><uni-tr u-s="{{['d']}}" u-i="e4b7b2b4-2,e4b7b2b4-1" bind:__l="__l"><uni-th wx:if="{{e}}" u-i="e4b7b2b4-3,e4b7b2b4-2" bind:__l="__l" u-p="{{e}}"></uni-th><uni-th wx:if="{{f}}" u-s="{{['d']}}" u-i="e4b7b2b4-4,e4b7b2b4-2" bind:__l="__l" u-p="{{f}}">订单总数</uni-th><uni-th wx:if="{{g}}" u-s="{{['d']}}" u-i="e4b7b2b4-5,e4b7b2b4-2" bind:__l="__l" u-p="{{g}}">签收件数</uni-th></uni-tr><uni-tr wx:for="{{h}}" wx:for-item="item" u-s="{{['d']}}" u-i="{{item.g}}" bind:__l="__l"><uni-td wx:if="{{i}}" u-s="{{['d']}}" class="jhjs" u-i="{{item.b}}" bind:__l="__l" u-p="{{i}}">{{item.a}}</uni-td><uni-td wx:if="{{j}}" u-s="{{['d']}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{j}}">{{item.c}}</uni-td><uni-td wx:if="{{k}}" u-s="{{['d']}}" u-i="{{item.f}}" bind:__l="__l" u-p="{{k}}">{{item.e}}</uni-td></uni-tr></uni-table></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{n}}" bindchange="{{m}}" u-i="e4b7b2b4-10" bind:__l="__l" u-p="{{n}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号"/></view><view class="btscan" bindtap="{{o}}">查询</view></view><view class="tabtip"><view bindtap="{{q}}"><view class="{{p}}">定制品</view></view><view bindtap="{{s}}"><view class="{{r}}">库存品</view></view></view><scroll-view scroll-y="true" class="scrollv"><view class="mabxs"><block wx:if="{{t}}"><view wx:for="{{v}}" wx:for-item="item" class="ite" bindtap="{{w}}"><view><view>订单号：{{item.a}}</view><view>包装号：{{item.b}}</view></view><view><view>是否扫描：{{item.c}}</view><view>异常：{{item.d}}</view></view></view></block><block wx:if="{{x}}"><view wx:for="{{y}}" wx:for-item="item" class="ite" bindtap="{{z}}"><view><view>SKU：{{item.a}}</view><view>包件号：{{item.b}}</view></view><view><view>物品：{{item.c}}</view><view>规格：{{item.d}}</view></view><view><view>单位：{{item.e}}</view><view>扫描：{{item.f}}</view></view></view></block></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="e4b7b2b4-11" bind:__l="__l"></tiplist><saomiao u-i="e4b7b2b4-12" bind:__l="__l"></saomiao><saomiao1 u-i="e4b7b2b4-13" bind:__l="__l"></saomiao1><saomiao2 u-i="e4b7b2b4-14" bind:__l="__l"></saomiao2><saomiao3 u-i="e4b7b2b4-15" bind:__l="__l"></saomiao3><saomiao4 u-i="e4b7b2b4-16" bind:__l="__l"></saomiao4>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxss
index 55b76eb..508ca1c 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxss
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.wxss
@@ -23,6 +23,32 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.tabtip {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.tabtip > view {
+  width: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #ffffff;
+  font-size: 32rpx;
+  font-weight: 400;
+  color: #90A0AF;
+}
+.tabtip > view > view {
+  height: 80rpx;
+  border-bottom: 8rpx solid #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.tabtip .xz {
+  color: #D3832A;
+  border-bottom: 8rpx solid #D3832A;
+}
 .scrollv {
   width: 686rpx;
   height: 48.5vh;
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.js
index 5924812..7794f2b 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupScan/SelfPickupScan.js
@@ -5,8 +5,8 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
@@ -41,8 +41,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       details.datatime = date.value[0] + " 至 " + date.value[1];
     }
     common_vendor.onLoad(() => {
-      date.value[0] = common_vendor.index.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 3, "yyyy-mm-dd");
-      date.value[1] = common_vendor.index.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd");
       init();
     });
     function init() {
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.js
index d5a022a..ed1ab18 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.js
@@ -5,8 +5,8 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
@@ -29,8 +29,23 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "SignDetailScan",
   setup(__props) {
     let details = common_vendor.reactive({
-      schanvalue: "",
-      typearr: [
+      orderCodevalue: "",
+      signforStatevalue: "",
+      signforStatearr: [
+        {
+          value: 1,
+          label: "齐套"
+        },
+        {
+          value: 2,
+          label: "部分扫"
+        },
+        {
+          value: 3,
+          label: "未扫"
+        }
+      ],
+      statearr: [
         {
           value: 1,
           label: "齐套"
@@ -46,24 +61,52 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       ],
       items: {},
       id: "",
-      datalist: []
+      datalist: [],
+      orderStatus: 1,
+      signforState: ""
     });
     common_vendor.onLoad((op) => {
       details.items = JSON.parse(op.item);
       details.id = JSON.parse(op.item).id;
       initpage();
     });
+    function setorderStatus(state) {
+      details.orderStatus = state;
+      initpage();
+    }
     async function initpage() {
       let data = {
-        id: details.id
+        id: details.id,
+        signforState: details.signforState
       };
-      let res = await api_user.signforwrap(data);
-      console.log(res);
-      details.datalist = res.data.records;
+      if (details.orderStatus == 1) {
+        let res = await api_user.signforwrap(data);
+        console.log(res);
+        details.datalist = res.data.records;
+      } else if (details.orderStatus == 2) {
+        let res = await api_user.signforwrapIn(data);
+        console.log(res);
+        details.datalist = res.data.records;
+      }
     }
-    function checktype(e) {
+    function checktype(type, e) {
+      console.log(type, e);
+      if (type == 1) {
+        if (e == "") {
+          details.signforStatevalue = "";
+          details.signforState = "";
+        }
+        details.signforStatearr.map((item) => {
+          if (item.value == e) {
+            details.signforStatevalue = item.label;
+            details.signforState = item.value;
+            console.log(details.signforStatevalue);
+          }
+        });
+        initpage();
+      }
     }
-    const { typearr, schanvalue, items, datalist } = common_vendor.toRefs(details);
+    const { orderStatus, signforStatearr, signforStatevalue, items, datalist } = common_vendor.toRefs(details);
     return (_ctx, _cache) => {
       return {
         a: common_vendor.p({
@@ -121,25 +164,21 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           loading: false,
           emptyText: "暂无更多数据"
         }),
-        o: common_vendor.o(checktype),
+        o: common_vendor.o(($event) => checktype(1, $event)),
         p: common_vendor.p({
-          data: common_vendor.unref(typearr),
-          value: common_vendor.unref(schanvalue),
-          placeholder: "全部",
-          arrLeft: 5,
-          size: "145",
-          clearable: true
-        }),
-        q: common_vendor.o(checktype),
-        r: common_vendor.p({
-          data: common_vendor.unref(typearr),
-          value: common_vendor.unref(schanvalue),
+          data: common_vendor.unref(signforStatearr),
+          value: common_vendor.unref(signforStatevalue),
           placeholder: "全部",
           arrLeft: 5,
           size: "145",
           clearable: true
         }),
-        s: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
+        q: common_vendor.o(initpage),
+        r: common_vendor.n(common_vendor.unref(orderStatus) == 1 ? "xz" : ""),
+        s: common_vendor.o(($event) => setorderStatus(1)),
+        t: common_vendor.n(common_vendor.unref(orderStatus) == 2 ? "xz" : ""),
+        v: common_vendor.o(($event) => setorderStatus(2)),
+        w: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.orderCode),
             b: common_vendor.n(item == 3 ? "tis bf" : "tis"),
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.wxml
index d2e0a17..733649b 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="618f7990-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="headtop"><view><view>配车类型：{{b}}</view></view><view><view>车牌号：{{c}}</view><view>司机：{{d}}</view></view></view><view class="tabmabx"><view><uni-table wx:if="{{n}}" u-s="{{['d']}}" u-i="618f7990-1" bind:__l="__l" u-p="{{n}}"><uni-tr u-s="{{['d']}}" u-i="618f7990-2,618f7990-1" bind:__l="__l"><uni-th wx:if="{{e}}" u-i="618f7990-3,618f7990-2" bind:__l="__l" u-p="{{e}}"></uni-th><uni-th wx:if="{{f}}" u-s="{{['d']}}" u-i="618f7990-4,618f7990-2" bind:__l="__l" u-p="{{f}}">配送客户数</uni-th><uni-th wx:if="{{g}}" u-s="{{['d']}}" u-i="618f7990-5,618f7990-2" bind:__l="__l" u-p="{{g}}">订单总数</uni-th><uni-th wx:if="{{h}}" u-s="{{['d']}}" u-i="618f7990-6,618f7990-2" bind:__l="__l" u-p="{{h}}">签收件数</uni-th></uni-tr><uni-tr wx:for="{{i}}" wx:for-item="item" u-s="{{['d']}}" u-i="{{item.i}}" bind:__l="__l"><uni-td wx:if="{{j}}" u-s="{{['d']}}" class="jhjs" u-i="{{item.b}}" bind:__l="__l" u-p="{{j}}">{{item.a}}</uni-td><uni-td wx:if="{{k}}" u-s="{{['d']}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{k}}">{{item.c}}</uni-td><uni-td wx:if="{{l}}" u-s="{{['d']}}" u-i="{{item.f}}" bind:__l="__l" u-p="{{l}}">{{item.e}}</uni-td><uni-td wx:if="{{m}}" u-s="{{['d']}}" u-i="{{item.h}}" bind:__l="__l" u-p="{{m}}">{{item.g}}</uni-td></uni-tr></uni-table></view></view><view class="scinp"><view class="titl">齐套状态</view><view><cus-selects wx:if="{{p}}" bindchange="{{o}}" u-i="618f7990-12" bind:__l="__l" u-p="{{p}}"></cus-selects></view><view class="titl">包件类型</view><view><cus-selects wx:if="{{r}}" bindchange="{{q}}" u-i="618f7990-13" bind:__l="__l" u-p="{{r}}"></cus-selects></view><view class="btscan">查询</view></view><scroll-view class="scbx" scroll-y="true"><view class="mabox"><view wx:for="{{s}}" wx:for-item="item" class="item"><view class="toptitl"><view class="toplft"> 订单号：{{item.a}}</view><view class="{{item.b}}"> 整托备货 </view></view><view class="boxcontt"><view><view><text style="color:#90A0AF">包装号：</text>{{item.c}}</view><view><text style="color:#90A0AF">货物名称：</text>{{item.d}}</view></view><view><view class="{{item.f}}"><text style="color:#90A0AF">扫描状态：</text>{{item.e}}</view></view></view><view class="buttts"><view class="anj"> 异常上报 </view></view></view></view></scroll-view>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="618f7990-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="headtop"><view><view>配车类型：{{b}}</view></view><view><view>车牌号：{{c}}</view><view>司机：{{d}}</view></view></view><view class="tabmabx"><view><uni-table wx:if="{{n}}" u-s="{{['d']}}" u-i="618f7990-1" bind:__l="__l" u-p="{{n}}"><uni-tr u-s="{{['d']}}" u-i="618f7990-2,618f7990-1" bind:__l="__l"><uni-th wx:if="{{e}}" u-i="618f7990-3,618f7990-2" bind:__l="__l" u-p="{{e}}"></uni-th><uni-th wx:if="{{f}}" u-s="{{['d']}}" u-i="618f7990-4,618f7990-2" bind:__l="__l" u-p="{{f}}">配送客户数</uni-th><uni-th wx:if="{{g}}" u-s="{{['d']}}" u-i="618f7990-5,618f7990-2" bind:__l="__l" u-p="{{g}}">订单总数</uni-th><uni-th wx:if="{{h}}" u-s="{{['d']}}" u-i="618f7990-6,618f7990-2" bind:__l="__l" u-p="{{h}}">签收件数</uni-th></uni-tr><uni-tr wx:for="{{i}}" wx:for-item="item" u-s="{{['d']}}" u-i="{{item.i}}" bind:__l="__l"><uni-td wx:if="{{j}}" u-s="{{['d']}}" class="jhjs" u-i="{{item.b}}" bind:__l="__l" u-p="{{j}}">{{item.a}}</uni-td><uni-td wx:if="{{k}}" u-s="{{['d']}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{k}}">{{item.c}}</uni-td><uni-td wx:if="{{l}}" u-s="{{['d']}}" u-i="{{item.f}}" bind:__l="__l" u-p="{{l}}">{{item.e}}</uni-td><uni-td wx:if="{{m}}" u-s="{{['d']}}" u-i="{{item.h}}" bind:__l="__l" u-p="{{m}}">{{item.g}}</uni-td></uni-tr></uni-table></view></view><view class="scinp"><view class="left"><view class="titl">齐套状态</view><view><cus-selects wx:if="{{p}}" bindchange="{{o}}" u-i="618f7990-12" bind:__l="__l" u-p="{{p}}"></cus-selects></view></view><view bindtap="{{q}}" class="btscan">查询</view></view><view class="tabtip"><view bindtap="{{s}}"><view class="{{r}}">定制品</view></view><view bindtap="{{v}}"><view class="{{t}}">库存品</view></view></view><scroll-view class="scbx" scroll-y="true"><view class="mabox"><view wx:for="{{w}}" wx:for-item="item" class="item"><view class="toptitl"><view class="toplft"> 订单号：{{item.a}}</view><view class="{{item.b}}"> 整托备货 </view></view><view class="boxcontt"><view><view><text style="color:#90A0AF">包装号：</text>{{item.c}}</view><view><text style="color:#90A0AF">货物名称：</text>{{item.d}}</view></view><view><view class="{{item.f}}"><text style="color:#90A0AF">扫描状态：</text>{{item.e}}</view></view></view><view class="buttts"><view class="anj"> 异常上报 </view></view></view></view></scroll-view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.wxss b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.wxss
index 5c88cc9..6006311 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.wxss
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/SignDetailScan/SignDetailScan.wxss
@@ -23,6 +23,32 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.tabtip {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.tabtip > view {
+  width: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #ffffff;
+  font-size: 32rpx;
+  font-weight: 400;
+  color: #90A0AF;
+}
+.tabtip > view > view {
+  height: 80rpx;
+  border-bottom: 8rpx solid #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.tabtip .xz {
+  color: #D3832A;
+  border-bottom: 8rpx solid #D3832A;
+}
 .scbx {
   width: 100%;
   height: 45vh;
@@ -51,7 +77,7 @@
 .scbx .mabox > .item .toptitl {
   width: 100%;
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   justify-content: space-between;
   border-bottom: 2rpx solid #EEEEEE;
   padding: 34rpx 24rpx;
@@ -61,11 +87,16 @@
   font-size: 32rpx;
   font-weight: 400;
   color: #092C4D;
+  word-wrap: break-word;
+  word-break: break-all;
 }
 .scbx .mabox > .item .toptitl .tis {
+  width: 180rpx;
   font-size: 32rpx;
   font-weight: 400;
   color: #0086F1;
+  display: flex;
+  justify-content: flex-end;
 }
 .scbx .mabox > .item .toptitl .bf {
   color: #D3832A;
@@ -133,12 +164,18 @@
   box-sizing: border-box;
   background-color: #ffffff;
 }
-.scinp > .titl {
+.scinp > .left {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.scinp > .left > .titl {
   font-size: 28rpx;
   font-weight: 400;
   color: #092C4D;
+  margin-right: 30rpx;
 }
-.scinp .inputs {
+.scinp > .left .inputs {
   width: 276rpx;
   height: 64rpx;
   background: #F5F5F6;
@@ -151,7 +188,7 @@
   font-weight: 400;
   color: #AFB4BA;
 }
-.scinp .inputs > input {
+.scinp > .left .inputs > input {
   flex: 1;
   font-size: 24rpx;
   color: #092C4D;
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js
index 90be01e..fce184d 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js
@@ -5,8 +5,8 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js
index 88b1082..c7f04ae 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js
@@ -5,17 +5,18 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
+  const _component_tiplist = common_vendor.resolveComponent("tiplist");
   const _component_saomiao = common_vendor.resolveComponent("saomiao");
   const _component_saomiao1 = common_vendor.resolveComponent("saomiao1");
   const _component_saomiao2 = common_vendor.resolveComponent("saomiao2");
   const _component_saomiao3 = common_vendor.resolveComponent("saomiao3");
   const _component_saomiao4 = common_vendor.resolveComponent("saomiao4");
-  (_easycom_u_navbar2 + _component_saomiao + _component_saomiao1 + _component_saomiao2 + _component_saomiao3 + _component_saomiao4)();
+  (_easycom_u_navbar2 + _component_tiplist + _component_saomiao + _component_saomiao1 + _component_saomiao2 + _component_saomiao3 + _component_saomiao4)();
 }
 const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
 if (!Math) {
@@ -41,6 +42,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       orderCode: "",
       scancode: ""
     });
+    const tiplists = common_vendor.ref(null);
     common_vendor.onLoad((op) => {
       details.stockArticleId = op.stockArticleId;
       details.orderStatus = op.orderStatus;
@@ -58,6 +60,26 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         }
       });
     });
+    function showsdqs() {
+      tiplists.value.setdetails({
+        isshow: true,
+        tipstate: 1,
+        title: "请输入签收的包条",
+        placeholder: "请输入签收的包条",
+        inputtext: "",
+        success: (detail) => {
+          details.scancode = detail.inputtext;
+          scandata();
+          tiplists.value.setdetails({ isshow: false });
+        },
+        cancel: () => {
+          tiplists.value.setdetails({ isshow: false });
+        },
+        close: () => {
+          tiplists.value.setdetails({ isshow: false });
+        }
+      });
+    }
     async function scandata() {
       let data = {
         scanType: 1,
@@ -112,6 +134,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             d: common_vendor.t(item.scanId == -1 ? "否" : "是"),
             e: common_vendor.t(item.StockUp)
           };
+        }),
+        i: common_vendor.o(showsdqs),
+        j: common_vendor.sr(tiplists, "7e1ff330-1", {
+          "k": "tiplists"
         })
       };
     };
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.wxml
index 50dbb75..ea3a2b2 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="7e1ff330-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="head"><view class="type1"><view> 客户：{{b}}</view><view> 备货区域：{{c}}</view></view><view class="type1"><view> 计划件数：{{d}}</view><view> 扫描件数：{{e}}</view></view><view class="type1"><view> 库位号：{{f}}</view><view> 托盘码：{{g}}</view></view><view class="type2"><view></view><view><view>备用托盘：无</view><view> 绑定托盘 </view></view></view></view><view class="butbox"><scroll-view scroll-y="true" class="scrollv"><view class="mabxs"><view wx:for="{{h}}" wx:for-item="item" class="ite"><view><view>订单号：{{item.a}}</view><view>包装号：{{item.b}}</view></view><view><view>货物类型：{{item.c}}</view><view>是否备货：{{item.d}}</view></view><view><view>备货：{{item.e}}</view></view></view></view></scroll-view><view class="prtbut"> 打印 </view></view><saomiao u-i="7e1ff330-1" bind:__l="__l"></saomiao><saomiao1 u-i="7e1ff330-2" bind:__l="__l"></saomiao1><saomiao2 u-i="7e1ff330-3" bind:__l="__l"></saomiao2><saomiao3 u-i="7e1ff330-4" bind:__l="__l"></saomiao3><saomiao4 u-i="7e1ff330-5" bind:__l="__l"></saomiao4>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="7e1ff330-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="head"><view class="type1"><view> 客户：{{b}}</view><view> 备货区域：{{c}}</view></view><view class="type1"><view> 计划件数：{{d}}</view><view> 扫描件数：{{e}}</view></view><view class="type1"><view> 库位号：{{f}}</view><view> 托盘码：{{g}}</view></view><view class="type2"><view></view><view><view>备用托盘：无</view><view> 绑定托盘 </view></view></view></view><view class="butbox"><scroll-view scroll-y="true" class="scrollv"><view class="mabxs"><view wx:for="{{h}}" wx:for-item="item" class="ite" bindtap="{{i}}"><view><view>订单号：{{item.a}}</view><view>包装号：{{item.b}}</view></view><view><view>货物类型：{{item.c}}</view><view>是否备货：{{item.d}}</view></view><view><view>备货：{{item.e}}</view></view></view></view></scroll-view><view class="prtbut"> 打印 </view></view><tiplist class="r" u-r="tiplists" u-i="7e1ff330-1" bind:__l="__l"></tiplist><saomiao u-i="7e1ff330-2" bind:__l="__l"></saomiao><saomiao1 u-i="7e1ff330-3" bind:__l="__l"></saomiao1><saomiao2 u-i="7e1ff330-4" bind:__l="__l"></saomiao2><saomiao3 u-i="7e1ff330-5" bind:__l="__l"></saomiao3><saomiao4 u-i="7e1ff330-6" bind:__l="__l"></saomiao4>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js
index 6b4b968..14c92f4 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js
@@ -5,8 +5,8 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
@@ -54,7 +54,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       let data = {
         current: details.currentPage,
         size: details.size,
-        stockupDate: details.stockupDate,
+        stockupDateStart: date.value[0],
+        stockupDateEnd: date.value[1],
         status: details.status
       };
       let response = await api_user.distributionStockuppageList(data);
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js
index 0f24d03..9295140 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js
@@ -5,12 +5,22 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
+  const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
   const _component_tiplist = common_vendor.resolveComponent("tiplist");
-  _component_tiplist();
+  const _component_saomiao = common_vendor.resolveComponent("saomiao");
+  const _component_saomiao1 = common_vendor.resolveComponent("saomiao1");
+  const _component_saomiao2 = common_vendor.resolveComponent("saomiao2");
+  const _component_saomiao3 = common_vendor.resolveComponent("saomiao3");
+  const _component_saomiao4 = common_vendor.resolveComponent("saomiao4");
+  (_easycom_u_navbar2 + _component_tiplist + _component_saomiao + _component_saomiao1 + _component_saomiao2 + _component_saomiao3 + _component_saomiao4)();
+}
+const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
+if (!Math) {
+  _easycom_u_navbar();
 }
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "setbarcode",
@@ -121,22 +131,29 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const { items, codelist, printlist } = common_vendor.toRefs(details);
     return (_ctx, _cache) => {
       return common_vendor.e({
-        a: common_vendor.t(common_vendor.unref(items).allocation),
-        b: common_vendor.t(common_vendor.unref(items).materialName),
-        c: common_vendor.t(common_vendor.unref(items).sku),
-        d: common_vendor.t(common_vendor.unref(items).cargoNorms),
-        e: common_vendor.t(common_vendor.unref(items).planNum),
-        f: common_vendor.t(common_vendor.unref(items).cargoUnit),
-        g: common_vendor.unref(items).unpack == 0
+        a: common_vendor.p({
+          title: "配置包条码",
+          placeholder: true,
+          border: "true",
+          autoBack: true,
+          leftIconSize: "35"
+        }),
+        b: common_vendor.t(common_vendor.unref(items).allocation),
+        c: common_vendor.t(common_vendor.unref(items).materialName),
+        d: common_vendor.t(common_vendor.unref(items).sku),
+        e: common_vendor.t(common_vendor.unref(items).cargoNorms),
+        f: common_vendor.t(common_vendor.unref(items).planNum),
+        g: common_vendor.t(common_vendor.unref(items).cargoUnit),
+        h: common_vendor.unref(items).unpack == 0
       }, common_vendor.unref(items).unpack == 0 ? {} : {}, {
-        h: common_vendor.o(showmd),
-        i: common_vendor.f(common_vendor.unref(codelist), (item, index, i0) => {
+        i: common_vendor.o(showmd),
+        j: common_vendor.f(common_vendor.unref(codelist), (item, index, i0) => {
           return {
             a: common_vendor.t(index),
             b: common_vendor.t(item.packageCode)
           };
         }),
-        j: common_vendor.sr(tips, "420736b0-0", {
+        k: common_vendor.sr(tips, "420736b0-1", {
           "k": "tips"
         })
       });
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.json b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.json
index ee7bf56..4f5db93 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.json
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.json
@@ -1,5 +1,8 @@
 {
   "navigationBarTitleText": "配置包条码",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "u-navbar": "../../../uni_modules/uview-plus/components/u-navbar/u-navbar"
+  }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxml
index cc54fc5..84db077 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.wxml
@@ -1 +1 @@
-<view class="head"><view class="type1"><view>货位：<view style="color:#092C4D">{{a}}</view></view><view>物品：<view style="color:#092C4D">{{b}}</view></view></view><view class="type1"><view>SKU：<view style="color:#092C4D">{{c}}</view></view><view>规格：<view style="color:#092C4D">{{d}}</view></view></view><view class="type1"><view>计划数量：<view style="color:#092C4D">{{e}}</view></view><view>单位：<view style="color:#092C4D">{{f}}</view></view></view></view><view class="butsbx"><view wx:if="{{g}}">采集原包条码</view><view bindtap="{{h}}">新生成包码</view></view><scroll-view scroll-y="true" class="scrollv"><view class="mabxs"><view wx:for="{{i}}" wx:for-item="item" class="ite"><view><view>序号：{{item.a}}</view><view>作业时间：2001-12-10</view></view><view><view>包条码：{{item.b}}</view><view></view></view></view></view></scroll-view><tiplist class="r" u-r="tips" u-i="420736b0-0" bind:__l="__l"></tiplist>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="420736b0-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="head"><view class="type1"><view>货位：<view style="color:#092C4D">{{b}}</view></view><view>物品：<view style="color:#092C4D">{{c}}</view></view></view><view class="type1"><view>SKU：<view style="color:#092C4D">{{d}}</view></view><view>规格：<view style="color:#092C4D">{{e}}</view></view></view><view class="type1"><view>计划数量：<view style="color:#092C4D">{{f}}</view></view><view>单位：<view style="color:#092C4D">{{g}}</view></view></view></view><view class="butsbx"><view wx:if="{{h}}">采集原包条码</view><view bindtap="{{i}}">新生成包码</view></view><scroll-view scroll-y="true" class="scrollv"><view class="mabxs"><view wx:for="{{j}}" wx:for-item="item" class="ite"><view><view>序号：{{item.a}}</view><view>作业时间：2001-12-10</view></view><view><view>包条码：{{item.b}}</view><view></view></view></view></view></scroll-view><tiplist class="r" u-r="tips" u-i="420736b0-1" bind:__l="__l"></tiplist><saomiao u-i="420736b0-2" bind:__l="__l"></saomiao><saomiao1 u-i="420736b0-3" bind:__l="__l"></saomiao1><saomiao2 u-i="420736b0-4" bind:__l="__l"></saomiao2><saomiao3 u-i="420736b0-5" bind:__l="__l"></saomiao3><saomiao4 u-i="420736b0-6" bind:__l="__l"></saomiao4>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js
index 5aabf5c..59c6a05 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js
@@ -5,12 +5,19 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
-  _easycom_u_navbar2();
+  const _component_tips = common_vendor.resolveComponent("tips");
+  const _component_tiplist = common_vendor.resolveComponent("tiplist");
+  const _component_saomiao = common_vendor.resolveComponent("saomiao");
+  const _component_saomiao1 = common_vendor.resolveComponent("saomiao1");
+  const _component_saomiao2 = common_vendor.resolveComponent("saomiao2");
+  const _component_saomiao3 = common_vendor.resolveComponent("saomiao3");
+  const _component_saomiao4 = common_vendor.resolveComponent("saomiao4");
+  (_easycom_u_navbar2 + _component_tips + _component_tiplist + _component_saomiao + _component_saomiao1 + _component_saomiao2 + _component_saomiao3 + _component_saomiao4)();
 }
 const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
 if (!Math) {
@@ -24,7 +31,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       schanvalue: "",
       typearr: [
         {
-          value: 1,
+          value: 3,
           label: "齐套"
         },
         {
@@ -32,27 +39,139 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           label: "部分扫"
         },
         {
-          value: 3,
+          value: 1,
           label: "未扫"
         }
       ],
       items: {},
       datalist: [],
       id: "",
-      orderStatus: 1
+      orderStatus: 1,
+      scancode: "",
+      deliveryId: "",
+      orderType: "",
+      inputtxt: ""
     });
+    const tiplists = common_vendor.ref(null);
+    const tip = common_vendor.ref(null);
     common_vendor.onLoad((op) => {
       details.items = JSON.parse(op.item);
       details.id = JSON.parse(op.item).id;
+      details.deliveryId = op.deliveryId;
       initpage();
+      common_vendor.index.$on("scancodedate", function(code) {
+        if (code) {
+          console.log(code);
+          details.scancode = code;
+          scandata();
+        }
+      });
     });
+    async function scandata() {
+      let data = {
+        barcode: details.scancode,
+        deliveryId: details.deliveryId,
+        reservationId: details.id
+      };
+      if (details.orderStatus == 1) {
+        let response = await api_user.signforsignfor(data);
+        console.log(response);
+        if (response.code == 3006) {
+          tip.value.setdetails({
+            isshow: true,
+            content: "请确认是否异常签收",
+            success: async () => {
+              let data2 = {
+                barcode: details.scancode,
+                deliveryId: details.deliveryId,
+                reservationId: details.id
+              };
+              let response2 = await api_user.signforsignforcontinue(data2);
+              console.log(response2);
+              common_vendor.index.showToast({
+                title: response2.msg,
+                icon: "none"
+              });
+              tip.value.setdetails({ isshow: false });
+            },
+            cancel: () => {
+              tip.value.setdetails({ isshow: false });
+            },
+            close: () => {
+              tip.value.setdetails({ isshow: false });
+            }
+          });
+        } else {
+          common_vendor.index.showToast({
+            title: response.msg,
+            icon: "none"
+          });
+        }
+      } else if (details.orderStatus == 2) {
+        let response = await api_user.signforsignforIn(data);
+        console.log(response);
+        if (response.code == 3006) {
+          tip.value.setdetails({
+            isshow: true,
+            content: "请确认是否异常签收",
+            success: async () => {
+              let data2 = {
+                barcode: details.scancode,
+                deliveryId: details.deliveryId,
+                reservationId: details.id
+              };
+              let response2 = await api_user.signforsignforcontinue(data2);
+              console.log(response2);
+              common_vendor.index.showToast({
+                title: response2.msg,
+                icon: "none"
+              });
+              tip.value.setdetails({ isshow: false });
+            },
+            cancel: () => {
+              tip.value.setdetails({ isshow: false });
+            },
+            close: () => {
+              tip.value.setdetails({ isshow: false });
+            }
+          });
+        } else {
+          common_vendor.index.showToast({
+            title: response.msg,
+            icon: "none"
+          });
+        }
+      }
+    }
+    function showsdqs() {
+      tiplists.value.setdetails({
+        isshow: true,
+        tipstate: 1,
+        title: "请输入签收的包条",
+        placeholder: "请输入签收的包条",
+        inputtext: "",
+        success: (detail) => {
+          details.scancode = detail.inputtext;
+          scandata();
+          tiplists.value.setdetails({ isshow: false });
+        },
+        cancel: () => {
+          tiplists.value.setdetails({ isshow: false });
+        },
+        close: () => {
+          tiplists.value.setdetails({ isshow: false });
+        }
+      });
+    }
     function setorderStatus(state) {
       details.orderStatus = state;
       initpage();
     }
     async function initpage() {
       let data = {
-        reservationId: details.id
+        reservationId: details.id,
+        completecode: details.orderType,
+        orderCode: details.inputtxt
       };
       let response = null;
       if (details.orderStatus == 1) {
@@ -63,8 +182,20 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       details.datalist = response.data.records;
     }
     function checktype(e) {
+      if (e == "") {
+        details.schanvalue = "";
+        details.orderType = "";
+        return;
+      }
+      details.typearr.map((item) => {
+        if (item.value == e) {
+          details.schanvalue = item.label;
+          details.orderType = item.value;
+          console.log(details.schanvalue);
+        }
+      });
     }
-    const { orderStatus, datalist, items, typearr, schanvalue } = common_vendor.toRefs(details);
+    const { inputtxt, orderStatus, datalist, items, typearr, schanvalue } = common_vendor.toRefs(details);
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.p({
@@ -87,13 +218,16 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           size: "145",
           clearable: true
         }),
-        h: common_vendor.n(common_vendor.unref(orderStatus) == 1 ? "xz" : ""),
-        i: common_vendor.o(($event) => setorderStatus(1)),
-        j: common_vendor.n(common_vendor.unref(orderStatus) == 2 ? "xz" : ""),
-        k: common_vendor.o(($event) => setorderStatus(2)),
-        l: common_vendor.unref(orderStatus) == 1
+        h: common_vendor.unref(inputtxt),
+        i: common_vendor.o(($event) => common_vendor.isRef(inputtxt) ? inputtxt.value = $event.detail.value : null),
+        j: common_vendor.o(initpage),
+        k: common_vendor.n(common_vendor.unref(orderStatus) == 1 ? "xz" : ""),
+        l: common_vendor.o(($event) => setorderStatus(1)),
+        m: common_vendor.n(common_vendor.unref(orderStatus) == 2 ? "xz" : ""),
+        n: common_vendor.o(($event) => setorderStatus(2)),
+        o: common_vendor.unref(orderStatus) == 1
       }, common_vendor.unref(orderStatus) == 1 ? {
-        m: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
+        p: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.orderCode),
             b: common_vendor.t(item.reservationNum),
@@ -103,19 +237,28 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             f: common_vendor.t(item.signforNub == 0 ? "未扫" : item.signforNub == item.reservationNum ? "齐套" : "部分扫"),
             g: common_vendor.n(item.signforNub == 0 ? "tip tp2" : item.signforNub == item.reservationNum ? "tip tp1" : "tip tp3")
           };
-        })
+        }),
+        q: common_vendor.o(showsdqs)
       } : {}, {
-        n: common_vendor.unref(orderStatus) == 2
+        r: common_vendor.unref(orderStatus) == 2
       }, common_vendor.unref(orderStatus) == 2 ? {
-        o: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
+        s: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.sku),
             b: common_vendor.t(item.descriptionGoods),
             c: common_vendor.t(item.specification),
             d: common_vendor.t(item.logpmUnit)
           };
+        }),
+        t: common_vendor.o(showsdqs)
+      } : {}, {
+        v: common_vendor.sr(tip, "2d27494e-2", {
+          "k": "tip"
+        }),
+        w: common_vendor.sr(tiplists, "2d27494e-3", {
+          "k": "tiplists"
         })
-      } : {});
+      });
     };
   }
 });
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.wxml
index 542e463..ef5eca4 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="2d27494e-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hdstop"><view class="khxb"><view>客户：{{b}}</view></view><view class="tps"><view><view>订单总数</view><view>{{c}}</view></view><view><view>齐套数</view><view>15</view></view><view><view>配送件数</view><view>{{d}}</view></view><view><view>签收件数</view><view>{{e}}</view></view></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{g}}" bindchange="{{f}}" u-i="2d27494e-1" bind:__l="__l" u-p="{{g}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号"/></view><view class="btscan">查询</view></view><view class="tabtip"><view bindtap="{{i}}"><view class="{{h}}">定制品</view></view><view bindtap="{{k}}"><view class="{{j}}">库存品</view></view></view><scroll-view class="scve" scroll-y="true"><view class="mabx"><block wx:if="{{l}}"><view wx:for="{{m}}" wx:for-item="item" class="itec"><view class="contenbx1"><view><text style="color:#90A0AF">订单编号：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">总数：</text>{{item.b}}</view><view><text style="color:#90A0AF">计划：</text>{{item.c}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">装车：</text>{{item.d}}</view><view><text style="color:#90A0AF">签收：</text>{{item.e}}</view></view><view class="{{item.g}}">{{item.f}}</view></view></block><block wx:if="{{n}}"><view wx:for="{{o}}" wx:for-item="item" class="itec"><view class="contenbx1"><view><text style="color:#90A0AF">SKU：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">物品：</text>{{item.b}}</view><view><text style="color:#90A0AF">规格：</text>{{item.c}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">单位：</text>{{item.d}}</view></view></view></block></view></scroll-view>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="2d27494e-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hdstop"><view class="khxb"><view>客户：{{b}}</view></view><view class="tps"><view><view>订单总数</view><view>{{c}}</view></view><view><view>齐套数</view><view>15</view></view><view><view>配送件数</view><view>{{d}}</view></view><view><view>签收件数</view><view>{{e}}</view></view></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{g}}" bindchange="{{f}}" u-i="2d27494e-1" bind:__l="__l" u-p="{{g}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号" value="{{h}}" bindinput="{{i}}"/></view><view class="btscan" bindtap="{{j}}">查询</view></view><view class="tabtip"><view bindtap="{{l}}"><view class="{{k}}">定制品</view></view><view bindtap="{{n}}"><view class="{{m}}">库存品</view></view></view><scroll-view class="scve" scroll-y="true"><view class="mabx"><block wx:if="{{o}}"><view wx:for="{{p}}" wx:for-item="item" class="itec" bindtap="{{q}}"><view class="contenbx1"><view><text style="color:#90A0AF">订单编号：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">总数：</text>{{item.b}}</view><view><text style="color:#90A0AF">计划：</text>{{item.c}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">装车：</text>{{item.d}}</view><view><text style="color:#90A0AF">签收：</text>{{item.e}}</view></view><view class="{{item.g}}">{{item.f}}</view></view></block><block wx:if="{{r}}"><view wx:for="{{s}}" wx:for-item="item" class="itec" bindtap="{{t}}"><view class="contenbx1"><view><text style="color:#90A0AF">SKU：</text>{{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">物品：</text>{{item.b}}</view><view><text style="color:#90A0AF">规格：</text>{{item.c}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">单位：</text>{{item.d}}</view></view></view></block></view></scroll-view><tips class="r" u-r="tip" u-i="2d27494e-2" bind:__l="__l"></tips><tiplist class="r" u-r="tiplists" u-i="2d27494e-3" bind:__l="__l"></tiplist><saomiao u-i="2d27494e-4" bind:__l="__l"></saomiao><saomiao1 u-i="2d27494e-5" bind:__l="__l"></saomiao1><saomiao2 u-i="2d27494e-6" bind:__l="__l"></saomiao2><saomiao3 u-i="2d27494e-7" bind:__l="__l"></saomiao3><saomiao4 u-i="2d27494e-8" bind:__l="__l"></saomiao4>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js
index 84ccd3d..7371c3b 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js
@@ -5,8 +5,8 @@ require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
 require("../../../utils/IDCardVerification.js");
-require("../../../config/host.js");
 require("../../../utils/base64.js");
+require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
@@ -46,17 +46,36 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       date.value[0] = common_vendor.index.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 3, "yyyy-mm-dd");
       date.value[1] = common_vendor.index.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd");
       details.current = 1;
-      initpage();
+      init();
     });
+    function init() {
+      details.current = 1;
+      initpage();
+    }
+    function jiazai() {
+      details.current++;
+      initpage();
+    }
     async function initpage() {
       let data = {
-        current: "",
-        size: "",
-        taskTime_start: "",
-        taskTime_end: ""
+        current: details.current,
+        size: 3,
+        taskTime_start: date.value[0],
+        taskTime_end: date.value[1]
       };
       let response = await api_user.signforpage(data);
-      details.datalist = response.data.records;
+      if (details.current == 1) {
+        details.datalist = response.data.records;
+      } else {
+        if (response.data.records.lngth == 0) {
+          common_vendor.index.showToast({
+            title: "已经到底了。",
+            icon: "none"
+          });
+          return;
+        }
+        details.datalist = details.datalist.concat(response.data.records);
+      }
     }
     function showtime(value) {
       console.log(value);
@@ -106,7 +125,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         h: common_vendor.o(() => {
         }),
         i: common_vendor.o(($event) => showtime(true)),
-        j: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
+        j: common_vendor.o(init),
+        k: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
           return {
             a: common_vendor.t(item.type_name),
             b: common_vendor.t(item.deliStatus_name),
@@ -124,10 +144,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             n: common_vendor.t(item.signNub)
           };
         }),
-        k: common_vendor.o(showCalendar),
-        l: common_vendor.o(onConfirm),
-        m: common_vendor.o(($event) => common_vendor.isRef(show) ? show.value = $event : null),
-        n: common_vendor.p({
+        l: common_vendor.o(jiazai),
+        m: common_vendor.o(showCalendar),
+        n: common_vendor.o(onConfirm),
+        o: common_vendor.o(($event) => common_vendor.isRef(show) ? show.value = $event : null),
+        p: common_vendor.p({
           initStartDate: date.value[0],
           initEndDate: date.value[1],
           value: common_vendor.unref(show)
diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.wxml
index f0a45a5..3768994 100644
--- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.wxml
@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="112fd010-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="schbox"><view>配车日期：</view><view catchtap="{{i}}" class="inputsr"><input value="{{b}}" disabled placeholder="请选择时间"/><view catchtap="{{h}}"><u-icon wx:if="{{c}}" catchclick="{{d}}" style="margin-right:10rpx" u-i="112fd010-1" bind:__l="__l" u-p="{{e}}"></u-icon><u-icon wx:else catchclick="{{f}}" style="margin-right:10rpx" u-i="112fd010-2" bind:__l="__l" u-p="{{g||''}}"></u-icon></view></view><view> 查询 </view></view><scroll-view scroll-y="true" class="scvbx"><view class="mabxslist"><view wx:for="{{j}}" wx:for-item="item" class="item"><view class="headtop"><view class="type1s"><view><text style="color:#90A0AF">配车类型：</text>{{item.a}}</view><view><text style="color:#90A0AF">配车状态：</text>{{item.b}}</view></view><view class="type1s"><view><text style="color:#90A0AF">车牌号：</text>{{item.c}}</view><view><text style="color:#90A0AF">司机：</text>{{item.d}}</view></view><view class="type1s"><view><text style="color:#90A0AF">装御班组：</text>{{item.e}}</view><view class="bhcolor"><text style="color:#90A0AF">备货是否完成：</text>{{item.f}}</view></view><view class="type1s"><view><text style="color:#90A0AF">制单时间：</text>{{item.g}}</view></view><view class="type1s"><view><text style="color:#90A0AF">任务时间：</text>{{item.h}}</view></view><view class="liebs"><view bindtap="{{item.j}}"><view>配送客户数</view><view>{{item.i}}</view></view><view bindtap="{{item.l}}"><view>订单总数</view><view>{{item.k}}</view></view><view><view>配送件数</view><view>{{item.m}}</view></view><view><view>签收件数</view><view>{{item.n}}</view></view></view></view></view></view></scroll-view><l-calendar wx:if="{{n}}" bindhide="{{k}}" bindchange="{{l}}" u-i="112fd010-3" bind:__l="__l" bindupdateValue="{{m}}" u-p="{{n}}"></l-calendar>
\ No newline at end of file
+<u-navbar wx:if="{{a}}" u-i="112fd010-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="schbox"><view>配车日期：</view><view catchtap="{{i}}" class="inputsr"><input value="{{b}}" disabled placeholder="请选择时间"/><view catchtap="{{h}}"><u-icon wx:if="{{c}}" catchclick="{{d}}" style="margin-right:10rpx" u-i="112fd010-1" bind:__l="__l" u-p="{{e}}"></u-icon><u-icon wx:else catchclick="{{f}}" style="margin-right:10rpx" u-i="112fd010-2" bind:__l="__l" u-p="{{g||''}}"></u-icon></view></view><view bindtap="{{j}}"> 查询 </view></view><scroll-view scroll-y="true" class="scvbx" bindscrolltolower="{{l}}"><view class="mabxslist"><view wx:for="{{k}}" wx:for-item="item" class="item"><view class="headtop"><view class="type1s"><view><text style="color:#90A0AF">配车类型：</text>{{item.a}}</view><view><text style="color:#90A0AF">配车状态：</text>{{item.b}}</view></view><view class="type1s"><view><text style="color:#90A0AF">车牌号：</text>{{item.c}}</view><view><text style="color:#90A0AF">司机：</text>{{item.d}}</view></view><view class="type1s"><view><text style="color:#90A0AF">装御班组：</text>{{item.e}}</view><view class="bhcolor"><text style="color:#90A0AF">备货是否完成：</text>{{item.f}}</view></view><view class="type1s"><view><text style="color:#90A0AF">制单时间：</text>{{item.g}}</view></view><view class="type1s"><view><text style="color:#90A0AF">任务时间：</text>{{item.h}}</view></view><view class="liebs"><view bindtap="{{item.j}}"><view>配送客户数</view><view>{{item.i}}</view></view><view bindtap="{{item.l}}"><view>订单总数</view><view>{{item.k}}</view></view><view><view>配送件数</view><view>{{item.m}}</view></view><view><view>签收件数</view><view>{{item.n}}</view></view></view></view></view></view></scroll-view><l-calendar wx:if="{{p}}" bindhide="{{m}}" bindchange="{{n}}" u-i="112fd010-3" bind:__l="__l" bindupdateValue="{{o}}" u-p="{{p}}"></l-calendar>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/static/add.png b/unpackage/dist/dev/mp-weixin/static/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f11301617d2983de2cfeb558d3b95d143fd484d
GIT binary patch
literal 785
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV7lSy;uum9_x8^2K;}T6)`z9+
zQyet&8mDk5WgH0I!Ps$PjuYn;2hNhDYY(=bRlaO+-1^rEj<R!8OD5FaHI3t`i%L(p
zXjOHPpXb6I7M=qPXN@n|)W|k4&PrcU`NN8V+2p*#=MSX}Y#H+!pFModz;nTd`Rw8A
zj1mhf*=Dt`XEt!y&l7Wh{k&r<^7py!lZ`X$f4w^IX2wlMi3b_QY%_`$GJnaevufaL
zVEiU$z|_-Vx3<3P3I~wIpnSmgz&U0K2Iho@^E^A)UnH{#a4<P4aIiEgd?<O9$iVZU
zv_P1@!2vFMA@svR=4}mXEEa8?P=x|4O(6N-8}2Ix!PP+p_ZvOX+R-nZ!?=whx<U7V
zSOWJ3)*DPYjI}q;hklUX`tAI};Gi{)wNZ_x7o;+Hx3EPquWh{MkiEck1OM+x=KsmO
zcZ9#*$=M>qU-R?vh4+u&uP^3K`MhD@+BrLG_zk2IqAeTJvn3^X16C!ze0cYw<btpR
zuP*ZhoPBU+etN@9@eNgf_AtH+JAYMy>Ae1N)*p|=S@PPqABgmtbank!O=E|bUlz9S
z<+f0p$G9w}LR#WiG0%xt3|0->8>{&x7~LEeu(zxB0)q$`QZ))G&l!0d7!NU9D)ciN
zFt8n900!EeKKby2jfpaoj(~Ux3_t}24c!Zx*&Px(PB3j!fCd62JPjBUGd)qmXNKCQ
z20Kt#BNXyDL_`U(fCChwO@L)tr_KU?CKwMa#Vjyw8dzId+kp~xEA_wA?hBRqv3ksJ
zWxOQH@!Hs72Sa8hn@709n)3_~nU*}2RETZdV8`6TJz-jULka7lUpxYO4pH+6D*n%~
XYL?}EM(3br1|aZs^>bP0l+XkK@6H_v

literal 0
HcmV?d00001

diff --git a/unpackage/dist/dev/mp-weixin/utils/functions.js b/unpackage/dist/dev/mp-weixin/utils/functions.js
index 8db2bb8..094bc37 100644
--- a/unpackage/dist/dev/mp-weixin/utils/functions.js
+++ b/unpackage/dist/dev/mp-weixin/utils/functions.js
@@ -1,6 +1,7 @@
 "use strict";
 const common_vendor = require("../common/vendor.js");
 const utils_IDCardVerification = require("./IDCardVerification.js");
+const utils_base64 = require("./base64.js");
 const config_host = require("../config/host.js");
 const api = {
   loginModalState: true,
@@ -34,15 +35,20 @@ const api = {
     return obj;
   },
   upfile: (file) => {
+    console.log(file);
     return new Promise((relove, reject) => {
       common_vendor.index.showLoading({
         title: "上传中"
       });
+      let header = {};
+      let token = common_vendor.index.getStorageSync("access_token");
+      header["Blade-Auth"] = `bearer ${token}`;
+      header.Authorization = `Basic ${utils_base64.base64.encode(config_host.APPKEY)}`;
       common_vendor.index.uploadFile({
-        url: `${config_host.host}/other/upload`,
-        //仅为示例，非真实的接口地址
+        url: `${config_host.host}blade-resource/oss/endpoint/put-file`,
         filePath: file,
         name: "file",
+        header,
         success: (uploadFileRes) => {
           common_vendor.index.hideLoading();
           relove(JSON.parse(uploadFileRes.data).data);
diff --git a/utils/functions.js b/utils/functions.js
index bfe6769..cab0c0a 100644
--- a/utils/functions.js
+++ b/utils/functions.js
@@ -9,7 +9,8 @@ import {
 // const QQMapWX=require('./qqmap-wx-jssdk.min.js')
 // import * as QQMapwx from '@/utils/qqmap-wx-jssdk.min.js'
 // var qqmapsdk; 
-import { imghost,host } from '@/config/host.js'
+import base64 from '@/utils/base64.js';
+import { imghost,host,APPKEY } from '@/config/host.js'
 const api = {
 	loginModalState: true,
 	
@@ -40,15 +41,20 @@ const api = {
 		  return obj
 	},
 	upfile:(file)=>{
-		// console.log(file);
+		console.log(file);
 		return new Promise((relove, reject) => {
 		uni.showLoading({
 			title:'上传中'
 		})
+		let header={}
+		let token=uni.getStorageSync('access_token')
+		header['Blade-Auth']=`bearer ${token}`
+		header.Authorization=`Basic ${base64.encode(APPKEY)}`
 		uni.uploadFile({
-			url: `${host}/other/upload`, //仅为示例，非真实的接口地址
+			url: `${host}blade-resource/oss/endpoint/put-file`, 
 			filePath:file,
 			name: 'file',
+			header,
 			success: (uploadFileRes) => {
 				uni.hideLoading()
 				relove(JSON.parse(uploadFileRes.data).data)