1

components/header/nav.vue

@@ -5,14 +5,11 @@
 
 			</view>
 			<view class="nav-sech">
-				<!-- <view class="secah">{{}}</view> -->
-				<picker class="secah" @change="change" :value="index" :range="airportList">
-					<view>{{airportList[index]}}</view>
+				<picker v-if="airportList && airportList.length>0" class="secah" @change="change" :value="valueIndex" :range="airportList">
+					<view>{{airportList[valueIndex]}}</view>
 				</picker>
-				<view class="input-nav" @tap="test">
-					{{ placeholder }}
-				</view>
-				
+				<input class="uni-input input-nav" @tap="test" disabled="true" :placeholder="placeholder" />
+				<uni-icons type="scan" size="26" @tap="scan" color="#fff"></uni-icons>
 			</view>
 		</view>
 	</view>
@@ -24,7 +21,8 @@
 				searchText: '', //搜索内容
 				placeholder: '请输入航班号或行李号',
 				array: [],
-				airportList:[]
+				airportList:[],
+				valueIndex:this.index
 			}
 		},
 		props: {
@@ -56,6 +54,9 @@
 		},
 		mounted() {},
 		methods: {
+			scan(){
+				this.$emit("scan")
+			},
 			async getAirportList(){
 				let data={
 						"serviceId": 14,
@@ -63,20 +64,21 @@
 						"event": "0"
 					}
 				await this.$http.httpPost('/openApi/query',data).then(res => {
+					this.airportList = []
 					if(res.code == "0"){
 						res.returnData.map(item =>{
 							this.airportList.push(item['IATACode'])
 						})
 						this.$storage.setJson('airportList',this.airportList);
-						let num = this.index;
+						let num = this.valueIndex;
 						this.$storage.set('airportName',this.airportList[num])
 					}
 				})
 			},
 			change(e){
-				this.index = e.detail.value
-				this.$emit('airport',this.airportList[this.index])
-				this.$storage.set('airport',this.index);
+				this.valueIndex = e.detail.value
+				this.$emit('airport',this.airportList[this.valueIndex])
+				this.$storage.set('airport',this.valueIndex);
 			},
 			test() {
 				uni.navigateTo({

components/header/navs.vue

@@ -62,7 +62,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		padding-top: 2.25rem;
+		padding-top: 1.25rem;
 		color: rgb(255, 255, 255);
 		font-family: Noto Sans SC;
 		font-size: 1rem;

config.js

@@ -1,5 +1,5 @@
 export default {
-	web_name: "网站名称", 
+	web_name: "BRS", 
 	// uni_app_web_url: "http://mimall.lovemi.ren/", // h5域名PC域名，用于分享图片或者拼接图片时使用，结尾必须加 “/”
 	uni_app_web_api_url: "http://10.199.7.20:8083", // 请求接口的地址
 	debug: true

pages.json

@@ -124,18 +124,25 @@
 	},
 	"tabBar":{
 		"color":"#7A7E83",
-		"selectedColor":"#3cc51f",
+		"selectedColor":"#33A1A5",
 		"borderStyle":"black",
+		"fontSize":"14px",
 		"backgroundColor":"#ffffff",
 		"list":[{
 		"pagePath":"pages/index/index",
-		"text": "首页"
+		"text": "首页",
+		"iconPath": "static/ic_home_tabbar_default.png",
+		"selectedIconPath": "static/ic_home_tabbar_check.png"
 		}, {
 		"pagePath":"pages/message/message",
-		"text": "消息"
+		"text": "消息",
+		"iconPath": "static/ic_message_tabbar_default.png",
+		"selectedIconPath": "static/ic_message_tabbar_check.png"
 		}, {
 		"pagePath":"pages/mypage/index",
-		"text": "我的"
+		"text": "我的",
+		"iconPath": "static/ic_user_tabbar_default.png",
+		"selectedIconPath": "static/ic_user_tabbar_check.png"
 		}]
 		},
 	"uniIdRouter": {}

pages/baggagecheck/index.vue

@@ -4,6 +4,10 @@
 			<view class="log" @tap="fall"></view>{{ navname }}
 			<view class="up" @tap="sendData()">完成</view>
 		</view>
+		<view class="craids" v-if="!luggageData">
+			<p>暂无行李信息</p>
+			<p>请扫描需要操作的行李牌条码</p>
+		</view>
 		<view class="content" v-if="luggageData">
 			<view class="list">
 				<p>行李编号</p>
@@ -103,10 +107,23 @@
 		created(option) {},
 		onLoad(option) {
 			this.luggageNum = option.luggageNum;
-			this.getDetial(this.luggageNum)
+			if(this.luggageNum.length>9){
+				this.getDetial(this.luggageNum)
+			}
 		},
 		onUnload() {},
-		onShow() {},
+		onShow() {
+			uni.$on("scancodemsg", (data) => {
+				if (data.msg.length > 9) {
+					this.luggageNum = Number(data.msg)
+					// this.luggageNum = 3784730658
+					this.getDetial(this.luggageNum)
+				}
+			});
+		},
+		onHide() {
+			uni.$off("scancodemsg");
+		},
 		mounted() {},
 		components: {
 			Nav,
@@ -247,7 +264,20 @@
 				font-weight: 500;
 			}
 		}
-
+		>.craids{
+				margin-top:10rem;
+				height: 5.625rem;
+				padding: 0 2.5625rem 0 2.5625rem;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				>p{
+					color: rgb(75, 84, 91);
+					font-family: Noto Sans SC;
+					font-size: 13px;
+					font-weight: 500;
+				}
+			}
 		>.content {
 			margin-left: 1.5rem;
 

pages/detail/index.vue

@@ -231,7 +231,6 @@
 		},
 		onLoad(option) {
 			this.luggageNum = option.luggageNum 
-			// this.luggageNum= "3784551037"
 			this.getNode()
 			this.getSpecialTypeList()
 			this.getDetial(this.luggageNum)

pages/extract/index.vue

@@ -23,10 +23,10 @@
           <p>暂无航班信息</p>
 				</view>
 				<view class="scanning">
-					<view :class="getFooterClass">
+					<view class="scanning_cd">
 						<input  class="input"  v-model.trim="capluggageNum" disabled  type="text" value=""  placeholder-style="font-size:.8125rem;color:rgb(189, 214, 231);display:flex;justify-content: start;" placeholder="请扫描机票信息"/>
 						<view class="log_l"></view>
-						<view class="log"></view>
+						<view class="log" @tap="scan('1')"></view>
 					</view>
 				</view>
 			</view>
@@ -50,10 +50,10 @@
 					<p>暂无航班信息</p>
 				</view>
 				<view class="scanning">
-					<view :class="getlooterClasser">
+					<view class="scanning_cd">
 						<input  class="input"  v-model.trim="capsluggageNum" disabled type="text" value=""  placeholder-style="font-size:.8125rem;color:rgb(189, 214, 231);display:flex;justify-content: start;" placeholder="请扫描行李牌号"/>
 						<view class="log_l"></view>
-						<view class="log"></view>
+						<view class="log" @tap="scan('2')"></view>
 					</view>
 					<view class="gao" v-if="!isMatch">*行李信息不一致，请上报处理</view>
 				</view>
@@ -115,18 +115,29 @@
 			// console.log(this.stratvalue.length)
 		},
 		computed: {
-			getFooterClass () {
-				return this.cap.luggageNum ? 'scanning_cds' : 'scanning_cd'
-			},
-			getlooterClasser () {
-				return this.caps.luggageNum ? 'scanning_cds' : 'scanning_cd'
-			}
+			// getFooterClass () {
+			// 	return this.cap.luggageNum ? 'scanning_cds' : 'scanning_cd'
+			// },
+			// getlooterClasser () {
+			// 	return this.caps.luggageNum ? 'scanning_cds' : 'scanning_cd'
+			// }
 		},
 		components: {
 			Navs,
 			maskModel:maskModel,
 		},
 		methods: {
+			scan(type){
+				let that = this
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: function (res) {
+						that.luggageNum = Number(res.result)
+						// this.luggageNum = 3784730658
+						that.getDetial(Number(res.result))
+					}
+				});
+			},
 			datatime() {
 				let dataTime = Format("yyyy-MM-dd hh:mm:ss", new Date());
 				return dataTime
@@ -211,9 +222,16 @@
 				})
 			},
 			abnormal(){
-				uni.navigateTo({
-					url: "/pages/baggagecheck/index?luggageNum="+this.caps.luggageNum
-				})
+				if(this.luggageNum){
+					uni.navigateTo({
+						url: "/pages/baggagecheck/index?luggageNum="+this.luggageNum
+					})
+				}
+				else{
+					uni.navigateTo({
+						url: "/pages/baggagecheck/index?luggageNum="
+					})
+				}
 			},
 			fall () {
 				uni.switchTab({

pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="app-content">
 		<img :src="icon" alt="" class="tuku">
-		<Nav :navname.sync="navname" :navtype="false" :index="index" @airport="airport"></Nav>
+		<Nav :navname.sync="navname" :navtype="false" :index="index" @scan="scan"></Nav>
 		<view class="fight" v-if="flightDetail">
 			<view class="fight_card">
 				<p>{{flightDetail.carrierFlights}}</p>
@@ -9,11 +9,12 @@
 			</view>
 			<view class="fight_card">
 				<p>{{flightDetail.outAirport}}</p>
-				<span>{{flightDetail.scheduleTakeOffTime}}</span>
+				<span>{{flightDetail.scheduleTakeOffTime?flightDetail.scheduleTakeOffTime:"-"}}</span>
 			</view>
+			<view class="aircraft"></view>
 			<view class="fight_card">
 				<p>{{flightDetail.landAirport}}</p>
-				<span>{{flightDetail.scheduleLandInTime}}</span>
+				<span>{{flightDetail.scheduleLandInTime?flightDetail.scheduleLandInTime:"-"}}</span>
 			</view>
 		</view>
 		<view class="times">
@@ -69,7 +70,8 @@
 				index: 0,
 				flightDetail: null,
 				flightNO: null,
-				airportName:null
+				airportName:null,
+				flightDate:null
 			}
 		},
 		created(option) {
@@ -88,14 +90,19 @@
 					})
 				}
 			});
-			if (this.$storage.getJson('airport')) {
-				this.index = this.$storage.getJson('airport')
+			if (this.$storage.get('airport')) {
+				this.index = this.$storage.get('airport')
 			}
-			let data = this.$storage.get('searchData');
-			if (data) {
-				this.flightNO = data
-				this.getFlightData()
+			if (this.$storage.get('flightDate')) {
+				this.flightDate = this.$storage.get('flightDate')
 			}
+			if (this.$storage.getJson('searchData')) {
+				this.flightDetail = this.$storage.getJson('searchData')
+				this.flightNO = this.flightDetail.carrierFlights
+				this.flightDate = this.flightDetail.carrierFlightsDate
+				// this.getFlightData()
+			}
+			
 		},
 		onHide() {
 			uni.$off("scancodemsg");
@@ -110,40 +117,24 @@
 			Nav
 		},
 		methods: {
-			airport(e){
-				this.airportName = e;
-				this.$storage.set('airportName',e)
+			scan(){
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: function (res) {
+						if (res.result.length > 9) {
+							uni.navigateTo({
+								url: "/pages/detail/index?luggageNum=" + res.result
+							})
+						}
+					}
+				});
 			},
 			datatime() {
-				this.newDataday = Format("yyyy/MM/dd", new Date());
 				setInterval(() => {
+					this.newDataday = Format("yyyy/MM/dd", new Date());
 					this.newData = Format("hh:mm", new Date());
 				}, 1000);
 			},
-			async getFlightData() {
-				let data = {
-					"serviceId": 3000,
-					"page": 1,
-					"pageSize": 10,
-					"dataContent": [{
-						"carrierFlights":this.flightNO
-					}],
-					"event": "0"
-				}
-				await this.$http.httpPost('/openApi/query', data).then(res => {
-					if (res.code == "0" && res.returnData.length>0) {
-						this.flightDetail = res.returnData[0]
-						this.$storage.remove('searchData')
-					}
-					else{
-						uni.showToast({
-							icon:'none',
-							title: "无此航班信息，请确认航班号",
-							duration: 5000
-						});
-					}
-				})
-			},
 			clickOrder(data) {
 				if(data == "extract"){//提取
 					uni.navigateTo({
@@ -157,7 +148,7 @@
 				}
 				else{
 					uni.navigateTo({
-						url: "/pages/sorting/index?item=" + data +"&flightNO="+this.flightNO
+						url: "/pages/sorting/index?item=" + data +"&flightNO="+this.flightNO+"&date="+this.flightDate
 					})
 				}
 				
@@ -184,7 +175,12 @@
 			align-items: center;
 			justify-content: space-around;
 			margin-top: 1.375rem;
-
+			>.aircraft {
+				width: 1.75rem;
+				height: 1.75rem;
+				background: url('../../static/hang.png') no-repeat;
+				background-size: 100% 100%;
+			}
 			>.fight_card {
 				display: flex;
 				flex-direction: column;
@@ -195,6 +191,7 @@
 					color: rgb(255, 255, 255);
 					font-family: Noto Sans SC;
 					font-size: 16px;
+					line-height: 24px;
 					font-weight: 700;
 				}
 
@@ -209,7 +206,7 @@
 
 		>.times {
 			width: 100%;
-			height: 4.6875rem;
+			height: 2.6875rem;
 			display: flex;
 			align-items: center;
 			justify-content: center;
@@ -236,7 +233,7 @@
 				background: linear-gradient(188.06deg, rgba(65.49, 109.04, 128.64, 1.00) 3.551%, rgba(38, 68.32, 81.96, 1.00) 110.878%);
 				box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
 				border-radius: 4px;
-				margin-bottom: 2.25rem;
+				margin-bottom: 2rem;
 				display: flex;
 				flex-direction: column;
 				justify-content: center;

pages/mypage/index.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="app-content">
 		<img src="static/beijing.png" alt="" class="tuku">
-		<Nav :navname.sync="navname" :navtype="false" :navtypes="true" :index="index"></Nav>
-    <view class="cont">
+		<!-- <Nav :navname.sync="navname" :navtype="false" :navtypes="true" :index="index"></Nav> -->
+    <view class="cont" style="margin-top: 3rem;">
 			<view class="photograph"  @tap="upindiv">
 				<img src="static/shuai.png" alt="">
 			</view>
@@ -139,8 +139,8 @@
 					})
 				}
 			});
-			if(this.$storage.getJson('airport')){
-				this.index = this.$storage.getJson('airport')
+			if(this.$storage.get('airport')){
+				this.index = this.$storage.get('airport')
 			}
 		},
 		onHide() {
@@ -286,7 +286,7 @@
 			>.list_child{
 				width: 7.5rem;
         height: 7.5rem;
-				background: rgb(37, 121, 160);
+				background: linear-gradient(188.06deg, rgba(65.49,109.04,128.64,1.00) 3.551%,rgba(38,68.32,81.96,1.00) 110.878%);
 				box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
 				border-radius: 4px;
 				margin-bottom: 4%;
@@ -301,7 +301,7 @@
 					margin-bottom: .5rem;
 				}
 				.bg1{
-					background: url('../../static/gongzuo.png') no-repeat;
+					background: url('../../static/jilu.png') no-repeat;
           background-size: 100% 100%;
 				}
 				.bg2{
@@ -309,7 +309,7 @@
           background-size: 100% 100%;
 				}
 				.bg3{
-					background: url('../../static/jilu.png') no-repeat;
+					background: url('../../static/gongzuo.png') no-repeat;
           background-size: 100% 100%;
 				}
 				.bg4{

pages/search/index.vue

@@ -4,6 +4,24 @@
 			<liu-search @fall="fall" :historyList="historyList" @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> -->
+			<button class="craid" v-for="(item,index) in flightList" :key="index"  @tap="toIndex(item)">
+				<view class="craid_data">
+					<p>{{item.carrierFlights}}</p>
+					<span>{{item.carrierFlightsDate}}</span>
+				</view>
+				<view class="craid_data">
+					<p>{{item.outAirport}}</p>
+					<span>{{item.scheduleTakeOffTime}}</span>
+				</view>
+				<view class="aircraft">To</view>
+				<view class="craid_data">
+					<p>{{item.landAirport}}</p>
+					<span>{{item.scheduleLandInTime}}</span>
+				</view>
+			</button>
+		</view>
 		<!-- 提示信息和下拉弹窗 -->
 		<mask-model :headername="headername" :typeShow="typeShow" :tabname="tabname" ref="showMask" btnType="1"
 			@confirm="confirm" @cancel="cancel" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF"
@@ -21,7 +39,8 @@
 				tabname: '', //按钮名称
 				typeShow: true,
 				headername: '请核对信息',
-				value:null
+				value:null,
+				flightList:[]
 			}
 		},
 		created(option) {},
@@ -38,11 +57,20 @@
 		},
 		mounted() {
 			uni.$off("scancodemsg");
+			
 		},
 		components: {
 			Nav
 		},
 		methods: {
+			toIndex(item){
+				console.log(item)
+				this.$storage.setJson('searchData',item);
+				// this.$storage.set('flightDate',item.carrierFlightsDate);
+				uni.switchTab({
+					url: "/pages/index/index"
+				})
+			},
 			fall() {
 				uni.navigateBack({
 					delta: 1
@@ -57,24 +85,75 @@
 			change(e) {
 				this.value = e
 				this.typeShow = false
-				this.maskTitle = '请核对录入的行李号是否正确'
+				this.maskTitle = '请核对录入的航班号或行李号是否正确'
 				this.headername = '请核对信息'
 				this.$refs.showMask.show();
 			},
 			confirm: function() { //确定按钮
-				this.$storage.remove('searchData');
 				if(this.value.length>9){
 					uni.navigateTo({
 						url: "/pages/detail/index?luggageNum=" + Number(this.value)
 					})
 				}
 				else{
-					this.$storage.set('searchData',this.value);
-					uni.switchTab({
-						url: "/pages/index/index"
-					})
+					this.getFlightData(this.value)
+					this.cancel()
+				}
+			},
+			async getFlightData(num) {
+				let data = {
+					"serviceId": 3000,
+					"page": 1,
+					"pageSize": 10,
+					"dataContent": [{
+						"carrierFlights":num
+					}],
+					"event": "0"
 				}
+				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');
+						if(res.returnData.length==1){
+							if(res.returnData[0].scheduleTakeOffTime){
+								res.returnData[0].scheduleTakeOffTime = res.returnData[0].scheduleTakeOffTime.split("T")[1]
+							}
+							if(res.returnData[0].scheduleLandInTime){
+								res.returnData[0].scheduleLandInTime = res.returnData[0].scheduleLandInTime.split("T")[1]
+							}
+							this.$storage.setJson('searchData',res.returnData[0]);
+							uni.switchTab({
+								url: "/pages/index/index"
+							})
+						}
+						else {
+							this.flightList = res.returnData
+							this.flightList.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 = "-"
+								}
+							})
+						}
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "无此航班号信息，请确认航班号",
+							duration: 5000
+						});
+					}
+				})
 			},
+			
 			cancel(){},
 			//input事件
 			input(e) {
@@ -91,7 +170,7 @@
 			position: relative;
 			display: flex;
 			margin-top: 1.875rem;
-
+			height: 10rem;
 			>.log {
 				width: .375rem;
 				height: .75rem;
@@ -102,5 +181,51 @@
 				background-size: 100% 100%;
 			}
 		}
+		>.content{
+			height: calc(100vh - 13rem);
+			overflow-x: hidden;
+			overflow-y: auto;
+			>.craid {
+				// width: 100%;
+				border-radius: 0;
+				border: none;
+				z-index: 10;
+				height: 5.625rem;
+				padding: 0 2.5625rem 0 2.5625rem;
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
+				align-items: center;
+				border-bottom: 1px solid #000;
+				>.craid_data {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: start;
+			
+					>p {
+						color: rgb(0, 0, 0);
+						font-family: Noto Sans SC;
+						font-size: 18px;
+						font-weight: 700;
+					}
+			
+					>span {
+						color: rgb(0, 0, 0);
+						font-family: Noto Sans SC;
+						font-size: 13px;
+						font-weight: 500;
+					}
+				}
+			
+				>.aircraft {
+					width: 1.75rem;
+					height: 1.75rem;
+					background: url('../../static/hang.png') no-repeat;
+					background-size: 100% 100%;
+				}
+			}
+		}
+		
 	}
 </style>

pages/sorting/index.vue

@@ -4,48 +4,45 @@
 		<Navs :navname.sync="navname" @fall="fall" :index='index'></Navs>
 		<view class="content">
 			<view class="content_top">
-				<view class="craid" v-if="flightDetail">
+				<view class="craid" v-if="flightDetail&&flightDetail.carrierFlights">
 					<view class="craid_data">
 						<p>{{flightDetail.carrierFlights}}</p>
 						<span>{{flightDetail.carrierFlightsDate}}</span>
 					</view>
 					<view class="craid_data">
 						<p>{{flightDetail.outAirport}}</p>
-						<span>{{flightDetail.scheduleTakeOffTime}}</span>
+						<span>{{flightDetail.scheduleTakeOffTime?flightDetail.scheduleTakeOffTime:"-"}}</span>
 					</view>
 					<view class="aircraft"></view>
 					<view class="craid_data">
 						<p>{{flightDetail.landAirport}}</p>
-						<span>{{flightDetail.scheduleLandInTime}}</span>
+						<span>{{flightDetail.scheduleLandInTime?flightDetail.scheduleLandInTime:"-"}}</span>
 					</view>
 				</view>
-				<view class="craids" v-if="!flightDetail">
+				<view class="craids" v-if="!flightDetail.carrierFlights">
 					<p>暂无航班信息</p>
 				</view>
 				<view class="scanning">
 					<view :class="getFooterClass">
 						<input class="input" v-model.trim="stratvalue" type="text"
-							value=""
 							placeholder-style="font-size:.8125rem;color:rgb(189, 214, 231);display:flex;justify-content: start;"
 							placeholder="请输入操作位置" />
 						<view class="log_l"></view>
-						<view class="log"></view>
+						<view class="log" @tap="scan('1')"></view>
 					</view>
 					<view :class="getFooterClasser" v-if="navname == '装车'">
 						<input class="input" v-model.trim="container_ID" type="text"
-							value=""
 							placeholder-style="font-size:.8125rem;color:rgb(189, 214, 231);display:flex;justify-content: start;"
 							placeholder="请输入容器编号" />
 						<view class="log_l"></view>
-						<view class="log"></view>
+						<view class="log" @tap="scan('2')"></view>
 					</view>
 					<view :class="getlooterClass">
 						<input class="input" v-model.trim="currentLuggageNum" disabled="true" @tap="baggageEntry" type="text"
-							value=""
 							placeholder-style="font-size:.8125rem;color:rgb(189, 214, 231);display:flex;justify-content: start;"
 							placeholder="请输入行李号" />
 						<view class="log_l"></view>
-						<view class="log"></view>
+						<view class="log" @tap="scan('3')"></view>
 					</view>
 				</view>
 			</view>
@@ -70,7 +67,7 @@
 						<!-- <view class="down_up" @tap="up"></view> -->
 					</view>
 				</scroll-view>
-				<view class="but" v-if="!action" @tap="clickOrder">一键处理</view>
+				<view class="but" v-if="!action&&listdate2.length>0" @tap="clickOrder">一键处理</view>
 			</view>
 		</view>
 		<!-- 提示信息和下拉弹窗 -->
@@ -122,6 +119,8 @@
 				typeShow: true,
 				headername: '提示信息',
 				flightNO:null,
+				flightDate:null,
+				onFlightDate:null,
 				flightDetail:{},
 				index:0,
 				currentLuggageNum:null,
@@ -160,6 +159,7 @@
 		onLoad(option) {
 			this.pagename = option.item
 			this.flightNO = option.flightNO
+			this.flightDate = option.date
 			this.getNode()
 			switch (this.pagename){
 				case "SORT":
@@ -180,7 +180,7 @@
 				default:
 					break;
 			}
-			if(this.flightNO){
+			if(this.flightNO!="null"&&this.flightNO){
 				this.getFlightData()
 				this.getluggageList()
 			}
@@ -191,7 +191,7 @@
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
-					this.currentLuggageNum = data.msg
+					this.currentLuggageNum = Number(data.msg)
 					this.getluggage(this.currentLuggageNum,true)
 				}
 			});
@@ -222,6 +222,24 @@
 			maskModel: maskModel,
 		},
 		methods: {
+			scan(type){
+				let that = this
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: function (res) {
+						if(type=="1"){
+							that.stratvalue = res.result;
+						}
+						else if(type=="2"){
+							that.container_ID = res.result;
+						}
+						else{
+							that.currentLuggageNum = res.result
+							that.getluggage(that.currentLuggageNum,true)
+						}
+					}
+				});
+			},
 			async getNode() {
 				let data = {
 					"serviceId": 3003,
@@ -240,6 +258,7 @@
 			},
 			next(data){
 				this.flightNO = this.currentLuggage.flightNo;
+				this.flightDate = this.currentLuggage.flightDate;
 				this.getFlightData()
 				this.getluggageList()
 				this.$refs.showMask.hide();
@@ -261,11 +280,38 @@
 					"event": "0"
 				}
 				await this.$http.httpPost('/openApi/query', data).then(res => {
-					if (res.code == "0") {
-						this.flightDetail = res.returnData[0]
+					if (res.code == "0"&&res.returnData.length>0) {
+						this.flightDetail = []
+						if(this.flightDate&&this.flightDate!="null"){
+							res.returnData.map(item =>{
+								if(this.flightDate == item.carrierFlightsDate){
+									this.flightDetail = item
+								}
+							})
+						}
+						else{
+							this.flightDetail = res.returnData[0]
+						}
+						if(this.flightDetail.scheduleTakeOffTime){
+							this.flightDetail.scheduleTakeOffTime = this.flightDetail.scheduleTakeOffTime.split("T")[1]
+						}
+						else{
+							item.scheduleTakeOffTime = "-"
+						}
+						if(this.flightDetail.scheduleLandInTime){
+							this.flightDetail.scheduleLandInTime = this.flightDetail.scheduleLandInTime.split("T")[1]
+						}
+						else{
+							item.scheduleLandInTime = "-"
+						}
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "未查询到"+this.flightNO+"航班信息",
+							duration: 5000
+						});
 					}
-					this.flightDetail.scheduleTakeOffTime = this.flightDetail.scheduleTakeOffTime.split("T")[1]
-					this.flightDetail.scheduleLandInTime = this.flightDetail.scheduleLandInTime.split("T")[1]
 				})
 			},
 			async getluggageList(){
@@ -353,20 +399,20 @@
 				await this.$http.httpPost('/openApi/query', data).then(res => {
 					if(res.code == "0"&&res.returnData.length>0){
 						this.currentLuggage = res.returnData[0];
-						if(this.flightNO&&this.flightNO == res.returnData[0].flightNo&&isSend==true){
+						console.log(this.flightNO)
+						if(this.flightNO !="null"&&this.flightNO&&this.flightNO == res.returnData[0].flightNo&&isSend==true){
 							this.setLuggage()
 						}
-						else if(this.flightNO&&this.flightNO != res.returnData[0].flightNo){
+						else if(this.flightNO !="null"&&this.flightNO&&this.flightNO != res.returnData[0].flightNo){
 							this.tabname = res.returnData[0].flightNo
+							this.typeShow = true
 							this.$refs.showMask.show();
 						}
-						else{
-							this.currentIndex = index
+						else if(this.flightNO =="null"){
 							this.typeShow = false
 							this.maskTitle3 = '是否对航班：'+ res.returnData[0].flightNo + "行李进行"+this.navname+"操作？"
 							this.headername = '提示'
-							this.$refs.showMask.show();
-							this.flightNO = res.returnData[0].flightNo;
+							this.$refs.showMask3.show();
 						}
 					}
 					else{
@@ -496,15 +542,19 @@
 				this.listdate1 = arr;
 				this.sendData()
 			},
-			confirm2: function(e) { //确定按钮
+			confirm2: function(e) { //确定一键操作按钮
+				this.cancel()
 				this.listdate2.map((item,index) =>{
 					this.currentLuggage = item;
+					this.currentLuggageNum = item.luggageNum;
 					this.setLuggage();
 					this.listdate1.unshift(item)
 				})
 				this.listdate2 = [];
 			},
 			confirm3: function(e) { //确定按钮
+				this.flightNO = this.currentLuggage.flightNo
+				this.flightDate = this.currentLuggage.flightDate
 				this.getFlightData();
 				this.getluggageList();
 			},

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,7 +1,7 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/index/index","pages/login/index","pages/flightdetails/index","pages/sorting/index","pages/baggagecheck/index","pages/mypage/index","pages/myrecords/index","pages/search/index","pages/loadingdetails/index","pages/help/index","pages/individual/index","pages/extract/index","pages/abnormal/index","pages/baggageEntry/index","pages/locationEntry/index","pages/detail/index","pages/message/message"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","navigationStyle":"custom"},"tabBar":{"color":"#7A7E83","selectedColor":"#3cc51f","borderStyle":"black","backgroundColor":"#ffffff","list":[{"pagePath":"pages/index/index","text":"首页"},{"pagePath":"pages/message/message","text":"消息"},{"pagePath":"pages/mypage/index","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":false,"autoclose":false},"appname":"BRS","compilerVersion":"3.8.4","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniConfig = {"pages":["pages/index/index","pages/login/index","pages/flightdetails/index","pages/sorting/index","pages/baggagecheck/index","pages/mypage/index","pages/myrecords/index","pages/search/index","pages/loadingdetails/index","pages/help/index","pages/individual/index","pages/extract/index","pages/abnormal/index","pages/baggageEntry/index","pages/locationEntry/index","pages/detail/index","pages/message/message"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","navigationStyle":"custom"},"tabBar":{"color":"#7A7E83","selectedColor":"#33A1A5","borderStyle":"black","fontSize":"14px","backgroundColor":"#ffffff","list":[{"pagePath":"pages/index/index","text":"首页","iconPath":"static/ic_home_tabbar_default.png","selectedIconPath":"static/ic_home_tabbar_check.png"},{"pagePath":"pages/message/message","text":"消息","iconPath":"static/ic_message_tabbar_default.png","selectedIconPath":"static/ic_message_tabbar_check.png"},{"pagePath":"pages/mypage/index","text":"我的","iconPath":"static/ic_user_tabbar_default.png","selectedIconPath":"static/ic_user_tabbar_check.png"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":false,"autoclose":false},"appname":"BRS","compilerVersion":"3.8.4","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
 var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"首页"}},{"path":"/pages/login/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/flightdetails/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/sorting/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/baggagecheck/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/mypage/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/myrecords/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/search/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/loadingdetails/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/help/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/individual/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/extract/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/abnormal/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/baggageEntry/index","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/locationEntry/index","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/detail/index","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/message/message","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});