11

components/header/nav.vue

@@ -8,8 +8,8 @@
 				<picker v-if="airportList && airportList.length>0" class="secah" @change="change" :value="valueIndex" :range="airportList">
 					<view>{{airportList[valueIndex]}}</view>
 				</picker>
-				<input class="uni-input input-nav" @tap="test" disabled="true" :placeholder="placeholder" />
-				<uni-icons type="scan" size="26" @tap="scan" color="#fff"></uni-icons>
+				<input class="uni-input input-nav" @tap="test" disabled="true" v-model="flightNo" :placeholder="placeholder" />
+				<uni-icons type="clear" size="26" @tap="clear" color="#fff" v-if="flightNo!=''"></uni-icons>
 			</view>
 		</view>
 	</view>
@@ -41,7 +41,11 @@
 			index:{
 				type: Number,
 				default: 0
-			}
+			},
+			flightNo:{
+				type: String,
+				default: ''
+			},
 		},
 		created(option) {
 			this.airportList =this.$storage.getJson('airportList');
@@ -54,8 +58,8 @@
 		},
 		mounted() {},
 		methods: {
-			scan(){
-				this.$emit("scan")
+			clear(){
+				this.$emit("clear")
 			},
 			async getAirportList(){
 				let data={
@@ -78,6 +82,7 @@
 			change(e){
 				this.valueIndex = e.detail.value
 				this.$emit('airport',this.airportList[this.valueIndex])
+				this.$storage.set('airportName',this.airportList[this.valueIndex])
 				this.$storage.set('airport',this.valueIndex);
 			},
 			test() {

pages/abnormal/index.vue

@@ -5,8 +5,10 @@
 		<view class="content">
 			<view class="content_bootom" style="top:0">
 				<scroll-view scroll-y="true" class="scroll-Y">
-					<view class="ups" v-for="(item, index) in listdata" :key="index">
-						<view class="list"  @tap="toDetail(item.luggageNum)">行李编号：{{ item.luggageNum }}</view>
+					<view class="up" v-for="(item, index) in listdata" :key="index">
+						<view class="list"  @tap="toDetail(item.luggageNum)">
+							<p>行李编号：{{ item.luggageNum }}</p>
+						</view>
 						<view :class="item.exception_type != null?'error':'normal'">{{item.exception_type!=null?item.exception_name:"正常"}}</view>
 					</view>
 				</scroll-view>
@@ -58,7 +60,7 @@
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
 					uni.navigateTo({
-						url: "/pages/baggagecheck/index?luggageNum="+Number(data.msg)
+						url: "/pages/baggagecheck/index?luggageNum="+data.msg
 					})
 				}
 			});
@@ -93,6 +95,7 @@
 								}
 							})
 						})
+						this.listdata = res.returnData;
 					}
 	
 				})
@@ -250,45 +253,16 @@
 				// border-radius: 6px 6px 0px 0px;
 				overflow: hidden;
 				background: rgb(255, 255, 255);
-
-				>.choice {
-					width: 100%;
-					height: 2.5rem;
-					display: flex;
-					background: rgb(240, 241, 243);
-
-					>.handle {
-						width: 50%;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						color: rgb(0, 0, 0);
-						font-family: Noto Sans SC;
-						font-size: 15px;
-						font-weight: 700;
-						border-radius: 6px 6px 0px 0px;
-						background: rgb(255, 255, 255);
-					}
-
-					>.handles {
-						width: 50%;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						color: rgb(0, 0, 0);
-						font-family: Noto Sans SC;
-						font-size: 15px;
-						font-weight: 700;
-					}
-				}
-
+				padding: 0 10px;
+				box-sizing: border-box;
 				.up {
 					width: 100%;
 					display: flex;
 					align-items: center;
+					justify-content: space-between;
 					margin-left: 1rem;
 					border-bottom: 1px solid rgb(238, 238, 238);
-
+				
 					// transform: all 3s;
 					>.down_up {
 						width: .875rem;
@@ -298,11 +272,11 @@
 					}
 					
 					>.error{
-						width: 20%;
+						width: 60px;
 						color:red
 					}
 					>.normal{
-						width: 20%;
+						width: 60px;
 						color:#4682b4 
 					}
 					>.list {
@@ -318,7 +292,7 @@
 						font-size: 13px;
 						font-weight: 500;
 					}
-
+				
 					>.delete {
 						width: 3.75rem;
 						height: 3.75rem;
@@ -329,7 +303,7 @@
 						position: relative;
 						right: -3.75rem;
 						transform: all 3s;
-
+				
 						>.log {
 							width: .875rem;
 							height: .875rem;
@@ -338,60 +312,7 @@
 						}
 					}
 				}
-
-				.ups {
-					width: 100%;
-					display: flex;
-					align-items: center;
-					margin-left: 1rem;
-					border-bottom: 1px solid rgb(238, 238, 238);
-
-					// transform: all 3s;
-					>.down_up {
-						width: .875rem;
-						height: .875rem;
-						position: relative;
-						right: 1.875rem;
-						background: url('../../static/xia.png') no-repeat;
-						background-size: 100% 100%;
-					}
-
-					>.list {
-						width: 97%;
-						position: relative;
-						height: 3.75rem;
-						display: flex;
-						align-items: center;
-						right: 3.75rem;
-						// right: 0;
-						color: rgb(0, 0, 0);
-						font-family: Noto Sans SC;
-						font-size: 13px;
-						font-weight: 500;
-						transform: all 3s;
-					}
-
-					>.delete {
-						width: 3.75rem;
-						height: 3.75rem;
-						background: rgb(237, 101, 101);
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						position: relative;
-						right: 1rem;
-						transform: all 3s;
-
-						// right: -3.75rem;
-						>.log {
-							width: .875rem;
-							height: .875rem;
-							background: url('../../static/vector@1x.png') no-repeat;
-							background-size: 100% 100%;
-						}
-					}
-				}
-
+				
 				.scroll-Y {
 					// height: calc(100% - 2.5rem - 2.75rem - 2.25rem - 2.25rem);
 					height: calc(100% - 2.5rem - 2.75rem);

pages/baggagecheck/index.vue

@@ -2,7 +2,7 @@
 	<view class="app-content">
 		<view class="header">
 			<view class="log" @tap="fall"></view>{{ navname }}
-			<view class="up" @tap="sendData()">完成</view>
+			<view class="up" v-if="luggageData" @tap="sendData()">完成</view>
 		</view>
 		<view class="craids" v-if="!luggageData">
 			<p>暂无行李信息</p>
@@ -15,19 +15,34 @@
 					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="" />
 			</view>
 			<view class="list">
-				<p>当前位置</p>
-				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.location_describe" disabled="true" value=""
+				<p>航班信息</p>
+				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.flightNo" disabled="true" value=""
 					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="" />
 			</view>
 			<view class="list">
-				<p>当前状态</p>
-				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.abnormalState" disabled="true" value=""
+				<p>航班日期</p>
+				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.flightDate" disabled="true" value=""
 					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="" />
 			</view>
 			<view class="list">
-				<p>航班信息</p>
-				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.flightNo" disabled="true" value=""
+				<p>当前节点</p>
+				<picker @change="bindPickerChange1" :placeholderStyle="placeholderStyle" :value="index1" :range-key="'nodeName'" :range="nodeList">
+					<view class="uni-input">{{nodeNameList[index]}}</view>
+				</picker>
+				<view class="listup"></view>
+			</view>
+			<view class="list">
+				<p>当前位置</p>
+				<uni-easyinput :inputBorder="false" :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>
 			</view>
 			<view class="list">
 				<p>异常类型</p>
@@ -65,6 +80,11 @@
 	export default {
 		data() {
 			return {
+				placeholderStyle: "color:000",
+				style: {
+					disableColor: "#fff",
+					color: "#000"
+				},
 				isShow: true,
 				dataheight: '20.75rem',
 				scrollTop: 0,
@@ -83,6 +103,7 @@
 				luggageNum:null,
 				luggageData:null,
 				index:0,
+				index1:0,
 				exceptionList:[
 					{
 						"type":null,
@@ -102,11 +123,14 @@
 					}
 				],
 				exceptionNameList:["非异常行李","破损","少收","多收"],
+				nodeList:[],
+				nodeNameList:[]
 			}
 		},
 		created(option) {},
 		onLoad(option) {
 			this.luggageNum = option.luggageNum;
+			this.getNode()
 			if(this.luggageNum.length>9){
 				this.getDetial(this.luggageNum)
 			}
@@ -115,11 +139,18 @@
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
-					this.luggageNum = Number(data.msg)
-					// this.luggageNum = 3784730658
+					this.luggageNum = data.msg.trim()
 					this.getDetial(this.luggageNum)
 				}
-			});
+				else{
+				uni.showToast({
+					icon:'none',
+					title: "请扫描规范条码",
+					duration: 5000
+				});
+				}
+			})
+				
 		},
 		onHide() {
 			uni.$off("scancodemsg");
@@ -130,6 +161,21 @@
 			mkUpload
 		},
 		methods: {
+			async getNode() {
+				let data = {
+					"serviceId": 3003,
+					"dataContent": {},
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					if (res.code == "0") {
+						this.nodeList = res.returnData;
+						this.nodeList.map(item => {
+							this.nodeNameList.push(item.nodeName)
+						})
+					}
+				})
+			},
 			async getDetial(num) {
 				let data = {
 					"serviceId": 3002,
@@ -143,6 +189,11 @@
 				await this.$http.httpPost('/openApi/query', data).then(res => {
 					if (res.code == "0" && res.returnData.length>0){
 						this.luggageData = res.returnData[0]
+						this.nodeList.map((item,index)=>{
+							if(res.returnData[0].nodeCode == item.nodeCode){
+								this.index1 = index
+							}
+						})
 					}
 					else{
 						uni.showToast({
@@ -157,6 +208,11 @@
 				this.index = e.detail.value
 				this.luggageData.exception_type = this.exceptionList[this.index].type;
 			},
+			bindPickerChange1(e){
+				this.index1 = e.detail.value
+				this.luggageData.nodeCode = this.nodeList[this.index1].nodeCode;
+				this.luggageData.location_describe = this.nodeList[this.index1].nodeDescribe;
+			},
 			async sendData(){
 				this.luggageData.sourceAirport = this.$storage.get('airportName');
 				let data = {

pages/detail/index.vue

@@ -21,70 +21,56 @@
 				<scroll-view scroll-y="true" class="scroll-Y">
 					<view class="list">
 						<view class="lable">航班号</view>
-						<uni-easyinput :inputBorder="false" :styles="style" :disabled="true"
-							v-model="luggageData.carrierFlights" type="text" placeholder="航班号" />
-						</uni-forms>
-						<!-- <view class="listup"></view> -->
+						<span>{{luggageData.carrierFlights}}</span>
 					</view>
 					<view class="list">
 						<view class="lable">航班日期</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="true"
-							v-model="luggageData.carrierFlightsDate" type="text" placeholder="航班日期" />
-						</uni-forms>
-						<!-- <view class="listup"></view> -->
+						<span>{{luggageData.carrierFlightsDate}}</span>
 					</view>
 					<view class="list">
 						<view class="lable">行李牌号</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="true"
-							v-model="luggageData.luggageNum" type="text" placeholder="行李牌号" />
-						</uni-forms>
-						<!-- <view class="listup"></view> -->
+						<span>{{luggageData.luggageNum}}</span>
+					</view>
+					<view class="list">
+						<view class="lable">操作时间</view>
+						<span>{{luggageData.processing_time}}</span>
+					</view>
+					<view class="list">
+						<view class="lable">操作人</view>
+						<span>{{luggageData.agentNumber}}</span>
 					</view>
 					<view class="list">
 						<view class="lable">操作节点</view>
-						<picker @change="bindPickerChange" :value="index" :range-key="'nodeName'" :range="nodeList">
+						<picker @change="bindPickerChange" :placeholderStyle="placeholderStyle" :value="index" :range-key="'nodeName'" :range="nodeList">
 							<view class="uni-input">{{nodeNameList[index]}}</view>
 						</picker>
 						<view class="listup"></view>
 					</view>
 					<view class="list">
 						<view class="lable">操作位置</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false"
+						<uni-easyinput :inputBorder="false" :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">
-						<view class="lable">操作时间</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="true"
-							v-model="luggageData.processing_time" type="text" placeholder="操作时间" />
-						</uni-forms>
-						<!-- <view class="listup"></view> -->
-					</view>
-					<view class="list">
-						<view class="lable">操作人</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="true"
-							v-model="luggageData.agentNumber" type="text" placeholder="操作人" />
-						</uni-forms>
-						<!-- <view class="listup"></view> -->
-					</view>
+					
 					<view class="list">
 						<view class="lable">发往节点</view>
-						<picker @change="bindPickerChange2" :value="index2" :range-key="'nodeName'" :range="nodeList">
+						<picker @change="bindPickerChange2" :placeholderStyle="placeholderStyle" :value="index2" :range-key="'nodeName'" :range="nodeList">
 							<view class="uni-input">{{nodeNameList[index2]}}</view>
 						</picker>
 						<view class="listup"></view>
 					</view>
 					<view class="list">
 						<view class="lable">发往位置</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false"
+						<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
 							v-model="luggageData.to_location_describe" type="text" placeholder="发往位置" />
 						</uni-forms>
 						<view class="listup"></view>
 					</view>
 					<view class="list">
 						<view class="lable">特殊行李类型</view>
-						<picker @change="bindPickerChange3" :value="index3" :range-key="'specialTypeName'" :range="specialTypeList">
+						<picker @change="bindPickerChange3" :placeholderStyle="placeholderStyle" :value="index3" :range-key="'specialTypeName'" :range="specialTypeList">
 							<view class="uni-input">{{specialTypeNameList[index3]}}</view>
 						</picker>
 						<view class="listup"></view>
@@ -92,42 +78,35 @@
 					
 					<view class="list">
 						<view class="lable">异常类型</view>
-						<picker @change="bindPickerChange4" :value="index4" :range-key="'name'" :range="exceptionList">
+						<picker @change="bindPickerChange4" :placeholderStyle="placeholderStyle" :value="index4" :range-key="'name'" :range="exceptionList">
 							<view class="uni-input">{{exceptionNameList[index4]}}</view>
 						</picker>
 						<view class="listup"></view>
 					</view>
 					<view class="list">
 						<view class="lable">非正常状态码</view>
-						<picker @change="bindPickerChange5" :value="index5" :range-key="'name'" :range="abnormalList">
+						<picker @change="bindPickerChange5" :placeholderStyle="placeholderStyle" :value="index5" :range-key="'name'" :range="abnormalList">
 							<view class="uni-input">{{abnormalNameList[index5]}}</view>
 						</picker>
 						<view class="listup"></view>
 					</view>
-					<!-- <view class="list">
-						<view class="lable">当前结果</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false"
-							v-model="luggageData.currentResult" type="text" placeholder="当前结果" />
-						</uni-forms>
-						<view class="listup"></view>
-					</view> -->
 					<view class="list">
 						<view class="lable">装载序号</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false"
+						<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
 							v-model="luggageData.loadNumber" type="text" placeholder="装载序号" />
 						</uni-forms>
 						<view class="listup"></view>
 					</view>
 					<view class="list">
 						<view class="lable">容器编号</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false"
+						<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
 							v-model="luggageData.container_ID" type="text" placeholder="容器编号" />
 						</uni-forms>
 						<view class="listup"></view>
 					</view>
 					<view class="list">
 						<view class="lable">备注</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false"
+						<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
 							v-model="luggageData.luggage_describe" type="text" placeholder="备注" />
 						</uni-forms>
 						<view class="listup"></view>
@@ -146,6 +125,7 @@
 	export default {
 		data() {
 			return {
+				placeholderStyle: "color:000",
 				style: {
 					disableColor: "#fff",
 					color: "#000"
@@ -239,7 +219,7 @@
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
-					this.luggageNum = Number(data.msg)
+					this.luggageNum = data.msg.trim()
 					this.getDetial(this.luggageNum)
 				}
 			});
@@ -516,7 +496,9 @@
 						font-family: Noto Sans SC;
 						font-size: 13px;
 						font-weight: 400;
-
+						.uni-input{
+							width: 200px;
+						}
 						>.lable {
 							color: rgb(0, 0, 0);
 							font-family: Noto Sans SC;

pages/extract/index.vue

@@ -101,7 +101,7 @@
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
-					this.luggageNum = Number(data.msg)
+					this.luggageNum = data.msg.trim()
 					// this.luggageNum = 3784730658
 					this.getDetial(this.luggageNum)
 				}

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" @scan="scan"></Nav>
+		<Nav :navname.sync="navname" :navtype="false" :index="index" @clear="clear" :flightNo = "searchFlightNo"></Nav>
 		<view class="fight" v-if="flightDetail">
 			<view class="fight_card">
 				<p>{{flightDetail.carrierFlights}}</p>
@@ -11,7 +11,12 @@
 				<p>{{flightDetail.outAirport}}</p>
 				<span>{{flightDetail.scheduleTakeOffTime?flightDetail.scheduleTakeOffTime:"-"}}</span>
 			</view>
-			<view class="aircraft"></view>
+			<view class="fight_center">
+				<view class="type">
+					{{flightDetail.normalState}}
+				</view>
+				<view class="aircraft"></view>
+			</view>
 			<view class="fight_card">
 				<p>{{flightDetail.landAirport}}</p>
 				<span>{{flightDetail.scheduleLandInTime?flightDetail.scheduleLandInTime:"-"}}</span>
@@ -21,25 +26,25 @@
 			<p>{{ newData }}</p>{{ newDataday }}
 		</view>
 		<view class="content">
-			<view class="card" @tap="clickOrder('SORT')">
+			<view class="card" v-if="APP_SORT" @tap="clickOrder('SORT')">
 				<p>分拣</p>
 			</view>
-			<view class="card" @tap="clickOrder('LOAD')">
+			<view class="card" v-if="APP_LOAD" @tap="clickOrder('LOAD')">
 				<p>装车</p>
 			</view>
-			<view class="card" @tap="clickOrder('INFL')">
+			<view class="card" v-if="APP_INFL" @tap="clickOrder('INFL')">
 				<p>装机</p>
 			</view>
-			<view class="card" @tap="clickOrder('UNLOAD')">
+			<view class="card" v-if="APP_UNLOAD" @tap="clickOrder('UNLOAD')">
 				<p>卸机</p>
 			</view>
-			<view class="card" @tap="clickOrder('ARRIVED')">
+			<view class="card" v-if="APP_ARRIVED" @tap="clickOrder('ARRIVED')">
 				<p>到达</p>
 			</view>
-			<view class="card" @tap="clickOrder('extract')">
+			<view class="card" v-if="APP_EXTRACT" @tap="clickOrder('extract')">
 				<p>提取</p>
 			</view>
-			<view class="card" @tap="clickOrder('abnormal')">
+			<view class="card" v-if="APP_Abnormal" @tap="clickOrder('abnormal')">
 				<p>异常登记</p>
 			</view>
 			<view class="card_no">
@@ -55,6 +60,13 @@
 	export default {
 		data() {
 			return {
+				APP_SORT:false,
+				APP_LOAD:false,
+				APP_INFL:false,
+				APP_UNLOAD:false,
+				APP_ARRIVED:false,
+				APP_EXTRACT:false,
+				APP_Abnormal:false,
 				input: '',
 				main: null,
 				poll: null,
@@ -71,12 +83,40 @@
 				flightDetail: null,
 				flightNO: null,
 				airportName:null,
-				flightDate:null
+				flightDate:null,
+				searchFlightNo:""
 			}
 		},
 		created(option) {
-			// this.arr = allScan(this.main,this.poll,this.filter)
-			// startScan(this.arr[0],this.arr[1],this.arr[2])
+			let authList = this.$storage.getJson('authList');
+			authList.map(item => {
+				switch (item.auth_ident){
+					case "APP_SORT":
+						this.APP_SORT = true;
+						break;
+					case "APP_LOAD":
+						this.APP_LOAD = true;
+						break;
+					case "APP_INFL":
+						this.APP_INFL = true;
+						break;
+					case "APP_UNLOAD":
+						this.APP_UNLOAD = true;
+						break;
+					case "APP_ARRIVED":
+						this.APP_ARRIVED = true;
+						break;
+					case "APP_EXTRACT":
+						this.APP_EXTRACT = true;
+						break;
+					case "APP_Abnormal_registration":
+						this.APP_Abnormal = true;
+						break;
+					default:
+						break;
+				}
+			})
+			
 		},
 		onLoad(option) {
 		},
@@ -99,6 +139,7 @@
 			if (this.$storage.getJson('searchData')) {
 				this.flightDetail = this.$storage.getJson('searchData')
 				this.flightNO = this.flightDetail.carrierFlights
+				this.searchFlightNo = this.flightDetail.carrierFlights
 				this.flightDate = this.flightDetail.carrierFlightsDate
 				// this.getFlightData()
 			}
@@ -117,17 +158,12 @@
 			Nav
 		},
 		methods: {
-			scan(){
-				uni.scanCode({
-					onlyFromCamera: true,
-					success: function (res) {
-						if (res.result.length > 9) {
-							uni.navigateTo({
-								url: "/pages/detail/index?luggageNum=" + res.result
-							})
-						}
-					}
-				});
+			clear(){
+				this.$storage.remove('searchData') 
+				this.flightDetail = null
+				this.flightNO = null
+				this.searchFlightNo = ""
+				this.flightDate = null
 			},
 			datatime() {
 				setInterval(() => {
@@ -175,12 +211,25 @@
 			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_center{
+				width: 3rem;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				color: rgb(255, 255, 255);
+				font-family: Noto Sans SC;
+				font-size: 16px;
+				line-height: 24px;
+				font-weight: 700;
+				>.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;
@@ -214,7 +263,7 @@
 			font-family: Noto Sans SC;
 			font-size: 18px;
 			font-weight: 700;
-
+			margin-top: 10px;
 			p {
 				margin-right: .625rem;
 			}

pages/individual/index.vue

@@ -51,7 +51,7 @@
 		methods: {
 			loginOut(){
 				this.$storage.clear()
-				uni.redirectTo({
+				uni.reLaunch({
 					url: "/pages/login/index"
 				})
 			},

pages/login/index.vue

@@ -26,7 +26,7 @@
 	export default {
 		data() {
 			return {
-				title: 'Hello',
+				title: '',
 				username:"",
 				password:"",
 			}
@@ -77,56 +77,41 @@
 					}
 					else if(res.code=="0"){
 						that.$storage.setJson('users',res.returnData);
-						uni.switchTab({
-							url: "/pages/index/index"
-						});	
+						this.getAuth(res.returnData.user_id);
 						
 					}
 					else{
 						uni.showToast({
 							title: '登录失败请联系管理员',
 							icon: 'none',
-							duration: 500
+							duration: 5000
 						});	
 					}
 				})
-				
 			},
-			
-			
-			/**发布提交 */
-			formSubmit(e) {
-				var that = this;
-				var	yonghuming1= e.detail.value.yonghuming;
-				var	mima1= e.detail.value.mima;
-			
-			uni.request({
-				url:'https://换成你自己的域名接口',
-			
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				method: 'POST',
-				data: {
-					yonghuming:yonghuming1,
-					mima:mima1,
-				},
-				success: (res) => {
-					if(res.data=="5"){
-						wx.showToast({
-							title: '用户名或密码错误',
-							icon: 'none',
-							duration: 500
-						});	
+			async getAuth(user_id){
+				let data = {"serviceId":2,"dataContent":[{"user_id":user_id}],"page":1,"pageSize":999,"event":"0"}
+				await this.$http.httpPost('/openApi/query',data).then(res => {
+					if(res.code=="0"){
+						let isAPP = res.returnData.filter(function(item){
+							return item.auth_ident==="APP_auth"
+						})
+						if(isAPP.length>0){
+							this.$storage.setJson("authList",res.returnData)
+							uni.switchTab({
+								url: "/pages/index/index"
+							});	
+						}
+						else{
+							this.$storage.remove('users');
+							uni.showToast({
+								title: '该账户没有APP登录权限',
+								icon: 'none',
+								duration: 5000
+							});	
+						}
 					}
-					else{
-					uni.navigateTo({
-							url:"/pages/index1/index1",
-							})		
-						
-					}
-				}
-			})
+				})
 			}
 
 		}

pages/message/message.vue

@@ -1,6 +1,10 @@
 <template>
-	<view>
-		页面开发中
+	<view class="app-content">
+		<view class="title-box">{{navname}}</view>
+		<uni-list :border="true" class="messageList">
+			<uni-list-chat :avatar-circle="true" title="uni-app" avatar="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png" note="您收到一条新的消息" time="2020-02-02 20:20" ></uni-list-chat>
+			<uni-list-chat title="uni-app" avatar="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
+		</uni-list>
 	</view>
 </template>
 
@@ -8,15 +12,65 @@
 	export default {
 		data() {
 			return {
-				
+				navname:"消息"
 			}
 		},
+		onShow() {
+			uni.$on("scancodemsg", (data) => {
+				if (data.msg.length > 9) {
+					uni.navigateTo({
+						url: "/pages/detail/index?luggageNum=" + data.msg
+					})
+				}
+			});
+		},
+		onHide() {
+			uni.$off("scancodemsg");
+		},
 		methods: {
-			
+			scan(){
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: function (res) {
+						if (res.result.length > 9) {
+							uni.navigateTo({
+								url: "/pages/detail/index?luggageNum=" + res.result
+							})
+						}
+					}
+				});
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.app-content {
+		position: relative;
+		background: rgb(49, 85, 99);
+		padding-top: 3.6rem;
+		box-sizing: border-box;
+		height: 100vh;
+		>.title-box{
+			width: 100%;
+			height: 2.375rem;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding-top: 1.25rem;
+			color: rgb(255, 255, 255);
+			font-family: Noto Sans SC;
+			font-size: 1rem;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 1000;
+		}
+		>.messageList{
+			width: 100%;
+			height: 100%;
+			overflow-x: hidden;
+			overflow-y: auto;
+		}
+}
 </style>

pages/mypage/index.vue

@@ -134,8 +134,8 @@
 			uni.$on("scancodemsg", (data) => {
 				if(data.msg.length > 9){
 					uni.navigateTo({
-						// url: "/pages/detail/index?luggageNum=" + data.msg
-						url: "/pages/detail/index?luggageNum=3999483183"
+						url: "/pages/detail/index?luggageNum=" + data.msg
+						// url: "/pages/detail/index?luggageNum=3999483183"
 					})
 				}
 			});

pages/search/index.vue

@@ -50,7 +50,7 @@
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
 					uni.navigateTo({
-						url: "/pages/detail/index?luggageNum=" + Number(data.msg)
+						url: "/pages/detail/index?luggageNum=" + data.msg
 					})
 				}
 			});

pages/sorting/index.vue

@@ -13,7 +13,12 @@
 						<p>{{flightDetail.outAirport}}</p>
 						<span>{{flightDetail.scheduleTakeOffTime?flightDetail.scheduleTakeOffTime:"-"}}</span>
 					</view>
-					<view class="aircraft"></view>
+					<view class="fight_center">
+						<view class="type">
+							{{flightDetail.normalState}}
+						</view>
+						<view class="aircraft"></view>
+					</view>
 					<view class="craid_data">
 						<p>{{flightDetail.landAirport}}</p>
 						<span>{{flightDetail.scheduleLandInTime?flightDetail.scheduleLandInTime:"-"}}</span>
@@ -191,7 +196,7 @@
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
-					this.currentLuggageNum = Number(data.msg)
+					this.currentLuggageNum = data.msg.trim()
 					this.getluggage(this.currentLuggageNum,true)
 				}
 			});
@@ -673,11 +678,23 @@
 						}
 					}
 
-					>.aircraft {
-						width: 1.75rem;
-						height: 1.75rem;
-						background: url('../../static/hang.png') no-repeat;
-						background-size: 100% 100%;
+					.fight_center{
+						width: 3rem;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						justify-content: center;
+						color: rgb(255, 255, 255);
+						font-family: Noto Sans SC;
+						font-size: 16px;
+						line-height: 24px;
+						font-weight: 700;
+						>.aircraft {
+							width: 1.75rem;
+							height: 1.75rem;
+							background: url('../../static/hang.png') no-repeat;
+							background-size: 100% 100%;
+						}
 					}
 				}
 				>.craids{

utils/request.js

@@ -47,6 +47,7 @@ export default {
 					reject(error);
 				}else{
                     // 相应拦截、根据后端的状态码来写，可以自行判断和封装
+					console.log(res)
 					if(res.data.error == '1'){
 						uni.hideLoading();
 					}else{