123

App.vue

@@ -21,7 +21,7 @@
 				});
 			}
 			else{
-				// this.$msg.getMsg(this.$storage.get('airportName'))
+				this.$msg.getMsg(this.$storage.get('airportName'))
 				plus.navigator.closeSplashscreen()
 			}
 		},
@@ -29,16 +29,17 @@
 			this.$devapi.TYPE_DEV_JQHWGEVIQUWVILBE = this.$storage.get("device")?Number(this.$storage.get("device")):0
 			this.$devapi.RFIDIntervalTime = this.$storage.get("times")?Number(this.$storage.get("times")):0
 			if(this.$storage.getJson("users")){
-				// this.$msg.getMsg(this.$storage.get('airportName'))
+				this.$msg.getMsg(this.$storage.get('airportName'))
 			}
-			
 			console.log('App Show')
 		},
 		onHide: function() {
 			console.log('App Hide')
 			this.$msg.stopMsg()
-			this.$devapi.RFIDStopInventory()
-			this.$devapi.ISRFIDOPEN = !this.$devapi.ISRFIDOPEN
+			if(this.$devapi.RFIDIntervalTime!=0){
+				this.$devapi.RFIDStopInventory()
+				this.$devapi.ISRFIDOPEN = false
+			}
 		}
 	}
 </script>

components/utils/scanCode.js

@@ -46,9 +46,6 @@ class DEVAPI {
 				onReceive: (context, intent) => {
 					// 红外扫描结果
 					if (intent.getAction() === this.SCANOBJ.SCAN_RESULT) {
-						console.log("scan====res")
-						// uni.off('scancodemsg')
-						
 						let _data_ = intent.getByteArrayExtra("scanContext")
 						let codeStr = this.byteToString(_data_)
 						console.log(`回调数据:${codeStr}`)
@@ -57,16 +54,25 @@ class DEVAPI {
 						})
 					}
 					else{
-						console.log(111)
+						uni.showToast({
+							icon: 'none',
+							title: "红外扫描结果获取失败",
+							duration: 5000
+						});
 						return
 					}
 				}
 			}
 		);
-
+		// ============
+		this.HTML5_PLUS_RUNTIME_MAIN_ACTIVITY.unregisterReceiver(this.POC_KEY_DOWN_OBJ); // 注册
+		let IntentFilter = plus.android.importClass(this.HTML5_PLUS_CONTENT_INTENTFILTER); // 暴露接口对象
+		let filter = new IntentFilter();
+		filter.addAction(this.SCANOBJ.SCAN_RESULT); // 红外 扫描结果，广播
+		this.HTML5_PLUS_RUNTIME_MAIN_ACTIVITY.registerReceiver(this.POC_KEY_DOWN_OBJ,filter); // 注册功能 
+		// ============
 		let that = this
 		plus.key.addEventListener("keyup", function(e) {
-			console.log(e.keyCode)
 			if (e.keyCode == 131 && that.TYPE_DEV_JQHWGEVIQUWVILBE === 0) {
 				console.log("按键被按下，开启红外扫描")
 				that.HTML5_PLUS_RUNTIME_MAIN_ACTIVITY.unregisterReceiver(that.POC_KEY_DOWN_OBJ); // 注册
@@ -77,17 +83,20 @@ class DEVAPI {
 			} else if (e.keyCode == 131 && that.TYPE_DEV_JQHWGEVIQUWVILBE === 1) {
 				console.log("按键被按下，开启RFID")
 				that.HTML5_PLUS_RUNTIME_MAIN_ACTIVITY.unregisterReceiver(that.POC_KEY_DOWN_OBJ); // 注册
-				that.ISRFIDOPEN = !that.ISRFIDOPEN
-				if (that.ISRFIDOPEN === true) {
+				console.log(that.RFIDIntervalTime)
+				console.log(that.ISRFIDOPEN)
+				if (that.RFIDIntervalTime ==0) {
 					console.log("开启RFID")
 					that.RFIDStartInventory()
 				}
-				if(that.ISRFIDOPEN !== true&&that.RFIDIntervalTime==0){
-					console.log("开启RFID")
+				else if(that.RFIDIntervalTime!=0 && that.ISRFIDOPEN === false){
+					console.log("开启RFID连续")
 					that.RFIDStartInventory()
+					that.ISRFIDOPEN = true
 				}
-				if(that.ISRFIDOPEN !== true&&that.RFIDIntervalTime!=0){
-					console.log("关闭RFID")
+				else if(that.ISRFIDOPEN === true&&that.RFIDIntervalTime!=0){
+					console.log("关闭RFID" +that.ISRFIDOPEN)
+					that.ISRFIDOPEN = false
 					that.RFIDStopInventory()
 				}
 			}
@@ -104,20 +113,18 @@ class DEVAPI {
 
 	// 初始化RFID
 	initRFID() {
-		console.log("RFID--------开始")
+		console.log("初始化RFID")
 		// RFID 插件对象
 		this.RFID_SDK_WX = uni.requireNativePlugin("Lizii-uhfmagic-sdk");
 		//初始化sdk，在启动的第一个页面调用一次即可
 		let that = this
 		this.RFID_SDK_WX.setCallback(function(res) {
-			console.log(res);
 			var event = res.event;
 			if (event == "onInventoryOnce") {
 				// res.data  epc 数组  没有信号强度
 				let arr = []
 				res.data.map(item => {
 					let codeStr = item.slice(6, 14)
-					console.log(codeStr)
 					codeStr = parseInt(codeStr, 16) + ""
 					uni.$emit('scancodemsg', {
 						msg: codeStr
@@ -131,7 +138,6 @@ class DEVAPI {
 				res.data.map(item => {
 					let codeStr = item.slice(6, 14)
 					codeStr = parseInt(codeStr, 16) + ""
-					console.log(codeStr)
 					arr.push(codeStr)
 				})
 				uni.$emit('scancodeList', {
@@ -150,9 +156,10 @@ class DEVAPI {
 	// 开始存盘
 	RFIDStartInventory() {
 		if (this.RFIDIntervalTime === 0) {
+			console.log("开始单次存盘")
 			this.RFID_SDK_WX.inventoryOnce(true);
-			// this.RFID_SDK_WX.inventoryOnce(false);
 		} else {
+			console.log("开始连续存盘")
 			this.RFID_SDK_WX.inventoryRealTime(true);
 		}
 	}

pages.json

@@ -97,6 +97,13 @@
 				"enablePullDownRefresh": false
 			}
 
+		}, {
+			"path": "pages/detailNode/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
 		}, {
 			"path": "pages/message/message",
 			"style": {

pages/abnormal/index.vue

@@ -14,12 +14,12 @@
 		<view class="content">
 			<view class="content_bootom" style="top:0">
 				<scroll-view scroll-y="true" class="scroll-Y">
-					<view class="up" v-for="(item, index) in listdata" :key="index">
-						<view class="list"  @tap="toDetail(item.luggageNum)">
+					<view class="up" v-for="(item, index) in listdata" :key="index" @tap="toDetail(item.luggageNum)">
+						<view class="list">
 							<p>{{ item.luggageNum }}</p>
 						</view>
 						<view class="normal">
-							{{item.specialType!=null?item.specialType:" "}}
+							{{item.specialType!=null?specialTypeList[item.specialType]:" "}}
 						</view>
 						<view :class="item.exception_type != null?'error':'normal'">{{item.exception_type!=null?item.exception_name:"正常"}}</view>
 					</view>
@@ -59,7 +59,22 @@
 				],
 				exceptionNameList:["非异常行李","破损","少收","多收"],
 				airport:null,
-				currentLuggageNum:null
+				currentLuggageNum:null,
+				specialTypeList:{
+					"AVIH":"装笼动物",
+					"CREW":"机组行李",
+					"RFAG":"易碎行李",
+					"HVY":"重型行李",
+					"PRIO":"优先行李",
+					"RUSH":"无人行李",
+					"SCON":"急转行李",
+					"SPEQ":"运动装备",
+					"VIP":"VIP行李",
+					"WCHR":"轮椅",
+					"WFAP":"武器枪支",
+					"SJ05":"到港行李破损",
+					"SJ34":"超大柜台接收",
+				}
 			}
 		},
 		created(option) {},
@@ -171,6 +186,9 @@
 	.app-content {
 		position: relative;
 		background: rgb(49, 85, 99);
+		width: 100vw;
+		height: 100vh;
+		overflow: hidden;
 		>.tuku {
 			position: absolute;
 			z-index: -1;
@@ -300,7 +318,7 @@
 						color:red
 					}
 					>.normal{
-						width: 60px;
+						width: 160px;
 						color:#4682b4 
 					}
 					>.list {

pages/baggagecheck/index.vue

@@ -28,52 +28,33 @@
 			</view>
 			<view class="list">
 				<p>当前节点</p>
-				<picker @change="bindPickerChange1" :placeholderStyle="placeholderStyle" :value="index1"
+				<picker @change="bindPickerChange1" style="line-height: 2.375rem;background-color: antiquewhite;" :placeholderStyle="placeholderStyle" :value="index1"
 					:range-key="'nodeName'" :range="nodeList">
 					<view class="uni-input">{{nodeNameList[index1]}}</view>
 				</picker>
-				<view class="listup"></view>
 			</view>
 			<view class="list">
 				<p>当前位置</p>
-				<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false"
+				<uni-easyinput :inputBorder="false" style="line-height: 2.375rem;background-color: antiquewhite;" :placeholderStyle="placeholderStyle" :clearable="false"
 					:styles="style" :disabled="false" v-model="luggageData.location_describe" type="text"
 					placeholder="操作位置" />
 				</uni-forms>
-				<view class="listup"></view>
 			</view>
 			<view class="list">
 				<p>当前状态</p>
-				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.currentResult" value=""
-					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="" />
-				<view class="listup"></view>
+				<uni-easyinput :inputBorder="false" style="line-height: 2.375rem;background-color: antiquewhite;" :placeholderStyle="placeholderStyle" :clearable="false"
+					:styles="style" :disabled="false" v-model="luggageData.currentResult" type="text"
+					placeholder="当前状态" />
 			</view>
 			<view class="list">
 				<p>异常类型</p>
-				<picker @change="bindPickerChange" :value="index" :range-key="'type'" :range="exceptionList">
-					<view class="uni-input">{{exceptionList[index].type?exceptionList[index].type:"无"}}</view>
+				<picker @change="bindPickerChange" style="line-height: 2.375rem;background-color: antiquewhite;" :value="index" :range-key="'name'" :range="exceptionList">
+					<view class="uni-input">{{exceptionList[index].type?exceptionList[index].name:"无"}}</view>
 				</picker>
-				<view class="listup"></view>
 			</view>
 			<view class="picturearea">
 				
 				<view class="name">图片上传</view>
-				<!-- <view class="content_list">
-          <view class="mg">
-            <view class="mg_lg"></view>
-          </view>
-          <view class="mg">
-            <view class="mg_lg"></view>
-          </view>
-          <view class="mg">
-            <view class="mg_lg"></view>
-          </view>
-        </view> -->
-				<!-- <sunui-upimg :url="upPicUrl" :before-upload="onBeforeUpload" ref="upload3" title="+" @upload="handleLoaded3" @change="handleChange3" :number="3">
-          <template v-slot:icon>
-              <text class="s-add-list-btn-icon">+</text>
-          </template>
-      </sunui-upimg> -->
 				<mk-upload :imgList="imgList" @onDelete="onDelete" @onChoose="onChoose" />
 			</view>
 		</view>
@@ -93,7 +74,7 @@
 	export default {
 		data() {
 			return {
-				placeholderStyle: "color:000",
+				placeholderStyle: "color:000;",
 				style: {
 					disableColor: "#fff",
 					color: "#000"
@@ -217,6 +198,9 @@
 						this.nodeList.map((item, index) => {
 							if (res.returnData[0].nodeCode == item.nodeCode) {
 								this.index1 = index
+								if(!this.luggageData.location_describe){
+									this.luggageData.location_describe = item.nodeDescribe
+								}
 							}
 						})
 						this.exceptionList.map((item, index) => {
@@ -392,6 +376,7 @@
 								"carrierFlightsDate": this.luggageData.carrierFlightsDate,
 								"luggageNum": this.luggageData.luggageNum,
 								"luggagePic": path,
+								"piclocation":this.luggageData.location_describe
 							}
 							// this.newImgList.push(path)
 							upImgList.push(newData)
@@ -490,7 +475,10 @@
 				display: flex;
 				align-items: center;
 				border-bottom: 1px solid rgb(238, 238, 238);
-
+				.uni-input {
+							width: 240px;
+							padding-left: 10px;
+						}
 				>p {
 					color: rgb(0, 0, 0);
 					font-family: Noto Sans SC;

pages/detail/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="app-content">
 		<view class="header">
-			<view class="log" @tap="fall"></view> 
+			<view class="log" @tap="fall"></view>
 		</view>
 		<!--    <view class="nav">
       <view :class="action === index ? 'nav_lists': 'nav_list'" v-for="(item, index) in list" :key="index" @tap="lop(index)">{{item.name}}</view>
@@ -22,6 +22,7 @@
 					<view class="list">
 						<view class="lable">航班号</view>
 						<span>{{luggageData.carrierFlights}}</span>
+						<button class="nodeList" @tap="toNode()">路径详情</button>
 					</view>
 					<view class="list">
 						<view class="lable">航班日期</view>
@@ -41,80 +42,106 @@
 					</view>
 					<view class="list">
 						<view class="lable">操作节点</view>
-						<picker @change="bindPickerChange" :placeholderStyle="placeholderStyle" :value="index" :range-key="'nodeName'" :range="nodeList">
+						<picker @change="bindPickerChange" style="line-height: 2.375rem;background-color: antiquewhite;"
+							:placeholderStyle="placeholderStyle" :value="index" :range-key="'nodeName'"
+							:range="nodeList">
 							<view class="uni-input">{{nodeNameList[index]}}</view>
 						</picker>
-						<view class="listup"></view>
+						<!-- <view class="listup"><uni-icons type="gear" size="25"></uni-icons></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">操作位置</view>
-						<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
+						<uni-easyinput :inputBorder="false"
+							style="line-height: 2.375rem;background-color: antiquewhite;"
+							:placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
 							v-model="luggageData.location_describe" type="text" placeholder="操作位置" />
 						</uni-forms>
-						<view class="listup"></view>
+						<!-- <view class="listup"><uni-icons type="gear" size="25"></uni-icons></view> -->
 					</view>
-					
+
 					<view class="list">
 						<view class="lable">发往节点</view>
-						<picker @change="bindPickerChange2" :placeholderStyle="placeholderStyle" :value="index2" :range-key="'nodeName'" :range="nodeList">
+						<picker @change="bindPickerChange2"
+							style="line-height: 2.375rem;background-color: antiquewhite;"
+							:placeholderStyle="placeholderStyle" :value="index2" :range-key="'nodeName'"
+							:range="nodeList">
 							<view class="uni-input">{{nodeNameList[index2]}}</view>
 						</picker>
-						<view class="listup"></view>
+						<!-- <view class="listup"><uni-icons type="gear" size="25"></uni-icons></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">发往位置</view>
-						<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
+						<uni-easyinput :inputBorder="false"
+							style="line-height: 2.375rem;background-color: antiquewhite;"
+							:placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
 							v-model="luggageData.to_location_describe" type="text" placeholder="发往位置" />
 						</uni-forms>
-						<view class="listup"></view>
+						<!-- <view class="listup"><uni-icons type="gear" size="25"></uni-icons></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">特殊行李类型</view>
-						<picker @change="bindPickerChange3" :placeholderStyle="placeholderStyle" :value="index3" :range-key="'specialType'" :range="specialTypeList">
-							<view class="uni-input">{{specialTypeList[index3].specialType?specialTypeList[index3].specialType:"无"}}</view>
+						<picker @change="bindPickerChange3"
+							style="line-height: 2.375rem;background-color: antiquewhite;"
+							:placeholderStyle="placeholderStyle" :value="index3" :range-key="'specialTypeName'"
+							:range="specialTypeList">
+							<view class="uni-input">
+								{{specialTypeList[index3].specialType?specialTypeList[index3].specialTypeName:"无"}}
+							</view>
 						</picker>
-						<view class="listup"></view>
+						<!-- <view class="listup"><uni-icons type="gear" size="25"></uni-icons></view> -->
 					</view>
-					
+
 					<view class="list">
 						<view class="lable">异常类型</view>
-						<picker @change="bindPickerChange4" :placeholderStyle="placeholderStyle" :value="index4" :range-key="'type'" :range="exceptionList">
-							<view class="uni-input">{{exceptionList[index4].type?exceptionList[index4].type:"无"}}</view>
+						<picker @change="bindPickerChange4"
+							style="line-height: 2.375rem;background-color: antiquewhite;"
+							:placeholderStyle="placeholderStyle" :value="index4" :range-key="'name'"
+							:range="exceptionList">
+							<view class="uni-input">{{exceptionList[index4].type?exceptionList[index4].name:"无"}}</view>
 						</picker>
-						<view class="listup"></view>
+						<!-- <view class="listup"><uni-icons type="gear" size="25"></uni-icons></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">非正常状态码</view>
-						<picker @change="bindPickerChange5" :placeholderStyle="placeholderStyle" :value="index5" :range-key="'type'" :range="abnormalList">
-							<view class="uni-input">{{abnormalList[index5].type?abnormalList[index5].type:"无"}}</view>
+						<picker @change="bindPickerChange5"
+							style="line-height: 2.375rem;background-color: antiquewhite;"
+							:placeholderStyle="placeholderStyle" :value="index5" :range-key="'name'"
+							:range="abnormalList">
+							<view class="uni-input">{{abnormalList[index5].type?abnormalList[index5].name:"无"}}</view>
 						</picker>
-						<view class="listup"></view>
+						<!-- <view class="listup"><uni-icons type="gear" size="25"></uni-icons></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">装载序号</view>
-						<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
+						<uni-easyinput :inputBorder="false"
+							style="line-height: 2.375rem;background-color: antiquewhite;"
+							:placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
 							v-model="luggageData.loadNumber" type="text" placeholder="装载序号" />
 						</uni-forms>
-						<view class="listup"></view>
+						<!-- <view class="listup"><uni-icons type="gear" size="25"></uni-icons></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">容器编号</view>
-						<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
+						<uni-easyinput :inputBorder="false"
+							style="line-height: 2.375rem;background-color: antiquewhite;"
+							:placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
 							v-model="luggageData.container_ID" type="text" placeholder="容器编号" />
 						</uni-forms>
-						<view class="listup"></view>
+						<!-- <view class="listup"><uni-icons type="gear" size="25"></uni-icons></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">备注</view>
-						<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
+						<uni-easyinput :inputBorder="false"
+							style="line-height: 2.375rem;background-color: antiquewhite;"
+							:placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
 							v-model="luggageData.luggage_describe" type="text" placeholder="备注" />
 						</uni-forms>
-						<view class="listup"></view>
+						<!-- <view class="listup"><uni-icons type="gear" size="25"></uni-icons></view> -->
 					</view>
 					<mk-upload :imgList="imgList" @onDelete="onDelete" @onChoose="onChoose" />
 				</scroll-view>
 			</view>
-			
+
 		</view>
 		<button type="primary" class="send" size="small" v-if="luggageData" @tap="sendData()">提交</button>
 		<luanqing-date-picker ref="datePickerObj" :isSimple="mode === 'simple'" :isMultiple="mode === 'multiple'"
@@ -136,7 +163,7 @@
 	export default {
 		data() {
 			return {
-				imgList:[],
+				imgList: [],
 				ImgObjList: [],
 				placeholderStyle: "color:000",
 				style: {
@@ -147,77 +174,78 @@
 				datatime: '2023-06-02',
 				datacontime: '',
 				luggageData: null,
-				luggageDataOld:null,
+				luggageDataOld: null,
 				current: 0,
 				mode: 'round',
 				show: false,
 				value1: Number(new Date()),
 				formatter: 'yy',
-				index:0,
-				index2:0,
-				index3:0,
-				index4:0,
-				index5:0,
-				nodeList:[],
-				nodeNameList:[],
-				nextNode:null,
-				luggageNum:null,
-				specialTypeList:[],
-				specialTypeNameList:[],
-				exceptionList:[
-					{
-						"type":null,
-						"name":"非异常行李"
+				index: 0,
+				index2: 0,
+				index3: 0,
+				index4: 0,
+				index5: 0,
+				nodeList: [],
+				nodeNameList: [],
+				nextNode: null,
+				luggageNum: null,
+				specialTypeList: [],
+				specialTypeNameList: [],
+				exceptionList: [{
+						"type": null,
+						"name": "非异常行李"
 					},
 					{
-						"type":"DPR",
-						"name":"破损"
+						"type": "DPR",
+						"name": "破损"
 					},
 					{
-						"type":"AHL",
-						"name":"少收"
+						"type": "AHL",
+						"name": "少收"
 					},
 					{
-						"type":"OHD",
-						"name":"多收"
+						"type": "OHD",
+						"name": "多收"
 					}
 				],
-				exceptionNameList:["非异常行李","破损","少收","多收"],
-				abnormalList:[
+				exceptionNameList: ["非异常行李", "破损", "少收", "多收"],
+				abnormalList: [{
+						"type": null,
+						"name": "无"
+					},
 					{
-						"type":null,
-						"name":"无"
+						"type": "NAL",
+						"name": "未授权装载"
 					},
 					{
-						"type":"NAL",
-						"name":"未被授权的装载"
+						"type": "OFF",
+						"name": "已卸载"
 					},
 					{
-						"type":"OFF",
-						"name":"已卸载"
+						"type": "PFF",
+						"name": "预卸载"
 					},
 					{
-						"type":"UNS",
-						"name":"未找到"
+						"type": "UNS",
+						"name": "未找到"
 					},
 					{
-						"type":"OND",
-						"name":"在场未装载，未被授权"
+						"type": "OND",
+						"name": "在场未装载，未授权"
 					},
 					{
-						"type":"ONA",
-						"name":"在场未装载，已授权"
+						"type": "ONA",
+						"name": "在场未装载，已授权"
 					}
 				],
-				abnormalNameList:["无","未被授权的装载","已卸载","未找到","在场未装载，未被授权","在场未装载，已授权"],
-				isShow:true,
-				sourceData:null
+				abnormalNameList: ["无", "未被授权的装载", "已卸载", "未找到", "在场未装载，未被授权", "在场未装载，已授权"],
+				isShow: true,
+				sourceData: null
 			}
 		},
-		created(option) {
-		},
+		created(option) {},
 		onLoad(option) {
-			this.luggageNum = option.luggageNum 
+			this.luggageNum = option.luggageNum
 			this.getNode()
 			this.getSpecialTypeList()
 			this.getDetial(this.luggageNum)
@@ -231,7 +259,7 @@
 					this.luggageNum = data.msg.trim()
 					this.getDetial(this.luggageNum)
 				}
-				if(data.msg.trim().length < 9){
+				if (data.msg.trim().length < 9) {
 					this.luggageData.container_ID = data.msg.trim()
 				}
 			});
@@ -258,7 +286,7 @@
 					}
 				})
 			},
-			async getSpecialTypeList(){
+			async getSpecialTypeList() {
 				let data = {
 					"serviceId": 16,
 					"dataContent": {},
@@ -267,12 +295,10 @@
 				await this.$http.httpPost('/openApi/query', data).then(res => {
 					if (res.code == "0") {
 						this.specialTypeList = res.returnData;
-						this.specialTypeList.unshift(
-						{
+						this.specialTypeList.unshift({
 							"specialType": null,
 							"specialTypeName": "非特殊行李",
-						}
-						)
+						})
 						this.specialTypeList.map(item => {
 							this.specialTypeNameList.push(item.specialTypeName)
 						})
@@ -291,45 +317,48 @@
 				}
 				await this.$http.httpPost('/openApi/query', data).then(res => {
 					this.luggageData = null
-					if (res.code == "0" && res.returnData.length>0) {
+					if (res.code == "0" && res.returnData.length > 0) {
 						this.luggageData = res.returnData[0]
 						this.getImgList()
 						this.luggageDataOld = JSON.parse(JSON.stringify(res.returnData[0]))
-						this.nodeList.map((item,index)=>{
-							if(res.returnData[0].nodeCode == item.nodeCode){
+						this.nodeList.map((item, index) => {
+							if (res.returnData[0].nodeCode == item.nodeCode) {
 								this.index = index
 								this.index2 = index + 1
+								if(!this.luggageData.location_describe){
+									this.luggageData.location_describe = item.nodeDescribe
+								}
 							}
 						})
-						this.specialTypeList.map((item,index)=>{
-							if(res.returnData[0].specialType == item.specialType){
+						this.specialTypeList.map((item, index) => {
+							if (res.returnData[0].specialType == item.specialType) {
 								this.index3 = index
 							}
 						})
-						this.exceptionList.map((item,index)=>{
-							if(res.returnData[0].exception_type == item.type){
+						this.exceptionList.map((item, index) => {
+							if (res.returnData[0].exception_type == item.type) {
 								this.index4 = index
 							}
 						})
-						this.abnormalList.map((item,index)=>{
-							if(res.returnData[0].abnormalState == item.type){
+						this.abnormalList.map((item, index) => {
+							if (res.returnData[0].abnormalState == item.type) {
 								this.index5 = index
 							}
 						})
-					}
-					else{
+					} else {
 						this.$scanAudio.src = "../../static/hqxl.mp3"
 						this.$scanAudio.play()
 						this.imgList = []
 						uni.showToast({
-							icon:'none',
+							icon: 'none',
 							title: "未查询到该行李信息",
 							duration: 5000
 						});
+						this.fall()
 					}
 				})
 			},
-			async sendData(){
+			async sendData() {
 				this.luggageData.sourceAirport = this.$storage.get('airportName');
 				this.luggageData.ID = null;
 				this.luggageData.dataType = "BPM";
@@ -345,42 +374,41 @@
 				await this.$http.httpPost('/openApi/query', data).then(res => {
 					if (res.code == "0") {
 						uni.showToast({
-							icon:'none',
+							icon: 'none',
 							title: "操作成功",
 							duration: 5000
 						});
-					}
-					else{
+					} else {
 						this.$scanAudio.src = "../../static/czsb.mp3"
 						this.$scanAudio.play()
 						uni.showToast({
-							icon:'none',
+							icon: 'none',
 							title: "操作失败",
 							duration: 5000
 						});
 					}
 				})
 			},
-			bindPickerChange(e){
+			bindPickerChange(e) {
 				this.index = e.detail.value
 				this.luggageData.nodeCode = this.nodeList[this.index].nodeCode;
 				this.luggageData.location_describe = this.nodeList[this.index].nodeDescribe;
 				this.index2 = this.index + 1
 				this.luggageData.to_location_describe = this.nodeList[this.index2].nodeDescribe;
 			},
-			bindPickerChange2(e){
+			bindPickerChange2(e) {
 				this.index2 = e.detail.value
 				this.luggageData.to_location_describe = this.nodeList[this.index2].nodeDescribe;
 			},
-			bindPickerChange3(e){
+			bindPickerChange3(e) {
 				this.index3 = e.detail.value
 				this.luggageData.specialType = this.specialTypeList[this.index3].specialType;
 			},
-			bindPickerChange4(e){
+			bindPickerChange4(e) {
 				this.index4 = e.detail.value
 				this.luggageData.exception_type = this.exceptionList[this.index4].type;
 			},
-			bindPickerChange5(e){
+			bindPickerChange5(e) {
 				this.index5 = e.detail.value
 				this.luggageData.abnormalState = this.abnormalList[this.index5].type;
 			},
@@ -399,7 +427,7 @@
 				let GMT = Year + '-' + Moth + '-' + Day + '   ' + Hour + ':' + Minute
 				this.datacontime = GMT
 			},
-			
+
 			async sendImg(upImgList) {
 				let data = {
 					"serviceId": 30051,
@@ -445,7 +473,7 @@
 								this.imgList.push(item.luggagePic);
 							}
 						})
-			
+
 					} else {
 						uni.showToast({
 							icon: 'none',
@@ -463,7 +491,7 @@
 							"left": "(",
 							"column": "id",
 							"comparator": "=",
-							"value": this.ImgObjList[index].id, 
+							"value": this.ImgObjList[index].id,
 							"right": ")",
 							"connector": "and"
 						}]
@@ -511,11 +539,10 @@
 								"carrierFlightsDate": this.luggageData.carrierFlightsDate,
 								"luggageNum": this.luggageData.luggageNum,
 								"luggagePic": path,
+								"piclocation":this.luggageData.location_describe
 							}
-							// this.newImgList.push(path)
 							upImgList.push(newData)
 							this.sendImg(upImgList)
-							// upImgList.push(newData)
 						}).catch(error => {
 							uni.hideLoading();
 						})
@@ -534,7 +561,7 @@
 					}
 				})
 			},
-			openImg(index){
+			openImg(index) {
 				const imgList = this.imgList;
 				const isReverse = false;
 				const currentIndex = isReverse ? (imgList.length - index) - 1 : index
@@ -544,8 +571,8 @@
 					urls: imgLists
 				});
 			},
-			
-			
+
+
 			finishSelectDate(e) {
 				this.datatime = e[0]
 				console.error("选择了日期：", e);
@@ -559,7 +586,13 @@
 					this.dataheight = 3.75 + 'rem'
 				}
 			},
-
+			toNode() {
+				uni.navigateTo({
+					url: "/pages/detailNode/index?luggageNum=" + this.luggageData.luggageNum + "&carrierFlights=" +
+						this.luggageData.carrierFlights + "&carrierFlightsDate=" + this.luggageData
+						.carrierFlightsDate
+				})
+			},
 			uplist() {
 				uni.redirectTo({
 					url: "/pages/loadingdetails/index"
@@ -587,7 +620,7 @@
 
 <style lang="scss" scoped>
 	.app-content {
-		>.send{
+		>.send {
 			position: fixed;
 			bottom: 10px;
 			left: calc((100% - 20.5625rem) / 2);
@@ -603,6 +636,7 @@
 			align-items: center;
 			justify-content: center;
 		}
+
 		>.header {
 			width: 100%;
 			height: 4.375rem;
@@ -627,7 +661,7 @@
 				background: url('../../static/ico@1x.png') no-repeat;
 				background-size: 100% 100%;
 			}
-			
+
 			>.up {
 				width: .8456rem;
 				height: .8456rem;
@@ -676,9 +710,12 @@
 						font-family: Noto Sans SC;
 						font-size: 13px;
 						font-weight: 400;
-						.uni-input{
-							width: 200px;
+
+						.uni-input {
+							width: 240px;
+							padding-left: 10px;
 						}
+
 						>.lable {
 							color: rgb(0, 0, 0);
 							font-family: Noto Sans SC;
@@ -691,12 +728,22 @@
 						}
 
 						>.listup {
-							width: .25rem;
-							height: .5rem;
-							background: url('../../static/icos.png') no-repeat;
-							background-size: 100% 100%;
+							// width: .25rem;
+							// height: .5rem;
+							// background: url('../../static/icos.png') no-repeat;
+							// background-size: 100% 100%;
 							position: absolute;
-							right: 1.5rem;
+							right: 5px;
+						}
+
+						>.nodeList {
+							background: linear-gradient(179.10deg, rgba(51, 161, 165, 1.00) 11.326%, rgba(59, 111, 142, 1.00) 119.032%, rgba(59, 111, 142, 1.00) 119.032%, rgba(59, 111, 142, 1.00) 119.032%);
+							border-radius: .25rem;
+							color: rgb(255, 255, 255);
+							font-family: Noto Sans SC;
+							font-size: 1rem;
+							float: right;
+							margin-right: 10px;
 						}
 					}
 				}

pages/flightdetails/index.vue

@@ -30,10 +30,10 @@
 							<p>{{ item.luggageNum }}</p>
 						</view>
 						<view class="normal">
-							{{item.specialType!=null?item.specialType:" "}}
+							{{item.specialType!=null?specialTypeList[item.specialType]:" "}}
 						</view>
 						<view :class="item.exception_type != null?'error':'normal'">
-							{{item.exception_type!=null?item.exception_type:"正常"}}
+							{{item.exception_type!=null?exceptionList[item.exception_type]:"正常"}}
 						</view>
 					</view>
 				</scroll-view>
@@ -62,11 +62,30 @@
 				icon: 'static/beijing.png',
 				newData: '',
 				newDataday: '',
-				listdata:[]
+				listdata:[],
+				exceptionList:{
+					"DPR":"破损",
+					"AHL":"少收",
+					"OHD":"多收"
+				},
+				specialTypeList:{
+					"AVIH":"装笼动物",
+					"CREW":"机组行李",
+					"RFAG":"易碎行李",
+					"HVY":"重型行李",
+					"PRIO":"优先行李",
+					"RUSH":"无人行李",
+					"SCON":"急转行李",
+					"SPEQ":"运动装备",
+					"VIP":"VIP行李",
+					"WCHR":"轮椅",
+					"WFAP":"武器枪支",
+					"SJ05":"到港行李破损",
+					"SJ34":"超大柜台接收",
+				}
 			}
 		},
-		created(option) {
-		},
+		created(option) {},
 		onLoad() {
 			this.flightDetail = this.$storage.getJson('searchData')
 			this.getluggageList()
@@ -359,11 +378,11 @@
 					}
 					
 					>.error{
-						width: 60px;
+						width: 80px;
 						color:red
 					}
 					>.normal{
-						width: 60px;
+						width: 80px;
 						color:#4682b4 
 					}
 					>.list {

pages/index/index.vue

@@ -146,7 +146,6 @@
 				this.flightDate = this.flightDetail.carrierFlightsDate
 				this.outAirport = this.flightDetail.outAirport
 				this.landAirport = this.flightDetail.landAirport
-				// this.getFlightData()
 			}
 		},
 		onHide() {

pages/message/message.vue

@@ -33,6 +33,17 @@
 					})
 				}
 			});
+			this.msgList = this.$storage.getJson('msgList')
+			this.msgList.map(item => {
+				if (item.abnormalState == "DLY") {
+					item['msg'] = item.carrierFlightsDate + "，航班：" + item.carrierFlights +
+						"（" + item.outAirport + "-" + item.landAirport + "）,延误"
+				}
+				if (item.abnormalState == "CAN") {
+					item['msg'] = item.carrierFlightsDate + "，航班：" + item.carrierFlights +
+						"（" + item.outAirport + "-" + item.landAirport + "）,取消"
+				}
+			})
 			this.msgSJ = setInterval(function() {
 				that.getMsg()
 			}, 3000)
@@ -68,12 +79,10 @@
 						this.msgList = res.returnData
 						this.msgList.map(item => {
 							if (item.abnormalState == "DLY") {
-								// 2023-07-06,航班(MU2948,CAN-->CZX),发生(延误或者取消)
 								item['msg'] = item.carrierFlightsDate + "，航班：" + item.carrierFlights +
 									"（" + item.outAirport + "-" + item.landAirport + "）,延误"
 							}
 							if (item.abnormalState == "CAN") {
-								// 2023-07-06,航班(MU2948,CAN-->CZX),发生(延误或者取消)
 								item['msg'] = item.carrierFlightsDate + "，航班：" + item.carrierFlights +
 									"（" + item.outAirport + "-" + item.landAirport + "）,取消"
 							}

pages/mypage/index.vue

@@ -268,11 +268,51 @@
 				this.$devapi.TYPE_DEV_JQHWGEVIQUWVILBE = Number(index)
 				this.$storage.set("device",index)
 				this.action = index
+				if(Number(index) == 0){ 
+					uni.showToast({
+						icon:'none',
+						title: "切换激光扫描枪",
+						duration: 3000
+					});
+					this.$storage.set("times",0)
+					this.action2 = 0
+					this.$devapi.RFIDIntervalTime = 0
+				}
+				else{
+					uni.showToast({
+						icon:'none',
+						title: "切换RFID读取器",
+						duration: 3000
+					});
+				}
 			},
 			selectup2(index) {
-				this.$storage.set("times",index)
-				this.action2 = index
-				this.$devapi.RFIDIntervalTime = this.action2
+				if(Number(this.$storage.get("device")) == 0 && Number(index)==1){
+					uni.showToast({
+						icon:'none',
+						title: "激光扫描枪不支持多扫",
+						duration: 3000
+					});
+				}
+				else{
+					if(Number(index)==1){
+						uni.showToast({
+							icon:'none',
+							title: "切换为多扫",
+							duration: 3000
+						});
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "切换为单扫",
+							duration: 3000
+						});
+					}
+					this.$storage.set("times",index)
+					this.action2 = index
+					this.$devapi.RFIDIntervalTime = this.action2
+				}
 			},
 			topup() {
 				this.all = false

pages/search/index.vue

@@ -1,11 +1,39 @@
 <template>
 	<view class="app-content">
 		<view class="nav">
-			<liu-search @fall="fall" :historyList="historyList" @input="input" @change="change"
+			<liu-search @fall="fall" @input="input" @change="change"
 				@changes='changes'></liu-search>
 		</view>
-		<view class="content" v-if="flightList.length">
-			<!-- <button  v-for="(item, index) in flightList" :key="index"  @tap="input(1)">11111111</button> -->
+		<view class="title">
+			<!-- <view class="date">
+				<uni-datetime-picker type="date" :clear-icon="false" v-model="date" @change="maskClick" />
+			</view> -->
+			<view class="inOut">
+				<uni-data-checkbox v-model="inOut" :localdata="inOutList" @change="inOutChange"></uni-data-checkbox>
+			</view>
+		</view>
+		 <scroll-view  class="content" scroll-y="true" @scrolltolower="scrolltolower">
+			 <!-- <view class="craid" v-for="(item,index) in flightList" :key="index"  @tap="toIndex(item)">
+			 	<view class="craid_data">
+			 		{{item.carrierFlights}}
+			 	</view>
+				<view class="craid_data">
+					{{item.carrierFlightsDate}}
+				</view>
+			 </view> -->
+			 <uni-list>
+			 	<uni-list-item  v-for="(item,index) in flightList" :key="index" :clickable= 'true'  @click="toIndex(item)">
+					<template v-slot:body>
+						<view style="display: flex;flex-direction: row;justify-content: space-between;">
+							<view style="margin-right: 30px;width: 80px;">{{item.carrierFlights}}</view>
+							<view style="margin-right: 30px;width: 90px;">{{item.outAirport}} - {{item.landAirport}}</view>
+							<view>{{item.carrierFlightsDate}}</view>
+						</view>
+					</template>
+				</uni-list-item>
+			 </uni-list>
+		 </scroll-view>
+		<!-- <view class="content" v-if="flightList.length">
 			<button class="craid" v-for="(item,index) in flightList" :key="index"  @tap="toIndex(item)">
 				<view class="craid_data">
 					<p>{{item.carrierFlights}}</p>
@@ -21,7 +49,7 @@
 					<span>{{item.scheduleLandInTime}}</span>
 				</view>
 			</button>
-		</view>
+		</view> -->
 		<!-- 提示信息和下拉弹窗 -->
 		<mask-model :headername="headername" :typeShow="typeShow" :tabname="tabname" ref="showMask" btnType="1"
 			@confirm="confirm" @cancel="cancel" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF"
@@ -31,22 +59,36 @@
 <script>
 	import Nav from '../../components/header/nav.vue'
 	import maskModel from '../../components/mask-model/mask-model.vue'
+	import {
+		Format
+	} from '@/components/utils/validate'
 	export default {
 		data() {
 			return {
+				// date:null,
 				historyList: [],
 				maskTitle: '请核对录入的航班号或行李号是否正确',
 				tabname: '', //按钮名称
 				typeShow: true,
 				headername: '请核对信息',
 				value:null,
-				flightList:[]
+				flightList:[],
+				inOut:1,
+				inOutList: [ {
+					text: '离港',
+					value: 1
+				}, {
+					text: '进港',
+					value: 2
+				}],
+				page:1
 			}
 		},
 		created(option) {},
 		onLoad() {},
 		onUnload() {uni.$off("scancodemsg");},
 		onShow() {
+			// this.date = this.datatime()
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
 					uni.navigateTo({
@@ -54,6 +96,7 @@
 					})
 				}
 			});
+			this.getDataList()
 		},
 		onHide() {uni.$off("scancodemsg");},
 		mounted() {
@@ -62,6 +105,17 @@
 			Nav
 		},
 		methods: {
+			// maskClick(e){
+			// 	console.log(e)
+			// },
+			inOutChange(){
+				this.page = 1;
+				this.flightList = [];
+				this.getDataList();
+			},
+			scrolltolower(){
+				this.getDataList()
+			},
 			toIndex(item){
 				this.$storage.setJson('searchData',item);
 				// this.$storage.set('flightDate',item.carrierFlightsDate);
@@ -93,16 +147,21 @@
 						url: "/pages/detail/index?luggageNum=" + Number(this.value)
 					})
 				}
-				else{
+				else if(this.value.length<=9 && this.value.length>0){
 					this.getFlightData(this.value)
 					this.cancel()
 				}
+				else{
+					this.flightList = [];
+					this.page = 1;
+					this.getDataList()
+				}
 			},
 			async getFlightData(num) {
 				let data = {
 					"serviceId": 3000,
 					"page": 1,
-					"pageSize": 10,
+					"pageSize": 20,
 					"dataContent": [{
 						"carrierFlights":num
 					}],
@@ -142,6 +201,13 @@
 							})
 						}
 					}
+					else if(res.code == "0" && res.returnData.length==0){
+						uni.showToast({
+							icon:'none',
+							title: "没有更多信息",
+							duration: 5000
+						});
+					}
 					else{
 						this.$scanAudio.src = "../../static/hqhb.mp3"
 						this.$scanAudio.play()
@@ -153,11 +219,62 @@
 					}
 				})
 			},
-			
+			async getDataList(){
+				let data = {
+					"serviceId": 3010,
+					"page": this.page,
+					"pageSize": 20,
+					"dataContent": [{
+					}],
+					"event": "0"
+				}
+				if(this.inOut == 1){
+					data.dataContent = [{
+						"outAirport": this.$storage.get("airportName")
+					}]
+				}
+				else{
+					data.dataContent = [{
+						"landAirport": this.$storage.get("airportName")
+					}]
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					if (res.code == "0" && res.returnData.length>0) {
+						this.$storage.remove('searchData')
+						this.$storage.remove('flightDate');
+						let list = res.returnData
+						list.map(item => {
+							if(item.scheduleTakeOffTime){
+								item.scheduleTakeOffTime = item.scheduleTakeOffTime.split("T")[1]
+							}
+							else{
+								item.scheduleTakeOffTime = "-"
+							}
+							if(item.scheduleLandInTime){
+								item.scheduleLandInTime = item.scheduleLandInTime.split("T")[1]
+							}
+							else{
+								item.scheduleLandInTime = "-"
+							}
+							this.flightList.push(item)
+						})
+						this.page++
+					}
+				})
+			},
 			cancel(){},
 			//input事件
 			input(e) {
 				console.log('搜索框输入的内容：' + e)
+				if(e.length==0){
+					this.flightList = [];
+					this.page = 1;
+					this.getDataList()
+				}
+			},
+			datatime() {
+				let dataTime = Format("yyyy-MM-dd", new Date());
+				return dataTime
 			},
 		},
 	}
@@ -172,7 +289,7 @@
 			position: relative;
 			display: flex;
 			margin-top: 1.875rem;
-			height: 10rem;
+			height: 3.5rem;
 			>.log {
 				width: .375rem;
 				height: .75rem;
@@ -183,10 +300,16 @@
 				background-size: 100% 100%;
 			}
 		}
+		>.title{
+			height: 3rem;
+			padding: 0 35px;
+			box-sizing: border-box;
+			>.date{
+				margin-bottom: 15px;
+			}
+		}
 		>.content{
-			height: calc(100vh - 14rem);
-			overflow-x: hidden;
-			overflow-y: auto;
+			height: calc(100vh - 9.5rem);
 			>.craid {
 				// width: 100%;
 				border-radius: 0!important;

pages/sorting/index.vue

@@ -63,25 +63,25 @@
 					<view v-if="action === true" :class="item.types ? 'ups':'up'" v-for="(item, index) in listdate1"
 						:key="index" @touchstart="start" @touchend="(e)=>end(e,item)">
 						<view class="list" @tap="toDetail(item.luggageNum)">{{ item.luggageNum }}</view>
-						<view class="normal">
-							{{item.specialType!=null?item.specialType:" "}}
+						<view class="normal" @tap="toDetail(item.luggageNum)">
+							{{item.specialType!=null?specialTypeList[item.specialType]:" "}}
 						</view>
-						<view :class="item.abnormalType!=null?'error':'normal'">
-							{{item.abnormalType!=null?item.abnormalType:"正常"}}</view>
-						<view class="down_up" v-if="pagename == 'LOAD' && item.abnormalType!='OFF'"
+						<view :class="item.abnormalType!=null?'error':'normal'" @tap="toDetail(item.luggageNum)">
+							{{item.abnormalType!=null?item.abnormalName:"正常"}}</view>
+						<view class="down_up" v-if="pagename == 'LOAD' && item.abnormalType!='OFF' && item.abnormalType!='POFF'"
 							@tap="up(item,index)"></view>
-						<view class="delete" v-if="pagename == 'LOAD' && item.abnormalType!='OFF'">
+						<view class="delete" v-if="pagename == 'LOAD' && item.abnormalType!='OFF' && item.abnormalType!='POFF'">
 							<view class="log" @click="()=>up(item,index)"></view>
 						</view>
 					</view>
 					<view v-if="action !== true" :class="item.types ? 'ups':'up'" v-for="(item, index) in listdate2"
-						:key="index">
-						<view class="list" @tap="toDetail(item.luggageNum)">{{ item.luggageNum }}</view>
+						:key="index" @tap="toDetail(item.luggageNum)">
+						<view class="list" >{{ item.luggageNum }}</view>
 						<view class="normal">
-							{{item.specialType!=null?item.specialType:" "}}
+							{{item.specialType!=null?specialTypeList[item.specialType]:" "}}
 						</view>
 						<view :class="item.abnormalType!=null?'error':'normal'">
-							{{item.abnormalType!=null?item.abnormalType:"正常"}}</view>
+							{{item.abnormalType!=null?item.abnormalName:"正常"}}</view>
 						<!-- <view class="down_up" @tap="up"></view> -->
 					</view>
 				</scroll-view>
@@ -153,19 +153,23 @@
 					},
 					{
 						"type": "NAL",
-						"name": "未被授权的装载"
+						"name": "未授权装载"
 					},
 					{
 						"type": "OFF",
 						"name": "已卸载"
 					},
+					{
+						"type": "PFF",
+						"name": "预卸载"
+					},
 					{
 						"type": "UNS",
 						"name": "未找到"
 					},
 					{
 						"type": "OND",
-						"name": "在场未装载，未被授权"
+						"name": "在场未装载，未授权"
 					},
 					{
 						"type": "ONA",
@@ -173,7 +177,21 @@
 					}
 				],
 				oldRfidList: [],
-				
+				specialTypeList:{
+					"AVIH":"装笼动物",
+					"CREW":"机组行李",
+					"RFAG":"易碎行李",
+					"HVY":"重型行李",
+					"PRIO":"优先行李",
+					"RUSH":"无人行李",
+					"SCON":"急转行李",
+					"SPEQ":"运动装备",
+					"VIP":"VIP行李",
+					"WCHR":"轮椅",
+					"WFAP":"武器枪支",
+					"SJ05":"到港行李破损",
+					"SJ34":"超大柜台接收",
+				}
 			}
 		},
 		created(option) {},
@@ -210,8 +228,10 @@
 		},
 		onUnload() {
 			uni.$off("scancodemsg");
-			this.$devapi.RFIDStopInventory()
-			this.$devapi.ISRFIDOPEN = !this.$devapi.ISRFIDOPEN
+			if(this.$devapi.RFIDIntervalTime!=0){
+				this.$devapi.RFIDStopInventory()
+				this.$devapi.ISRFIDOPEN = false
+			}
 		},
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
@@ -230,7 +250,7 @@
 					this.currentLuggageNum = data.msg[0].trim()
 					this.getluggage(this.currentLuggageNum, true)
 					this.$devapi.RFIDStopInventory()
-					this.$devapi.ISRFIDOPEN = !this.$devapi.ISRFIDOPEN
+					this.$devapi.ISRFIDOPEN = false
 				} else if (this.flightNO && data.msg.length > 0) {
 					data.msg.map(item => {
 						if (_.findIndex(this.listdate1, function(o) {
@@ -349,7 +369,7 @@
 						} else {
 							this.flightDetail = res.returnData[0]
 							this.getluggageList()
-						}
+						}	
 						if (this.flightDetail.scheduleTakeOffTime) {
 							this.flightDetail.scheduleTakeOffTime = this.flightDetail.scheduleTakeOffTime
 								.split("T")[1]
@@ -375,7 +395,6 @@
 				})
 			},
 			async getluggageList() {
-				console.log(123)
 				let data = {
 					"serviceId": 3001,
 					"page": 1,
@@ -495,8 +514,10 @@
 							this.$scanAudio.play()
 						}
 					} else {
-						this.$devapi.RFIDStopInventory()
-						this.$devapi.ISRFIDOPEN = !this.$devapi.ISRFIDOPEN
+						if(this.$devapi.RFIDIntervalTime!=0){
+							this.$devapi.RFIDStopInventory()
+							this.$devapi.ISRFIDOPEN = false
+						}
 						this.$scanAudio.src = "../../static/hqxl.mp3"
 						this.$scanAudio.play()
 						uni.showToast({
@@ -590,8 +611,8 @@
 				this.$scanAudio.play()
 			},
 			confirm: function(e) { //确定按钮
-				this.currentLuggage.abnormalState = "OFF"
-				this.currentLuggage.abnormalName = "拉下"
+				this.currentLuggage.abnormalState = "PFF"
+				this.currentLuggage.abnormalName = "预卸载"
 				let datas = this.setLuggage()
 				this.sendData(datas)
 			},
@@ -607,13 +628,15 @@
 			},
 
 			confirm3: function(e) { //确定按钮
-				this.$devapi.RFIDStartInventory()
-				this.$devapi.ISRFIDOPEN = !this.$devapi.ISRFIDOPEN
 				this.flightNO = this.currentLuggage.carrierFlights
 				this.flightDate = this.currentLuggage.carrierFlightsDate
 				this.landAirport = this.currentLuggage.landAirport
 				this.outAirport = this.currentLuggage.outAirport
 				this.getFlightData();
+				if (this.$devapi.RFIDIntervalTime!=0) {//继续连续操作
+					this.$devapi.RFIDStartInventory()
+					this.$devapi.ISRFIDOPEN = true
+				}
 			},
 			cancel3: function() { //取消按钮
 				this.flightNO = "null"

uni_modules/liu-search/components/liu-search/liu-search.vue

@@ -9,7 +9,7 @@
 			<view class="search-name"  @click="confirmSearch">搜索</view>
 			<!-- <view class="search-name" v-if="searchText.length > 0" @click="upele">取消</view> -->
 		</view>
-		<view class="search-history" v-if="historyList.length">
+		<!-- <view class="search-history" v-if="historyList.length">
 			<view class="history-title">
 				<view class="title-name">搜索历史</view>
 				<view class="history-delete" v-if="isDelete">
@@ -26,7 +26,7 @@
 					<span class="delete-icon" v-if="isDelete">x</span>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="search-history" v-if="hotList.length">
 			<view class="history-title">
 				<view class="title-name">热门搜索</view>
@@ -77,7 +77,7 @@
 			this.noSeeImg = nosee
 			this.deleteImg = deleteSrc
 			this.searchImg = searchSrc
-			this.historyList = uni.getStorageSync('liu-search-name-list') || []
+			// this.historyList = uni.getStorageSync('liu-search-name-list') || []
 		},
 		methods: {
 			//返回上级

utils/request.js

@@ -18,10 +18,11 @@ export default {
 	},
 	send(options={}){
         // loading加载
-        // uni.showLoading({
-        //    title: '加载中'
-        // });
-        
+		if(options.data.serviceId!=3021){
+			uni.showLoading({
+			   title: '加载中'
+			});
+		}
         // 拼接路劲，下面的配置文件会提到
 		options.url = config.uni_app_web_api_url + '' + options.url;
         // 请求方式
@@ -45,6 +46,7 @@ export default {
 				var [error, res] = data;
 				if(error != null){
 					reject(error);
+					uni.hideLoading();
 				}else{
                     // 相应拦截、根据后端的状态码来写，可以自行判断和封装
 					console.log(res)
@@ -62,9 +64,10 @@ export default {
 						uni.hideLoading();
 					}else{
 						resolve(res.data); 
+						uni.hideLoading();
 					}
+					uni.hideLoading();
 				}
-				uni.hideLoading();
 			}).catch(data =>{
 				uni.showToast({
 					icon: 'none',