From ea71513d3f7f483e62f39ddb1a9da0d143ceb2c8 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 10 Nov 2023 13:42:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=93=9D=E7=89=99=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=B7=A5=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compoment/BasicContainer/BasicContainer.vue   |    7 +-
 compoment/BluetoothList/BluetoothList.vue     |  202 +++
 config/host.js                                |    4 +-
 main.js                                       |    2 +
 manifest.json                                 |    4 +-
 pages.json                                    |   12 +-
 pages/index/index.vue                         |  238 +--
 pages/login/login.vue                         |    7 +-
 pagesHome/pages/CustomerSign/CustomerSign.vue |    6 +-
 .../CustomerTrayDetails.vue                   |   43 +-
 pagesHome/pages/LoadingScan/LoadingScan.vue   |    1 +
 .../OrderSortingDetail/OrderSortingDetail.vue |   69 +-
 pagesHome/pages/PeopleScanUp/PeopleScanUp.vue |   12 +-
 pagesHome/pages/Relocation/Relocation.vue     |   10 +
 .../RelocationAllocationId.vue                |   10 +
 pagesHome/pages/ScanUp/ScanUp.vue             |   12 +
 pagesHome/pages/StockUplist/StockUplist.vue   |   20 +-
 .../StockUplistScandetails.vue                |   22 +-
 pagesHome/pages/orderInquiry/orderInquiry.vue |  125 +-
 pagesHome/pages/scansorting/scansorting.vue   |    5 +
 pagesHome/pages/setbarcode/setbarcode.vue     |   75 +-
 pagesTask/pages/dynamicCheck/dynamicCheck.vue |    5 +
 store/index.js                                |    3 +-
 store/useBluetoothStore.js                    |   72 +
 .../OrderSortingDetail/OrderSortingDetail.css |    2 +-
 unpackage/dist/dev/app-plus/app-service.js    | 1573 +++++++++++------
 unpackage/dist/dev/app-plus/app.css           |   93 +
 unpackage/dist/dev/app-plus/manifest.json     |    4 +-
 utils/request.js                              |    9 +-
 utils/utils.js                                |  123 +-
 30 files changed, 1912 insertions(+), 858 deletions(-)
 create mode 100644 compoment/BluetoothList/BluetoothList.vue
 create mode 100644 store/useBluetoothStore.js

diff --git a/compoment/BasicContainer/BasicContainer.vue b/compoment/BasicContainer/BasicContainer.vue
index 0d88721..43b92cd 100644
--- a/compoment/BasicContainer/BasicContainer.vue
+++ b/compoment/BasicContainer/BasicContainer.vue
@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<!-- 顶部导航栏 -->
-		<u-navbar :title="title" placeholder :autoBack="true" leftIconSize='35' bgColor='#d3832a' leftIconColor='#ffffff'
-			titleStyle='color:#ffffff'></u-navbar>
+		<u-navbar :title="title" placeholder :autoBack="false" @leftClick="option.leftClick" leftIconSize='35'
+			bgColor='#d3832a' leftIconColor='#ffffff' titleStyle='color:#ffffff'></u-navbar>
 	</view>
 
 	<!-- 头部 -->
@@ -40,6 +40,9 @@
 		},
 		title: {
 			type: String
+		},
+		leftClick() {
+			uni.navigateBack()
 		}
 	})
 
diff --git a/compoment/BluetoothList/BluetoothList.vue b/compoment/BluetoothList/BluetoothList.vue
new file mode 100644
index 0000000..68ade28
--- /dev/null
+++ b/compoment/BluetoothList/BluetoothList.vue
@@ -0,0 +1,202 @@
+<template>
+	<view class="maboxbg" v-if="isshow" @click.stop="checkbox(0)">
+		<view class="modtips" @click.stop.prevent>
+			<view class="title">
+				{{title||'选择连接的蓝牙'}}
+			</view>
+
+			<!-- 复选框列表 -->
+			<scroll-view scroll-y="true" class="scvboxs">
+				<template v-if="bluetoothList.length !== 0">
+					<block v-for="(item, index) in bluetoothList" :key="item">
+						<view class="list-container" @click="handle_single(index as any)">
+							<!-- 单选图片 -->
+							<image class="chooseImg" v-show="!details.singleIndex.includes(index)" src="@/static/nocheck.png"
+								mode=""></image>
+							<image class="chooseImg" v-show="details.singleIndex.includes(index)" src="@/static/check.png"
+								mode=""></image>
+
+							<view class="list-item-title">{{item.name}}</view>
+						</view>
+					</block>
+				</template>
+				<template v-else>
+					<view></view>
+				</template>
+			</scroll-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 { reactive, toRefs } from "vue";
+	import useBluetoothStore from "@/store/useBluetoothStore";
+	import { storeToRefs } from "pinia";
+	let details = reactive<any>({
+		title: '',
+		isshowcancel: true,
+		confirmTxt: '',
+		cancelTxt: '',
+		success: null,
+		cancel: null,
+		close: null,
+		isshow: false,
+		singleIndex: []
+	})
+
+	const bluetoothStore = useBluetoothStore()
+	// 获取蓝牙列表
+	const { bluetoothList } = storeToRefs(bluetoothStore)
+	// 获取修改蓝牙信息的方法
+	const { CHOOSE_BLUETOOTH, HANDLE_INITBLUETOOTH } = bluetoothStore
+
+	// 没有蓝牙信息, 查询一次
+	if (bluetoothList.value.length === 0) { HANDLE_INITBLUETOOTH() }
+	/**
+	 * 修改复选框的值
+	 */
+	const handle_single = (index : number) : void => {
+		if (details.singleIndex.includes(index)) {
+			// 清除首位
+			details.singleIndex.shift()
+			return
+		}
+		details.singleIndex.splice(0, 1, index)
+	}
+
+	function setdetails(objs : any) {
+		for (let key in objs) {
+			details[key] = objs[key]
+		}
+	}
+
+	/**
+	 * 点击事件
+	 */
+	function checkbox(type : number) {
+		switch (type) {
+			case 0:
+				if (details.close) {
+					details.close(details)
+				} else {
+					details.isshow = false
+				}
+				break;
+			case 1:
+				if (details.cancel) {
+					details.cancel(details)
+				} else {
+					details.isshow = false
+				}
+				break;
+			case 2:
+				if (details.success) {
+					details.success(details)
+				} else {
+					if (details.singleIndex.length === 0) {
+						uni.showToast({
+							title: '请选择一项蓝牙信息',
+							icon: 'none'
+						})
+						return
+					}
+
+					CHOOSE_BLUETOOTH(details.singleIndex[0])
+					details.isshow = false
+				}
+				break;
+		}
+	}
+
+
+	const { isshow, title, isshowcancel, confirmTxt, cancelTxt } = toRefs(details)
+	defineExpose({ setdetails, isshow })
+</script>
+
+<style lang="scss">
+	.maboxbg {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		left: 0;
+		top: 0;
+		background-color: #00000050;
+		z-index: 10000;
+	}
+
+	.modtips {
+		width: 630upx;
+		background: #FFFFFF;
+		border-radius: 7upx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 40upx 20upx;
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translateX(-50%) translateY(-50%);
+		box-sizing: border-box;
+
+		// 标题
+		.title {
+			font-size: 34upx;
+			color: #092C4D;
+		}
+
+		.scvboxs {
+			width: 100%;
+			max-height: 500upx;
+		}
+
+		.list-container {
+			display: flex;
+			align-items: center;
+			height: 60upx;
+
+			.list-item-title {
+				margin-left: 20upx;
+			}
+		}
+
+		.buts {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			margin-top: 40upx;
+
+			>view {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 260upx;
+				height: 88upx;
+				border-radius: 8upx;
+				font-size: 32upx;
+			}
+
+			>.cancel {
+				background-color: #F5F5F6;
+				color: #5A6875;
+				margin-right: 20upx;
+			}
+
+			>.confirm {
+				background-color: #D3832A;
+				color: #FFFFFF;
+			}
+		}
+	}
+
+	// 选项图片
+	.chooseImg {
+		width: 32upx;
+		height: 32upx;
+	}
+</style>
\ No newline at end of file
diff --git a/config/host.js b/config/host.js
index 54652f3..a9fa6c9 100644
--- a/config/host.js
+++ b/config/host.js
@@ -20,8 +20,8 @@ const devhost = 'http://test.api.huitongys.com/'
 /**
  * 正式域名
  * */
-const prohost = 'http://h5uapi.huitongys.com/'
-// const prohost = 'http://test.api.huitongys.com/'
+// const prohost = 'http://h5uapi.huitongys.com/'
+const prohost = 'http://test.api.huitongys.com/'
 /**
  * 图片域名
  * */
diff --git a/main.js b/main.js
index fdc6633..9460afa 100644
--- a/main.js
+++ b/main.js
@@ -24,6 +24,7 @@ import tiplist from '@/compoment/tiplist/tiplist.vue'
 import InputNum from '@/compoment/InputNum/InputNum.vue';
 import BasicContainer from '@/compoment/BasicContainer/BasicContainer.vue';
 import PopUp from '@/compoment/PopUp/PopUp.vue';
+import BluetoothList from '@/compoment/BluetoothList/BluetoothList.vue';
 // import moduleName from '@/compoment/ScanButton/ScanButton.vue';
 import saomiao1 from '@/compoment/saomiao1.vue'
 import saomiao2 from '@/compoment/saomiao2.vue'
@@ -52,6 +53,7 @@ export function createApp() {
 		.component('InputNum', InputNum)
 		.component('BasicContainer', BasicContainer)
 		.component('PopUp', PopUp)
+		.component('BluetoothList', BluetoothList)
 	uni.$u.config.unit = 'rpx'
 	return {
 		app,
diff --git a/manifest.json b/manifest.json
index fe54035..cafa4ae 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "货无忧",
     "appid" : "__UNI__EB22F37",
     "description" : "",
-    "versionName" : "1.0.24",
-    "versionCode" : 1024,
+    "versionName" : "1.0.26",
+    "versionCode" : 1026,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index eca5871..80bed23 100644
--- a/pages.json
+++ b/pages.json
@@ -1272,12 +1272,12 @@
 			// 	"selectedIconPath": "/static/TabberIcon/icon3check.png",
 			// 	"text": "报表"
 			// },
-			{
-				"pagePath": "pages/news/news",
-				"iconPath": "/static/TabberIcon/icon4.png",
-				"selectedIconPath": "/static/TabberIcon/icon4check.png",
-				"text": "消息"
-			},
+			// {
+			// 	"pagePath": "pages/news/news",
+			// 	"iconPath": "/static/TabberIcon/icon4.png",
+			// 	"selectedIconPath": "/static/TabberIcon/icon4check.png",
+			// 	"text": "消息"
+			// },
 			{
 				"pagePath": "pages/user/user",
 				"iconPath": "/static/TabberIcon/icon5.png",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6d1b07e..bb6f29f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -43,125 +43,125 @@
 	import utils from '../../utils/utils';
 	const tip = ref(null)
 	let details = reactive<listtype>({ tablist: [] });
-	// let details = reactive<listtype>({
-	// 	tablist: [
-	// 		{
-	// 			type: 1,
-	// 			name: '工作台',
-	// 			minilist: [
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '订单查询',
-	// 					router: '/pagesHome/pages/orderInquiry/orderInquiry',
-	// 				},
-	// 			]
-	// 		},
-	// 		{
-	// 			type: 1,
-	// 			name: '库内',
-	// 			minilist: [
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '分拣打托',
-	// 					router: '/pagesHome/pages/scansorting/scansorting',
-	// 				},
-	// 				// {
-	// 				// 	icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 				// 	name: '订单分拣',
-	// 				// 	router: '/pagesHome/pages/ordersorting/ordersorting',
-	// 				// },
-	// 				// {
-	// 				// 	icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 				// 	name: '库存品分拣',
-	// 				// 	router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
-	// 				// },
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '扫码上架',
-	// 					router: '/pagesHome/pages/ScanUpType/ScanUpType',
-	// 				},
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '手动上架',
-	// 					router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType',
-	// 				},
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '移库',
-	// 					router: '/pagesHome/pages/RelocationType/RelocationType',
-	// 				},
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '滞留',
-	// 					router: '/pagesHome/pages/Retention/Retention',
-	// 				},
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '合托',
-	// 					router: '/pagesHome/pages/MergeTray/MergeTray',
-	// 				},
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '下架',
-	// 					router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
-	// 				},
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '空置托盘',
-	// 					router: '/pagesHome/pages/RemoveTray/RemoveTray',
-	// 				},
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '复核',
-	// 					router: '/pagesHome/pages/Check/Check',
-	// 				},
-	// 			]
-	// 		},
-	// 		{
-	// 			type: 1,
-	// 			name: '出库',
-	// 			minilist: [
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '拣货扫描',
-	// 					router: '/pagesHome/pages/pickingScan/pickingScan',
-	// 				},
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '自提扫描',
-	// 					router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan',
-	// 				},
-	// 			]
-	// 		},
-	// 		{
-	// 			type: 1,
-	// 			name: '配送',
-	// 			minilist: [
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '装车扫描',
-	// 					router: '/pagesHome/pages/LoadingScan/LoadingScan',
-	// 				},
-	// 				{
-	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
-	// 					name: '签收扫描',
-	// 					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',
-	// 				},
-	// 			]
-	// 		},
-	// 	]
-	// })
+	/* let details = reactive<listtype>({
+		tablist: [
+			{
+				type: 1,
+				name: '工作台',
+				minilist: [
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '订单查询',
+						router: '/pagesHome/pages/orderInquiry/orderInquiry',
+					},
+				]
+			},
+			{
+				type: 1,
+				name: '库内',
+				minilist: [
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '分拣打托',
+						router: '/pagesHome/pages/scansorting/scansorting',
+					},
+					// {
+					// 	icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+					// 	name: '订单分拣',
+					// 	router: '/pagesHome/pages/ordersorting/ordersorting',
+					// },
+					// {
+					// 	icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+					// 	name: '库存品分拣',
+					// 	router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
+					// },
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '扫码上架',
+						router: '/pagesHome/pages/ScanUpType/ScanUpType',
+					},
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '手动上架',
+						router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType',
+					},
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '移库',
+						router: '/pagesHome/pages/RelocationType/RelocationType',
+					},
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '滞留',
+						router: '/pagesHome/pages/Retention/Retention',
+					},
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '合托',
+						router: '/pagesHome/pages/MergeTray/MergeTray',
+					},
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '下架',
+						router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
+					},
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '空置托盘',
+						router: '/pagesHome/pages/RemoveTray/RemoveTray',
+					},
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '复核',
+						router: '/pagesHome/pages/Check/Check',
+					},
+				]
+			},
+			{
+				type: 1,
+				name: '出库',
+				minilist: [
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '拣货扫描',
+						router: '/pagesHome/pages/pickingScan/pickingScan',
+					},
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '自提扫描',
+						router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan',
+					},
+				]
+			},
+			{
+				type: 1,
+				name: '配送',
+				minilist: [
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '装车扫描',
+						router: '/pagesHome/pages/LoadingScan/LoadingScan',
+					},
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '签收扫描',
+						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',
+					},
+				]
+			},
+		]
+	}) */
 
 	function gopathpage(path : string) {
 		uni.navigateTo({
diff --git a/pages/login/login.vue b/pages/login/login.vue
index ddeb5b8..9fca79a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -71,6 +71,8 @@
 	import utils from '@/utils/utils';
 	// 引入pinia仓库
 	import { useUserStore } from '@/store/uaeUserStore';
+	import useBluetoothStore from '@/store/useBluetoothStore.js';
+	const { HANDLE_INITBLUETOOTH } = useBluetoothStore()
 	// import { storeToRefs } from 'pinia';
 	const userStore = useUserStore()
 	const { HANDLE_ACCTOKEN, HANDLE_REFTOKEN, HANDLE_USERINFO } = userStore
@@ -95,6 +97,8 @@
 			details.tenantId = users.tenantId
 			details.username = users.username
 		}
+		// 初始化获取蓝牙信息
+		HANDLE_INITBLUETOOTH()
 	})
 	onShow(() => {
 		const timer = setTimeout(() => {
@@ -168,7 +172,8 @@
 				'scope': 'all',
 				'username': details.username,
 				'password': details.password,
-				'tenantId': details.tenantId
+				'tenantId': details.tenantId,
+				'isLogin': true
 			}
 			uni.showLoading({
 				mask: true,
diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue
index 3f069a7..1f23eae 100644
--- a/pagesHome/pages/CustomerSign/CustomerSign.vue
+++ b/pagesHome/pages/CustomerSign/CustomerSign.vue
@@ -68,12 +68,12 @@
 						<view :class="item.positioning==1?'ydk':''" @click="getLocation(item)">
 							{{item.positioning==1?'已打卡':'定位打卡'}}
 						</view>
-						<view @click="gosinorderscan(item)">签到扫描</view>
+						<view @click="gosinorderscan(item)">签收扫描</view>
 						<view @click="uplodimg(item)">上传签收图片</view>
 					</view>
-					<view @click="gosetorice(item)" class="mabut">
+					<!-- <view @click="gosetorice(item)" class="mabut">
 						设置增值服务
-					</view>
+					</view> -->
 					<view class="mabut" @click="allclick(item)"
 						v-if="authbuts.findIndex(val => val.code === '127')!=-1&&item.deliveryStatus!='完成配送'">
 						批量签收
diff --git a/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue b/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue
index 92ceec8..9e481c7 100644
--- a/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue
+++ b/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue
@@ -213,24 +213,35 @@
 	/** 扫描接口
 	 * */
 	async function scandata() {
-		let loadingId = uni.getStorageSync('checkvehicle').id
+		try {
+			uni.showLoading({
+				title: '数据请求中',
+				mask: true
+			});
+			let loadingId = uni.getStorageSync('checkvehicle').id
+
+			let data = {
+				reservationId: details.items.id,
+				deliveryId: details.id,
+				// reservationId: '1707271276416094210',
+				// deliveryId: '1707271279670874114',
+				loadingId,
+				type: 2,
+				barcode: details.scancode
+			}
 
-		let data = {
-			reservationId: details.items.id,
-			deliveryId: details.id,
-			// reservationId: '1707271276416094210',
-			// deliveryId: '1707271279670874114',
-			loadingId,
-			type: 2,
-			barcode: details.scancode
+			let res = await deliveryloadingscan(data)
+			console.log('res', res);
+			const { code } = res
+			// 语音播报
+			if (code === 3001 || code === 200) utils.ttsspke(res.audio)
+			initpage()
+		} catch (err) {
+			console.log('err :>> ', err);
+			//TODO handle the exception
+		} finally {
+			uni.hideLoading()
 		}
-
-		let res = await deliveryloadingscan(data)
-		console.log('res', res);
-		const { code } = res
-		// 语音播报
-		if (code === 3001 || code === 200) utils.ttsspke(res.audio)
-		initpage()
 	}
 	function checkphon(index : number) {
 		// details.listcheckindex=index
diff --git a/pagesHome/pages/LoadingScan/LoadingScan.vue b/pagesHome/pages/LoadingScan/LoadingScan.vue
index 763e991..068111c 100644
--- a/pagesHome/pages/LoadingScan/LoadingScan.vue
+++ b/pagesHome/pages/LoadingScan/LoadingScan.vue
@@ -299,6 +299,7 @@
 			taskTime_end: date.value[1] || '',
 			type: details.checkstate
 		}
+		console.log('data :>> ', data);
 		let response = await deliverypage(data)
 		console.log(response);
 		if (response.code !== 200) return
diff --git a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
index e2e719e..ebdd58a 100644
--- a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
+++ b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<!-- <u-navbar title="分拣" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> -->
-	<u-navbar title="扫描" placeholder :autoBack="true" leftIconSize='35' bgColor='#d3832a' leftIconColor='#ffffff'
-		titleStyle='color:#ffffff'></u-navbar>
+	<u-navbar title="扫描" placeholder :autoBack="false" @leftClick="backPage" leftIconSize='35' bgColor='#d3832a'
+		leftIconColor='#ffffff' titleStyle='color:#ffffff'></u-navbar>
 	<image mode="widthFix" class="bgimg" src="/pagesHome/static/bgby.png"></image>
 	<!-- <view class="headtop">
 		<view>
@@ -337,6 +337,7 @@
 	<saomiao2></saomiao2>
 	<tips ref="tip"></tips>
 	<tiplist ref="tiplists"></tiplist>
+	<BluetoothList ref="bluetoothList"></BluetoothList>
 </template>
 
 <script lang="ts" setup>
@@ -357,12 +358,13 @@
 		onLoad,
 		onShow,
 		onHide,
-		onUnload,
 		onPullDownRefresh
 	} from '@dcloudio/uni-app'
 	import utils from '@/utils/utils.js'
-	import { reactive, ref, toRefs, watchEffect } from "vue";
+	import { reactive, ref, toRefs } from "vue";
 	import dayjs from 'dayjs';
+	import useBluetoothStore from '@/store/useBluetoothStore.js';
+	import { storeToRefs } from 'pinia';
 	let details = reactive({
 		trayCode: '',
 		trayType: '',
@@ -392,7 +394,10 @@
 	})
 	let tip = ref(null)
 	const tiplists = ref(null)
+	const bluetoothList = ref(null)
 
+	const bluetoothStore = useBluetoothStore()
+	const { bluetoothInfo } = storeToRefs(bluetoothStore)
 	onLoad((op) => {
 		details.trayCode = op.trayCode
 		details.trayType = op.trayType
@@ -563,14 +568,41 @@
 		return res
 	}
 	function scandata() {
+		// 当扫描的码值为托盘码时
+		if (details.scancode[0] === 'T') scanTray()
 		// 定制品
-		if (details.tabBarState === 1) return scanOrder()
+		else if (details.tabBarState === 1) return scanOrder()
 		// 零担
 		else if (details.tabBarState === 2) return
 		// 库存品
 		else if (details.tabBarState === 3) return scanStock()
 	}
 
+	/**
+	 * 扫描托盘码
+	 */
+	async function scanTray() {
+		let data = {
+			trayCode: details.scancode
+		}
+		let res = await warehouseTrayTypeorderScanTrayCode(data)
+		if (res.code !== 200) return
+
+		console.log('res', res);
+		if (Number(res.data.isHasData) === 0) {
+			uni.setStorageSync('trayCodeType', res.data.data)
+			uni.navigateTo({
+				url: '/pagesHome/pages/ScanSortingType/ScanSortingType?trayCode=' + details.scancode
+			})
+		} else {
+			uni.navigateTo({
+				url: '/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode='
+					+ res.data.data.trayCode + '&trayType='
+					+ res.data.data.trayType
+			})
+		}
+	}
+
 	/**
 	 * 扫描包件执行的回调
 	 */
@@ -874,7 +906,7 @@
 	 * 打印
 	 */
 	const print = () => {
-
+		console.log('bluetoothList :>> ', bluetoothList);
 		console.log('details.detauser :>> ', details.detauser);
 		tiplists.value.setdetails({
 			title: '是否打印',
@@ -886,7 +918,9 @@
 			confirmTxt: '确认打印',
 			isonecheck: true,
 			success: () => {
+				// 没有蓝牙信息时进行蓝牙信息设置
 				// #ifdef APP
+				if (!bluetoothInfo.value.name) return bluetoothList.value.setdetails({ isshow: true })
 				// 打印时间
 				const time = dayjs().format('YYYY/MM/DD HH:mm:ss')
 
@@ -951,6 +985,8 @@
 				text += orderListText
 				text += 'FORM\r\n'
 				text += 'PRINT\r\n'
+				// 将数据传入打印函数中
+				utils.getbl(bluetoothInfo.value, text)
 				/* const _arr = []
 				let list = ''
 				_arr.forEach((value, index) => {
@@ -978,17 +1014,6 @@
 										${list}
 									^XZ               
 								` */
-				let sylist = utils.initbl()
-				console.log(sylist);
-				sylist.every(item => {
-					// 循环链接蓝牙, 打印成功退出循环
-					console.log(item);
-					if (item.uuids) {
-						utils.getbl(item, text)
-						return false
-					}
-					return true
-				})
 				// #endif
 				tiplists.value.setdetails({ isshow: false })
 			},
@@ -1001,6 +1026,16 @@
 		})
 	}
 
+	/**
+	 * 返回上一页
+	 */
+	function backPage() {
+		console.log('111 :>> ', 111);
+		uni.redirectTo({
+			url: '/pagesHome/pages/scansorting/scansorting'
+		})
+	}
+
 	const { datelist, detauser, showstate, waybillCode, checkinarr, Remarktext, codelist } = toRefs(details)
 </script>
 
diff --git a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
index 3776c47..eba74a5 100644
--- a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
+++ b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
@@ -525,6 +525,16 @@
 		// if (Number(details.upshelfScanType) == 1 || Number(details.upshelfScanType) == 2) {
 
 		// }
+		if (details.scancode[0] === 'T') {
+			uni.showToast({
+				title: '请扫描库位码',
+				icon: 'none'
+			})
+			// #ifdef APP
+			utils.ttsspke('请扫描库位码')
+			// #endif
+			return
+		}
 		let data = {
 			allocationId: details.scancode,
 		}
@@ -608,7 +618,7 @@
 				}
 				// 关闭loading
 				uni.hideLoading()
-
+				console.log('res上架 :>> ', res);
 				if (res.code == 200) {
 					uni.showToast({
 						title: '上架成功',
diff --git a/pagesHome/pages/Relocation/Relocation.vue b/pagesHome/pages/Relocation/Relocation.vue
index 78192e8..1619db2 100644
--- a/pagesHome/pages/Relocation/Relocation.vue
+++ b/pagesHome/pages/Relocation/Relocation.vue
@@ -342,6 +342,16 @@
 		let res = null
 		// 先扫库位码, 后扫描托盘码
 		if (!details.allocationId) {
+			if (details.scancode[0] === 'T') {
+				uni.showToast({
+					title: '请扫描库位码',
+					icon: 'none'
+				})
+				// #ifdef APP
+				utils.ttsspke('请扫描库位码')
+				// #endif
+				return
+			}
 			let data = {
 				allocationId: details.scancode
 			}
diff --git a/pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue b/pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue
index 3a01556..6d182b4 100644
--- a/pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue
+++ b/pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue
@@ -272,6 +272,16 @@
 	})
 	async function scandata(flg ?: boolean, type ?: number) {
 		let res = null
+		if (details.scancode[0] === 'T') {
+			uni.showToast({
+				title: '请扫描库位码',
+				icon: 'none'
+			})
+			// #ifdef APP
+			utils.ttsspke('请扫描库位码')
+			// #endif
+			return
+		}
 		if (flg) {
 			if (type == 1) {
 				let data = {
diff --git a/pagesHome/pages/ScanUp/ScanUp.vue b/pagesHome/pages/ScanUp/ScanUp.vue
index 08a261e..5bfb330 100644
--- a/pagesHome/pages/ScanUp/ScanUp.vue
+++ b/pagesHome/pages/ScanUp/ScanUp.vue
@@ -267,6 +267,18 @@
 	async function scandata() {
 		//是否有库位id，有库位ID就扫描包条码否则只能扫描库位码
 		if (!details.allocationId) {
+			console.log('details.scancode[0] :>> ', details.scancode[0]);
+			if (details.scancode[0] === 'T') {
+				uni.showToast({
+					title: '请扫描库位码',
+					icon: 'none'
+				})
+				// #ifdef APP
+				utils.ttsspke('请扫描库位码')
+				// #endif
+				return
+			}
+			console.log('111 :>> ', 111);
 			let data = {
 				allocationId: details.scancode,
 			}
diff --git a/pagesHome/pages/StockUplist/StockUplist.vue b/pagesHome/pages/StockUplist/StockUplist.vue
index 48a3504..4967c50 100644
--- a/pagesHome/pages/StockUplist/StockUplist.vue
+++ b/pagesHome/pages/StockUplist/StockUplist.vue
@@ -130,6 +130,8 @@
 		</view>
 	</scroll-view>
 	<tiplist ref="tiplists"></tiplist>
+	<saomiao2></saomiao2>
+	<BluetoothList ref="bluetoothList"></BluetoothList>
 </template>
 
 <script lang="ts" setup>
@@ -151,6 +153,11 @@
 		postZeroStockUp
 	} from '@/api/user.js'
 	import { reactive, toRefs, ref, inject } from "vue";
+	import useBluetoothStore from '@/store/useBluetoothStore.js';
+	import { storeToRefs } from 'pinia';
+	const bluetoothList = ref(null)
+	const bluetoothStore = useBluetoothStore()
+	const { bluetoothInfo } = storeToRefs(bluetoothStore)
 	const utils = inject('utils') as any
 	const tiplists = ref(null)
 	let details = reactive<detailType>({
@@ -185,6 +192,7 @@
 	onShow(() => {
 		uni.$on('scancodedate', function (code) {
 			if (code) {
+				console.log('code :>> ', code);
 				console.log(code);
 				details.scancode = code
 				if (details.isscan) scandata()
@@ -341,6 +349,7 @@
 			stockupId: details.stockupId,
 			trayId: details.trayId,
 			reservationId: details.reservationId,
+			scanType: 1
 		}
 		let res = await distributionStockupscanningCode(data)
 		if (res.code !== 200) return
@@ -516,8 +525,9 @@
 				}
 				// 不满足打印条件, 退出函数
 				if (!_flag) return tiplists.value.setdetails({ isshow: false })
-
+				let _isReturn = false
 				for (let i = 0; i <= _inputValue; i++) {
+					if (_isReturn) return
 					console.log('i :>> ', i);
 					let text = '! 0 200 200 330 1\r\n'
 					text += 'SETBOLD 2\r\n'
@@ -541,11 +551,9 @@
 					text += 'PRINT\r\n'
 					let sylist = utils.initbl()
 					console.log(sylist);
-					sylist.map(item => {
-						console.log(item);
-						if (item.uuids) {
-							utils.getbl(item, text)
-						}
+					utils.getbl(bluetoothInfo.value, text).catch(() => {
+						bluetoothList.value.setdetails({ isshow: true })
+						_isReturn = true
 					})
 				}
 				// #ifdef APP
diff --git a/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue b/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
index ec9187d..f70739d 100644
--- a/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
+++ b/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
@@ -94,6 +94,7 @@
 		</view>
 	</view>
 	<tiplist ref="tiplists"></tiplist>
+	<BluetoothList ref="bluetoothList"></BluetoothList>
 	<saomiao2></saomiao2>
 </template>
 
@@ -109,7 +110,12 @@
 	import { detailType } from '@/interfaces/pagesHome/StockUplistScandetails'
 	import { reactive, ref, toRefs, inject } from "vue";
 	import utils from '@/utils/utils';
+	import useBluetoothStore from '@/store/useBluetoothStore.js';
+	import { storeToRefs } from 'pinia';
 	const util = (inject('utils') as any)
+	const bluetoothList = ref(null)
+	const bluetoothStore = useBluetoothStore()
+	const { bluetoothInfo } = storeToRefs(bluetoothStore)
 	let details = reactive<detailType>({
 		dataList: [],
 		stockArticleId: '',
@@ -207,7 +213,10 @@
 					return
 				}
 				// #ifdef APP
-				deta.checklist.map(item => {
+				if (!bluetoothInfo.value.name) return bluetoothList.value.setdetails({ isshow: true })
+				let _isReturn = false
+				deta.checklist.forEach(item => {
+					if (_isReturn) return
 					let text = '! 0 200 200 330 1\r\n'
 					text += 'SETBOLD 2\r\n'
 					text += `T 56 0 0 0 ${details.dataList[item]?.orderCode}\r\n`
@@ -228,15 +237,12 @@
 					text += `T 55 0 140 260 ${details.dataList[item]?.packageBarCode}\r\n`
 					text += 'FORM\r\n'
 					text += 'PRINT\r\n'
-					let sylist = util.initbl()
-					console.log(sylist);
-					sylist.map(item => {
-						console.log(item);
-						if (item.uuids) {
-							util.getbl(item, text)
-						}
+					util.getbl(bluetoothInfo.value, text).catch(() => {
+						bluetoothList.value.setdetails({ isshow: true })
+						_isReturn = true
 					})
 				})
+				if (_isReturn) return
 				// #endif
 				tiplists.value.setdetails({ isshow: false })
 			},
diff --git a/pagesHome/pages/orderInquiry/orderInquiry.vue b/pagesHome/pages/orderInquiry/orderInquiry.vue
index 16d6d28..e01c76f 100644
--- a/pagesHome/pages/orderInquiry/orderInquiry.vue
+++ b/pagesHome/pages/orderInquiry/orderInquiry.vue
@@ -10,25 +10,28 @@
 				<input class="searchInput" v-model="scancode" type="text">
 
 				<!-- 搜索结果列表 -->
-				<view class="searchResultList" v-if="isShowOrderList">
+				<!-- 		<view class="searchResultList" v-if="isShowOrderList">
 					<view v-for="item in distributionOrderList" :key="item" @click="handleSearchOrder(item)">
 						{{item}}
 					</view>
-				</view>
+				</view> -->
 			</view>
 
 			<view class="search">
-				<view class="searchType" @click="showTypeList">
-					{{searchForm.searchTypeList.find((item)=> item.type === searchForm.type).label}}
+				<view class="searchType" @click="scandata">
+					搜索
 				</view>
+				<!-- <view class="searchType" @click="showTypeList">
+					{{searchForm.searchTypeList.find((item)=> item.type === searchForm.type).label}}
+				</view> -->
 
 				<!-- 搜索类型列表 -->
-				<view class="searchResultList" v-if="isShowTypeList">
+				<!-- 		<view class="searchResultList" v-if="isShowTypeList">
 					<view>
 						<view v-for="value in searchForm.searchTypeList" :key="value.label"
 							@click="handleSearchFormType(value.type)">{{value.label}}</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 
 		</view>
@@ -36,7 +39,10 @@
 		<!-- 数据详情 -->
 		<view class="dataInfo">
 			<view class="dataInfo__item">
-				<text class="label">订单状态:</text>{{orderStateDictionaries[dataInfo.orderCode] || ''}}
+				<text class="label">订单码:</text>{{dataInfo.orderCode}}
+			</view>
+			<view class="dataInfo__item">
+				<text class="label">订单状态:</text>{{orderStateDictionaries[dataInfo.orderStatus] || ''}}
 			</view>
 			<view class="dataInfo__item">
 				<text class="label">品牌:</text>
@@ -50,6 +56,12 @@
 					{{dataInfo.mallName || ''}}
 				</text>
 			</view>
+			<view class="dataInfo__item">
+				<text class="label">商场收货人:</text>
+				<text>
+					{{dataInfo.consigneePerson || ''}}
+				</text>
+			</view>
 			<view class="dataInfo__item">
 				<text class="label">商场电话:</text>
 				<text>
@@ -59,7 +71,7 @@
 			<view class="dataInfo__item">
 				<text class="label">客户名称:</text>
 				<text>
-					{{dataInfo.consigneePerson || ''}}
+					{{dataInfo.customerName || ''}}
 				</text>
 			</view>
 			<view class="dataInfo__item">
@@ -78,7 +90,7 @@
 					{{dataInfo.completeSet === 1 ? '齐套' : '未齐套'}}
 				</text>
 			</view>
-			<view>
+			<view class="dataInfo__item">
 				<view class="label">收货地址:</view>
 				<view>{{dataInfo.customerAddress || ''}}</view>
 			</view>
@@ -106,7 +118,8 @@
 					<view class="batchOperationBtn" @click="batchPrint">打印</view>
 				</view>
 				<u-checkbox-group v-model="checkboxValue" placement="column">
-					<view class="packagesList__item" v-for="item in packageList" :key="item.orderPackageCode">
+					<view :class="{'packagesList__item':true, 'active': item.orderPackageCode === scancode }"
+						v-for="item in packageList" :key="item.orderPackageCode">
 						<view>
 							<u-checkbox :name="item.id" :checked="item.isChecked" @change="checkboxChange(item)" size="18px" />
 						</view>
@@ -134,7 +147,7 @@
 	</view>
 	<tiplist ref="tiplists"></tiplist>
 	<saomiao2></saomiao2>
-
+	<BluetoothList ref="bluetoothList"></BluetoothList>
 </template>
 
 <script lang="ts" setup>
@@ -152,7 +165,11 @@
 		distributionOrderInfoInQuery,
 		BatchPrintPackages
 	} from '@/api/user.js'
-
+	import useBluetoothStore from '@/store/useBluetoothStore.js';
+	import { storeToRefs } from 'pinia';
+	const bluetoothList = ref(null)
+	const bluetoothStore = useBluetoothStore()
+	const { bluetoothInfo } = storeToRefs(bluetoothStore)
 	// type列表是否显示
 	const isShowTypeList = ref<Boolean>(false)
 
@@ -189,6 +206,8 @@
 		'20': '已入库',
 		'30': '部分出库',
 		'40': '已出库',
+		'50': '部分装车',
+		'60': '已装车',
 		'70': '部分签收',
 		'80': '已签收',
 	})
@@ -244,7 +263,20 @@
 		}, 500)
 	})
 
-	function scandata() { }
+	async function scandata() {
+		searchForm.condition = scancode.value
+		// let res = await distributionOrderInFuzzyQuery(searchForm)
+		const res = await distributionOrderInfoInQuery(searchForm)
+		const { code, data } = res
+		if (code === 200) {
+			dataInfo.value = data
+			packageList.value = data.list.map(item => {
+				item.isChecked = false
+				return item
+			})
+			stockList.value = data.stockList
+		}
+	}
 
 	// 改变搜索表单内type
 	function handleSearchFormType(type : number) {
@@ -340,7 +372,10 @@
 				// }
 				console.log('data :>> ', data);
 				// #ifdef APP
+				if (!bluetoothInfo.value.name) return bluetoothList.value.setdetails({ isshow: true })
+				let _isReturn = false
 				data.map(item => {
+					if (_isReturn) return
 					let text = '! 0 200 200 330 1\r\n'
 					text += 'SETBOLD 1\r\n'
 					text += `T 56 0 0 0 ${item.orderCode}\r\n`
@@ -361,15 +396,12 @@
 					text += `T 55 0 140 260 ${item.qrCode}\r\n`
 					text += 'FORM\r\n'
 					text += 'PRINT\r\n'
-					let sylist = utils.initbl()
-					console.log(sylist);
-					sylist.map(item => {
-						console.log(item);
-						if (item.uuids) {
-							utils.getbl(item, text)
-						}
+					utils.getbl(bluetoothInfo.value, text).catch(() => {
+						bluetoothList.value.setdetails({ isshow: true })
+						_isReturn = true
 					})
 				})
+				if (_isReturn) return
 				// #endif
 				tiplists.value.setdetails({ isshow: false })
 			},
@@ -383,27 +415,27 @@
 	}
 
 	// 储存定时器
-	let timer : any
-
-	watch([scancode], (newVal, oldVal) => {
-		console.log('newVal :>> ', newVal);
-		if (newVal[0] === oldVal[0]) return
-		// 监听值变化并发送请求
-		// 节流
-		if (timer) clearTimeout(timer)
-		timer = setTimeout(async () => {
-			searchForm.condition = scancode.value
-			// 发送请求
-			let res = await distributionOrderInFuzzyQuery(searchForm)
-			isShowOrderList.value = true
-			const { code, data } = res
-			console.log('res :>> ', res);
-			if (code === 200) {
-				distributionOrderList.value = data
-			}
-			clearTimeout(timer)
-		}, 1000)
-	})
+	/* 	let timer : any
+	
+		watch([scancode], (newVal, oldVal) => {
+			console.log('newVal :>> ', newVal);
+			if (newVal[0] === oldVal[0]) return
+			// 监听值变化并发送请求
+			// 节流
+			if (timer) clearTimeout(timer)
+			timer = setTimeout(async () => {
+				searchForm.condition = scancode.value
+				// 发送请求
+				let res = await distributionOrderInFuzzyQuery(searchForm)
+				isShowOrderList.value = true
+				const { code, data } = res
+				console.log('res :>> ', res);
+				if (code === 200) {
+					distributionOrderList.value = data
+				}
+				clearTimeout(timer)
+			}, 1000)
+		}) */
 </script>
 
 <style lang="scss" scoped>
@@ -457,7 +489,7 @@
 		height: 100%;
 		display: flex;
 		align-items: center;
-		padding: 0 20upx;
+		padding: 0 40upx;
 		background: #fff;
 		border: 1upx solid $themeColors;
 		border-radius: 10upx;
@@ -474,12 +506,12 @@
 	.dataInfo__item {
 		flex: none;
 		min-width: 50%;
-		line-height: 80upx;
+		line-height: 60upx;
 		display: inline-flex;
 
 		.label {
 			display: inline-block;
-			width: 120upx;
+			width: 160upx;
 			text-align: right;
 			margin-right: 20rpx;
 		}
@@ -543,6 +575,11 @@
 			grid-template-columns: 1fr 3fr 1fr 1fr 3fr 1fr 1fr;
 			// display: flex;
 			margin: 10upx 0;
+
+			&.active {
+				background: #e40b2c;
+				color: #fff;
+			}
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pagesHome/pages/scansorting/scansorting.vue b/pagesHome/pages/scansorting/scansorting.vue
index ea5a0fb..1497ec4 100644
--- a/pagesHome/pages/scansorting/scansorting.vue
+++ b/pagesHome/pages/scansorting/scansorting.vue
@@ -104,6 +104,11 @@
 	import utils from '@/utils/utils.js'
 	// 组件配置
 	const option = reactive({
+		leftClick() {
+			uni.reLaunch({
+				url: "/pages/index/index"
+			})
+		},
 		// 标题
 		title: '任务列表',
 		// 下拉刷新回调函数
diff --git a/pagesHome/pages/setbarcode/setbarcode.vue b/pagesHome/pages/setbarcode/setbarcode.vue
index c369354..73cdb8c 100644
--- a/pagesHome/pages/setbarcode/setbarcode.vue
+++ b/pagesHome/pages/setbarcode/setbarcode.vue
@@ -48,6 +48,7 @@
 	</scroll-view>
 	<tiplist ref="tips"></tiplist>
 	<saomiao2></saomiao2>
+	<BluetoothList ref="bluetoothList"></BluetoothList>
 </template>
 
 <script lang="ts" setup>
@@ -64,6 +65,11 @@
 	} from '@/api/user.js'
 	import { detailType } from '@/interfaces/pagesHome/setbarcode'
 	import { reactive, ref, toRefs, inject } from "vue";
+	import useBluetoothStore from '@/store/useBluetoothStore.js';
+	import { storeToRefs } from 'pinia';
+	const bluetoothList = ref(null)
+	const bluetoothStore = useBluetoothStore()
+	const { bluetoothInfo } = storeToRefs(bluetoothStore)
 	const utils = inject('utils') as any
 	let details = reactive<detailType>({
 		items: {},
@@ -210,9 +216,37 @@
 					})
 					return
 				}
+				// #ifdef APP
+				if (!bluetoothInfo.value.name) return bluetoothList.value.setdetails({ isshow: true })
+				let _isReturn = false
 				deta.checklist.map(item => {
-					print(details.printlist[item])
+					// const util=(inject('utils') as any)
+					let text = '! 0 200 200 330 1\r\n'
+					text += 'SETBOLD 2\r\n'
+					text += `T 56 0 0 0 ${item}\r\n`
+					text += 'LINE 0 50 420 50 3\r\n'
+					text += `T 55 0 0 60 客户\r\n`
+					text += 'LINE 40 50 40 110 3\r\n'
+					text += `T 55 0 50 60 ${details.customer}\r\n`
+					text += 'LINE 40 80 420 80 3\r\n'
+					text += `T 55 0 50 90 ${details.deliveryAddress}\r\n`
+					text += 'LINE 0 110 420 110 3\r\n'
+					text += `T 55 0 0 120 物料\r\n`
+					text += 'LINE 40 110 40 140 3\r\n'
+					text += `T 55 0 60 120 ${details.items.materialName}\r\n`
+					text += 'LINE 0 140 420 140 3\r\n'
+					text += 'B QR 150 150 M 2 U 4\r\n'
+					text += `MA,${item}\r\n`
+					text += 'ENDQR\r\n'
+					text += 'PRINT\r\n'
+
+					utils.getbl(bluetoothInfo.value, text).catch(() => {
+						bluetoothList.value.setdetails({ isshow: true })
+						_isReturn = true
+					})
 				})
+				if (_isReturn) return
+				// #endif
 				// scandata(response.data[0])
 				tips.value.setdetails({ isshow: false })
 			},
@@ -224,45 +258,6 @@
 			}
 		})
 	}
-	function print(item : string) {
-		// #ifdef APP
-		// const util=(inject('utils') as any)
-		let text = '! 0 200 200 330 1\r\n'
-		text += 'SETBOLD 2\r\n'
-		text += `T 56 0 0 0 ${item}\r\n`
-		text += 'LINE 0 50 420 50 3\r\n'
-		text += `T 55 0 0 60 客户\r\n`
-		text += 'LINE 40 50 40 110 3\r\n'
-		text += `T 55 0 50 60 ${details.customer}\r\n`
-		text += 'LINE 40 80 420 80 3\r\n'
-		text += `T 55 0 50 90 ${details.deliveryAddress}\r\n`
-		text += 'LINE 0 110 420 110 3\r\n'
-		text += `T 55 0 0 120 物料\r\n`
-		text += 'LINE 40 110 40 140 3\r\n'
-		text += `T 55 0 60 120 ${details.items.materialName}\r\n`
-		text += 'LINE 0 140 420 140 3\r\n'
-		text += 'B QR 150 150 M 2 U 4\r\n'
-		text += `MA,${item}\r\n`
-		text += 'ENDQR\r\n'
-		text += 'PRINT\r\n'
-
-		// let text='! 0 200 200 500 1\r\n'
-		// text+='SETBOLD 2\r\n'
-		// text+='B QR 80 40 M 2 U 8\r\n'
-		// text+=`MA,${item}\r\n`
-		// text+='ENDQR\r\n'
-		// text+=`T 56 0 15 280 ${item}\r\n`
-		// text+='PRINT\r\n'
-		let sylist = utils.initbl()
-		console.log(sylist);
-		sylist.map(item => {
-			console.log(item);
-			if (item.uuids) {
-				utils.getbl(item, text)
-			}
-		})
-		// #endif
-	}
 	async function scandata(code) {
 		let data = {
 			scanType: 2,
diff --git a/pagesTask/pages/dynamicCheck/dynamicCheck.vue b/pagesTask/pages/dynamicCheck/dynamicCheck.vue
index 020ada0..c48ecd5 100644
--- a/pagesTask/pages/dynamicCheck/dynamicCheck.vue
+++ b/pagesTask/pages/dynamicCheck/dynamicCheck.vue
@@ -79,6 +79,11 @@
 	const basicContainer = ref(null)
 
 	const option = reactive({
+		leftClick() {
+			uni.reLaunch({
+				url: "/pages/index/index"
+			})
+		},
 		title: '任务列表',
 		pullDownRefreshInitPage: async () => {
 			// 重置页码
diff --git a/store/index.js b/store/index.js
index 87d2feb..b607b21 100644
--- a/store/index.js
+++ b/store/index.js
@@ -8,7 +8,8 @@ export default createStore({
 		access_token: '',
 		refresh_token: '',
 		userinfo: {},
-		repetitionCode: 4000
+		// 暂时没用
+		// repetitionCode: 4000
 	},
 	mutations: {
 		updateislog(state, islogin) {
diff --git a/store/useBluetoothStore.js b/store/useBluetoothStore.js
new file mode 100644
index 0000000..a61596b
--- /dev/null
+++ b/store/useBluetoothStore.js
@@ -0,0 +1,72 @@
+import {
+	defineStore
+} from 'pinia';
+
+import {
+	reactive,
+	ref
+} from 'vue';
+
+import utils from '@/utils/utils.js';
+
+// 创建hooks函数仓库
+const useBluetoothStore = defineStore('useBluetoothStore', () => {
+	/**
+	 * 已连接的蓝牙 && 打印链接成功的蓝牙信息
+	 */
+	const bluetoothInfo = reactive({
+		name: '',
+		address: '',
+		status: '',
+		uuids: [],
+		op: {},
+	})
+
+	/**
+	 * 设备内已匹配的蓝牙信息组成的数组
+	 */
+	const bluetoothList = ref([])
+
+	/**
+	 * 蓝牙信息初始化, 获取设备内已匹配的蓝牙信息
+	 */
+	const HANDLE_INITBLUETOOTH = () => {
+		// #ifdef APP
+		bluetoothList.value = utils.initbl_App()
+		console.log('bluetoothList.value :>> ', bluetoothList.value);
+		// #endif
+	}
+
+	/**
+	 * 选择蓝牙
+	 * @index 蓝牙数组中被选中的索引 
+	 */
+	const CHOOSE_BLUETOOTH = (index) => {
+		// 将被选中的值赋给蓝牙信息中
+		for (let key in bluetoothInfo) {
+			bluetoothInfo[key] = bluetoothList.value[index][key]
+		}
+		console.log('bluetoothInfo :>> ', bluetoothInfo);
+	}
+
+	/**
+	 * 重置已选中蓝牙信息
+	 */
+	const CLEAR_BL_INFO = () => {
+		bluetoothInfo.name = ''
+		bluetoothInfo.address = ''
+		bluetoothInfo.status = ''
+		bluetoothInfo.uuids = []
+		bluetoothInfo.op = {}
+	}
+
+	return {
+		bluetoothInfo,
+		bluetoothList,
+		HANDLE_INITBLUETOOTH,
+		CHOOSE_BLUETOOTH
+	}
+})
+
+// 导出仓库
+export default useBluetoothStore
\ No newline at end of file
diff --git a/unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css b/unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
index 363f4d3..6220d5a 100644
--- a/unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
+++ b/unpackage/dist/build/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
@@ -1 +1 @@
-.u-status-bar[data-v-31491727]{width:100%}uni-view[data-v-5c79ae5e],uni-scroll-view[data-v-5c79ae5e],uni-swiper-item[data-v-5c79ae5e]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-5c79ae5e]{display:flex;align-items:center}.u-icon--left[data-v-5c79ae5e]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-5c79ae5e]{flex-direction:row;align-items:center}.u-icon--top[data-v-5c79ae5e]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-5c79ae5e]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-5c79ae5e]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-5c79ae5e]{color:#3c9cff}.u-icon__icon--success[data-v-5c79ae5e]{color:#5ac725}.u-icon__icon--error[data-v-5c79ae5e]{color:#f56c6c}.u-icon__icon--warning[data-v-5c79ae5e]{color:#f9ae3d}.u-icon__icon--info[data-v-5c79ae5e]{color:#909399}.u-icon__img[data-v-5c79ae5e]{height:auto;will-change:transform}.u-icon__label[data-v-5c79ae5e]{line-height:1}uni-view[data-v-917ffc31],uni-scroll-view[data-v-917ffc31],uni-swiper-item[data-v-917ffc31]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-917ffc31]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-917ffc31]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-917ffc31],.u-navbar__content__right[data-v-917ffc31]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-917ffc31]{left:0}.u-navbar__content__left--hover[data-v-917ffc31]{opacity:.7}.u-navbar__content__left__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-917ffc31]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-917ffc31]{right:0}.u-navbar__content__right__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.mabxtop{position:relative;width:21.375rem;background:#FFFFFF;border-radius:.625rem;margin:auto;margin-top:.625rem;padding:1.875rem;box-sizing:border-box;display:flex;flex-direction:column;align-items:center;justify-content:center}.mabxtop>uni-view{width:100%;display:flex;align-items:center;justify-content:space-between;margin-bottom:.3125rem}.mabxtop>uni-view:nth-last-child(1){margin-bottom:0}.mabxtop>uni-view>uni-view{display:flex;flex-direction:column;align-items:flex-start}.mabxtop>uni-view>uni-view:nth-of-type(1){width:60%}.mabxtop>uni-view>uni-view:nth-of-type(2){width:40%}.mabxtop>uni-view>uni-view>uni-view:nth-of-type(1){font-size:1rem;font-weight:400;color:#020b18;word-wrap:break-word;word-break:break-all}.mabxtop>uni-view>uni-view>uni-view:nth-of-type(2){font-size:.875rem;font-weight:400;color:#90a0af}.mabxtop .printBtn{background:#d3832a;color:#fff!important;width:3.125rem;padding:.3125rem;text-align:center;border-radius:.15625rem}.bgimg{position:fixed;left:0;top:0;width:100%}.scvmabx{width:21.375rem;height:45vh;margin:auto;margin-top:.625rem}.scvmabx .maxboxs{width:100%;display:flex;flex-direction:column;align-items:center}.scvmabx .maxboxs .chuanhuo{border:#ff0000}.scvmabx .maxboxs .weiqt,.scvmabx .maxboxs .qitao{position:absolute;right:0;top:0;width:2.1875rem;height:2.1875rem}.scvmabx .maxboxs>.items{width:21.5625rem;display:flex;flex-direction:column;align-items:center;padding:.625rem .9375rem;box-sizing:border-box;background-color:#fff;border-radius:.3125rem;margin-bottom:.9375rem;position:relative}.scvmabx .maxboxs>.items:nth-last-child(1){margin-bottom:.625rem}.scvmabx .maxboxs>.items .tophd{width:100%;display:flex;align-items:flex-start;justify-content:flex-start;padding:.9375rem .625rem .46875rem;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.scvmabx .maxboxs>.items .tophd>uni-image{width:1.5rem;height:1.5rem;margin-right:.3125rem;box-sizing:border-box}.scvmabx .maxboxs>.items .tophd>uni-view{font-size:1rem;color:#020b18;font-weight:400;word-wrap:break-word;word-break:break-all}.scvmabx .maxboxs>.items .tophd>uni-view:nth-of-type(1){width:5.625rem}.scvmabx .maxboxs>.items .tophd>uni-view:nth-of-type(2){flex:1}.scvmabx .maxboxs>.items .tophd1{width:100%;display:flex;box-sizing:border-box;padding:.46875rem .625rem;border-bottom:.125rem solid #EEEEEE}.scvmabx .maxboxs>.items .tophd1>uni-view{display:flex;flex:1;align-items:center}.scvmabx .maxboxs>.items .tophd1 uni-image{width:2rem;height:2rem}.scvmabx .maxboxs>.items .numbxvie{width:100%;display:flex;align-items:center;justify-content:space-around;padding:.46875rem .78125rem;box-sizing:border-box}.scvmabx .maxboxs>.items .numbxvie .zhon{color:#d3832a}.scvmabx .maxboxs>.items .numbxvie .yish{color:#1197eb}.scvmabx .maxboxs>.items .numbxvie .weish{color:#020b18}.scvmabx .maxboxs>.items .numbxvie>uni-view{display:flex;flex-direction:column;align-items:center}.scvmabx .maxboxs>.items .numbxvie>uni-view>uni-view:nth-of-type(1){font-size:1.125rem;margin-bottom:.375rem}.scvmabx .maxboxs>.items .numbxvie>uni-view>uni-view:nth-of-type(2){font-size:.875rem}.headtop{width:21.375rem;padding:.625rem;display:flex;align-items:center;justify-content:space-between;background-color:#fff;padding:.625rem .9375rem;box-sizing:border-box;position:relative;margin:auto;border-radius:.625rem;margin-top:.9375rem}.headtop>uni-view{flex:1}.headtop>uni-view>uni-input{flex:1;font-size:.875rem}.hedtopt{display:flex;align-items:center;justify-content:center;flex-direction:column;background-color:#fff;padding:1.125rem 1rem;box-sizing:border-box}.hedtopt .typto{display:flex;align-items:center;justify-content:space-between;width:100%;font-size:.875rem;font-weight:400;color:#092c4d;margin-bottom:.625rem}.hedtopt .typto:nth-last-child(1){margin-bottom:0}.hedtopt .typto>uni-view{flex:1}.tabBar[data-v-36454cb0]{margin-top:.3125rem;padding:0 .9375rem;display:flex}.tabBar_item[data-v-36454cb0]{flex:1;flex-basis:0;text-align:center;line-height:2.5rem;background:#fff;position:relative}.tabBar_item[data-v-36454cb0]:after{content:"";display:block;position:absolute;height:.125rem;background:#d3832a;width:0;left:50%;bottom:0;transition:all .5s}.tabBar_item.active[data-v-36454cb0]:after{left:0;width:100%}.buts[data-v-36454cb0]{position:fixed;bottom:.625rem;left:50%;transform:translate(-50%);width:10rem;height:2.75rem;border-radius:.25rem;opacity:1;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:700;color:#d3832a;margin:auto;margin-top:.625rem;border:.09375rem solid #d3832a}.tanchuangbg[data-v-36454cb0]{width:100%;height:100%;position:fixed;z-index:99;left:0;top:0;background-color:rgba(0,0,0,.314);display:flex;align-items:center;justify-content:center;transition:all 1s}.tanchuangbg .tanbx[data-v-36454cb0]{width:20.9375rem;background-color:#fff;box-sizing:border-box;border-radius:.3125rem;display:flex;flex-direction:column;align-items:center;padding:.9375rem}.tanchuangbg .tanbx .titlran[data-v-36454cb0]{font-size:1rem;color:#092c4d;margin-bottom:1.25rem}.tanchuangbg .tanbx .textareabx[data-v-36454cb0]{width:17.5rem;height:7.5rem;background:#F5F5F6;border-radius:.25rem;padding:.625rem 1.25rem;box-sizing:border-box}.tanchuangbg .tanbx .textareabx>uni-textarea[data-v-36454cb0]{width:100%;height:100%;box-sizing:border-box;font-size:.875rem;font-weight:400}.tanchuangbg .tanbx .btx[data-v-36454cb0]{display:flex;align-items:center;justify-content:space-around;margin-top:1.5625rem}.tanchuangbg .tanbx .btx>uni-view[data-v-36454cb0]{display:flex;align-items:center;justify-content:center;width:8.125rem;height:2.75rem;border-radius:.25rem;font-size:1rem}.tanchuangbg .tanbx .btx>.cancel[data-v-36454cb0]{background-color:#f5f5f6;color:#5a6875;margin-right:.625rem}.tanchuangbg .tanbx .btx>.confirm[data-v-36454cb0]{background-color:#d3832a;color:#fff}.tanchuangbg .inputbox[data-v-36454cb0]{width:20.9375rem;background-color:#fff;box-sizing:border-box;border-radius:.3125rem;display:flex;flex-direction:column;align-items:center;padding:.9375rem}.tanchuangbg .inputbox .inputscan[data-v-36454cb0]{width:100%;display:flex;align-items:center;justify-content:space-around}.tanchuangbg .inputbox .inputscan>uni-input[data-v-36454cb0]{width:13.75rem;height:2rem;border:.03125rem solid #092C4D30;border-radius:.25rem;font-size:.875rem;padding:0 .625rem;box-sizing:border-box}.tanchuangbg .inputbox .inputscan .scanbt[data-v-36454cb0]{width:4rem;height:2rem;background:#D3832A;border-radius:.25rem;opacity:1;display:flex;align-items:center;justify-content:center;font-size:.9375rem;font-weight:400;color:#fff}.tanchuangbg .inputbox .scvbw[data-v-36454cb0]{width:100%;height:14.0625rem;margin-top:.9375rem}.tanchuangbg .inputbox .scvbw .scboxitem[data-v-36454cb0]{display:flex;flex-direction:column;align-items:center}.tanchuangbg .inputbox .scvbw .scboxitem .items[data-v-36454cb0]{width:18.4375rem;display:flex;flex-direction:column;box-shadow:0 .0625rem .3125rem #e2e2e3;margin-top:.3125rem;padding:.625rem;box-sizing:border-box;position:relative}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite[data-v-36454cb0]{width:100%;display:flex;align-items:center;justify-content:center}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite>.itembox[data-v-36454cb0]{width:100%;display:flex;flex-direction:column;align-items:flex-start;justify-content:space-between;font-size:.875rem;color:#020b18;border:.03125rem solid #D3832A;padding:.3125rem .625rem;box-sizing:border-box;border-radius:.625rem;color:#d3832a}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite>.itembox>uni-view[data-v-36454cb0]{word-wrap:break-word;word-break:break-all}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s[data-v-36454cb0]{display:flex;align-items:center;justify-content:space-between;margin-bottom:.625rem}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view[data-v-36454cb0]{min-width:50%;display:flex;align-items:center;justify-content:flex-start;font-size:.875rem}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view>uni-view[data-v-36454cb0]:nth-of-type(1){color:#90a0af}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view>uni-view[data-v-36454cb0]:nth-of-type(2){color:#092c4d}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu[data-v-36454cb0]{display:flex;align-items:center;justify-content:space-between;margin-bottom:.625rem}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view[data-v-36454cb0]{display:flex;align-items:center;justify-content:flex-start;font-size:.875rem}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view>uni-view[data-v-36454cb0]:nth-of-type(1){color:#90a0af}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view>uni-input[data-v-36454cb0]{width:6.25rem;padding:0 .46875rem;border:.03125rem solid #00000020}.tanchuangbg .inputbox .btx[data-v-36454cb0]{display:flex;align-items:center;justify-content:space-around;margin-top:1.5625rem}.tanchuangbg .inputbox .btx>uni-view[data-v-36454cb0]{display:flex;align-items:center;justify-content:center;width:8.125rem;height:2.375rem;border-radius:.21875rem;font-size:.875rem}.tanchuangbg .inputbox .btx>.cancel[data-v-36454cb0]{background-color:#f5f5f6;color:#5a6875;margin-right:.625rem}.tanchuangbg .inputbox .btx>.confirm[data-v-36454cb0]{background-color:#d3832a;color:#fff}
+.u-status-bar[data-v-31491727]{width:100%}uni-view[data-v-5c79ae5e],uni-scroll-view[data-v-5c79ae5e],uni-swiper-item[data-v-5c79ae5e]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-5c79ae5e]{display:flex;align-items:center}.u-icon--left[data-v-5c79ae5e]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-5c79ae5e]{flex-direction:row;align-items:center}.u-icon--top[data-v-5c79ae5e]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-5c79ae5e]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-5c79ae5e]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-5c79ae5e]{color:#3c9cff}.u-icon__icon--success[data-v-5c79ae5e]{color:#5ac725}.u-icon__icon--error[data-v-5c79ae5e]{color:#f56c6c}.u-icon__icon--warning[data-v-5c79ae5e]{color:#f9ae3d}.u-icon__icon--info[data-v-5c79ae5e]{color:#909399}.u-icon__img[data-v-5c79ae5e]{height:auto;will-change:transform}.u-icon__label[data-v-5c79ae5e]{line-height:1}uni-view[data-v-917ffc31],uni-scroll-view[data-v-917ffc31],uni-swiper-item[data-v-917ffc31]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-917ffc31]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-917ffc31]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-917ffc31],.u-navbar__content__right[data-v-917ffc31]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-917ffc31]{left:0}.u-navbar__content__left--hover[data-v-917ffc31]{opacity:.7}.u-navbar__content__left__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-917ffc31]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-917ffc31]{right:0}.u-navbar__content__right__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.mabxtop{position:relative;width:21.375rem;background:#FFFFFF;border-radius:.625rem;margin:auto;margin-top:.625rem;padding:1.875rem;box-sizing:border-box;display:flex;flex-direction:column;align-items:center;justify-content:center}.mabxtop>uni-view{width:100%;display:flex;align-items:center;justify-content:space-between;margin-bottom:.3125rem}.mabxtop>uni-view:nth-last-child(1){margin-bottom:0}.mabxtop>uni-view>uni-view{display:flex;flex-direction:column;align-items:flex-start}.mabxtop>uni-view>uni-view:nth-of-type(1){width:60%}.mabxtop>uni-view>uni-view:nth-of-type(2){width:40%}.mabxtop>uni-view>uni-view>uni-view:nth-of-type(1){font-size:1rem;font-weight:400;color:#020b18;word-wrap:break-word;word-break:break-all}.mabxtop>uni-view>uni-view>uni-view:nth-of-type(2){font-size:.875rem;font-weight:400;color:#90a0af}.mabxtop .printBtn{background:#d3832a;color:#fff!important;width:3.125rem;padding:.3125rem;text-align:center;border-radius:.15625rem}.bgimg{position:fixed;left:0;top:0;width:100%}.scvmabx{width:21.375rem;height:45vh;margin:auto;margin-top:.625rem}.scvmabx .maxboxs{width:100%;display:flex;flex-direction:column;align-items:center}.scvmabx .maxboxs .chuanhuo{border:#ff0000}.scvmabx .maxboxs .weiqt,.scvmabx .maxboxs .qitao{position:absolute;right:0;top:0;width:2.1875rem;height:2.1875rem}.scvmabx .maxboxs>.items{width:21.5625rem;display:flex;flex-direction:column;align-items:center;padding:.625rem .9375rem;box-sizing:border-box;background-color:#fff;border-radius:.3125rem;margin-bottom:.9375rem;position:relative}.scvmabx .maxboxs>.items:nth-last-child(1){margin-bottom:.625rem}.scvmabx .maxboxs>.items .tophd{width:100%;display:flex;align-items:flex-start;justify-content:flex-start;padding:.9375rem .625rem .46875rem;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.scvmabx .maxboxs>.items .tophd>uni-image{width:1.5rem;height:1.5rem;margin-right:.3125rem;box-sizing:border-box}.scvmabx .maxboxs>.items .tophd>uni-view{font-size:1rem;color:#020b18;font-weight:400;word-wrap:break-word;word-break:break-all}.scvmabx .maxboxs>.items .tophd>uni-view:nth-of-type(1){width:5.625rem}.scvmabx .maxboxs>.items .tophd>uni-view:nth-of-type(2){flex:1}.scvmabx .maxboxs>.items .tophd1{width:100%;display:flex;box-sizing:border-box;padding:.46875rem .625rem;border-bottom:.125rem solid #EEEEEE}.scvmabx .maxboxs>.items .tophd1>uni-view{display:flex;flex:1;align-items:center}.scvmabx .maxboxs>.items .tophd1 uni-image{width:2rem;height:2rem}.scvmabx .maxboxs>.items .numbxvie{width:100%;display:flex;align-items:center;justify-content:space-around;padding:.46875rem .78125rem;box-sizing:border-box}.scvmabx .maxboxs>.items .numbxvie .zhon{color:#d3832a}.scvmabx .maxboxs>.items .numbxvie .yish{color:#1197eb}.scvmabx .maxboxs>.items .numbxvie .weish{color:#020b18}.scvmabx .maxboxs>.items .numbxvie>uni-view{display:flex;flex-direction:column;align-items:center}.scvmabx .maxboxs>.items .numbxvie>uni-view>uni-view:nth-of-type(1){font-size:1.125rem;margin-bottom:.375rem}.scvmabx .maxboxs>.items .numbxvie>uni-view>uni-view:nth-of-type(2){font-size:.875rem}.headtop{width:21.375rem;padding:.625rem;display:flex;align-items:center;justify-content:space-between;background-color:#fff;padding:.625rem .9375rem;box-sizing:border-box;position:relative;margin:auto;border-radius:.625rem;margin-top:.9375rem}.headtop>uni-view{flex:1}.headtop>uni-view>uni-input{flex:1;font-size:.875rem}.hedtopt{display:flex;align-items:center;justify-content:center;flex-direction:column;background-color:#fff;padding:1.125rem 1rem;box-sizing:border-box}.hedtopt .typto{display:flex;align-items:center;justify-content:space-between;width:100%;font-size:.875rem;font-weight:400;color:#092c4d;margin-bottom:.625rem}.hedtopt .typto:nth-last-child(1){margin-bottom:0}.hedtopt .typto>uni-view{flex:1}.tabBar[data-v-a1e26d0f]{margin-top:.3125rem;padding:0 .9375rem;display:flex}.tabBar_item[data-v-a1e26d0f]{flex:1;flex-basis:0;text-align:center;line-height:2.5rem;background:#fff;position:relative}.tabBar_item[data-v-a1e26d0f]:after{content:"";display:block;position:absolute;height:.125rem;background:#d3832a;width:0;left:50%;bottom:0;transition:all .5s}.tabBar_item.active[data-v-a1e26d0f]:after{left:0;width:100%}.buts[data-v-a1e26d0f]{position:fixed;bottom:.625rem;left:50%;transform:translate(-50%);width:10rem;height:2.75rem;border-radius:.25rem;opacity:1;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:700;color:#d3832a;margin:auto;margin-top:.625rem;border:.09375rem solid #d3832a}.tanchuangbg[data-v-a1e26d0f]{width:100%;height:100%;position:fixed;z-index:99;left:0;top:0;background-color:rgba(0,0,0,.314);display:flex;align-items:center;justify-content:center;transition:all 1s}.tanchuangbg .tanbx[data-v-a1e26d0f]{width:20.9375rem;background-color:#fff;box-sizing:border-box;border-radius:.3125rem;display:flex;flex-direction:column;align-items:center;padding:.9375rem}.tanchuangbg .tanbx .titlran[data-v-a1e26d0f]{font-size:1rem;color:#092c4d;margin-bottom:1.25rem}.tanchuangbg .tanbx .textareabx[data-v-a1e26d0f]{width:17.5rem;height:7.5rem;background:#F5F5F6;border-radius:.25rem;padding:.625rem 1.25rem;box-sizing:border-box}.tanchuangbg .tanbx .textareabx>uni-textarea[data-v-a1e26d0f]{width:100%;height:100%;box-sizing:border-box;font-size:.875rem;font-weight:400}.tanchuangbg .tanbx .btx[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:space-around;margin-top:1.5625rem}.tanchuangbg .tanbx .btx>uni-view[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:center;width:8.125rem;height:2.75rem;border-radius:.25rem;font-size:1rem}.tanchuangbg .tanbx .btx>.cancel[data-v-a1e26d0f]{background-color:#f5f5f6;color:#5a6875;margin-right:.625rem}.tanchuangbg .tanbx .btx>.confirm[data-v-a1e26d0f]{background-color:#d3832a;color:#fff}.tanchuangbg .inputbox[data-v-a1e26d0f]{width:20.9375rem;background-color:#fff;box-sizing:border-box;border-radius:.3125rem;display:flex;flex-direction:column;align-items:center;padding:.9375rem}.tanchuangbg .inputbox .inputscan[data-v-a1e26d0f]{width:100%;display:flex;align-items:center;justify-content:space-around}.tanchuangbg .inputbox .inputscan>uni-input[data-v-a1e26d0f]{width:13.75rem;height:2rem;border:.03125rem solid #092C4D30;border-radius:.25rem;font-size:.875rem;padding:0 .625rem;box-sizing:border-box}.tanchuangbg .inputbox .inputscan .scanbt[data-v-a1e26d0f]{width:4rem;height:2rem;background:#D3832A;border-radius:.25rem;opacity:1;display:flex;align-items:center;justify-content:center;font-size:.9375rem;font-weight:400;color:#fff}.tanchuangbg .inputbox .scvbw[data-v-a1e26d0f]{width:100%;height:14.0625rem;margin-top:.9375rem}.tanchuangbg .inputbox .scvbw .scboxitem[data-v-a1e26d0f]{display:flex;flex-direction:column;align-items:center}.tanchuangbg .inputbox .scvbw .scboxitem .items[data-v-a1e26d0f]{width:18.4375rem;display:flex;flex-direction:column;box-shadow:0 .0625rem .3125rem #e2e2e3;margin-top:.3125rem;padding:.625rem;box-sizing:border-box;position:relative}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite[data-v-a1e26d0f]{width:100%;display:flex;align-items:center;justify-content:center}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite>.itembox[data-v-a1e26d0f]{width:100%;display:flex;flex-direction:column;align-items:flex-start;justify-content:space-between;font-size:.875rem;color:#020b18;border:.03125rem solid #D3832A;padding:.3125rem .625rem;box-sizing:border-box;border-radius:.625rem;color:#d3832a}.tanchuangbg .inputbox .scvbw .scboxitem .items>.lisbite>.itembox>uni-view[data-v-a1e26d0f]{word-wrap:break-word;word-break:break-all}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:space-between;margin-bottom:.625rem}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view[data-v-a1e26d0f]{min-width:50%;display:flex;align-items:center;justify-content:flex-start;font-size:.875rem}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view>uni-view[data-v-a1e26d0f]:nth-of-type(1){color:#90a0af}.tanchuangbg .inputbox .scvbw .scboxitem .items>.type1s>uni-view>uni-view[data-v-a1e26d0f]:nth-of-type(2){color:#092c4d}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:space-between;margin-bottom:.625rem}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:flex-start;font-size:.875rem}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view>uni-view[data-v-a1e26d0f]:nth-of-type(1){color:#90a0af}.tanchuangbg .inputbox .scvbw .scboxitem .items .rksu>uni-view>uni-input[data-v-a1e26d0f]{width:6.25rem;padding:0 .46875rem;border:.03125rem solid #00000020}.tanchuangbg .inputbox .btx[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:space-around;margin-top:1.5625rem}.tanchuangbg .inputbox .btx>uni-view[data-v-a1e26d0f]{display:flex;align-items:center;justify-content:center;width:8.125rem;height:2.375rem;border-radius:.21875rem;font-size:.875rem}.tanchuangbg .inputbox .btx>.cancel[data-v-a1e26d0f]{background-color:#f5f5f6;color:#5a6875;margin-right:.625rem}.tanchuangbg .inputbox .btx>.confirm[data-v-a1e26d0f]{background-color:#d3832a;color:#fff}
diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js
index 9ec332e..2ed3893 100644
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
@@ -1118,8 +1118,9 @@ if (uni.restoreGlobal) {
       islogin: true,
       access_token: "",
       refresh_token: "",
-      userinfo: {},
-      repetitionCode: 4e3
+      userinfo: {}
+      // 暂时没用
+      // repetitionCode: 4000
     },
     mutations: {
       updateislog(state, islogin) {
@@ -1244,8 +1245,8 @@ if (uni.restoreGlobal) {
         sunmi_print.labelOutput();
       }, 2e3);
     },
-    //蓝牙打印初始化
-    initbl: () => {
+    // H5蓝牙打印初始化
+    initbl_App: () => {
       let deviceList = [];
       let main = plus.android.runtimeMainActivity();
       let Context = plus.android.importClass("android.content.Context");
@@ -1272,55 +1273,97 @@ if (uni.restoreGlobal) {
       }
       return deviceList;
     },
+    // 蓝牙打印初始化
+    initbl: () => {
+      let deviceList = [];
+      let main = plus.android.runtimeMainActivity();
+      let Context = plus.android.importClass("android.content.Context");
+      let BManager = main.getSystemService(Context.BLUETOOTH_SERVICE);
+      plus.android.importClass(BManager);
+      let BAdapter = BManager.getAdapter();
+      plus.android.importClass(BAdapter);
+      let lists = BAdapter.getBondedDevices();
+      plus.android.importClass(lists);
+      let iterator = lists.iterator();
+      formatAppLog("log", "at utils/utils.js:164", "iterator :>> ", iterator);
+      plus.android.importClass(iterator);
+      while (iterator.hasNext()) {
+        let d = iterator.next();
+        plus.android.importClass(d);
+        let temp = {
+          name: d.getName(),
+          address: d.getAddress(),
+          status: d.getBondState(),
+          uuids: d.getUuids(),
+          op: d
+        };
+        deviceList.push(temp);
+      }
+      return deviceList;
+    },
     //给蓝牙打印机推送打印的内容
     getbl: (dev, text) => {
-      plus.android.runtimeMainActivity();
-      let BluetoothAdapter = plus.android.importClass("android.bluetooth.BluetoothAdapter");
-      let UUID = plus.android.importClass("java.util.UUID");
-      let uuid = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
-      let BAdapter = BluetoothAdapter.getDefaultAdapter();
-      let device = BAdapter.getRemoteDevice(dev.address);
-      plus.android.importClass(device);
-      let bluetoothSocket = device.createInsecureRfcommSocketToServiceRecord(uuid);
-      plus.android.importClass(bluetoothSocket);
-      formatAppLog("log", "at utils/utils.js:160", "开始连接打印机:" + dev.name);
-      if (!bluetoothSocket.isConnected()) {
-        bluetoothSocket.connect();
-        if (bluetoothSocket.isConnected()) {
-          formatAppLog("log", "at utils/utils.js:164", "设备已连接,开始发送打印文件");
-          let outputStream = bluetoothSocket.getOutputStream();
-          plus.android.importClass(outputStream);
-          formatAppLog("log", "at utils/utils.js:170", text);
-          let arrayBuffer = plus.android.invoke(text, "getBytes", "gbk");
-          outputStream.write(arrayBuffer);
-          outputStream.flush();
-          bluetoothSocket.close();
+      return new Promise((resolve, reject) => {
+        try {
+          uni.showLoading({
+            title: "打印中",
+            mask: true
+          });
+          let main = plus.android.runtimeMainActivity();
+          let BluetoothAdapter = plus.android.importClass("android.bluetooth.BluetoothAdapter");
+          let UUID = plus.android.importClass("java.util.UUID");
+          let uuid = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
+          let BAdapter = BluetoothAdapter.getDefaultAdapter();
+          let device = BAdapter.getRemoteDevice(dev.address);
+          plus.android.importClass(device);
+          let bluetoothSocket = device.createInsecureRfcommSocketToServiceRecord(uuid);
+          plus.android.importClass(bluetoothSocket);
+          formatAppLog("log", "at utils/utils.js:202", "开始连接打印机:" + dev.name);
           if (!bluetoothSocket.isConnected()) {
-            formatAppLog("log", "at utils/utils.js:177", "设备已关闭");
+            bluetoothSocket.connect();
+            if (bluetoothSocket.isConnected()) {
+              formatAppLog("log", "at utils/utils.js:206", "设备已连接,开始发送打印文件");
+              let outputStream = bluetoothSocket.getOutputStream();
+              plus.android.importClass(outputStream);
+              formatAppLog("log", "at utils/utils.js:212", text);
+              let arrayBuffer = plus.android.invoke(text, "getBytes", "gbk");
+              outputStream.write(arrayBuffer);
+              outputStream.flush();
+              bluetoothSocket.close();
+              if (!bluetoothSocket.isConnected()) {
+                formatAppLog("log", "at utils/utils.js:219", "设备已关闭");
+              }
+              resolve(null);
+            } else {
+              uni.showToast({
+                title: "设备连接失败",
+                icon: "error",
+                duration: 2e3
+              });
+              reject(null);
+            }
           }
-        } else {
-          uni.showToast({
-            title: "设备连接失败",
-            icon: "error",
-            duration: 2e3
-          });
+        } catch (err) {
+          reject(null);
+        } finally {
+          uni.hideLoading();
         }
-      }
+      });
     },
     //初始化tts语音引擎
     inittts() {
       TTSSpeech.init((status) => {
         if (status === 0) {
-          formatAppLog("log", "at utils/utils.js:194", "引擎初始化成功");
+          formatAppLog("log", "at utils/utils.js:245", "引擎初始化成功");
           TTSSpeech.setSpeed(100);
           TTSSpeech.getInstallTTS((res2) => {
-            formatAppLog("log", "at utils/utils.js:197", JSON.stringify(res2));
+            formatAppLog("log", "at utils/utils.js:248", JSON.stringify(res2));
             let flage = false;
             res2.forEach((v) => {
               if (v.name == "com.iflytek.speechcloud") {
                 flage = true;
               }
-              formatAppLog("log", "at utils/utils.js:203", v.label + "： " + v.name);
+              formatAppLog("log", "at utils/utils.js:254", v.label + "： " + v.name);
             });
             if (!flage) {
               uni.showModal({
@@ -1360,13 +1403,13 @@ if (uni.restoreGlobal) {
             }
           });
         } else {
-          formatAppLog("log", "at utils/utils.js:251", "引擎初始化失败");
+          formatAppLog("log", "at utils/utils.js:302", "引擎初始化失败");
         }
       }, "com.iflytek.speechcloud");
     },
     //语音播报
     ttsspke: (text) => {
-      formatAppLog("log", "at utils/utils.js:259", "语音播报");
+      formatAppLog("log", "at utils/utils.js:310", "语音播报");
       if (!text) {
         return;
       }
@@ -1384,7 +1427,7 @@ if (uni.restoreGlobal) {
       intentSetting.putExtra("barcode_send_mode", "BROADCAST");
       intentSetting.putExtra("action_barcode_broadcast", deviceAction);
       intentSetting.putExtra("key_barcode_broadcast", strdata);
-      formatAppLog("log", "at utils/utils.js:287", "广播动作：" + deviceAction + ",接受的标签值：" + strdata);
+      formatAppLog("log", "at utils/utils.js:338", "广播动作：" + deviceAction + ",接受的标签值：" + strdata);
       main.sendBroadcast(intentSetting);
     },
     //获取当前APP的版本信息
@@ -1393,7 +1436,7 @@ if (uni.restoreGlobal) {
         let main = plus.android.runtimeMainActivity();
         let pkName = main.getPackageName();
         plus.runtime.getProperty(plus.runtime.appid, (info) => {
-          formatAppLog("log", "at utils/utils.js:301", info.version, pkName);
+          formatAppLog("log", "at utils/utils.js:352", info.version, pkName);
           let obj = {
             version: info.version,
             pkName
@@ -1669,7 +1712,7 @@ if (uni.restoreGlobal) {
     };
   };
   const base64 = new Base64();
-  const devhost = "http://test.api.huitongys.com/";
+  const devhost = "http://192.168.10.75:8777/";
   const imghost = "";
   const host = devhost;
   const APPKEY = "h5u:h5u_secret";
@@ -2111,7 +2154,7 @@ if (uni.restoreGlobal) {
             utils.ttsspke("接口出错，请联系后端开发人员");
             return;
           } else if (res2.statusCode == 401) {
-            if (!refresh_token && params.url.indexOf("blade-auth/oauth/token") != -1) {
+            if (isLogin) {
               return uni.showToast({
                 title: "登录失败",
                 icon: "none"
@@ -2154,15 +2197,22 @@ if (uni.restoreGlobal) {
   let _isRefreshToken = {
     _isRefreshToken: null
   };
+  let isLogin = false;
   const service = async (params) => {
-    formatAppLog("log", "at utils/request.js:281", "params :>> ", params);
+    formatAppLog("log", "at utils/request.js:283", "params :>> ", params);
+    if (params.data.isLogin) {
+      isLogin = true;
+      delete params.data.isLogin;
+    } else
+      isLogin = false;
+    formatAppLog("log", "at utils/request.js:288", "params :>> ", params);
     const _key = params.url + JSON.stringify(params.data);
     if (requestObj[_key])
       return new Promise((resolve) => resolve({
         code: 4e3
       }));
     requestObj[_key] = params;
-    formatAppLog("log", "at utils/request.js:290", "_isRefreshToken :>> ", _isRefreshToken);
+    formatAppLog("log", "at utils/request.js:297", "_isRefreshToken :>> ", _isRefreshToken);
     if (_isRefreshToken._isRefreshToken) {
       await _isRefreshToken._isRefreshToken;
       return HandleRequest(params, _key);
@@ -2967,13 +3017,6 @@ if (uni.restoreGlobal) {
       data
     });
   }
-  function distributionOrderInFuzzyQuery(data) {
-    return service({
-      url: `logpm-distribution/app/distributionInQuery/fuzzy`,
-      method: "post",
-      data
-    });
-  }
   function distributionOrderInfoInQuery(data) {
     return service({
       url: `logpm-distribution/app/distributionInQuery/order`,
@@ -4737,12 +4780,12 @@ This will fail in production if not fixed.`);
     storeToRefs
   }, Symbol.toStringTag, { value: "Module" }));
   const useUserStore = defineStore("useUserStore", () => {
-    const isLogin = vue.ref(uni.getStorageSync("isLogin") || false);
+    const isLogin2 = vue.ref(uni.getStorageSync("isLogin") || false);
     const access_token = vue.ref(uni.getStorageSync("access_token") || "");
     const refresh_token = vue.ref(uni.getStorageSync("refresh_token") || "");
     const userInfo = vue.shallowRef(uni.getStorageSync("userInfo") || {});
     const HANDLE_ISLOGIN = (_islogin) => {
-      isLogin.value = _islogin;
+      isLogin2.value = _islogin;
     };
     const HANDLE_ACCTOKEN = (_token) => {
       access_token.value = _token;
@@ -4754,7 +4797,7 @@ This will fail in production if not fixed.`);
       userInfo.value = _info;
     };
     return {
-      isLogin,
+      isLogin: isLogin2,
       access_token,
       refresh_token,
       userInfo,
@@ -4764,9 +4807,36 @@ This will fail in production if not fixed.`);
       HANDLE_USERINFO
     };
   });
-  const _sfc_main$1q = /* @__PURE__ */ vue.defineComponent({
+  const useBluetoothStore = defineStore("useBluetoothStore", () => {
+    const bluetoothInfo = vue.reactive({
+      name: "",
+      address: "",
+      status: "",
+      uuids: [],
+      op: {}
+    });
+    const bluetoothList = vue.ref([]);
+    const HANDLE_INITBLUETOOTH = () => {
+      bluetoothList.value = utils.initbl_App();
+      formatAppLog("log", "at store/useBluetoothStore.js:36", "bluetoothList.value :>> ", bluetoothList.value);
+    };
+    const CHOOSE_BLUETOOTH = (index2) => {
+      for (let key in bluetoothInfo) {
+        bluetoothInfo[key] = bluetoothList.value[index2][key];
+      }
+      formatAppLog("log", "at store/useBluetoothStore.js:49", "bluetoothInfo :>> ", bluetoothInfo);
+    };
+    return {
+      bluetoothInfo,
+      bluetoothList,
+      HANDLE_INITBLUETOOTH,
+      CHOOSE_BLUETOOTH
+    };
+  });
+  const _sfc_main$1r = /* @__PURE__ */ vue.defineComponent({
     __name: "login",
     setup(__props) {
+      const { HANDLE_INITBLUETOOTH } = useBluetoothStore();
       const userStore = useUserStore();
       const { HANDLE_ACCTOKEN, HANDLE_REFTOKEN, HANDLE_USERINFO } = userStore;
       let tip = vue.ref(null);
@@ -4781,7 +4851,7 @@ This will fail in production if not fixed.`);
       });
       const tiplists = vue.ref(null);
       const bluetoothList = utils.initbl();
-      formatAppLog("log", "at pages/login/login.vue:90", "bluetoothList :>> ", bluetoothList);
+      formatAppLog("log", "at pages/login/login.vue:92", "bluetoothList :>> ", bluetoothList);
       onLoad(() => {
         let users = uni.getStorageSync("loginuser");
         if (users) {
@@ -4789,6 +4859,7 @@ This will fail in production if not fixed.`);
           details.tenantId = users.tenantId;
           details.username = users.username;
         }
+        HANDLE_INITBLUETOOTH();
       });
       onShow(() => {
         const timer = setTimeout(() => {
@@ -4829,14 +4900,15 @@ This will fail in production if not fixed.`);
             "scope": "all",
             "username": details.username,
             "password": details.password,
-            "tenantId": details.tenantId
+            "tenantId": details.tenantId,
+            "isLogin": true
           };
           uni.showLoading({
             mask: true,
             title: "登录中"
           });
           let response = await oauthtoken(data);
-          formatAppLog("log", "at pages/login/login.vue:178", response);
+          formatAppLog("log", "at pages/login/login.vue:183", response);
           if (response == null ? void 0 : response.refresh_token) {
             setloctuser(response);
             uni.setStorageSync("checkname", {
@@ -4878,10 +4950,10 @@ This will fail in production if not fixed.`);
                 tip.value.setisshow(false);
               }
             });
-            formatAppLog("log", "at pages/login/login.vue:222", "登录错误");
+            formatAppLog("log", "at pages/login/login.vue:227", "登录错误");
           }
         } catch (err) {
-          formatAppLog("log", "at pages/login/login.vue:225", "err :>> ", err);
+          formatAppLog("log", "at pages/login/login.vue:230", "err :>> ", err);
         } finally {
           uni.hideLoading();
         }
@@ -5082,7 +5154,7 @@ This will fail in production if not fixed.`);
     }
     return target;
   };
-  const PagesLoginLogin = /* @__PURE__ */ _export_sfc(_sfc_main$1q, [["__file", "D:/workSpace/logpm/pages/login/login.vue"]]);
+  const PagesLoginLogin = /* @__PURE__ */ _export_sfc(_sfc_main$1r, [["__file", "D:/workSpace/logpm/pages/login/login.vue"]]);
   const version$1 = "3";
   {
     formatAppLog("log", "at uni_modules/uview-plus/libs/config/config.js:5", `
@@ -6780,7 +6852,7 @@ This will fail in production if not fixed.`);
       }
     }
   };
-  const _sfc_main$1p = {
+  const _sfc_main$1q = {
     name: "u-status-bar",
     mixins: [mpMixin$1, mixin$1, props$5],
     data() {
@@ -6809,7 +6881,7 @@ This will fail in production if not fixed.`);
       /* STYLE */
     );
   }
-  const __easycom_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1p, [["render", _sfc_render$i], ["__scopeId", "data-v-eb8e0cdd"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]);
+  const __easycom_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1q, [["render", _sfc_render$i], ["__scopeId", "data-v-eb8e0cdd"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]);
   const icons = {
     "uicon-level": "",
     "uicon-column-line": "",
@@ -7113,7 +7185,7 @@ This will fail in production if not fixed.`);
       }
     }
   };
-  const _sfc_main$1o = {
+  const _sfc_main$1p = {
     name: "u-icon",
     data() {
       return {};
@@ -7207,7 +7279,7 @@ This will fail in production if not fixed.`);
       /* CLASS */
     );
   }
-  const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1o, [["render", _sfc_render$h], ["__scopeId", "data-v-ac70166d"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-icon/u-icon.vue"]]);
+  const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1p, [["render", _sfc_render$h], ["__scopeId", "data-v-ac70166d"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-icon/u-icon.vue"]]);
   const props$3 = {
     props: {
       // 是否开启顶部安全区适配
@@ -7292,7 +7364,7 @@ This will fail in production if not fixed.`);
       }
     }
   };
-  const _sfc_main$1n = {
+  const _sfc_main$1o = {
     name: "u-navbar",
     mixins: [mpMixin$1, mixin$1, props$3],
     data() {
@@ -7424,7 +7496,7 @@ This will fail in production if not fixed.`);
       )
     ]);
   }
-  const __easycom_0 = /* @__PURE__ */ _export_sfc(_sfc_main$1n, [["render", _sfc_render$g], ["__scopeId", "data-v-f631659b"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-navbar/u-navbar.vue"]]);
+  const __easycom_0 = /* @__PURE__ */ _export_sfc(_sfc_main$1o, [["render", _sfc_render$g], ["__scopeId", "data-v-f631659b"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-navbar/u-navbar.vue"]]);
   function getImageCache(filePath, fileMd51) {
     return new Promise((resolve, reject) => {
       let fileMd5 = "";
@@ -7472,11 +7544,129 @@ This will fail in production if not fixed.`);
       }
     });
   }
-  const _sfc_main$1m = /* @__PURE__ */ vue.defineComponent({
+  const _sfc_main$1n = /* @__PURE__ */ vue.defineComponent({
     __name: "index",
     setup(__props) {
       const tip = vue.ref(null);
-      let details = vue.reactive({ tablist: [] });
+      let details = vue.reactive({
+        tablist: [
+          {
+            type: 1,
+            name: "工作台",
+            minilist: [
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "订单查询",
+                router: "/pagesHome/pages/orderInquiry/orderInquiry"
+              }
+            ]
+          },
+          {
+            type: 1,
+            name: "库内",
+            minilist: [
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "分拣打托",
+                router: "/pagesHome/pages/scansorting/scansorting"
+              },
+              // {
+              // 	icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+              // 	name: '订单分拣',
+              // 	router: '/pagesHome/pages/ordersorting/ordersorting',
+              // },
+              // {
+              // 	icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+              // 	name: '库存品分拣',
+              // 	router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
+              // },
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "扫码上架",
+                router: "/pagesHome/pages/ScanUpType/ScanUpType"
+              },
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "手动上架",
+                router: "/pagesHome/pages/PeopleScanUpType/PeopleScanUpType"
+              },
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "移库",
+                router: "/pagesHome/pages/RelocationType/RelocationType"
+              },
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "滞留",
+                router: "/pagesHome/pages/Retention/Retention"
+              },
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "合托",
+                router: "/pagesHome/pages/MergeTray/MergeTray"
+              },
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "下架",
+                router: "/pagesHome/pages/DownGoodsType/DownGoodsType"
+              },
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "空置托盘",
+                router: "/pagesHome/pages/RemoveTray/RemoveTray"
+              },
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "复核",
+                router: "/pagesHome/pages/Check/Check"
+              }
+            ]
+          },
+          {
+            type: 1,
+            name: "出库",
+            minilist: [
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "拣货扫描",
+                router: "/pagesHome/pages/pickingScan/pickingScan"
+              },
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "自提扫描",
+                router: "/pagesHome/pages/SelfPickupScan/SelfPickupScan"
+              }
+            ]
+          },
+          {
+            type: 1,
+            name: "配送",
+            minilist: [
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "装车扫描",
+                router: "/pagesHome/pages/LoadingScan/LoadingScan"
+              },
+              {
+                icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
+                name: "签收扫描",
+                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"
+              }
+            ]
+          }
+        ]
+      });
       function gopathpage(path) {
         uni.navigateTo({
           url: path
@@ -7682,8 +7872,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$1m, [["__file", "D:/workSpace/logpm/pages/index/index.vue"]]);
-  const _sfc_main$1l = /* @__PURE__ */ vue.defineComponent({
+  const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$1n, [["__file", "D:/workSpace/logpm/pages/index/index.vue"]]);
+  const _sfc_main$1m = /* @__PURE__ */ vue.defineComponent({
     __name: "user",
     setup(__props) {
       let users = vue.ref(null);
@@ -7993,8 +8183,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesUserUser = /* @__PURE__ */ _export_sfc(_sfc_main$1l, [["__file", "D:/workSpace/logpm/pages/user/user.vue"]]);
-  const _sfc_main$1k = /* @__PURE__ */ vue.defineComponent({
+  const PagesUserUser = /* @__PURE__ */ _export_sfc(_sfc_main$1m, [["__file", "D:/workSpace/logpm/pages/user/user.vue"]]);
+  const _sfc_main$1l = /* @__PURE__ */ vue.defineComponent({
     __name: "news",
     setup(__props) {
       onPullDownRefresh(() => {
@@ -8057,8 +8247,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesNewsNews = /* @__PURE__ */ _export_sfc(_sfc_main$1k, [["__file", "D:/workSpace/logpm/pages/news/news.vue"]]);
-  const _sfc_main$1j = /* @__PURE__ */ vue.defineComponent({
+  const PagesNewsNews = /* @__PURE__ */ _export_sfc(_sfc_main$1l, [["__file", "D:/workSpace/logpm/pages/news/news.vue"]]);
+  const _sfc_main$1k = /* @__PURE__ */ vue.defineComponent({
     __name: "taskList",
     setup(__props) {
       const tip = vue.ref(null);
@@ -8173,8 +8363,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesTaskListTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$1j, [["__file", "D:/workSpace/logpm/pages/taskList/taskList.vue"]]);
-  const _sfc_main$1i = /* @__PURE__ */ vue.defineComponent({
+  const PagesTaskListTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$1k, [["__file", "D:/workSpace/logpm/pages/taskList/taskList.vue"]]);
+  const _sfc_main$1j = /* @__PURE__ */ vue.defineComponent({
     __name: "reportForms",
     setup(__props) {
       onPullDownRefresh(() => {
@@ -8188,7 +8378,7 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesReportFormsReportForms = /* @__PURE__ */ _export_sfc(_sfc_main$1i, [["__file", "D:/workSpace/logpm/pages/reportForms/reportForms.vue"]]);
+  const PagesReportFormsReportForms = /* @__PURE__ */ _export_sfc(_sfc_main$1j, [["__file", "D:/workSpace/logpm/pages/reportForms/reportForms.vue"]]);
   let calendar = {
     /**
      * 农历1900-2100的润大小信息表
@@ -9108,7 +9298,7 @@ This will fail in production if not fixed.`);
     solar2lunar: calendar.solar2lunar,
     lunar2solar: calendar.lunar2solar
   };
-  const _sfc_main$1h = {
+  const _sfc_main$1i = {
     name: "lCalendar",
     model: {
       prop: "value",
@@ -9762,8 +9952,8 @@ This will fail in production if not fixed.`);
       /* HYDRATE_EVENTS */
     );
   }
-  const __easycom_1$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1h, [["render", _sfc_render$f], ["__scopeId", "data-v-665735f1"], ["__file", "D:/workSpace/logpm/uni_modules/l-calendar/components/l-calendar/l-calendar.vue"]]);
-  const _sfc_main$1g = /* @__PURE__ */ vue.defineComponent({
+  const __easycom_1$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1i, [["render", _sfc_render$f], ["__scopeId", "data-v-665735f1"], ["__file", "D:/workSpace/logpm/uni_modules/l-calendar/components/l-calendar/l-calendar.vue"]]);
+  const _sfc_main$1h = /* @__PURE__ */ vue.defineComponent({
     __name: "pickingScan",
     setup(__props) {
       let details = vue.reactive({
@@ -10101,8 +10291,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesPickingScanPickingScan = /* @__PURE__ */ _export_sfc(_sfc_main$1g, [["__file", "D:/workSpace/logpm/pagesHome/pages/pickingScan/pickingScan.vue"]]);
-  const _sfc_main$1f = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesPickingScanPickingScan = /* @__PURE__ */ _export_sfc(_sfc_main$1h, [["__file", "D:/workSpace/logpm/pagesHome/pages/pickingScan/pickingScan.vue"]]);
+  const _sfc_main$1g = /* @__PURE__ */ vue.defineComponent({
     __name: "SelfPickupScan",
     setup(__props) {
       let details = vue.reactive({
@@ -10374,8 +10564,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesSelfPickupScanSelfPickupScan = /* @__PURE__ */ _export_sfc(_sfc_main$1f, [["__file", "D:/workSpace/logpm/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue"]]);
-  const _sfc_main$1e = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesSelfPickupScanSelfPickupScan = /* @__PURE__ */ _export_sfc(_sfc_main$1g, [["__file", "D:/workSpace/logpm/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue"]]);
+  const _sfc_main$1f = /* @__PURE__ */ vue.defineComponent({
     __name: "LoadingScan",
     setup(__props) {
       let details = vue.reactive({
@@ -10537,8 +10727,9 @@ This will fail in production if not fixed.`);
           taskTime_end: date2.value[1] || "",
           type: details.checkstate
         };
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:302", "data :>> ", data);
         let response = await deliverypage(data);
-        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:303", response);
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:304", response);
         if (response.code !== 200)
           return;
         if (details.current == 1) {
@@ -10611,12 +10802,12 @@ This will fail in production if not fixed.`);
         });
       }
       async function goRetention(item) {
-        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:385", "item :>> ", item);
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:386", "item :>> ", item);
         let data = {
           deliveryId: item.id
         };
         let res2 = await deliveryvehicle(data);
-        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:390", res2);
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:391", res2);
         if (res2.data.length == 1) {
           uni.setStorageSync("checkvehicle", res2.data[0]);
           uni.navigateTo({
@@ -10673,7 +10864,7 @@ This will fail in production if not fixed.`);
         let res2 = await deliveryvehicle(data);
         if (res2.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:447", res2);
+        formatAppLog("log", "at pagesHome/pages/LoadingScan/LoadingScan.vue:448", res2);
         if (res2.data.length == 1) {
           uni.setStorageSync("checkvehicle", res2.data[0]);
           uni.navigateTo({
@@ -11050,8 +11241,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesLoadingScanLoadingScan = /* @__PURE__ */ _export_sfc(_sfc_main$1e, [["__file", "D:/workSpace/logpm/pagesHome/pages/LoadingScan/LoadingScan.vue"]]);
-  const _sfc_main$1d = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesLoadingScanLoadingScan = /* @__PURE__ */ _export_sfc(_sfc_main$1f, [["__file", "D:/workSpace/logpm/pagesHome/pages/LoadingScan/LoadingScan.vue"]]);
+  const _sfc_main$1e = /* @__PURE__ */ vue.defineComponent({
     __name: "loadingRetention",
     setup(__props) {
       let details = vue.reactive({
@@ -11340,10 +11531,13 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesLoadingRetentionLoadingRetention = /* @__PURE__ */ _export_sfc(_sfc_main$1d, [["__scopeId", "data-v-0b4cf6ee"], ["__file", "D:/workSpace/logpm/pagesHome/pages/loadingRetention/loadingRetention.vue"]]);
-  const _sfc_main$1c = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesLoadingRetentionLoadingRetention = /* @__PURE__ */ _export_sfc(_sfc_main$1e, [["__scopeId", "data-v-0b4cf6ee"], ["__file", "D:/workSpace/logpm/pagesHome/pages/loadingRetention/loadingRetention.vue"]]);
+  const _sfc_main$1d = /* @__PURE__ */ vue.defineComponent({
     __name: "StockUplist",
     setup(__props) {
+      const bluetoothList = vue.ref(null);
+      const bluetoothStore = useBluetoothStore();
+      const { bluetoothInfo } = storeToRefs(bluetoothStore);
       const utils2 = vue.inject("utils");
       const tiplists = vue.ref(null);
       let details = vue.reactive({
@@ -11376,7 +11570,8 @@ This will fail in production if not fixed.`);
       onShow(() => {
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:188", code2);
+            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:195", "code :>> ", code2);
+            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:196", code2);
             details.scancode = code2;
             if (details.isscan)
               scandata();
@@ -11402,7 +11597,7 @@ This will fail in production if not fixed.`);
       }
       async function initpage() {
         var _a, _b, _c, _d, _e, _f, _g;
-        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:212", details.items);
+        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:220", details.items);
         let data = {
           // 零担为1, 不是零担为0
           isZero: 0,
@@ -11419,8 +11614,8 @@ This will fail in production if not fixed.`);
         let response = await distributionStockuporderList(data);
         if (response.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:229", "response :>> ", response);
-        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:230", "details.orderStatus :>> ", details.orderStatus);
+        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:237", "response :>> ", response);
+        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:238", "details.orderStatus :>> ", details.orderStatus);
         details.user.consignee = (_a = response.data) == null ? void 0 : _a.consignee;
         details.user.goodsAreaName = (_b = response.data) == null ? void 0 : _b.goodsAreaName;
         details.user.planNum = (_c = response.data) == null ? void 0 : _c.planNum;
@@ -11505,7 +11700,8 @@ This will fail in production if not fixed.`);
           trayBarCode: details.scancode,
           stockupId: details.stockupId,
           trayId: details.trayId,
-          reservationId: details.reservationId
+          reservationId: details.reservationId,
+          scanType: 1
         };
         let res2 = await distributionStockupscanningCode(data);
         if (res2.code !== 200)
@@ -11534,7 +11730,7 @@ This will fail in production if not fixed.`);
         let inpList = [];
         if (code2 !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:373", "res.data :>> ", res2.data);
+        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:382", "res.data :>> ", res2.data);
         inpList = res2.data.map((val) => {
           return {
             id: val.id,
@@ -11578,7 +11774,7 @@ This will fail in production if not fixed.`);
           confirmTxt: "确认选择",
           isonecheck: true,
           success: async (deta) => {
-            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:422", "deta :>> ", deta);
+            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:431", "deta :>> ", deta);
             if (deta.inpList.length === 0 || item.completeStact)
               return tiplists.value.setdetails({ isshow: false });
             let data2 = {
@@ -11592,7 +11788,7 @@ This will fail in production if not fixed.`);
             if (deta.inpList[0].allocationId)
               data2.allocationId = deta.inpList[0].allocationId;
             const _flag = deta.inpList.every((val) => {
-              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:434", "val :>> ", val);
+              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:443", "val :>> ", val);
               if (val.value < val.minNum) {
                 uni.showToast({
                   title: "不能小于当前数量"
@@ -11600,7 +11796,7 @@ This will fail in production if not fixed.`);
                 return false;
               }
               if (val.value > val.minNum) {
-                formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:442", "1 :>> ", 1);
+                formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:451", "1 :>> ", 1);
                 data2.list.push({
                   firsts: val.title,
                   id: val.id,
@@ -11619,7 +11815,7 @@ This will fail in production if not fixed.`);
               });
             }
             const res22 = await postZeroStockUp(data2);
-            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:463", "res :>> ", res22);
+            formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:472", "res :>> ", res22);
             const { code: code22 } = res22;
             if (code22 === 200) {
               tiplists.value.setdetails({ isshow: false });
@@ -11638,7 +11834,7 @@ This will fail in production if not fixed.`);
         });
       }
       function printOrderCode(item) {
-        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:488", "item :>> ", item);
+        formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:497", "item :>> ", item);
         tiplists.value.setdetails({
           title: "生成订单编号二维码数量",
           isshow: true,
@@ -11666,8 +11862,11 @@ This will fail in production if not fixed.`);
             }
             if (!_flag)
               return tiplists.value.setdetails({ isshow: false });
+            let _isReturn = false;
             for (let i = 0; i <= _inputValue; i++) {
-              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:521", "i :>> ", i);
+              if (_isReturn)
+                return;
+              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:531", "i :>> ", i);
               let text = "! 0 200 200 330 1\r\n";
               text += "SETBOLD 2\r\n";
               text += `T 56 0 0 0 ${item.orderCode}\r
@@ -11697,12 +11896,10 @@ This will fail in production if not fixed.`);
               text += "FORM\r\n";
               text += "PRINT\r\n";
               let sylist = utils2.initbl();
-              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:543", sylist);
-              sylist.map((item2) => {
-                formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:545", item2);
-                if (item2.uuids) {
-                  utils2.getbl(item2, text);
-                }
+              formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:553", sylist);
+              utils2.getbl(bluetoothInfo.value, text).catch(() => {
+                bluetoothList.value.setdetails({ isshow: true });
+                _isReturn = true;
               });
             }
           },
@@ -11719,6 +11916,8 @@ This will fail in production if not fixed.`);
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
         const _component_up_button = vue.resolveComponent("up-button");
         const _component_tiplist = vue.resolveComponent("tiplist");
+        const _component_saomiao2 = vue.resolveComponent("saomiao2");
+        const _component_BluetoothList = vue.resolveComponent("BluetoothList");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
@@ -12062,6 +12261,17 @@ This will fail in production if not fixed.`);
               null,
               512
               /* NEED_PATCH */
+            ),
+            vue.createVNode(_component_saomiao2),
+            vue.createVNode(
+              _component_BluetoothList,
+              {
+                ref_key: "bluetoothList",
+                ref: bluetoothList
+              },
+              null,
+              512
+              /* NEED_PATCH */
             )
           ],
           64
@@ -12070,11 +12280,14 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesStockUplistStockUplist = /* @__PURE__ */ _export_sfc(_sfc_main$1c, [["__file", "D:/workSpace/logpm/pagesHome/pages/StockUplist/StockUplist.vue"]]);
-  const _sfc_main$1b = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesStockUplistStockUplist = /* @__PURE__ */ _export_sfc(_sfc_main$1d, [["__file", "D:/workSpace/logpm/pagesHome/pages/StockUplist/StockUplist.vue"]]);
+  const _sfc_main$1c = /* @__PURE__ */ vue.defineComponent({
     __name: "StockUplistScandetails",
     setup(__props) {
       const util = vue.inject("utils");
+      const bluetoothList = vue.ref(null);
+      const bluetoothStore = useBluetoothStore();
+      const { bluetoothInfo } = storeToRefs(bluetoothStore);
       let details = vue.reactive({
         dataList: [],
         stockArticleId: "",
@@ -12115,7 +12328,7 @@ This will fail in production if not fixed.`);
       onShow(() => {
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:159", code2);
+            formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:165", code2);
             details.scancode = code2;
             scandata();
           }
@@ -12160,8 +12373,13 @@ This will fail in production if not fixed.`);
               });
               return;
             }
-            deta.checklist.map((item) => {
+            if (!bluetoothInfo.value.name)
+              return bluetoothList.value.setdetails({ isshow: true });
+            let _isReturn = false;
+            deta.checklist.forEach((item) => {
               var _a, _b, _c, _d;
+              if (_isReturn)
+                return;
               let text = "! 0 200 200 330 1\r\n";
               text += "SETBOLD 2\r\n";
               text += `T 56 0 0 0 ${(_a = details.dataList[item]) == null ? void 0 : _a.orderCode}\r
@@ -12190,15 +12408,13 @@ This will fail in production if not fixed.`);
 `;
               text += "FORM\r\n";
               text += "PRINT\r\n";
-              let sylist = util.initbl();
-              formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:232", sylist);
-              sylist.map((item2) => {
-                formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:234", item2);
-                if (item2.uuids) {
-                  util.getbl(item2, text);
-                }
+              util.getbl(bluetoothInfo.value, text).catch(() => {
+                bluetoothList.value.setdetails({ isshow: true });
+                _isReturn = true;
               });
             });
+            if (_isReturn)
+              return;
             tiplists.value.setdetails({ isshow: false });
           },
           cancel: (details2) => {
@@ -12241,7 +12457,7 @@ This will fail in production if not fixed.`);
           typeService: details.typeService
         };
         let res2 = await distributionStockupstockupScan(data);
-        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:283", res2);
+        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:289", res2);
         if (res2.code == 200) {
           details.isscan = true;
           initpage();
@@ -12266,7 +12482,7 @@ This will fail in production if not fixed.`);
         let response = await distributionStockuporderInfo(data);
         if (response.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:307", response);
+        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:313", response);
         details.dataList = response.data.packageList;
         details.customer = response.data.customer;
         details.stockupArea = response.data.stockupArea;
@@ -12283,6 +12499,7 @@ This will fail in production if not fixed.`);
       return (_ctx, _cache) => {
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
         const _component_tiplist = vue.resolveComponent("tiplist");
+        const _component_BluetoothList = vue.resolveComponent("BluetoothList");
         const _component_saomiao2 = vue.resolveComponent("saomiao2");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
@@ -12445,6 +12662,16 @@ This will fail in production if not fixed.`);
               512
               /* NEED_PATCH */
             ),
+            vue.createVNode(
+              _component_BluetoothList,
+              {
+                ref_key: "bluetoothList",
+                ref: bluetoothList
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            ),
             vue.createVNode(_component_saomiao2)
           ],
           64
@@ -12453,8 +12680,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesStockUplistScandetailsStockUplistScandetails = /* @__PURE__ */ _export_sfc(_sfc_main$1b, [["__file", "D:/workSpace/logpm/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue"]]);
-  const _sfc_main$1a = {};
+  const PagesHomePagesStockUplistScandetailsStockUplistScandetails = /* @__PURE__ */ _export_sfc(_sfc_main$1c, [["__file", "D:/workSpace/logpm/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue"]]);
+  const _sfc_main$1b = {};
   function _sfc_render$e(_ctx, _cache) {
     const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
     return vue.openBlock(), vue.createElementBlock(
@@ -12476,8 +12703,8 @@ This will fail in production if not fixed.`);
       /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
     );
   }
-  const PagesHomePagesDownScanDownScan = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["render", _sfc_render$e], ["__file", "D:/workSpace/logpm/pagesHome/pages/DownScan/DownScan.vue"]]);
-  const _sfc_main$19 = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesDownScanDownScan = /* @__PURE__ */ _export_sfc(_sfc_main$1b, [["render", _sfc_render$e], ["__file", "D:/workSpace/logpm/pagesHome/pages/DownScan/DownScan.vue"]]);
+  const _sfc_main$1a = /* @__PURE__ */ vue.defineComponent({
     __name: "signinScan",
     setup(__props) {
       let details = vue.reactive({
@@ -12846,9 +13073,9 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesSigninScanSigninScan = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["__file", "D:/workSpace/logpm/pagesHome/pages/signinScan/signinScan.vue"]]);
-  const _imports_0 = "/assets/cha.b7e7843e.png";
-  const _sfc_main$18 = {
+  const PagesHomePagesSigninScanSigninScan = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["__file", "D:/workSpace/logpm/pagesHome/pages/signinScan/signinScan.vue"]]);
+  const _imports_0$1 = "/assets/cha.b7e7843e.png";
+  const _sfc_main$19 = {
     props: {
       data: {
         type: Array,
@@ -13033,7 +13260,7 @@ This will fail in production if not fixed.`);
                 key: 1,
                 class: "arrow-clear"
               }, [
-                vue.createElementVNode("image", { src: _imports_0 })
+                vue.createElementVNode("image", { src: _imports_0$1 })
               ])) : vue.createCommentVNode("v-if", true)
             ])
           ],
@@ -13096,8 +13323,8 @@ This will fail in production if not fixed.`);
       /* STYLE */
     );
   }
-  const cusSelects = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["render", _sfc_render$d], ["__scopeId", "data-v-7a3666ce"], ["__file", "D:/workSpace/logpm/compoment/cus-selects-fan/cus-selects-fan.vue"]]);
-  const _sfc_main$17 = /* @__PURE__ */ vue.defineComponent({
+  const cusSelects = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["render", _sfc_render$d], ["__scopeId", "data-v-7a3666ce"], ["__file", "D:/workSpace/logpm/compoment/cus-selects-fan/cus-selects-fan.vue"]]);
+  const _sfc_main$18 = /* @__PURE__ */ vue.defineComponent({
     __name: "SelfPScanList",
     setup(__props) {
       let details = vue.reactive({
@@ -13683,8 +13910,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesSelfPScanListSelfPScanList = /* @__PURE__ */ _export_sfc(_sfc_main$17, [["__file", "D:/workSpace/logpm/pagesHome/pages/SelfPScanList/SelfPScanList.vue"]]);
-  const _sfc_main$16 = {
+  const PagesHomePagesSelfPScanListSelfPScanList = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["__file", "D:/workSpace/logpm/pagesHome/pages/SelfPScanList/SelfPScanList.vue"]]);
+  const _sfc_main$17 = {
     name: "uniTh",
     options: {
       virtualHost: true
@@ -13859,8 +14086,8 @@ This will fail in production if not fixed.`);
       /* CLASS, STYLE */
     );
   }
-  const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["render", _sfc_render$c], ["__scopeId", "data-v-bf970acd"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-th/uni-th.vue"]]);
-  const _sfc_main$15 = {
+  const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$17, [["render", _sfc_render$c], ["__scopeId", "data-v-bf970acd"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-th/uni-th.vue"]]);
+  const _sfc_main$16 = {
     name: "TableCheckbox",
     emits: ["checkboxSelected"],
     props: {
@@ -13949,8 +14176,8 @@ This will fail in production if not fixed.`);
       ]))
     ]);
   }
-  const tableCheckbox = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["render", _sfc_render$b], ["__scopeId", "data-v-25e435b1"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-tr/table-checkbox.vue"]]);
-  const _sfc_main$14 = {
+  const tableCheckbox = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["render", _sfc_render$b], ["__scopeId", "data-v-25e435b1"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-tr/table-checkbox.vue"]]);
+  const _sfc_main$15 = {
     name: "uniTr",
     components: { tableCheckbox },
     props: {
@@ -14060,8 +14287,8 @@ This will fail in production if not fixed.`);
       vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
     ]);
   }
-  const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["render", _sfc_render$a], ["__scopeId", "data-v-b48b3e32"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-tr/uni-tr.vue"]]);
-  const _sfc_main$13 = {
+  const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["render", _sfc_render$a], ["__scopeId", "data-v-b48b3e32"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-tr/uni-tr.vue"]]);
+  const _sfc_main$14 = {
     name: "uniTd",
     options: {
       virtualHost: true
@@ -14133,8 +14360,8 @@ This will fail in production if not fixed.`);
       /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
     );
   }
-  const __easycom_3 = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["render", _sfc_render$9], ["__scopeId", "data-v-edae4802"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-td/uni-td.vue"]]);
-  const _sfc_main$12 = {
+  const __easycom_3 = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["render", _sfc_render$9], ["__scopeId", "data-v-edae4802"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-td/uni-td.vue"]]);
+  const _sfc_main$13 = {
     name: "uniTable",
     options: {
       virtualHost: true
@@ -14425,8 +14652,8 @@ This will fail in production if not fixed.`);
       /* CLASS */
     );
   }
-  const __easycom_4 = /* @__PURE__ */ _export_sfc(_sfc_main$12, [["render", _sfc_render$8], ["__scopeId", "data-v-c1ea9b5d"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-table/uni-table.vue"]]);
-  const _sfc_main$11 = /* @__PURE__ */ vue.defineComponent({
+  const __easycom_4 = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["render", _sfc_render$8], ["__scopeId", "data-v-c1ea9b5d"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-table/uni-table.vue"]]);
+  const _sfc_main$12 = /* @__PURE__ */ vue.defineComponent({
     __name: "SelfPickupDetails",
     setup(__props) {
       const utils2 = vue.inject("utils");
@@ -15054,8 +15281,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesSelfPickupDetailsSelfPickupDetails = /* @__PURE__ */ _export_sfc(_sfc_main$11, [["__file", "D:/workSpace/logpm/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue"]]);
-  const _sfc_main$10 = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesSelfPickupDetailsSelfPickupDetails = /* @__PURE__ */ _export_sfc(_sfc_main$12, [["__file", "D:/workSpace/logpm/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue"]]);
+  const _sfc_main$11 = /* @__PURE__ */ vue.defineComponent({
     __name: "LoadingDetails",
     setup(__props) {
       let details = vue.reactive({
@@ -15498,8 +15725,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesLoadingDetailsLoadingDetails = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["__file", "D:/workSpace/logpm/pagesHome/pages/LoadingDetails/LoadingDetails.vue"]]);
-  const _sfc_main$$ = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesLoadingDetailsLoadingDetails = /* @__PURE__ */ _export_sfc(_sfc_main$11, [["__file", "D:/workSpace/logpm/pagesHome/pages/LoadingDetails/LoadingDetails.vue"]]);
+  const _sfc_main$10 = /* @__PURE__ */ vue.defineComponent({
     __name: "CustomerOrdersDetails",
     setup(__props) {
       const utils2 = vue.inject("utils");
@@ -16358,8 +16585,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesCustomerOrdersDetailsCustomerOrdersDetails = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["__file", "D:/workSpace/logpm/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue"]]);
-  const _sfc_main$_ = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesCustomerOrdersDetailsCustomerOrdersDetails = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["__file", "D:/workSpace/logpm/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue"]]);
+  const _sfc_main$$ = /* @__PURE__ */ vue.defineComponent({
     __name: "DeliveryCustomerScan",
     setup(__props) {
       let details = vue.reactive({
@@ -16725,8 +16952,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesDeliveryCustomerScanDeliveryCustomerScan = /* @__PURE__ */ _export_sfc(_sfc_main$_, [["__file", "D:/workSpace/logpm/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue"]]);
-  const _sfc_main$Z = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesDeliveryCustomerScanDeliveryCustomerScan = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["__file", "D:/workSpace/logpm/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue"]]);
+  const _sfc_main$_ = /* @__PURE__ */ vue.defineComponent({
     __name: "CustomerSign",
     setup(__props) {
       let details = vue.reactive({
@@ -16790,11 +17017,6 @@ This will fail in production if not fixed.`);
           formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:173", "details.imgList :>> ", details.imgList);
         }
       }
-      function gosetorice(item) {
-        uni.navigateTo({
-          url: "/pagesHome/pages/SetPrice/SetPrice?reservationId=" + details.id + "&item=" + JSON.stringify(item)
-        });
-      }
       const signNub = vue.computed(() => {
         let num = 0;
         details.datalist.map((item) => {
@@ -17217,15 +17439,12 @@ This will fail in production if not fixed.`);
                           }, vue.toDisplayString(item.positioning == 1 ? "已打卡" : "定位打卡"), 11, ["onClick"]),
                           vue.createElementVNode("view", {
                             onClick: ($event) => gosinorderscan(item)
-                          }, "签到扫描", 8, ["onClick"]),
+                          }, "签收扫描", 8, ["onClick"]),
                           vue.createElementVNode("view", {
                             onClick: ($event) => uplodimg(item)
                           }, "上传签收图片", 8, ["onClick"])
                         ]),
-                        vue.createElementVNode("view", {
-                          onClick: ($event) => gosetorice(item),
-                          class: "mabut"
-                        }, " 设置增值服务 ", 8, ["onClick"]),
+                        vue.createCommentVNode(' <view @click="gosetorice(item)" class="mabut">\r\n						设置增值服务\r\n					</view> '),
                         vue.unref(authbuts).findIndex((val) => val.code === "127") != -1 && item.deliveryStatus != "完成配送" ? (vue.openBlock(), vue.createElementBlock("view", {
                           key: 0,
                           class: "mabut",
@@ -17256,8 +17475,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesCustomerSignCustomerSign = /* @__PURE__ */ _export_sfc(_sfc_main$Z, [["__file", "D:/workSpace/logpm/pagesHome/pages/CustomerSign/CustomerSign.vue"]]);
-  const _sfc_main$Y = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesCustomerSignCustomerSign = /* @__PURE__ */ _export_sfc(_sfc_main$_, [["__file", "D:/workSpace/logpm/pagesHome/pages/CustomerSign/CustomerSign.vue"]]);
+  const _sfc_main$Z = /* @__PURE__ */ vue.defineComponent({
     __name: "signOrderScan",
     setup(__props) {
       const utils2 = vue.inject("utils");
@@ -18049,8 +18268,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesSignOrderScanSignOrderScan = /* @__PURE__ */ _export_sfc(_sfc_main$Y, [["__scopeId", "data-v-fb393026"], ["__file", "D:/workSpace/logpm/pagesHome/pages/signOrderScan/signOrderScan.vue"]]);
-  const _sfc_main$X = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesSignOrderScanSignOrderScan = /* @__PURE__ */ _export_sfc(_sfc_main$Z, [["__scopeId", "data-v-fb393026"], ["__file", "D:/workSpace/logpm/pagesHome/pages/signOrderScan/signOrderScan.vue"]]);
+  const _sfc_main$Y = /* @__PURE__ */ vue.defineComponent({
     __name: "SignDetailScan",
     setup(__props) {
       let details = vue.reactive({
@@ -18509,10 +18728,13 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesSignDetailScanSignDetailScan = /* @__PURE__ */ _export_sfc(_sfc_main$X, [["__file", "D:/workSpace/logpm/pagesHome/pages/SignDetailScan/SignDetailScan.vue"]]);
-  const _sfc_main$W = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesSignDetailScanSignDetailScan = /* @__PURE__ */ _export_sfc(_sfc_main$Y, [["__file", "D:/workSpace/logpm/pagesHome/pages/SignDetailScan/SignDetailScan.vue"]]);
+  const _sfc_main$X = /* @__PURE__ */ vue.defineComponent({
     __name: "setbarcode",
     setup(__props) {
+      const bluetoothList = vue.ref(null);
+      const bluetoothStore = useBluetoothStore();
+      const { bluetoothInfo } = storeToRefs(bluetoothStore);
       const utils2 = vue.inject("utils");
       let details = vue.reactive({
         items: {},
@@ -18544,7 +18766,7 @@ This will fail in production if not fixed.`);
       onShow(() => {
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:101", code2);
+            formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:107", code2);
             scandata(code2);
           }
         });
@@ -18584,7 +18806,7 @@ This will fail in production if not fixed.`);
           tipstate: 1,
           placeholder: "请输入需要生成的包条码数量",
           success: (deta) => {
-            formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:161", deta);
+            formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:167", deta);
             details.packageNum = deta.inputtext;
             if (Number(details.packageNum) > Number(details.items.planNum)) {
               uni.showToast({
@@ -18615,7 +18837,7 @@ This will fail in production if not fixed.`);
         let response = await distributionStockupstockupStockListPackageCode(data);
         if (response.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:192", response);
+        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:198", response);
         details.printlist = response.data;
         let checklist = [];
         response.data.map((item, index2) => {
@@ -18636,9 +18858,42 @@ This will fail in production if not fixed.`);
               });
               return;
             }
+            if (!bluetoothInfo.value.name)
+              return bluetoothList.value.setdetails({ isshow: true });
+            let _isReturn = false;
             deta.checklist.map((item) => {
-              print(details.printlist[item]);
+              let text = "! 0 200 200 330 1\r\n";
+              text += "SETBOLD 2\r\n";
+              text += `T 56 0 0 0 ${item}\r
+`;
+              text += "LINE 0 50 420 50 3\r\n";
+              text += `T 55 0 0 60 客户\r
+`;
+              text += "LINE 40 50 40 110 3\r\n";
+              text += `T 55 0 50 60 ${details.customer}\r
+`;
+              text += "LINE 40 80 420 80 3\r\n";
+              text += `T 55 0 50 90 ${details.deliveryAddress}\r
+`;
+              text += "LINE 0 110 420 110 3\r\n";
+              text += `T 55 0 0 120 物料\r
+`;
+              text += "LINE 40 110 40 140 3\r\n";
+              text += `T 55 0 60 120 ${details.items.materialName}\r
+`;
+              text += "LINE 0 140 420 140 3\r\n";
+              text += "B QR 150 150 M 2 U 4\r\n";
+              text += `MA,${item}\r
+`;
+              text += "ENDQR\r\n";
+              text += "PRINT\r\n";
+              utils2.getbl(bluetoothInfo.value, text).catch(() => {
+                bluetoothList.value.setdetails({ isshow: true });
+                _isReturn = true;
+              });
             });
+            if (_isReturn)
+              return;
             tips2.value.setdetails({ isshow: false });
           },
           cancel: (details2) => {
@@ -18649,41 +18904,6 @@ This will fail in production if not fixed.`);
           }
         });
       }
-      function print(item) {
-        let text = "! 0 200 200 330 1\r\n";
-        text += "SETBOLD 2\r\n";
-        text += `T 56 0 0 0 ${item}\r
-`;
-        text += "LINE 0 50 420 50 3\r\n";
-        text += `T 55 0 0 60 客户\r
-`;
-        text += "LINE 40 50 40 110 3\r\n";
-        text += `T 55 0 50 60 ${details.customer}\r
-`;
-        text += "LINE 40 80 420 80 3\r\n";
-        text += `T 55 0 50 90 ${details.deliveryAddress}\r
-`;
-        text += "LINE 0 110 420 110 3\r\n";
-        text += `T 55 0 0 120 物料\r
-`;
-        text += "LINE 40 110 40 140 3\r\n";
-        text += `T 55 0 60 120 ${details.items.materialName}\r
-`;
-        text += "LINE 0 140 420 140 3\r\n";
-        text += "B QR 150 150 M 2 U 4\r\n";
-        text += `MA,${item}\r
-`;
-        text += "ENDQR\r\n";
-        text += "PRINT\r\n";
-        let sylist = utils2.initbl();
-        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:257", sylist);
-        sylist.map((item2) => {
-          formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:259", item2);
-          if (item2.uuids) {
-            utils2.getbl(item2, text);
-          }
-        });
-      }
       async function scandata(code2) {
         let data = {
           scanType: 2,
@@ -18698,7 +18918,7 @@ This will fail in production if not fixed.`);
           id: details.orderpackgedetails.stockListId
         };
         let res2 = await distributionStockupstockupScan(data);
-        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:281", res2);
+        formatAppLog("log", "at pagesHome/pages/setbarcode/setbarcode.vue:276", res2);
         if (res2.code == 200) {
           initpage();
         }
@@ -18708,6 +18928,7 @@ This will fail in production if not fixed.`);
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
         const _component_tiplist = vue.resolveComponent("tiplist");
         const _component_saomiao2 = vue.resolveComponent("saomiao2");
+        const _component_BluetoothList = vue.resolveComponent("BluetoothList");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
@@ -18865,7 +19086,17 @@ This will fail in production if not fixed.`);
               512
               /* NEED_PATCH */
             ),
-            vue.createVNode(_component_saomiao2)
+            vue.createVNode(_component_saomiao2),
+            vue.createVNode(
+              _component_BluetoothList,
+              {
+                ref_key: "bluetoothList",
+                ref: bluetoothList
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            )
           ],
           64
           /* STABLE_FRAGMENT */
@@ -18873,8 +19104,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesSetbarcodeSetbarcode = /* @__PURE__ */ _export_sfc(_sfc_main$W, [["__file", "D:/workSpace/logpm/pagesHome/pages/setbarcode/setbarcode.vue"]]);
-  const _sfc_main$V = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesSetbarcodeSetbarcode = /* @__PURE__ */ _export_sfc(_sfc_main$X, [["__file", "D:/workSpace/logpm/pagesHome/pages/setbarcode/setbarcode.vue"]]);
+  const _sfc_main$W = /* @__PURE__ */ vue.defineComponent({
     __name: "OfflineUpload",
     setup(__props) {
       const tiplists = vue.ref(null);
@@ -19015,8 +19246,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesOfflineUploadOfflineUpload = /* @__PURE__ */ _export_sfc(_sfc_main$V, [["__file", "D:/workSpace/logpm/pagesHome/pages/OfflineUpload/OfflineUpload.vue"]]);
-  const _sfc_main$U = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesOfflineUploadOfflineUpload = /* @__PURE__ */ _export_sfc(_sfc_main$W, [["__file", "D:/workSpace/logpm/pagesHome/pages/OfflineUpload/OfflineUpload.vue"]]);
+  const _sfc_main$V = /* @__PURE__ */ vue.defineComponent({
     __name: "createTask",
     setup(__props) {
       let details = vue.reactive({
@@ -19202,8 +19433,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesCreateTaskCreateTask = /* @__PURE__ */ _export_sfc(_sfc_main$U, [["__file", "D:/workSpace/logpm/pagesHome/pages/createTask/createTask.vue"]]);
-  const _sfc_main$T = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesCreateTaskCreateTask = /* @__PURE__ */ _export_sfc(_sfc_main$V, [["__file", "D:/workSpace/logpm/pagesHome/pages/createTask/createTask.vue"]]);
+  const _sfc_main$U = /* @__PURE__ */ vue.defineComponent({
     __name: "ordersorting",
     setup(__props) {
       utils.ttsspke("订单扫描");
@@ -19263,8 +19494,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesOrdersortingOrdersorting = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["__file", "D:/workSpace/logpm/pagesHome/pages/ordersorting/ordersorting.vue"]]);
-  const _sfc_main$S = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesOrdersortingOrdersorting = /* @__PURE__ */ _export_sfc(_sfc_main$U, [["__file", "D:/workSpace/logpm/pagesHome/pages/ordersorting/ordersorting.vue"]]);
+  const _sfc_main$T = /* @__PURE__ */ vue.defineComponent({
     __name: "lnventorysorting",
     setup(__props) {
       function gotourl(type) {
@@ -19313,11 +19544,16 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesLnventorysortingLnventorysorting = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["__file", "D:/workSpace/logpm/pagesHome/pages/lnventorysorting/lnventorysorting.vue"]]);
-  const _sfc_main$R = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesLnventorysortingLnventorysorting = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["__file", "D:/workSpace/logpm/pagesHome/pages/lnventorysorting/lnventorysorting.vue"]]);
+  const _sfc_main$S = /* @__PURE__ */ vue.defineComponent({
     __name: "scansorting",
     setup(__props) {
       const option = vue.reactive({
+        leftClick() {
+          uni.reLaunch({
+            url: "/pages/index/index"
+          });
+        },
         // 标题
         title: "任务列表",
         // 下拉刷新回调函数
@@ -19358,7 +19594,7 @@ This will fail in production if not fixed.`);
               title: "数据已加载完毕"
             });
           }
-          formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:153", "antiShake :>> ", antiShake);
+          formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:158", "antiShake :>> ", antiShake);
           if (antiShake) {
             uni.hideLoading();
             clearTimeout(antiShake);
@@ -19384,7 +19620,7 @@ This will fail in production if not fixed.`);
             clearTimeout(antiShake);
           }, 500);
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:186", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:191", "err :>> ", err);
         }
       }
       let details = vue.reactive({
@@ -19403,9 +19639,9 @@ This will fail in production if not fixed.`);
       onShow(() => {
         initpage();
         uni.$on("scancodedate", function(code2) {
-          formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:211", "code :>> ", code2);
+          formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:216", "code :>> ", code2);
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:213", code2);
+            formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:218", code2);
             details.scancode = code2;
             scandata();
           }
@@ -19426,7 +19662,7 @@ This will fail in production if not fixed.`);
         let res2 = await warehouseTrayTypeorderScanTrayCode(data);
         if (res2.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:234", "res", res2);
+        formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:239", "res", res2);
         if (Number(res2.data.isHasData) === 0) {
           utils.ttsspke("请选择分拣方式");
           uni.setStorageSync("trayCodeType", res2.data.data);
@@ -19455,10 +19691,10 @@ This will fail in production if not fixed.`);
             details.datalist = [...details.datalist, ...data.records];
           if (data && data.pages <= details.pageNum)
             option.isEnd = true;
-          formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:262", "details.datalist :>> ", details.datalist);
+          formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:267", "details.datalist :>> ", details.datalist);
           return res2;
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:266", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:271", "err :>> ", err);
         }
       }
       function goorderdetail(item) {
@@ -19475,7 +19711,7 @@ This will fail in production if not fixed.`);
         details.show = !details.show;
       }
       function onConfirm(e) {
-        formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:289", e);
+        formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:294", e);
         date2.value[0] = e.startDate;
         date2.value[1] = e.endDate;
         details.datatime = date2.value[0] + " 至 " + date2.value[1];
@@ -19706,8 +19942,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesScansortingScansorting = /* @__PURE__ */ _export_sfc(_sfc_main$R, [["__file", "D:/workSpace/logpm/pagesHome/pages/scansorting/scansorting.vue"]]);
-  const _sfc_main$Q = {};
+  const PagesHomePagesScansortingScansorting = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["__file", "D:/workSpace/logpm/pagesHome/pages/scansorting/scansorting.vue"]]);
+  const _sfc_main$R = {};
   function _sfc_render$7(_ctx, _cache) {
     const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
     return vue.openBlock(), vue.createElementBlock(
@@ -19730,7 +19966,7 @@ This will fail in production if not fixed.`);
       /* STABLE_FRAGMENT */
     );
   }
-  const PagesHomePagesPeopleSortingPeopleSorting = /* @__PURE__ */ _export_sfc(_sfc_main$Q, [["render", _sfc_render$7], ["__file", "D:/workSpace/logpm/pagesHome/pages/peopleSorting/peopleSorting.vue"]]);
+  const PagesHomePagesPeopleSortingPeopleSorting = /* @__PURE__ */ _export_sfc(_sfc_main$R, [["render", _sfc_render$7], ["__file", "D:/workSpace/logpm/pagesHome/pages/peopleSorting/peopleSorting.vue"]]);
   var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
   var dayjs_minExports = {};
   var dayjs_min = {
@@ -20031,7 +20267,7 @@ This will fail in production if not fixed.`);
     });
   })(dayjs_min);
   const dayjs = dayjs_minExports;
-  const _sfc_main$P = /* @__PURE__ */ vue.defineComponent({
+  const _sfc_main$Q = /* @__PURE__ */ vue.defineComponent({
     __name: "OrderSortingDetail",
     setup(__props) {
       let details = vue.reactive({
@@ -20063,12 +20299,15 @@ This will fail in production if not fixed.`);
       });
       let tip = vue.ref(null);
       const tiplists = vue.ref(null);
+      const bluetoothList = vue.ref(null);
+      const bluetoothStore = useBluetoothStore();
+      const { bluetoothInfo } = storeToRefs(bluetoothStore);
       onLoad((op) => {
         details.trayCode = op.trayCode;
         details.trayType = op.trayType;
         if (op.pageName)
           utils.ttsspke("当前打托方式为" + op.pageName);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:400", "details.trayType :>> ", details.trayType);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:405", "details.trayType :>> ", details.trayType);
         if (!op.trayType) {
           uni.showToast({
             title: "获取打托方式出错",
@@ -20079,7 +20318,7 @@ This will fail in production if not fixed.`);
       onShow(async () => {
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:411", code2);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:416", code2);
             details.scancode = code2;
             scandata();
             details.iscan = true;
@@ -20125,7 +20364,7 @@ This will fail in production if not fixed.`);
             let res2 = await warehouseTrayTypedeleteOrderCode(data);
             if (res2.code !== 200)
               return;
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:467", "res :>> ", res2);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:472", "res :>> ", res2);
             initlist();
             tip.value.setisshow(false);
           },
@@ -20173,7 +20412,7 @@ This will fail in production if not fixed.`);
               trayGoodsId: item.trayGoodsId
             };
             let res2 = await warehouseTrayTypedeleteStockByTrayGoodsId(data);
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:521", "res :>> ", res2);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:526", "res :>> ", res2);
             if (res2.code == 200) {
               initlist();
             }
@@ -20192,13 +20431,13 @@ This will fail in production if not fixed.`);
           trayCode: details.trayCode
         };
         let res2 = await warehouseTrayTypeorderScanTrayCode(data);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:541", res2.data, "resresresres");
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:546", res2.data, "resresresres");
         if (res2.code == 200) {
           if (res2.data.isHasData == 1) {
             details.detauser = res2.data.data;
             details.stock.marketId = res2.data.data.marketId;
             details.Remarktext = res2.data.data.reamrk;
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:549", " details.detauser :>> ", details.detauser);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:554", " details.detauser :>> ", details.detauser);
             if (details.tabBarState === 1)
               details.datelist = details.detauser.packageList;
             else if (details.tabBarState === 2)
@@ -20216,13 +20455,34 @@ This will fail in production if not fixed.`);
         return res2;
       }
       function scandata() {
-        if (details.tabBarState === 1)
+        if (details.scancode[0] === "T")
+          scanTray();
+        else if (details.tabBarState === 1)
           return scanOrder();
         else if (details.tabBarState === 2)
           return;
         else if (details.tabBarState === 3)
           return scanStock();
       }
+      async function scanTray() {
+        let data = {
+          trayCode: details.scancode
+        };
+        let res2 = await warehouseTrayTypeorderScanTrayCode(data);
+        if (res2.code !== 200)
+          return;
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:591", "res", res2);
+        if (Number(res2.data.isHasData) === 0) {
+          uni.setStorageSync("trayCodeType", res2.data.data);
+          uni.navigateTo({
+            url: "/pagesHome/pages/ScanSortingType/ScanSortingType?trayCode=" + details.scancode
+          });
+        } else {
+          uni.navigateTo({
+            url: "/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode=" + res2.data.data.trayCode + "&trayType=" + res2.data.data.trayType
+          });
+        }
+      }
       async function scanOrder() {
         var _a, _b;
         let submitData = {
@@ -20231,11 +20491,11 @@ This will fail in production if not fixed.`);
           orderPackageCode: details.scancode
         };
         let response = await warehouseTrayTypeorderScanOrderPackageCode(submitData);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:584", "response", response);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:616", "response", response);
         const res2 = await initlist();
         const { code: code2 } = res2;
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:588", "res :>> ", res2);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:590", "details.scancode :>> ", details.scancode);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:620", "res :>> ", res2);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:622", "details.scancode :>> ", details.scancode);
         if (code2 !== 200)
           return;
         if (((_a = details == null ? void 0 : details.detauser) == null ? void 0 : _a.trayNum) && ((_b = details == null ? void 0 : details.detauser) == null ? void 0 : _b.trayNum) > 0) {
@@ -20243,7 +20503,7 @@ This will fail in production if not fixed.`);
             utils.ttsspke(details.detauser.trayNum + "件");
           const { data: { orderCode } } = response;
           const scanOrder2 = details.datelist.find((val) => val.dataCode === orderCode);
-          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:601", "scanOrder :>> ", scanOrder2);
+          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:633", "scanOrder :>> ", scanOrder2);
           if (scanOrder2 && scanOrder2.orderTotalNum === scanOrder2.scanNum) {
             utils.ttsspke(`订单${orderCode}已齐套`);
           }
@@ -20254,7 +20514,7 @@ This will fail in production if not fixed.`);
           orderPackageCode: details.scancode
         };
         const res2 = warehouseTrayTypeenterStockNoDataMaterialCode(data);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:619", "res :>> ", res2);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:651", "res :>> ", res2);
       }
       async function setTabBarState(state) {
         details.tabBarState = state;
@@ -20269,11 +20529,11 @@ This will fail in production if not fixed.`);
         }
       }
       async function chooseMarket() {
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:642", "111 :>> ", 111);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:644", "details.datelist :>> ", details.datelist.length);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:674", "111 :>> ", 111);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:676", "details.datelist :>> ", details.datelist.length);
         if (details.datelist.length === 0) {
           const res2 = await warehouseTrayTypefindAllMarket({});
-          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:648", "res :>> ", res2);
+          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:680", "res :>> ", res2);
           if (res2.code !== 200)
             return;
           const _marketArr = res2.data;
@@ -20291,9 +20551,9 @@ This will fail in production if not fixed.`);
                   icon: "none"
                 });
               }
-              formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:667", "detail :>> ", detail);
+              formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:699", "detail :>> ", detail);
               details.stock.marketId = _marketArr[detail.checklist[0]].marketId;
-              formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:669", "_marketName :>> ", _marketArr);
+              formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:701", "_marketName :>> ", _marketArr);
               details.stock.marketName = _marketArr[detail.checklist[0]].marketName;
               tiplists.value.setdetails({ isshow: false });
             },
@@ -20357,7 +20617,7 @@ This will fail in production if not fixed.`);
         let response = await warehouseTrayTypegetZeroOrderByWaybillCode(data);
         if (response.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:744", response);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:776", response);
         details.codelist = response.data;
         details.codelist.map((item) => {
           item["number"] = 0;
@@ -20367,7 +20627,7 @@ This will fail in production if not fixed.`);
       async function confirmlist() {
         let zeroList = [];
         let isfl = false;
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:761", "details.codelist :>> ", details.codelist);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:793", "details.codelist :>> ", details.codelist);
         isfl = !details.codelist.some((item) => {
           if (item.number === 0) {
             return false;
@@ -20446,20 +20706,21 @@ This will fail in production if not fixed.`);
             }
           });
           Promise.all(PromiseArr).then((res2) => {
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:856", "res :>> ", res2);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:888", "res :>> ", res2);
             setshowstate(0);
             initlist();
             details.stock.searchStockList = [];
             details.stock.materialCode = "";
           });
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:863", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:895", "err :>> ", err);
         } finally {
           uni.hideLoading();
         }
       }
       const print = () => {
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:878", "details.detauser :>> ", details.detauser);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:909", "bluetoothList :>> ", bluetoothList);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:910", "details.detauser :>> ", details.detauser);
         tiplists.value.setdetails({
           title: "是否打印",
           isshow: true,
@@ -20470,6 +20731,8 @@ This will fail in production if not fixed.`);
           confirmTxt: "确认打印",
           isonecheck: true,
           success: () => {
+            if (!bluetoothInfo.value.name)
+              return bluetoothList.value.setdetails({ isshow: true });
             const time = dayjs().format("YYYY/MM/DD HH:mm:ss");
             const data = details.detauser;
             const _arr = [...data.packageList, ...data.zeroList, ...data.stockList];
@@ -20538,16 +20801,7 @@ This will fail in production if not fixed.`);
             text += orderListText;
             text += "FORM\r\n";
             text += "PRINT\r\n";
-            let sylist = utils.initbl();
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:982", sylist);
-            sylist.every((item) => {
-              formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:985", item);
-              if (item.uuids) {
-                utils.getbl(item, text);
-                return false;
-              }
-              return true;
-            });
+            utils.getbl(bluetoothInfo.value, text);
             tiplists.value.setdetails({ isshow: false });
           },
           cancel: (details2) => {
@@ -20558,6 +20812,12 @@ This will fail in production if not fixed.`);
           }
         });
       };
+      function backPage() {
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:1033", "111 :>> ", 111);
+        uni.redirectTo({
+          url: "/pagesHome/pages/scansorting/scansorting"
+        });
+      }
       const { datelist, detauser, showstate, waybillCode, checkinarr, Remarktext, codelist } = vue.toRefs(details);
       return (_ctx, _cache) => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -20565,6 +20825,7 @@ This will fail in production if not fixed.`);
         const _component_saomiao2 = vue.resolveComponent("saomiao2");
         const _component_tips = vue.resolveComponent("tips");
         const _component_tiplist = vue.resolveComponent("tiplist");
+        const _component_BluetoothList = vue.resolveComponent("BluetoothList");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
@@ -20573,7 +20834,8 @@ This will fail in production if not fixed.`);
             vue.createVNode(_component_u_navbar, {
               title: "扫描",
               placeholder: "",
-              autoBack: true,
+              autoBack: false,
+              onLeftClick: backPage,
               leftIconSize: "35",
               bgColor: "#d3832a",
               leftIconColor: "#ffffff",
@@ -21402,6 +21664,16 @@ This will fail in production if not fixed.`);
               null,
               512
               /* NEED_PATCH */
+            ),
+            vue.createVNode(
+              _component_BluetoothList,
+              {
+                ref_key: "bluetoothList",
+                ref: bluetoothList
+              },
+              null,
+              512
+              /* NEED_PATCH */
             )
           ],
           64
@@ -21410,8 +21682,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesOrderSortingDetailOrderSortingDetail = /* @__PURE__ */ _export_sfc(_sfc_main$P, [["__scopeId", "data-v-ca2cce65"], ["__file", "D:/workSpace/logpm/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue"]]);
-  const _sfc_main$O = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesOrderSortingDetailOrderSortingDetail = /* @__PURE__ */ _export_sfc(_sfc_main$Q, [["__scopeId", "data-v-ca2cce65"], ["__file", "D:/workSpace/logpm/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue"]]);
+  const _sfc_main$P = /* @__PURE__ */ vue.defineComponent({
     __name: "ScanSortingType",
     setup(__props) {
       let typelist = vue.ref([]);
@@ -21514,8 +21786,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesScanSortingTypeScanSortingType = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["__file", "D:/workSpace/logpm/pagesHome/pages/ScanSortingType/ScanSortingType.vue"]]);
-  const _sfc_main$N = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesScanSortingTypeScanSortingType = /* @__PURE__ */ _export_sfc(_sfc_main$P, [["__file", "D:/workSpace/logpm/pagesHome/pages/ScanSortingType/ScanSortingType.vue"]]);
+  const _sfc_main$O = /* @__PURE__ */ vue.defineComponent({
     __name: "PeopleSortingDetail",
     setup(__props) {
       let details = vue.reactive({
@@ -22105,8 +22377,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesPeopleSortingDetailPeopleSortingDetail = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__scopeId", "data-v-e9f42dec"], ["__file", "D:/workSpace/logpm/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue"]]);
-  const _sfc_main$M = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesPeopleSortingDetailPeopleSortingDetail = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["__scopeId", "data-v-e9f42dec"], ["__file", "D:/workSpace/logpm/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue"]]);
+  const _sfc_main$N = /* @__PURE__ */ vue.defineComponent({
     __name: "inventoryType",
     setup(__props) {
       let typelist = vue.ref([]);
@@ -22188,8 +22460,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesInventoryTypeInventoryType = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryType/inventoryType.vue"]]);
-  const _sfc_main$L = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesInventoryTypeInventoryType = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryType/inventoryType.vue"]]);
+  const _sfc_main$M = /* @__PURE__ */ vue.defineComponent({
     __name: "inventoryDetail",
     setup(__props) {
       let details = vue.reactive({
@@ -22398,8 +22670,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesInventoryDetailInventoryDetail = /* @__PURE__ */ _export_sfc(_sfc_main$L, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryDetail/inventoryDetail.vue"]]);
-  const _sfc_main$K = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesInventoryDetailInventoryDetail = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryDetail/inventoryDetail.vue"]]);
+  const _sfc_main$L = /* @__PURE__ */ vue.defineComponent({
     __name: "inventoryDetailList",
     setup(__props) {
       let tip = vue.ref(null);
@@ -22575,8 +22847,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesInventoryDetailListInventoryDetailList = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryDetailList/inventoryDetailList.vue"]]);
-  const _sfc_main$J = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesInventoryDetailListInventoryDetailList = /* @__PURE__ */ _export_sfc(_sfc_main$L, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryDetailList/inventoryDetailList.vue"]]);
+  const _sfc_main$K = /* @__PURE__ */ vue.defineComponent({
     __name: "inventoryenter",
     setup(__props) {
       const tip = vue.ref(null);
@@ -23178,8 +23450,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesInventoryenterInventoryenter = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryenter/inventoryenter.vue"]]);
-  const _sfc_main$I = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesInventoryenterInventoryenter = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryenter/inventoryenter.vue"]]);
+  const _sfc_main$J = /* @__PURE__ */ vue.defineComponent({
     __name: "lnventorysortinglist",
     setup(__props) {
       const option = vue.reactive({
@@ -23549,8 +23821,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesLnventorysortinglistLnventorysortinglist = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["__file", "D:/workSpace/logpm/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue"]]);
-  const _sfc_main$H = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesLnventorysortinglistLnventorysortinglist = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__file", "D:/workSpace/logpm/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue"]]);
+  const _sfc_main$I = /* @__PURE__ */ vue.defineComponent({
     __name: "OrderSortingDetailList",
     setup(__props) {
       let tip = vue.ref(null);
@@ -24021,8 +24293,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesOrderSortingDetailListOrderSortingDetailList = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["__file", "D:/workSpace/logpm/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue"]]);
-  const _sfc_main$G = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesOrderSortingDetailListOrderSortingDetailList = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["__file", "D:/workSpace/logpm/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue"]]);
+  const _sfc_main$H = /* @__PURE__ */ vue.defineComponent({
     __name: "ScanUpType",
     setup(__props) {
       let typelist = vue.ref([]);
@@ -24098,8 +24370,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesScanUpTypeScanUpType = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__file", "D:/workSpace/logpm/pagesHome/pages/ScanUpType/ScanUpType.vue"]]);
-  const _sfc_main$F = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesScanUpTypeScanUpType = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["__file", "D:/workSpace/logpm/pagesHome/pages/ScanUpType/ScanUpType.vue"]]);
+  const _sfc_main$G = /* @__PURE__ */ vue.defineComponent({
     __name: "ScanUp",
     setup(__props) {
       const utils2 = vue.inject("utils");
@@ -24157,11 +24429,21 @@ This will fail in production if not fixed.`);
       async function scandata() {
         var _a;
         if (!details.allocationId) {
+          formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:270", "details.scancode[0] :>> ", details.scancode[0]);
+          if (details.scancode[0] === "T") {
+            uni.showToast({
+              title: "请扫描库位码",
+              icon: "none"
+            });
+            utils2.ttsspke("请扫描库位码");
+            return;
+          }
+          formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:281", "111 :>> ", 111);
           let data = {
             allocationId: details.scancode
           };
           let res2 = await warehouseUpdownTypeupShelfScanAllocation(data);
-          formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:274", res2);
+          formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:286", res2);
           if (res2.code == 200) {
             details.reqobj = res2.data;
             const _positionArr = details.reqobj.allocationTitle.split("-");
@@ -24188,7 +24470,7 @@ This will fail in production if not fixed.`);
             code: details.scancode
           };
           let res2 = await warehouseUpdownTypeupShelfScanGoods(data);
-          formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:308", "res>>>>>", res2);
+          formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:320", "res>>>>>", res2);
           if (res2.code == 200) {
             if (Number(details.upshelfScanType) !== 3) {
               const _uplistarr = details.uplistarr;
@@ -24767,8 +25049,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesScanUpScanUp = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["__file", "D:/workSpace/logpm/pagesHome/pages/ScanUp/ScanUp.vue"]]);
-  const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesScanUpScanUp = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__file", "D:/workSpace/logpm/pagesHome/pages/ScanUp/ScanUp.vue"]]);
+  const _sfc_main$F = /* @__PURE__ */ vue.defineComponent({
     __name: "RelocationType",
     setup(__props) {
       utils.ttsspke("请选择移库方式");
@@ -24856,8 +25138,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesRelocationTypeRelocationType = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["__file", "D:/workSpace/logpm/pagesHome/pages/RelocationType/RelocationType.vue"]]);
-  const _sfc_main$D = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesRelocationTypeRelocationType = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["__file", "D:/workSpace/logpm/pagesHome/pages/RelocationType/RelocationType.vue"]]);
+  const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
     __name: "Relocation",
     setup(__props) {
       const tip = vue.ref(null);
@@ -24928,11 +25210,19 @@ This will fail in production if not fixed.`);
       async function scandata() {
         let res2 = null;
         if (!details.allocationId) {
+          if (details.scancode[0] === "T") {
+            uni.showToast({
+              title: "请扫描库位码",
+              icon: "none"
+            });
+            utils.ttsspke("请扫描库位码");
+            return;
+          }
           let data = {
             allocationId: details.scancode
           };
           res2 = await warehouseUpdownTypemoveAllocationScanTarget(data);
-          formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:349", "res1 :>> ", res2);
+          formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:359", "res1 :>> ", res2);
           if (res2.code == 200) {
             details.dtilobj = res2.data;
             details.allocationId = res2.data.allocationId;
@@ -24963,7 +25253,7 @@ This will fail in production if not fixed.`);
               trayCode: details.scancode
             };
             res2 = await warehouseUpdownTypemoveAllocationScanTrayCode(data);
-            formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:386", "res :>> ", res2);
+            formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:396", "res :>> ", res2);
             if (res2.code !== 200)
               return;
             details.trayCode = details.scancode;
@@ -24976,14 +25266,14 @@ This will fail in production if not fixed.`);
               orderPackageCode: details.scancode
             };
             res2 = await warehouseUpdownTypemoveAllocationScanPackage(data);
-            formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:400", "res :>> ", res2);
+            formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:410", "res :>> ", res2);
             if (res2.code == 200) {
               details.scanlist.push(res2.data);
               utils.ttsspke(details.scanlist.length + "件");
             }
           }
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:411", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:421", "err :>> ", err);
         }
       }
       async function uplist() {
@@ -25007,7 +25297,7 @@ This will fail in production if not fixed.`);
         }
         uni.hideLoading();
         if (res2.code == 200) {
-          formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:436", "res :>> ", res2);
+          formatAppLog("log", "at pagesHome/pages/Relocation/Relocation.vue:446", "res :>> ", res2);
           uni.showToast({
             title: "移库成功",
             icon: "success"
@@ -25589,8 +25879,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesRelocationRelocation = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__file", "D:/workSpace/logpm/pagesHome/pages/Relocation/Relocation.vue"]]);
-  const _sfc_main$C = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesRelocationRelocation = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["__file", "D:/workSpace/logpm/pagesHome/pages/Relocation/Relocation.vue"]]);
+  const _sfc_main$D = /* @__PURE__ */ vue.defineComponent({
     __name: "PeopleScanUpType",
     setup(__props) {
       let typelist = vue.ref([]);
@@ -25660,8 +25950,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesPeopleScanUpTypePeopleScanUpType = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["__file", "D:/workSpace/logpm/pagesHome/pages/PeopleScanUpType/PeopleScanUpType.vue"]]);
-  const _sfc_main$B = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesPeopleScanUpTypePeopleScanUpType = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__file", "D:/workSpace/logpm/pagesHome/pages/PeopleScanUpType/PeopleScanUpType.vue"]]);
+  const _sfc_main$C = /* @__PURE__ */ vue.defineComponent({
     __name: "PeopleScanUp",
     setup(__props) {
       const tip = vue.ref(null);
@@ -25818,18 +26108,26 @@ This will fail in production if not fixed.`);
       }
       async function scandata() {
         var _a;
+        if (details.scancode[0] === "T") {
+          uni.showToast({
+            title: "请扫描库位码",
+            icon: "none"
+          });
+          utils.ttsspke("请扫描库位码");
+          return;
+        }
         let data = {
           allocationId: details.scancode
         };
         let res2 = await warehouseUpdownTypeupShelfScanAllocation(data);
-        formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:532", res2);
+        formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:542", res2);
         if (res2.code == 200) {
           details.reqobj = res2.data;
           const _positionArr = details.reqobj.allocationTitle.split("-");
           details.reqobj.positionInfo = _positionArr[0] + "层" + _positionArr[1] + "列";
           details.allocationId = res2.data.allocationId;
           details.datalist = ((_a = res2.data) == null ? void 0 : _a.list) || [];
-          formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:540", "details.pageName.slice(0, details.pageName.length - 3) :>> ", details.pageName);
+          formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:550", "details.pageName.slice(0, details.pageName.length - 3) :>> ", details.pageName);
           utils.ttsspke("请输入" + details.pageName.slice(0, details.pageName.length - 2));
         } else {
           uni.showToast({
@@ -25890,6 +26188,7 @@ This will fail in production if not fixed.`);
               res2 = await warehouseUpdownTypeupShelfStockList(data);
             }
             uni.hideLoading();
+            formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:621", "res上架 :>> ", res2);
             if (res2.code == 200) {
               uni.showToast({
                 title: "上架成功",
@@ -25949,7 +26248,7 @@ This will fail in production if not fixed.`);
       }
       let isClick = null;
       function inputNum(item) {
-        formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:674", "item :>> ", item);
+        formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:684", "item :>> ", item);
         if (isClick)
           clearTimeout(isClick);
         isClick = setTimeout(() => {
@@ -26786,8 +27085,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesPeopleScanUpPeopleScanUp = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["__file", "D:/workSpace/logpm/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue"]]);
-  const _sfc_main$A = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesPeopleScanUpPeopleScanUp = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["__file", "D:/workSpace/logpm/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue"]]);
+  const _sfc_main$B = /* @__PURE__ */ vue.defineComponent({
     __name: "PickingScanList",
     setup(__props) {
       const { userInfo } = storeToRefs(useUserStore());
@@ -27089,8 +27388,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesPickingScanListPickingScanList = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["__file", "D:/workSpace/logpm/pagesHome/pages/PickingScanList/PickingScanList.vue"]]);
-  const _sfc_main$z = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesPickingScanListPickingScanList = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["__file", "D:/workSpace/logpm/pagesHome/pages/PickingScanList/PickingScanList.vue"]]);
+  const _sfc_main$A = /* @__PURE__ */ vue.defineComponent({
     __name: "Retention",
     setup(__props) {
       const details = vue.reactive({
@@ -27245,8 +27544,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesRetentionRetention = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__file", "D:/workSpace/logpm/pagesHome/pages/Retention/Retention.vue"]]);
-  const _sfc_main$y = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesRetentionRetention = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["__file", "D:/workSpace/logpm/pagesHome/pages/Retention/Retention.vue"]]);
+  const _sfc_main$z = /* @__PURE__ */ vue.defineComponent({
     __name: "MergeTray",
     setup(__props) {
       const tip = vue.ref(null);
@@ -27730,8 +28029,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesMergeTrayMergeTray = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__file", "D:/workSpace/logpm/pagesHome/pages/MergeTray/MergeTray.vue"]]);
-  const _sfc_main$x = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesMergeTrayMergeTray = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__file", "D:/workSpace/logpm/pagesHome/pages/MergeTray/MergeTray.vue"]]);
+  const _sfc_main$y = /* @__PURE__ */ vue.defineComponent({
     __name: "MergeTrayDetails",
     setup(__props) {
       let trayCode = vue.ref("");
@@ -28027,8 +28326,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesMergeTrayDetailsMergeTrayDetails = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__file", "D:/workSpace/logpm/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue"]]);
-  const _sfc_main$w = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesMergeTrayDetailsMergeTrayDetails = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__file", "D:/workSpace/logpm/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue"]]);
+  const _sfc_main$x = /* @__PURE__ */ vue.defineComponent({
     __name: "DownGoodsType",
     setup(__props) {
       let typelist = vue.ref([]);
@@ -28099,8 +28398,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesDownGoodsTypeDownGoodsType = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["__file", "D:/workSpace/logpm/pagesHome/pages/DownGoodsType/DownGoodsType.vue"]]);
-  const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesDownGoodsTypeDownGoodsType = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__file", "D:/workSpace/logpm/pagesHome/pages/DownGoodsType/DownGoodsType.vue"]]);
+  const _sfc_main$w = /* @__PURE__ */ vue.defineComponent({
     __name: "DownGoods",
     setup(__props) {
       const tiplists = vue.ref(null);
@@ -29234,8 +29533,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesDownGoodsDownGoods = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__file", "D:/workSpace/logpm/pagesHome/pages/DownGoods/DownGoods.vue"]]);
-  const _sfc_main$u = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesDownGoodsDownGoods = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["__file", "D:/workSpace/logpm/pagesHome/pages/DownGoods/DownGoods.vue"]]);
+  const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
     __name: "SetPrice",
     setup(__props) {
       let details = vue.reactive({
@@ -29535,8 +29834,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesSetPriceSetPrice = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__file", "D:/workSpace/logpm/pagesHome/pages/SetPrice/SetPrice.vue"]]);
-  const _sfc_main$t = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesSetPriceSetPrice = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__file", "D:/workSpace/logpm/pagesHome/pages/SetPrice/SetPrice.vue"]]);
+  const _sfc_main$u = /* @__PURE__ */ vue.defineComponent({
     __name: "RemoveTray",
     setup(__props) {
       const tip = vue.ref(null);
@@ -30020,8 +30319,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesRemoveTrayRemoveTray = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-8dd39525"], ["__file", "D:/workSpace/logpm/pagesHome/pages/RemoveTray/RemoveTray.vue"]]);
-  const _sfc_main$s = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesRemoveTrayRemoveTray = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-8dd39525"], ["__file", "D:/workSpace/logpm/pagesHome/pages/RemoveTray/RemoveTray.vue"]]);
+  const _sfc_main$t = /* @__PURE__ */ vue.defineComponent({
     __name: "Check",
     setup(__props) {
       vue.reactive({});
@@ -30039,8 +30338,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesCheckCheck = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__file", "D:/workSpace/logpm/pagesHome/pages/Check/Check.vue"]]);
-  const _sfc_main$r = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesCheckCheck = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__file", "D:/workSpace/logpm/pagesHome/pages/Check/Check.vue"]]);
+  const _sfc_main$s = /* @__PURE__ */ vue.defineComponent({
     __name: "createAddServe",
     setup(__props) {
       const tiplists = vue.ref(null);
@@ -30643,8 +30942,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesCreateAddServeCreateAddServe = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-fee6bcca"], ["__file", "D:/workSpace/logpm/pagesHome/pages/createAddServe/createAddServe.vue"]]);
-  const _sfc_main$q = {};
+  const PagesHomePagesCreateAddServeCreateAddServe = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-fee6bcca"], ["__file", "D:/workSpace/logpm/pagesHome/pages/createAddServe/createAddServe.vue"]]);
+  const _sfc_main$r = {};
   function _sfc_render$6(_ctx, _cache) {
     const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
     return vue.openBlock(), vue.createBlock(_component_u_navbar, {
@@ -30657,8 +30956,8 @@ This will fail in production if not fixed.`);
       leftIconSize: "35"
     });
   }
-  const PagesHomePagesOrderDetailOrderDetail = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_render$6], ["__file", "D:/workSpace/logpm/pagesHome/pages/orderDetail/orderDetail.vue"]]);
-  const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesOrderDetailOrderDetail = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["render", _sfc_render$6], ["__file", "D:/workSpace/logpm/pagesHome/pages/orderDetail/orderDetail.vue"]]);
+  const _sfc_main$q = /* @__PURE__ */ vue.defineComponent({
     __name: "RelocationAllocationId",
     setup(__props) {
       const tip = vue.ref(null);
@@ -30719,6 +31018,14 @@ This will fail in production if not fixed.`);
       });
       async function scandata(flg, type) {
         let res2 = null;
+        if (details.scancode[0] === "T") {
+          uni.showToast({
+            title: "请扫描库位码",
+            icon: "none"
+          });
+          utils.ttsspke("请扫描库位码");
+          return;
+        }
         if (flg) {
           if (type == 1) {
             let data = {
@@ -30753,7 +31060,7 @@ This will fail in production if not fixed.`);
             details.dtilobj = res2.data;
             details.allocationId = res2.data.allocationId;
             details.scanlist = res2.data.list;
-            formatAppLog("log", "at pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue:311", "res1 :>> ", res2);
+            formatAppLog("log", "at pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue:321", "res1 :>> ", res2);
           }
           return;
         } else {
@@ -30764,7 +31071,7 @@ This will fail in production if not fixed.`);
           if (res2.code == 200) {
             details.targetAllocationId = res2.data.allocationId;
             details.obldate = res2.data;
-            formatAppLog("log", "at pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue:323", "res2 :>> ", res2);
+            formatAppLog("log", "at pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue:333", "res2 :>> ", res2);
           }
         }
       }
@@ -31217,8 +31524,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesRelocationAllocationIdRelocationAllocationId = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__file", "D:/workSpace/logpm/pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue"]]);
-  const _sfc_main$o = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesRelocationAllocationIdRelocationAllocationId = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["__file", "D:/workSpace/logpm/pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue"]]);
+  const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
     __name: "orderDetails",
     setup(__props) {
       let tip = vue.ref(null);
@@ -31486,7 +31793,7 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesOrderDetailsOrderDetails = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["__file", "D:/workSpace/logpm/pagesHome/pages/orderDetails/orderDetails.vue"]]);
+  const PagesHomePagesOrderDetailsOrderDetails = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__file", "D:/workSpace/logpm/pagesHome/pages/orderDetails/orderDetails.vue"]]);
   const props$2 = {
     props: {
       // checkbox的名称
@@ -31556,7 +31863,7 @@ This will fail in production if not fixed.`);
       }
     }
   };
-  const _sfc_main$n = {
+  const _sfc_main$o = {
     name: "u-checkbox",
     mixins: [mpMixin$1, mixin$1, props$2],
     data() {
@@ -31767,7 +32074,7 @@ This will fail in production if not fixed.`);
       /* CLASS, STYLE */
     );
   }
-  const __easycom_1 = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$5], ["__scopeId", "data-v-41713600"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-checkbox/u-checkbox.vue"]]);
+  const __easycom_1 = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["render", _sfc_render$5], ["__scopeId", "data-v-41713600"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-checkbox/u-checkbox.vue"]]);
   const props$1 = {
     props: {
       // 标识符
@@ -31847,7 +32154,7 @@ This will fail in production if not fixed.`);
       }
     }
   };
-  const _sfc_main$m = {
+  const _sfc_main$n = {
     name: "u-checkbox-group",
     mixins: [mpMixin$1, mixin$1, props$1],
     computed: {
@@ -31919,13 +32226,16 @@ This will fail in production if not fixed.`);
       /* CLASS */
     );
   }
-  const __easycom_2 = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["render", _sfc_render$4], ["__scopeId", "data-v-ff0492f0"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-checkbox-group/u-checkbox-group.vue"]]);
-  const _sfc_main$l = /* @__PURE__ */ vue.defineComponent({
+  const __easycom_2 = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$4], ["__scopeId", "data-v-ff0492f0"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-checkbox-group/u-checkbox-group.vue"]]);
+  const _sfc_main$m = /* @__PURE__ */ vue.defineComponent({
     __name: "orderInquiry",
     setup(__props) {
-      const isShowTypeList = vue.ref(false);
-      const isShowOrderList = vue.ref(false);
-      const distributionOrderList = vue.shallowRef([]);
+      const bluetoothList = vue.ref(null);
+      const bluetoothStore = useBluetoothStore();
+      const { bluetoothInfo } = storeToRefs(bluetoothStore);
+      vue.ref(false);
+      vue.ref(false);
+      vue.shallowRef([]);
       const dataInfo = vue.shallowRef({});
       const packageList = vue.ref([]);
       let checkboxValue = vue.reactive([]);
@@ -31938,6 +32248,8 @@ This will fail in production if not fixed.`);
         "20": "已入库",
         "30": "部分出库",
         "40": "已出库",
+        "50": "部分装车",
+        "60": "已装车",
         "70": "部分签收",
         "80": "已签收"
       });
@@ -31963,6 +32275,7 @@ This will fail in production if not fixed.`);
         uni.$on("scancodedate", function(code2) {
           if (code2) {
             scancode.value = code2;
+            scandata();
           }
         });
       });
@@ -31970,25 +32283,16 @@ This will fail in production if not fixed.`);
         uni.$off("scancodedate");
       });
       onPullDownRefresh(() => {
-        const timer2 = setTimeout(() => {
+        const timer = setTimeout(() => {
           dataInfo.value = {};
           scancode.value = "";
           packageList.value = [];
           uni.stopPullDownRefresh();
-          clearTimeout(timer2);
+          clearTimeout(timer);
         }, 500);
       });
-      function handleSearchFormType(type) {
-        searchForm.type = type;
-        isShowTypeList.value = !isShowTypeList.value;
-      }
-      function showTypeList() {
-        isShowTypeList.value = !isShowTypeList.value;
-      }
-      async function handleSearchOrder(order) {
-        scancode.value = order;
-        isShowOrderList.value = false;
-        distributionOrderList.value = [];
+      async function scandata() {
+        searchForm.condition = scancode.value;
         const res2 = await distributionOrderInfoInQuery(searchForm);
         const { code: code2, data } = res2;
         if (code2 === 200) {
@@ -32009,7 +32313,7 @@ This will fail in production if not fixed.`);
           if (val.id === item.id)
             val.isChecked = !val.isChecked;
         });
-        formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:292", packageList.value);
+        formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:324", packageList.value);
       };
       function batchOperationBtn() {
         isBatchOperation.value = true;
@@ -32036,7 +32340,7 @@ This will fail in production if not fixed.`);
         const { code: code2, data } = res2;
         if (code2 !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:324", "res :>> ", res2);
+        formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:356", "res :>> ", res2);
         tiplists.value.setdetails({
           title: "请选择需要打印的包条码",
           isshow: true,
@@ -32046,8 +32350,13 @@ This will fail in production if not fixed.`);
           confirmTxt: "确认选择",
           isonecheck: true,
           success: () => {
-            formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:341", "data :>> ", data);
+            formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:373", "data :>> ", data);
+            if (!bluetoothInfo.value.name)
+              return bluetoothList.value.setdetails({ isshow: true });
+            let _isReturn = false;
             data.map((item) => {
+              if (_isReturn)
+                return;
               let text = "! 0 200 200 330 1\r\n";
               text += "SETBOLD 1\r\n";
               text += `T 56 0 0 0 ${item.orderCode}\r
@@ -32076,15 +32385,13 @@ This will fail in production if not fixed.`);
 `;
               text += "FORM\r\n";
               text += "PRINT\r\n";
-              let sylist = utils.initbl();
-              formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:365", sylist);
-              sylist.map((item2) => {
-                formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:367", item2);
-                if (item2.uuids) {
-                  utils.getbl(item2, text);
-                }
+              utils.getbl(bluetoothInfo.value, text).catch(() => {
+                bluetoothList.value.setdetails({ isshow: true });
+                _isReturn = true;
               });
             });
+            if (_isReturn)
+              return;
             tiplists.value.setdetails({ isshow: false });
           },
           cancel: (details) => {
@@ -32095,31 +32402,13 @@ This will fail in production if not fixed.`);
           }
         });
       }
-      let timer;
-      vue.watch([scancode], (newVal, oldVal) => {
-        formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:389", "newVal :>> ", newVal);
-        if (newVal[0] === oldVal[0])
-          return;
-        if (timer)
-          clearTimeout(timer);
-        timer = setTimeout(async () => {
-          searchForm.condition = scancode.value;
-          let res2 = await distributionOrderInFuzzyQuery(searchForm);
-          isShowOrderList.value = true;
-          const { code: code2, data } = res2;
-          formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:400", "res :>> ", res2);
-          if (code2 === 200) {
-            distributionOrderList.value = data;
-          }
-          clearTimeout(timer);
-        }, 1e3);
-      });
       return (_ctx, _cache) => {
         const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
         const _component_u_checkbox = resolveEasycom(vue.resolveDynamicComponent("u-checkbox"), __easycom_1);
         const _component_u_checkbox_group = resolveEasycom(vue.resolveDynamicComponent("u-checkbox-group"), __easycom_2);
         const _component_tiplist = vue.resolveComponent("tiplist");
         const _component_saomiao2 = vue.resolveComponent("saomiao2");
+        const _component_BluetoothList = vue.resolveComponent("BluetoothList");
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
@@ -32152,63 +32441,32 @@ This will fail in production if not fixed.`);
                     [vue.vModelText, scancode.value]
                   ]),
                   vue.createCommentVNode(" 搜索结果列表 "),
-                  isShowOrderList.value ? (vue.openBlock(), vue.createElementBlock("view", {
-                    key: 0,
-                    class: "searchResultList"
-                  }, [
-                    (vue.openBlock(true), vue.createElementBlock(
-                      vue.Fragment,
-                      null,
-                      vue.renderList(vue.unref(distributionOrderList), (item) => {
-                        return vue.openBlock(), vue.createElementBlock("view", {
-                          key: item,
-                          onClick: ($event) => handleSearchOrder(item)
-                        }, vue.toDisplayString(item), 9, ["onClick"]);
-                      }),
-                      128
-                      /* KEYED_FRAGMENT */
-                    ))
-                  ])) : vue.createCommentVNode("v-if", true)
+                  vue.createCommentVNode(' 		<view class="searchResultList" v-if="isShowOrderList">\r\n					<view v-for="item in distributionOrderList" :key="item" @click="handleSearchOrder(item)">\r\n						{{item}}\r\n					</view>\r\n				</view> ')
                 ]),
                 vue.createElementVNode("view", { class: "search" }, [
-                  vue.createElementVNode(
-                    "view",
-                    {
-                      class: "searchType",
-                      onClick: showTypeList
-                    },
-                    vue.toDisplayString(searchForm.searchTypeList.find((item) => item.type === searchForm.type).label),
-                    1
-                    /* TEXT */
-                  ),
+                  vue.createElementVNode("view", {
+                    class: "searchType",
+                    onClick: scandata
+                  }, " 搜索 "),
+                  vue.createCommentVNode(' <view class="searchType" @click="showTypeList">\r\n					{{searchForm.searchTypeList.find((item)=> item.type === searchForm.type).label}}\r\n				</view> '),
                   vue.createCommentVNode(" 搜索类型列表 "),
-                  isShowTypeList.value ? (vue.openBlock(), vue.createElementBlock("view", {
-                    key: 0,
-                    class: "searchResultList"
-                  }, [
-                    vue.createElementVNode("view", null, [
-                      (vue.openBlock(true), vue.createElementBlock(
-                        vue.Fragment,
-                        null,
-                        vue.renderList(searchForm.searchTypeList, (value) => {
-                          return vue.openBlock(), vue.createElementBlock("view", {
-                            key: value.label,
-                            onClick: ($event) => handleSearchFormType(value.type)
-                          }, vue.toDisplayString(value.label), 9, ["onClick"]);
-                        }),
-                        128
-                        /* KEYED_FRAGMENT */
-                      ))
-                    ])
-                  ])) : vue.createCommentVNode("v-if", true)
+                  vue.createCommentVNode(' 		<view class="searchResultList" v-if="isShowTypeList">\r\n					<view>\r\n						<view v-for="value in searchForm.searchTypeList" :key="value.label"\r\n							@click="handleSearchFormType(value.type)">{{value.label}}</view>\r\n					</view>\r\n				</view> ')
                 ])
               ]),
               vue.createCommentVNode(" 数据详情 "),
               vue.createElementVNode("view", { class: "dataInfo" }, [
+                vue.createElementVNode("view", { class: "dataInfo__item" }, [
+                  vue.createElementVNode("text", { class: "label" }, "订单码:"),
+                  vue.createTextVNode(
+                    vue.toDisplayString(vue.unref(dataInfo).orderCode),
+                    1
+                    /* TEXT */
+                  )
+                ]),
                 vue.createElementVNode("view", { class: "dataInfo__item" }, [
                   vue.createElementVNode("text", { class: "label" }, "订单状态:"),
                   vue.createTextVNode(
-                    vue.toDisplayString(orderStateDictionaries[vue.unref(dataInfo).orderCode] || ""),
+                    vue.toDisplayString(orderStateDictionaries[vue.unref(dataInfo).orderStatus] || ""),
                     1
                     /* TEXT */
                   )
@@ -32233,6 +32491,16 @@ This will fail in production if not fixed.`);
                     /* TEXT */
                   )
                 ]),
+                vue.createElementVNode("view", { class: "dataInfo__item" }, [
+                  vue.createElementVNode("text", { class: "label" }, "商场收货人:"),
+                  vue.createElementVNode(
+                    "text",
+                    null,
+                    vue.toDisplayString(vue.unref(dataInfo).consigneePerson || ""),
+                    1
+                    /* TEXT */
+                  )
+                ]),
                 vue.createElementVNode("view", { class: "dataInfo__item" }, [
                   vue.createElementVNode("text", { class: "label" }, "商场电话:"),
                   vue.createElementVNode(
@@ -32248,7 +32516,7 @@ This will fail in production if not fixed.`);
                   vue.createElementVNode(
                     "text",
                     null,
-                    vue.toDisplayString(vue.unref(dataInfo).consigneePerson || ""),
+                    vue.toDisplayString(vue.unref(dataInfo).customerName || ""),
                     1
                     /* TEXT */
                   )
@@ -32277,7 +32545,7 @@ This will fail in production if not fixed.`);
                     /* TEXT */
                   )
                 ]),
-                vue.createElementVNode("view", null, [
+                vue.createElementVNode("view", { class: "dataInfo__item" }, [
                   vue.createElementVNode("view", { class: "label" }, "收货地址:"),
                   vue.createElementVNode(
                     "view",
@@ -32368,61 +32636,67 @@ This will fail in production if not fixed.`);
                         vue.Fragment,
                         null,
                         vue.renderList(packageList.value, (item) => {
-                          return vue.openBlock(), vue.createElementBlock("view", {
-                            class: "packagesList__item",
-                            key: item.orderPackageCode
-                          }, [
-                            vue.createElementVNode("view", null, [
-                              vue.createVNode(_component_u_checkbox, {
-                                name: item.id,
-                                checked: item.isChecked,
-                                onChange: ($event) => checkboxChange(item),
-                                size: "18px"
-                              }, null, 8, ["name", "checked", "onChange"])
-                            ]),
-                            vue.createElementVNode(
-                              "text",
-                              null,
-                              vue.toDisplayString(item.orderPackageCode),
-                              1
-                              /* TEXT */
-                            ),
-                            vue.createElementVNode(
-                              "text",
-                              null,
-                              vue.toDisplayString(item.warehouse),
-                              1
-                              /* TEXT */
-                            ),
-                            vue.createElementVNode(
-                              "text",
-                              null,
-                              vue.toDisplayString(item.thirdProduct),
-                              1
-                              /* TEXT */
-                            ),
-                            vue.createElementVNode(
-                              "text",
-                              null,
-                              vue.toDisplayString(item.pallet),
-                              1
-                              /* TEXT */
-                            ),
-                            vue.createElementVNode(
-                              "text",
-                              null,
-                              vue.toDisplayString(item.materialName),
-                              1
-                              /* TEXT */
-                            ),
-                            vue.createElementVNode(
-                              "text",
-                              null,
-                              vue.toDisplayString(item.orderPackageStatus === "70" ? "已签" : "未签"),
-                              1
-                              /* TEXT */
-                            )
-                          ]);
+                          return vue.openBlock(), vue.createElementBlock(
+                            "view",
+                            {
+                              class: vue.normalizeClass({ "packagesList__item": true, "active": item.orderPackageCode === scancode.value }),
+                              key: item.orderPackageCode
+                            },
+                            [
+                              vue.createElementVNode("view", null, [
+                                vue.createVNode(_component_u_checkbox, {
+                                  name: item.id,
+                                  checked: item.isChecked,
+                                  onChange: ($event) => checkboxChange(item),
+                                  size: "18px"
+                                }, null, 8, ["name", "checked", "onChange"])
+                              ]),
+                              vue.createElementVNode(
+                                "text",
+                                null,
+                                vue.toDisplayString(item.orderPackageCode),
+                                1
+                                /* TEXT */
+                              ),
+                              vue.createElementVNode(
+                                "text",
+                                null,
+                                vue.toDisplayString(item.warehouse),
+                                1
+                                /* TEXT */
+                              ),
+                              vue.createElementVNode(
+                                "text",
+                                null,
+                                vue.toDisplayString(item.thirdProduct),
+                                1
+                                /* TEXT */
+                              ),
+                              vue.createElementVNode(
+                                "text",
+                                null,
+                                vue.toDisplayString(item.pallet),
+                                1
+                                /* TEXT */
+                              ),
+                              vue.createElementVNode(
+                                "text",
+                                null,
+                                vue.toDisplayString(item.materialName),
+                                1
+                                /* TEXT */
+                              ),
+                              vue.createElementVNode(
+                                "text",
+                                null,
+                                vue.toDisplayString(item.orderPackageStatus === "70" ? "已签" : "未签"),
+                                1
+                                /* TEXT */
+                              )
+                            ],
+                            2
+                            /* CLASS */
+                          );
                         }),
                         128
                         /* KEYED_FRAGMENT */
@@ -32502,7 +32776,17 @@ This will fail in production if not fixed.`);
               512
               /* NEED_PATCH */
             ),
-            vue.createVNode(_component_saomiao2)
+            vue.createVNode(_component_saomiao2),
+            vue.createVNode(
+              _component_BluetoothList,
+              {
+                ref_key: "bluetoothList",
+                ref: bluetoothList
+              },
+              null,
+              512
+              /* NEED_PATCH */
+            )
           ],
           64
           /* STABLE_FRAGMENT */
@@ -32510,8 +32794,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesOrderInquiryOrderInquiry = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__scopeId", "data-v-e1375c52"], ["__file", "D:/workSpace/logpm/pagesHome/pages/orderInquiry/orderInquiry.vue"]]);
-  const _sfc_main$k = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesOrderInquiryOrderInquiry = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-e1375c52"], ["__file", "D:/workSpace/logpm/pagesHome/pages/orderInquiry/orderInquiry.vue"]]);
+  const _sfc_main$l = /* @__PURE__ */ vue.defineComponent({
     __name: "CustomerTrayDetails",
     setup(__props) {
       const utils2 = vue.inject("utils");
@@ -32615,22 +32899,32 @@ This will fail in production if not fixed.`);
         }
       }
       async function scandata() {
-        let loadingId = uni.getStorageSync("checkvehicle").id;
-        let data = {
-          reservationId: details.items.id,
-          deliveryId: details.id,
-          // reservationId: '1707271276416094210',
-          // deliveryId: '1707271279670874114',
-          loadingId,
-          type: 2,
-          barcode: details.scancode
-        };
-        let res2 = await deliveryloadingscan(data);
-        formatAppLog("log", "at pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue:229", "res", res2);
-        const { code: code2 } = res2;
-        if (code2 === 3001 || code2 === 200)
-          utils2.ttsspke(res2.audio);
-        initpage();
+        try {
+          uni.showLoading({
+            title: "数据请求中",
+            mask: true
+          });
+          let loadingId = uni.getStorageSync("checkvehicle").id;
+          let data = {
+            reservationId: details.items.id,
+            deliveryId: details.id,
+            // reservationId: '1707271276416094210',
+            // deliveryId: '1707271279670874114',
+            loadingId,
+            type: 2,
+            barcode: details.scancode
+          };
+          let res2 = await deliveryloadingscan(data);
+          formatAppLog("log", "at pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue:234", "res", res2);
+          const { code: code2 } = res2;
+          if (code2 === 3001 || code2 === 200)
+            utils2.ttsspke(res2.audio);
+          initpage();
+        } catch (err) {
+          formatAppLog("log", "at pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue:240", "err :>> ", err);
+        } finally {
+          uni.hideLoading();
+        }
       }
       function checkphon(index2) {
         if (details.listcheckindex == index2) {
@@ -32887,8 +33181,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesCustomerTrayDetailsCustomerTrayDetails = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__file", "D:/workSpace/logpm/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue"]]);
-  const _sfc_main$j = /* @__PURE__ */ vue.defineComponent({
+  const PagesHomePagesCustomerTrayDetailsCustomerTrayDetails = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__file", "D:/workSpace/logpm/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue"]]);
+  const _sfc_main$k = /* @__PURE__ */ vue.defineComponent({
     __name: "StockUpListZero",
     setup(__props) {
       const util = vue.inject("utils");
@@ -33166,8 +33460,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesHomePagesStockUpListZeroStockUpListZero = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__file", "D:/workSpace/logpm/pagesHome/pages/StockUpListZero/StockUpListZero.vue"]]);
-  const _sfc_main$i = {};
+  const PagesHomePagesStockUpListZeroStockUpListZero = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__file", "D:/workSpace/logpm/pagesHome/pages/StockUpListZero/StockUpListZero.vue"]]);
+  const _sfc_main$j = {};
   function _sfc_render$3(_ctx, _cache) {
     const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0);
     return vue.openBlock(), vue.createElementBlock(
@@ -33189,7 +33483,7 @@ This will fail in production if not fixed.`);
       /* STABLE_FRAGMENT */
     );
   }
-  const PagesUserPagesAboutAbout = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$3], ["__file", "D:/workSpace/logpm/pagesUser/pages/about/about.vue"]]);
+  const PagesUserPagesAboutAbout = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$3], ["__file", "D:/workSpace/logpm/pagesUser/pages/about/about.vue"]]);
   const usePdaStore = defineStore("usePdaStore", () => {
     const pdaBroadcastList = vue.reactive({
       "newPdaVersion": {
@@ -33223,7 +33517,7 @@ This will fail in production if not fixed.`);
       HANDLE_PDABROADCAS
     };
   });
-  const _sfc_main$h = /* @__PURE__ */ vue.defineComponent({
+  const _sfc_main$i = /* @__PURE__ */ vue.defineComponent({
     __name: "systemSettings",
     setup(__props) {
       usePdaStore();
@@ -33272,8 +33566,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesUserPagesSystemSettingsSystemSettings = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__file", "D:/workSpace/logpm/pagesUser/pages/systemSettings/systemSettings.vue"]]);
-  const _sfc_main$g = /* @__PURE__ */ vue.defineComponent({
+  const PagesUserPagesSystemSettingsSystemSettings = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__file", "D:/workSpace/logpm/pagesUser/pages/systemSettings/systemSettings.vue"]]);
+  const _sfc_main$h = /* @__PURE__ */ vue.defineComponent({
     __name: "dynamicCheck",
     setup(__props) {
       const details = vue.reactive({
@@ -33296,6 +33590,11 @@ This will fail in production if not fixed.`);
       });
       const basicContainer = vue.ref(null);
       const option = vue.reactive({
+        leftClick() {
+          uni.reLaunch({
+            url: "/pages/index/index"
+          });
+        },
         title: "任务列表",
         pullDownRefreshInitPage: async () => {
           details.page.current = 1;
@@ -33352,10 +33651,10 @@ This will fail in production if not fixed.`);
       async function initPage() {
         try {
           const res2 = await getWarehouseTask({ ...details.page });
-          formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:180", "res :>> ", res2);
+          formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:185", "res :>> ", res2);
           const { code: code2, data: { records } } = res2;
           if (code2 === 200 && res2.data) {
-            formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:183", "records :>> ", records);
+            formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:188", "records :>> ", records);
             details.renderList = [...details.renderList, ...records];
             details.renderList.forEach((item) => {
               item.marketName = item.list.map((val) => val.refName).join(",");
@@ -33370,7 +33669,7 @@ This will fail in production if not fixed.`);
           }
           return code2;
         } catch (error2) {
-          formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:201", "error :>> ", error2);
+          formatAppLog("log", "at pagesTask/pages/dynamicCheck/dynamicCheck.vue:206", "error :>> ", error2);
         }
       }
       const { renderList, isEnd } = vue.toRefs(details);
@@ -33487,8 +33786,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesTaskPagesDynamicCheckDynamicCheck = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__file", "D:/workSpace/logpm/pagesTask/pages/dynamicCheck/dynamicCheck.vue"]]);
-  const _sfc_main$f = /* @__PURE__ */ vue.defineComponent({
+  const PagesTaskPagesDynamicCheckDynamicCheck = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__file", "D:/workSpace/logpm/pagesTask/pages/dynamicCheck/dynamicCheck.vue"]]);
+  const _sfc_main$g = /* @__PURE__ */ vue.defineComponent({
     __name: "checkTaskList",
     setup(__props) {
       const details = vue.reactive({
@@ -34189,8 +34488,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesTaskPagesCheckTaskListCheckTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-ab53b22c"], ["__file", "D:/workSpace/logpm/pagesTask/pages/checkTaskList/checkTaskList.vue"]]);
-  const _sfc_main$e = /* @__PURE__ */ vue.defineComponent({
+  const PagesTaskPagesCheckTaskListCheckTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-ab53b22c"], ["__file", "D:/workSpace/logpm/pagesTask/pages/checkTaskList/checkTaskList.vue"]]);
+  const _sfc_main$f = /* @__PURE__ */ vue.defineComponent({
     __name: "dynamicCheckDetails",
     setup(__props) {
       const details = vue.reactive({
@@ -34406,8 +34705,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesTaskPagesDynamicCheckDetailsDynamicCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-5a4729ce"], ["__file", "D:/workSpace/logpm/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue"]]);
-  const _sfc_main$d = /* @__PURE__ */ vue.defineComponent({
+  const PagesTaskPagesDynamicCheckDetailsDynamicCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-5a4729ce"], ["__file", "D:/workSpace/logpm/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue"]]);
+  const _sfc_main$e = /* @__PURE__ */ vue.defineComponent({
     __name: "storageLocationCheckDetails",
     setup(__props) {
       const option = vue.reactive({
@@ -35642,8 +35941,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesTaskPagesStorageLocationCheckDetailsStorageLocationCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-683b534e"], ["__file", "D:/workSpace/logpm/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue"]]);
-  const _sfc_main$c = /* @__PURE__ */ vue.defineComponent({
+  const PagesTaskPagesStorageLocationCheckDetailsStorageLocationCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-683b534e"], ["__file", "D:/workSpace/logpm/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue"]]);
+  const _sfc_main$d = /* @__PURE__ */ vue.defineComponent({
     __name: "trayCheckDetails",
     setup(__props) {
       const option = vue.reactive({
@@ -36552,8 +36851,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesTaskPagesTrayCheckDetailsTrayCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__scopeId", "data-v-99e79307"], ["__file", "D:/workSpace/logpm/pagesTask/pages/trayCheckDetails/trayCheckDetails.vue"]]);
-  const _sfc_main$b = /* @__PURE__ */ vue.defineComponent({
+  const PagesTaskPagesTrayCheckDetailsTrayCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-99e79307"], ["__file", "D:/workSpace/logpm/pagesTask/pages/trayCheckDetails/trayCheckDetails.vue"]]);
+  const _sfc_main$c = /* @__PURE__ */ vue.defineComponent({
     __name: "contracts",
     setup(__props) {
       const option = vue.reactive({
@@ -37721,7 +38020,7 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const PagesTaskPagesContractsContracts = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__scopeId", "data-v-4e527f5b"], ["__file", "D:/workSpace/logpm/pagesTask/pages/contracts/contracts.vue"]]);
+  const PagesTaskPagesContractsContracts = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__scopeId", "data-v-4e527f5b"], ["__file", "D:/workSpace/logpm/pagesTask/pages/contracts/contracts.vue"]]);
   __definePage("pages/login/login", PagesLoginLogin);
   __definePage("pages/index/index", PagesIndexIndex);
   __definePage("pages/user/user", PagesUserUser);
@@ -37790,7 +38089,7 @@ This will fail in production if not fixed.`);
   __definePage("pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails", PagesTaskPagesStorageLocationCheckDetailsStorageLocationCheckDetails);
   __definePage("pagesTask/pages/trayCheckDetails/trayCheckDetails", PagesTaskPagesTrayCheckDetailsTrayCheckDetails);
   __definePage("pagesTask/pages/contracts/contracts", PagesTaskPagesContractsContracts);
-  const _sfc_main$a = {
+  const _sfc_main$b = {
     setup() {
       onLaunch(() => {
         const utils2 = vue.inject("utils");
@@ -37805,7 +38104,7 @@ This will fail in production if not fixed.`);
       return {};
     }
   };
-  const App = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__file", "D:/workSpace/logpm/App.vue"]]);
+  const App = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__file", "D:/workSpace/logpm/App.vue"]]);
   const mixin = {
     // 定义每个组件都可能需要用到的外部样式以及类名
     props: {
@@ -41072,7 +41371,7 @@ This will fail in production if not fixed.`);
   const fantMini = {
     install
   };
-  const _sfc_main$9 = {
+  const _sfc_main$a = {
     setup() {
       let details = vue.reactive({
         activity: null,
@@ -41133,8 +41432,8 @@ This will fail in production if not fixed.`);
   function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", { class: "content" });
   }
-  const saomiao = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["render", _sfc_render$2], ["__file", "D:/workSpace/logpm/compoment/saomiao.vue"]]);
-  const _sfc_main$8 = /* @__PURE__ */ vue.defineComponent({
+  const saomiao = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["render", _sfc_render$2], ["__file", "D:/workSpace/logpm/compoment/saomiao.vue"]]);
+  const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({
     __name: "tips",
     emits: ["cancel", "confirm"],
     setup(__props, { expose, emit }) {
@@ -41231,8 +41530,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const tips = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-27fa88b6"], ["__file", "D:/workSpace/logpm/compoment/tips/tips.vue"]]);
-  const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
+  const tips = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-27fa88b6"], ["__file", "D:/workSpace/logpm/compoment/tips/tips.vue"]]);
+  const _sfc_main$8 = /* @__PURE__ */ vue.defineComponent({
     __name: "tiplist",
     setup(__props, { expose }) {
       let details = vue.reactive({
@@ -41577,7 +41876,7 @@ This will fail in production if not fixed.`);
                                     }, null, 8, ["src", "onClick"]),
                                     vue.createElementVNode("image", {
                                       onClick: ($event) => remove(index2, i, item.dictKey),
-                                      src: _imports_0
+                                      src: _imports_0$1
                                     }, null, 8, ["onClick"])
                                   ]);
                                 }),
@@ -41998,8 +42297,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const tiplist = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-a3a2f036"], ["__file", "D:/workSpace/logpm/compoment/tiplist/tiplist.vue"]]);
-  const _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({
+  const tiplist = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-a3a2f036"], ["__file", "D:/workSpace/logpm/compoment/tiplist/tiplist.vue"]]);
+  const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
     __name: "InputNum",
     props: {
       // 输入框的值
@@ -42056,8 +42355,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const InputNum = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-92b65ffd"], ["__file", "D:/workSpace/logpm/compoment/InputNum/InputNum.vue"]]);
-  const _sfc_main$5 = /* @__PURE__ */ vue.defineComponent({
+  const InputNum = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-92b65ffd"], ["__file", "D:/workSpace/logpm/compoment/InputNum/InputNum.vue"]]);
+  const _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({
     __name: "BasicContainer",
     props: {
       option: {
@@ -42066,6 +42365,9 @@ This will fail in production if not fixed.`);
       },
       title: {
         type: String
+      },
+      leftClick() {
+        uni.navigateBack();
       }
     },
     setup(__props, { expose }) {
@@ -42076,7 +42378,7 @@ This will fail in production if not fixed.`);
       if (isEnd === void 0)
         isEnd = vue.ref(false);
       const pullDownRefreshInitPage = props2.option.pullDownRefreshInitPage || function() {
-        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:54", "刷新");
+        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:57", "刷新");
       };
       const reachBottomInitPage = props2.option.reachBottomInitPage || function() {
       };
@@ -42090,7 +42392,7 @@ This will fail in production if not fixed.`);
             title: "数据已加载完毕"
           });
         }
-        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:75", "antiShake :>> ", antiShake);
+        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:78", "antiShake :>> ", antiShake);
         if (antiShake) {
           uni.hideLoading();
           clearTimeout(antiShake);
@@ -42109,13 +42411,13 @@ This will fail in production if not fixed.`);
       onPullDownRefresh(() => {
         const timer = setTimeout(async () => {
           await pullDownRefreshInitPage();
-          formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:103", "111 :>> ", 111);
+          formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:106", "111 :>> ", 111);
           uni.stopPullDownRefresh();
           clearTimeout(timer);
         }, 500);
       });
       function startPullDownRefresh() {
-        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:112", "触发下拉");
+        formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:115", "触发下拉");
         uni.startPullDownRefresh();
       }
       expose({ startPullDownRefresh });
@@ -42130,12 +42432,13 @@ This will fail in production if not fixed.`);
               vue.createVNode(_component_u_navbar, {
                 title: vue.unref(title),
                 placeholder: "",
-                autoBack: true,
+                autoBack: false,
+                onLeftClick: __props.option.leftClick,
                 leftIconSize: "35",
                 bgColor: "#d3832a",
                 leftIconColor: "#ffffff",
                 titleStyle: "color:#ffffff"
-              }, null, 8, ["title"])
+              }, null, 8, ["title", "onLeftClick"])
             ]),
             vue.createCommentVNode(" 头部 "),
             vue.renderSlot(_ctx.$slots, "head", {}, void 0, true),
@@ -42160,8 +42463,8 @@ This will fail in production if not fixed.`);
       };
     }
   });
-  const BasicContainer = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-e1062c8b"], ["__file", "D:/workSpace/logpm/compoment/BasicContainer/BasicContainer.vue"]]);
-  const _sfc_main$4 = {
+  const BasicContainer = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-e1062c8b"], ["__file", "D:/workSpace/logpm/compoment/BasicContainer/BasicContainer.vue"]]);
+  const _sfc_main$5 = {
     __name: "PopUp",
     setup(__props, { expose }) {
       const details = vue.reactive({
@@ -42269,7 +42572,177 @@ This will fail in production if not fixed.`);
       };
     }
   };
-  const PopUp = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-385736e8"], ["__file", "D:/workSpace/logpm/compoment/PopUp/PopUp.vue"]]);
+  const PopUp = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-385736e8"], ["__file", "D:/workSpace/logpm/compoment/PopUp/PopUp.vue"]]);
+  const _imports_0 = "/static/nocheck.png";
+  const _imports_1 = "/static/check.png";
+  const _sfc_main$4 = /* @__PURE__ */ vue.defineComponent({
+    __name: "BluetoothList",
+    setup(__props, { expose }) {
+      let details = vue.reactive({
+        title: "",
+        isshowcancel: true,
+        confirmTxt: "",
+        cancelTxt: "",
+        success: null,
+        cancel: null,
+        close: null,
+        isshow: false,
+        singleIndex: []
+      });
+      const bluetoothStore = useBluetoothStore();
+      const { bluetoothList } = storeToRefs(bluetoothStore);
+      const { CHOOSE_BLUETOOTH, HANDLE_INITBLUETOOTH } = bluetoothStore;
+      if (bluetoothList.value.length === 0) {
+        HANDLE_INITBLUETOOTH();
+      }
+      const handle_single = (index2) => {
+        if (details.singleIndex.includes(index2)) {
+          details.singleIndex.shift();
+          return;
+        }
+        details.singleIndex.splice(0, 1, index2);
+      };
+      function setdetails(objs) {
+        for (let key in objs) {
+          details[key] = objs[key];
+        }
+      }
+      function checkbox(type) {
+        switch (type) {
+          case 0:
+            if (details.close) {
+              details.close(details);
+            } else {
+              details.isshow = false;
+            }
+            break;
+          case 1:
+            if (details.cancel) {
+              details.cancel(details);
+            } else {
+              details.isshow = false;
+            }
+            break;
+          case 2:
+            if (details.success) {
+              details.success(details);
+            } else {
+              if (details.singleIndex.length === 0) {
+                uni.showToast({
+                  title: "请选择一项蓝牙信息",
+                  icon: "none"
+                });
+                return;
+              }
+              CHOOSE_BLUETOOTH(details.singleIndex[0]);
+              details.isshow = false;
+            }
+            break;
+        }
+      }
+      const { isshow, title, isshowcancel, confirmTxt, cancelTxt } = vue.toRefs(details);
+      expose({ setdetails, isshow });
+      return (_ctx, _cache) => {
+        return vue.unref(isshow) ? (vue.openBlock(), vue.createElementBlock("view", {
+          key: 0,
+          class: "maboxbg",
+          onClick: _cache[3] || (_cache[3] = vue.withModifiers(($event) => checkbox(0), ["stop"]))
+        }, [
+          vue.createElementVNode("view", {
+            class: "modtips",
+            onClick: _cache[2] || (_cache[2] = vue.withModifiers(() => {
+            }, ["stop", "prevent"]))
+          }, [
+            vue.createElementVNode(
+              "view",
+              { class: "title" },
+              vue.toDisplayString(vue.unref(title) || "选择连接的蓝牙"),
+              1
+              /* TEXT */
+            ),
+            vue.createCommentVNode(" 复选框列表 "),
+            vue.createElementVNode("scroll-view", {
+              "scroll-y": "true",
+              class: "scvboxs"
+            }, [
+              vue.unref(bluetoothList).length !== 0 ? (vue.openBlock(true), vue.createElementBlock(
+                vue.Fragment,
+                { key: 0 },
+                vue.renderList(vue.unref(bluetoothList), (item, index2) => {
+                  return vue.openBlock(), vue.createElementBlock("view", {
+                    key: item,
+                    class: "list-container",
+                    onClick: ($event) => handle_single(index2)
+                  }, [
+                    vue.createCommentVNode(" 单选图片 "),
+                    vue.withDirectives(vue.createElementVNode(
+                      "image",
+                      {
+                        class: "chooseImg",
+                        src: _imports_0,
+                        mode: ""
+                      },
+                      null,
+                      512
+                      /* NEED_PATCH */
+                    ), [
+                      [vue.vShow, !vue.unref(details).singleIndex.includes(index2)]
+                    ]),
+                    vue.withDirectives(vue.createElementVNode(
+                      "image",
+                      {
+                        class: "chooseImg",
+                        src: _imports_1,
+                        mode: ""
+                      },
+                      null,
+                      512
+                      /* NEED_PATCH */
+                    ), [
+                      [vue.vShow, vue.unref(details).singleIndex.includes(index2)]
+                    ]),
+                    vue.createElementVNode(
+                      "view",
+                      { class: "list-item-title" },
+                      vue.toDisplayString(item.name),
+                      1
+                      /* TEXT */
+                    )
+                  ], 8, ["onClick"]);
+                }),
+                128
+                /* KEYED_FRAGMENT */
+              )) : (vue.openBlock(), vue.createElementBlock("view", { key: 1 }))
+            ]),
+            vue.createElementVNode("view", { class: "buts" }, [
+              vue.unref(isshowcancel) ? (vue.openBlock(), vue.createElementBlock(
+                "view",
+                {
+                  key: 0,
+                  onClick: _cache[0] || (_cache[0] = ($event) => checkbox(1)),
+                  class: "cancel"
+                },
+                vue.toDisplayString(vue.unref(cancelTxt) || "取消"),
+                1
+                /* TEXT */
+              )) : vue.createCommentVNode("v-if", true),
+              vue.createElementVNode(
+                "view",
+                {
+                  onClick: _cache[1] || (_cache[1] = ($event) => checkbox(2)),
+                  class: "confirm"
+                },
+                vue.toDisplayString(vue.unref(confirmTxt) || "确认"),
+                1
+                /* TEXT */
+              )
+            ])
+          ])
+        ])) : vue.createCommentVNode("v-if", true);
+      };
+    }
+  });
+  const BluetoothList = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-05b5e40b"], ["__file", "D:/workSpace/logpm/compoment/BluetoothList/BluetoothList.vue"]]);
   const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
     __name: "saomiao1",
     props: {
@@ -42598,7 +43071,7 @@ This will fail in production if not fixed.`);
     app.use(Store);
     app.use(createPinia());
     app.use(fantMini);
-    app.component("saomiao", saomiao).component("tips", tips).component("tiplist", tiplist).component("saomiao1", saomiao1).component("saomiao2", saomiao2).component("saomiao3", saomiao3).component("saomiao4", saomiao4).component("InputNum", InputNum).component("BasicContainer", BasicContainer).component("PopUp", PopUp);
+    app.component("saomiao", saomiao).component("tips", tips).component("tiplist", tiplist).component("saomiao1", saomiao1).component("saomiao2", saomiao2).component("saomiao3", saomiao3).component("saomiao4", saomiao4).component("InputNum", InputNum).component("BasicContainer", BasicContainer).component("PopUp", PopUp).component("BluetoothList", BluetoothList);
     uni.$u.config.unit = "rpx";
     return {
       app,
diff --git a/unpackage/dist/dev/app-plus/app.css b/unpackage/dist/dev/app-plus/app.css
index 7f3c3e4..d408608 100644
--- a/unpackage/dist/dev/app-plus/app.css
+++ b/unpackage/dist/dev/app-plus/app.css
@@ -1187,4 +1187,97 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   color: #D3832A;
   background: #fff;
   border: 0.03125rem solid #D3832A;
+}
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.maboxbg[data-v-05b5e40b] {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  background-color: #00000050;
+  z-index: 10000;
+}
+.modtips[data-v-05b5e40b] {
+  width: 19.6875rem;
+  background: #FFFFFF;
+  border-radius: 0.21875rem;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 1.25rem 0.625rem;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translateX(-50%) translateY(-50%);
+  box-sizing: border-box;
+}
+.modtips .title[data-v-05b5e40b] {
+  font-size: 1.0625rem;
+  color: #092C4D;
+}
+.modtips .scvboxs[data-v-05b5e40b] {
+  width: 100%;
+  max-height: 15.625rem;
+}
+.modtips .list-container[data-v-05b5e40b] {
+  display: flex;
+  align-items: center;
+  height: 1.875rem;
+}
+.modtips .list-container .list-item-title[data-v-05b5e40b] {
+  margin-left: 0.625rem;
+}
+.modtips .buts[data-v-05b5e40b] {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  margin-top: 1.25rem;
+}
+.modtips .buts > uni-view[data-v-05b5e40b] {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 8.125rem;
+  height: 2.75rem;
+  border-radius: 0.25rem;
+  font-size: 1rem;
+}
+.modtips .buts > .cancel[data-v-05b5e40b] {
+  background-color: #F5F5F6;
+  color: #5A6875;
+  margin-right: 0.625rem;
+}
+.modtips .buts > .confirm[data-v-05b5e40b] {
+  background-color: #D3832A;
+  color: #FFFFFF;
+}
+.chooseImg[data-v-05b5e40b] {
+  width: 1rem;
+  height: 1rem;
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json
index 3453ea6..d443c65 100644
--- a/unpackage/dist/dev/app-plus/manifest.json
+++ b/unpackage/dist/dev/app-plus/manifest.json
@@ -7,8 +7,8 @@
   "id": "__UNI__EB22F37",
   "name": "货无忧",
   "version": {
-    "name": "1.0.24",
-    "code": 1024
+    "name": "1.0.26",
+    "code": 1026
   },
   "description": "",
   "developer": {
diff --git a/utils/request.js b/utils/request.js
index 61f9cac..56840eb 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -210,7 +210,7 @@ const HandleRequest = (params, key) => {
 					return
 				} else if (res.statusCode == 401) {
 					// 登录失败时
-					if (!refresh_token && params.url.indexOf('blade-auth/oauth/token') != -1) {
+					if (isLogin) {
 						return uni.showToast({
 							title: "登录失败",
 							icon: 'none'
@@ -277,7 +277,14 @@ let _isRefreshToken = {
 	_isRefreshToken: null
 }
 
+let isLogin = false
+
 const service = async (params) => {
+	console.log('params :>> ', params);
+	if (params.data.isLogin) {
+		isLogin = true
+		delete params.data.isLogin
+	} else isLogin = false
 	console.log('params :>> ', params);
 	const _key = params.url + JSON.stringify(params.data)
 	// 防止重复请求
diff --git a/utils/utils.js b/utils/utils.js
index e9a7819..4d8bd0a 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -109,8 +109,8 @@ const utils = {
 		}, 2000)
 		// #endif
 	},
-	//蓝牙打印初始化
-	initbl: () => {
+	// H5蓝牙打印初始化
+	initbl_App: () => {
 		// #ifdef APP
 		let deviceList = [];
 		let main = plus.android.runtimeMainActivity();
@@ -145,46 +145,97 @@ const utils = {
 		return deviceList
 		// #endif
 	},
-	//给蓝牙打印机推送打印的内容
-	getbl: (dev, text) => {
+	// 蓝牙打印初始化
+	initbl: () => {
 		// #ifdef APP
+		let deviceList = [];
 		let main = plus.android.runtimeMainActivity();
-		let BluetoothAdapter = plus.android.importClass("android.bluetooth.BluetoothAdapter");
-		let UUID = plus.android.importClass("java.util.UUID");
-		let uuid = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
-		let BAdapter = BluetoothAdapter.getDefaultAdapter();
-		let device = BAdapter.getRemoteDevice(dev.address);
-		plus.android.importClass(device);
-		let bluetoothSocket = device.createInsecureRfcommSocketToServiceRecord(uuid);
-		plus.android.importClass(bluetoothSocket);
-		console.log("开始连接打印机:" + dev.name);
-		if (!bluetoothSocket.isConnected()) {
-			bluetoothSocket.connect();
-			if (bluetoothSocket.isConnected()) {
-				console.log("设备已连接,开始发送打印文件");
-				let outputStream = bluetoothSocket.getOutputStream();
-				plus.android.importClass(outputStream);
-				// sb(outputStream);
+		let Context = plus.android.importClass("android.content.Context");
+		let BManager = main.getSystemService(Context.BLUETOOTH_SERVICE);
+		plus.android.importClass(BManager);
+		let BAdapter = BManager.getAdapter();
+		plus.android.importClass(BAdapter);
+		let lists = BAdapter.getBondedDevices();
+		// let aaa = BAdapter.getProfileConnectionState()
+		// console.log('aaa :>> ', aaa);
+		// console.log('lists :>> ', lists);
+		plus.android.importClass(lists);
+		let iterator = lists.iterator();
+		console.log('iterator :>> ', iterator);
+
+		plus.android.importClass(iterator);
+		while (iterator.hasNext()) {
+			let d = iterator.next();
+			plus.android.importClass(d);
+			let temp = {
+				name: d.getName(),
+				address: d.getAddress(),
+				status: d.getBondState(),
+				uuids: d.getUuids(),
+				op: d
+			};
+			deviceList.push(temp);
+		}
 
-				// text+='PRINT\r\n'
-				console.log(text)
-				let arrayBuffer = plus.android.invoke(text, 'getBytes', 'gbk');
-				outputStream.write(arrayBuffer);
-				// console.log(111111111);
-				outputStream.flush();
-				bluetoothSocket.close();
+		// getProfileConnectionState
+		return deviceList
+		// #endif
+	},
+	//给蓝牙打印机推送打印的内容
+	getbl: (dev, text) => {
+		return new Promise((resolve, reject) => {
+			try {
+				// #ifdef APP
+				uni.showLoading({
+					title: '打印中',
+					mask: true
+				});
+				let main = plus.android.runtimeMainActivity();
+				let BluetoothAdapter = plus.android.importClass("android.bluetooth.BluetoothAdapter");
+				let UUID = plus.android.importClass("java.util.UUID");
+				let uuid = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
+				let BAdapter = BluetoothAdapter.getDefaultAdapter();
+				let device = BAdapter.getRemoteDevice(dev.address);
+				plus.android.importClass(device);
+				let bluetoothSocket = device.createInsecureRfcommSocketToServiceRecord(uuid);
+				plus.android.importClass(bluetoothSocket);
+				console.log("开始连接打印机:" + dev.name);
 				if (!bluetoothSocket.isConnected()) {
-					console.log("设备已关闭");
+					bluetoothSocket.connect();
+					if (bluetoothSocket.isConnected()) {
+						console.log("设备已连接,开始发送打印文件");
+						let outputStream = bluetoothSocket.getOutputStream();
+						plus.android.importClass(outputStream);
+						// sb(outputStream);
+
+						// text+='PRINT\r\n'
+						console.log(text)
+						let arrayBuffer = plus.android.invoke(text, 'getBytes', 'gbk');
+						outputStream.write(arrayBuffer);
+						// console.log(111111111);
+						outputStream.flush();
+						bluetoothSocket.close();
+						if (!bluetoothSocket.isConnected()) {
+							console.log("设备已关闭");
+						}
+						resolve(null)
+					} else {
+						uni.showToast({
+							title: '设备连接失败',
+							icon: 'error',
+							duration: 2000
+						});
+						reject(null)
+					}
 				}
-			} else {
-				uni.showToast({
-					title: '设备连接失败',
-					icon: 'error',
-					duration: 2000
-				});
+				// #endif
+			} catch (err) {
+				reject(null)
+				//TODO handle the exception
+			} finally {
+				uni.hideLoading()
 			}
-		}
-		// #endif
+		})
 	},
 	//初始化tts语音引擎
 	inittts() {