提交

.hbuilderx/launch.json

@@ -1,16 +1,20 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

App.vue

@@ -1,13 +1,37 @@
 <script>
+	import {allScan, startScan ,stopScan,Format} from '@/components/utils/validate'
 	export default {
+		data() {
+			return {
+				main: null,
+				poll: null,
+				filter:null,
+				pusher:null,
+			}
+		},
 		onLaunch: function() {
-			console.log('App Launch')
+			const users = this.$storage.getJson("users")
+			if(!users){
+				uni.reLaunch({
+					url: "/pages/login/index",
+					success:() => {
+						plus.navigator.closeSplashscreen()
+					}
+				});
+			}
+			else{
+				plus.navigator.closeSplashscreen()
+			}
 		},
 		onShow: function() {
 			console.log('App Show')
+			let arr = allScan(this.main,this.poll,this.filter)
+			startScan(arr[0],arr[1],arr[2])
 		},
 		onHide: function() {
 			console.log('App Hide')
+			let arr = allScan(this.main,this.poll,this.filter)
+			stopScan(arr[0],arr[1],arr[2])
 		}
 	}
 </script>

components/header/nav.vue

@@ -1,6 +1,20 @@
 <template>
 	<view class="nav-content">
-		<view class="nav"><view class="log" v-if="navtype" @tap="clickOrder"></view><view class="nav-sech"><view class="secah">CAN</view><view class="input-nav" @tap="test">{{ placeholder }}</view></view></view>
+		<view class="nav">
+			<view class="log" v-if="navtype" @tap="clickOrder">
+
+			</view>
+			<view class="nav-sech">
+				<!-- <view class="secah">{{}}</view> -->
+				<picker class="secah" @change="change" :value="index" :range="airportList">
+					<view>{{airportList[index]}}</view>
+				</picker>
+				<view class="input-nav" @tap="test">
+					{{ placeholder }}
+				</view>
+				
+			</view>
+		</view>
 	</view>
 </template>
 <script>
@@ -8,110 +22,143 @@
 		data() {
 			return {
 				searchText: '', //搜索内容
-				placeholder: '请输入航班号或行李号'
+				placeholder: '请输入航班号或行李号',
+				array: [],
+				airportList:[]
 			}
 		},
-    props:{
-			navname:{
-				type:String,
-				default:''
+		props: {
+			navname: {
+				type: String,
+				default: ''
+			},
+			navtype: {
+				type: Boolean,
+				default: true
 			},
-			navtype:{
-				type:Boolean,
-				default:true
+			navtypes: {
+				type: Boolean,
+				default: false
 			},
-			navtypes:{
-				type:Boolean,
-				default:false
+			index:{
+				type: Number,
+				default: 0
 			}
 		},
 		created(option) {
+			this.airportList =this.$storage.getJson('airportList');
+			if(!this.airportList){
+				this.getAirportList()
+			}
 		},
-		onLoad(){
-		},
-		onUnload() {
-		},
+		onUnload() {},
 		onShow() {
 		},
-		mounted() {
-		},
+		mounted() {},
 		methods: {
-			test(){
-        uni.redirectTo({
+			async getAirportList(){
+				let data={
+						"serviceId": 14,
+						"dataContent": [],
+						"event": "0"
+					}
+				await this.$http.httpPost('/openApi/query',data).then(res => {
+					if(res.code == "0"){
+						res.returnData.map(item =>{
+							this.airportList.push(item['IATACode'])
+						})
+						this.$storage.setJson('airportList',this.airportList);
+						let num = this.index;
+						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);
+			},
+			test() {
+				uni.navigateTo({
 					url: "/pages/search/index"
 				})
-		  },
-
+			},
+			
 			//搜索框输入事件
 			inputSearch() {
 				this.$emit('input', this.searchText)
 			},
-      clickOrder () {
-        this.$emit('fall')
+			clickOrder() {
+				this.$emit('fall')
 			}
 		},
 	}
 </script>
 <style lang="scss" scoped>
-.nav-content{
-	>.nav{
-		width: 100%;
-		height: 2.375rem;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		padding-top: 2.25rem;
-		color: rgb(255, 255, 255);
-		font-family: Noto Sans SC;
-		font-size: 1rem;
-		position: relative;
-		// background: rgba(234, 241, 245,0.2);
-		>.log{
-			width: .375rem;
-			height: .75rem;
-			font-size: .75rem;
-			position: absolute;
-			left: 1.5rem;
-			background: url('../../static/ico.png') no-repeat;
-			background-size: 100% 100%;
-		}
-		>.nav-sech{
-			width: 18.5625rem;
-      height: 1.875rem;
+	.nav-content {
+		>.nav {
+			width: 100%;
+			height: 2.375rem;
 			display: flex;
+			justify-content: center;
 			align-items: center;
-			background: rgba(234, 241, 245,0.2);
-			border-radius:4px;
-			.secah{
-				width: 3.75rem;
-				height: 80%;
+			padding-top: 2.25rem;
+			color: rgb(255, 255, 255);
+			font-family: Noto Sans SC;
+			font-size: 1rem;
+			position: relative;
+
+			// background: rgba(234, 241, 245,0.2);
+			>.log {
+				width: .375rem;
+				height: .75rem;
+				font-size: .75rem;
+				position: absolute;
+				left: 1.5rem;
+				background: url('../../static/ico.png') no-repeat;
+				background-size: 100% 100%;
+			}
+
+			>.nav-sech {
+				width: 18.5625rem;
+				height: 1.875rem;
 				display: flex;
 				align-items: center;
-				justify-content: center;
+				background: rgba(234, 241, 245, 0.2);
+				border-radius: 4px;
+
+				.secah {
+					width: 3.75rem;
+					height: 80%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					color: rgb(255, 255, 255);
+					font-family: Noto Sans SC;
+					font-size: 14px;
+					font-weight: 400;
+					border-right: .0625rem solid rgb(255, 255, 255);
+				}
+
+				.my-input-placeholder {
+					color: rgb(170, 195, 207);
+				}
+
+				.input-nav {
+					padding-left: .625rem;
+					color: rgb(170, 195, 207);
+				}
+
+			}
+
+			>.up {
+				position: absolute;
+				right: 1.5rem;
 				color: rgb(255, 255, 255);
 				font-family: Noto Sans SC;
-				font-size: 14px;
-				font-weight: 400;
-				border-right: .0625rem solid rgb(255, 255, 255);
+				font-size: .875rem;
+				font-weight: 500;
 			}
-			.my-input-placeholder{
-				color: rgb(170, 195, 207);
-			}
-			.input-nav{
-				padding-left: .625rem;
-				color: rgb(170, 195, 207);
-			}
-
-		}
-		>.up{
-			position: absolute;
-			right: 1.5rem;
-			color: rgb(255, 255, 255);
-			font-family: Noto Sans SC;
-			font-size: .875rem;
-			font-weight: 500;
 		}
 	}
-}
-
 </style>

components/header/navs.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="nav-content">
-		<view class="nav"><view class="log" v-if="navtype" @tap="clickOrder"></view><view class="name">{{ navname }}</view><view class="nav-sech"><view class="secah">CAN</view><view class="input-nav" @tap="test">{{ placeholder }}</view></view></view>
+		<view class="nav"><view class="log" v-if="navtype" @tap="clickOrder"></view><view class="name">{{ navname }}</view>
+		<!-- <view class="nav-sech"><view class="secah">CAN</view><view class="input-nav" @tap="test">{{ placeholder }}</view> -->
+		</view></view>
 	</view>
 </template>
 <script>

components/mask-model/mask-model.vue

@@ -4,12 +4,12 @@
 		<view class="model-count">
 			<view class="amen-tit">{{ headername }}</view>
 			<view class="count" :style="{'color':titleColoe}">{{maskTitle}}</view>
-			<button form-type="submit" class="switchBtn" v-if="typeShow">切换{{tabname}}</button>
-			<button form-type="submit" class="switchBtn" v-if="typeShow">强制装载</button>
+			<button form-type="submit" class="switchBtn" v-if="typeShow" @tap="next()">切换<span>{{tabname}}</span></button>
+			<button form-type="submit" class="switchBtn" v-if="typeShow" @tap="load()">强制装载</button>
 			<button form-type="submit" class="eleBtn" @click="hide" v-if="typeShow">取消</button>
 			<view class="bot"  v-if="!typeShow">
 				<button form-type="submit" class="eleBtns" @click="hide">取消</button>
-				<button form-type="submit" class="switchBtndel" >确定</button>
+				<button form-type="submit" class="switchBtndel" @tap="confirm">确定</button>
 				</view>
 			<!-- <view class="btm-box">
 				<view v-show="btnType==1" class="btn cancel" @click="hide" :style="{'color':cancelColor}">取消</view>
@@ -58,7 +58,6 @@
 			};
 		},
 		mounted() {
-			
 		},
 		created() {
 
@@ -78,6 +77,14 @@
 				this.showMask = false;
 				this.$emit('confirm');
 			},
+			next(){
+				this.showMask = false;
+				this.$emit('next',this.tabname);
+			},
+			load(){
+				this.showMask = false;
+				this.$emit('load');
+			}
 		}
 	}
 </script>

components/utils/validate.js

@@ -117,7 +117,7 @@ export function allScan(HTML5_PLUS_RUNTIME_MAIN_ACTIVITY,POC_KEY_DOWN_OBJ,filter
               let codeStr = byteToString(_data_)
               console.log(`回调数据:${codeStr}`)
               uni.$emit('scancodemsg', {
-                  msg: _data_
+                  msg: codeStr
               })
             }
           }

config.js

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

main.js

@@ -1,4 +1,16 @@
 import App from './App'
+import * as http from './utils/http' // http请求接口
+import * as utils from './utils/utils' // 工具文件
+import storage from 'utils/storage' // 缓存文件
+import config from '@/config' // 配置
+// import lodash
+Vue.prototype.$storage = storage
+Vue.prototype.$http = http
+Vue.prototype.$config = config
+Vue.prototype.$utils = utils
+
+import MD5 from 'js-md5'
+Vue.prototype.$md5 = MD5
 
 // #ifndef VUE3
 import Vue from 'vue'

manifest.json

@@ -7,13 +7,16 @@
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
+		"compatible": {
+		"ignoreVersion": true
+		},
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
         "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
+            "alwaysShowBeforeRender" : false,
             "waiting" : true,
-            "autoclose" : true,
+            "autoclose" : false,
             "delay" : 0
         },
         /* 模块配置 */
@@ -96,7 +99,22 @@
                 }
             }
         },
-        "nativePlugins" : {}
+        "nativePlugins" : {
+            "Uhf-Rfid" : {
+                "__plugin_info__" : {
+                    "name" : "Rfid插件",
+                    "description" : "Rfid插件",
+                    "platforms" : "Android",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {}
+                }
+            }
+        }
     },
     /* 快应用特有相关 */
     "quickapp" : {},

nativeplugins/Uhf-Rfid/package.json

@@ -0,0 +1,27 @@
+{
+	"name": "Rfid插件",  
+	"id": "Uhf-Rfid",  
+	"version": "1.0",  
+	"description": "Rfid插件",  
+	"_dp_type":"nativeplugin",  
+	"_dp_nativeplugin":{ 
+		"android": {
+		  "plugins": [  
+		    {
+		      "type": "module",  
+		      "name": "Uhf-Rfid",  
+		      "class": "com.zhimi.uhfrfid.UhfRfidModule"  
+		    }
+		  ],  
+		  "hooksClass": "com.zhimi.uhfrfid.UhfRfidAppProxy",  
+		  "integrateType": "aar",  
+		  "dependencies": [
+		  ],
+		  "abis": [
+		  	"armeabi-v7a",
+			"arm64-v8a"
+		  ],
+		  "minSdkVersion": "19"
+		}
+	}
+}

node_modules/.package-lock.json

@@ -0,0 +1,14 @@
+{
+    "name": "PDA广播模式下监听扫描组件",
+    "version": "1.0.0",
+    "lockfileVersion": 2,
+    "requires": true,
+    "packages": {
+        "node_modules/js-md5": {
+            "version": "0.7.3",
+            "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
+            "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==",
+            "dev": true
+        }
+    }
+}

node_modules/js-md5/CHANGELOG.md

@@ -0,0 +1,101 @@
+# Change Log
+
+## v0.7.3 / 2017-12-18
+### Fixed
+- incorrect result when first bit is 1 of bytes. #18
+
+## v0.7.2 / 2017-10-31
+### Improved
+- performance of hBytes increment.
+
+## v0.7.1 / 2017-10-29
+### Fixed
+- incorrect result when file size >= 4G.
+
+## v0.7.0 / 2017-10-29
+### Fixed
+- incorrect result when file size >= 512M.
+
+## v0.6.1 / 2017-10-07
+### Fixed
+- ArrayBuffer.isView issue in IE10.
+
+### Improved
+- performance of input check.
+
+## v0.6.0 / 2017-07-28
+### Added
+- support base64 string output.
+
+## v0.5.0 / 2017-07-14
+### Added
+- support for web worker. #11
+
+### Changed
+- throw error if input type is incorrect.
+- prevent webpack to require dependencies.
+
+## v0.4.2 / 2017-01-18
+### Fixed
+- `root` is undefined in some special environment. #7
+
+## v0.4.1 / 2016-03-31
+### Removed
+- length detection in node.js.
+### Deprecated
+- `buffer` and replace by `arrayBuffer`.
+
+## v0.4.0 / 2015-12-28
+### Added
+- support for update hash.
+- support for bytes array output.
+- support for ArrayBuffer output.
+- support for AMD.
+
+## v0.3.0 / 2015-03-07
+### Added
+- support byte Array, Uint8Array and ArrayBuffer input.
+
+## v0.2.2 / 2015-02-01
+### Fixed
+- bug when special length.
+### Improve
+- performance for node.js.
+
+## v0.2.1 / 2015-01-13
+### Improve
+- performance.
+
+## v0.2.0 / 2015-01-12
+### Removed
+- ascii parameter.
+### Improve
+- performance.
+
+## v0.1.4 / 2015-01-11
+### Improve
+- performance.
+### Added
+- test cases.
+
+## v0.1.3 / 2015-01-05
+### Added
+- bower package.
+- travis.
+- coveralls.
+### Improved
+- performance.
+### Fixed
+- JSHint warnings.
+
+## v0.1.2 / 2014-07-27
+### Fixed
+- accents bug
+
+## v0.1.1 / 2014-01-05
+### Changed
+- license
+
+## v0.1.0 / 2014-01-04
+### Added
+- initial release

node_modules/js-md5/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright 2014-2017 Chen, Yi-Cyuan
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

node_modules/js-md5/README.md

@@ -0,0 +1,76 @@
+# js-md5
+[![Build Status](https://travis-ci.org/emn178/js-md5.svg?branch=master)](https://travis-ci.org/emn178/js-md5)
+[![Coverage Status](https://coveralls.io/repos/emn178/js-md5/badge.svg?branch=master)](https://coveralls.io/r/emn178/js-md5?branch=master)  
+[![NPM](https://nodei.co/npm/js-md5.png?stars&downloads)](https://nodei.co/npm/js-md5/)
+
+A simple MD5 hash function for JavaScript supports UTF-8 encoding.
+
+## Demo
+[MD5 Online](http://emn178.github.io/online-tools/md5.html)  
+[MD5 File Checksum Online](http://emn178.github.io/online-tools/md5_checksum.html)
+
+## Download
+[Compress](https://raw.github.com/emn178/js-md5/master/build/md5.min.js)  
+[Uncompress](https://raw.github.com/emn178/js-md5/master/src/md5.js)
+
+## Installation
+You can also install js-md5 by using Bower.
+
+    bower install md5
+
+For node.js, you can use this command to install:
+
+    npm install js-md5
+
+## Notice
+`buffer` method is deprecated. This maybe confuse with Buffer in node.js. Please use `arrayBuffer` instead.
+
+## Usage
+You could use like this:
+```JavaScript
+md5('Message to hash');
+var hash = md5.create();
+hash.update('Message to hash');
+hash.hex();
+```
+If you use node.js, you should require the module first:
+```JavaScript
+md5 = require('js-md5');
+```
+It supports AMD:
+```JavaScript
+require(['your/path/md5.js'], function(md5) {
+// ...
+});
+```
+[See document](https://emn178.github.com/js-md5/doc/)
+
+## Example
+```JavaScript
+md5(''); // d41d8cd98f00b204e9800998ecf8427e
+md5('The quick brown fox jumps over the lazy dog'); // 9e107d9d372bb6826bd81d3542a419d6
+md5('The quick brown fox jumps over the lazy dog.'); // e4d909c290d0fb1ca068ffaddf22cbd0
+
+// It also supports UTF-8 encoding
+md5('中文'); // a7bac2239fcdcb3a067903d8077c4a07
+
+// It also supports byte `Array`, `Uint8Array`, `ArrayBuffer`
+md5([]); // d41d8cd98f00b204e9800998ecf8427e
+md5(new Uint8Array([])); // d41d8cd98f00b204e9800998ecf8427e
+
+// Different output
+md5(''); // d41d8cd98f00b204e9800998ecf8427e
+md5.hex(''); // d41d8cd98f00b204e9800998ecf8427e
+md5.array(''); // [212, 29, 140, 217, 143, 0, 178, 4, 233, 128, 9, 152, 236, 248, 66, 126]
+md5.digest(''); // [212, 29, 140, 217, 143, 0, 178, 4, 233, 128, 9, 152, 236, 248, 66, 126]
+md5.arrayBuffer(''); // ArrayBuffer
+md5.buffer(''); // ArrayBuffer, deprecated, This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.
+md5.base64(''); // 1B2M2Y8AsgTpgAmY7PhCfg==
+```
+
+## License
+The project is released under the [MIT license](http://www.opensource.org/licenses/MIT).
+
+## Contact
+The project's website is located at https://github.com/emn178/js-md5  
+Author: Chen, Yi-Cyuan (emn178@gmail.com)

node_modules/js-md5/package.json

@@ -0,0 +1,45 @@
+{
+  "name": "js-md5",
+  "version": "0.7.3",
+  "description": "A simple MD5 hash function for JavaScript supports UTF-8 encoding.",
+  "main": "src/md5.js",
+  "devDependencies": {
+    "expect.js": "~0.3.1",
+    "jsdoc": "^3.4.0",
+    "mocha": "~2.3.4",
+    "nyc": "^11.3.0",
+    "requirejs": "^2.1.22",
+    "uglify-js": "^3.1.9",
+    "webworker-threads": "^0.7.11"
+  },
+  "scripts": {
+    "test": "nyc mocha tests/node-test.js",
+    "report": "nyc --reporter=html --reporter=text mocha tests/node-test.js",
+    "coveralls": "nyc report --reporter=text-lcov | coveralls",
+    "doc": "rm -rf doc;jsdoc src README.md -d doc",
+    "compress": "uglifyjs src/md5.js -c -m eval --comments --output build/md5.min.js",
+    "build": "npm run-script compress;npm run-script doc"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/emn178/js-md5.git"
+  },
+  "keywords": [
+    "md5",
+    "hash",
+    "encryption",
+    "cryptography",
+    "HMAC"
+  ],
+  "license": "MIT",
+  "author": "Chen, Yi-Cyuan <emn178@gmail.com>",
+  "homepage": "https://github.com/emn178/js-md5",
+  "bugs": {
+    "url": "https://github.com/emn178/js-md5/issues"
+  },
+  "nyc": {
+    "exclude": [
+      "tests"
+    ]
+  }
+}

node_modules/js-md5/src/md5.js

@@ -0,0 +1,683 @@
+/**
+ * [js-md5]{@link https://github.com/emn178/js-md5}
+ *
+ * @namespace md5
+ * @version 0.7.3
+ * @author Chen, Yi-Cyuan [emn178@gmail.com]
+ * @copyright Chen, Yi-Cyuan 2014-2017
+ * @license MIT
+ */
+(function () {
+  'use strict';
+
+  var ERROR = 'input is invalid type';
+  var WINDOW = typeof window === 'object';
+  var root = WINDOW ? window : {};
+  if (root.JS_MD5_NO_WINDOW) {
+    WINDOW = false;
+  }
+  var WEB_WORKER = !WINDOW && typeof self === 'object';
+  var NODE_JS = !root.JS_MD5_NO_NODE_JS && typeof process === 'object' && process.versions && process.versions.node;
+  if (NODE_JS) {
+    root = global;
+  } else if (WEB_WORKER) {
+    root = self;
+  }
+  var COMMON_JS = !root.JS_MD5_NO_COMMON_JS && typeof module === 'object' && module.exports;
+  var AMD = typeof define === 'function' && define.amd;
+  var ARRAY_BUFFER = !root.JS_MD5_NO_ARRAY_BUFFER && typeof ArrayBuffer !== 'undefined';
+  var HEX_CHARS = '0123456789abcdef'.split('');
+  var EXTRA = [128, 32768, 8388608, -2147483648];
+  var SHIFT = [0, 8, 16, 24];
+  var OUTPUT_TYPES = ['hex', 'array', 'digest', 'buffer', 'arrayBuffer', 'base64'];
+  var BASE64_ENCODE_CHAR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
+
+  var blocks = [], buffer8;
+  if (ARRAY_BUFFER) {
+    var buffer = new ArrayBuffer(68);
+    buffer8 = new Uint8Array(buffer);
+    blocks = new Uint32Array(buffer);
+  }
+
+  if (root.JS_MD5_NO_NODE_JS || !Array.isArray) {
+    Array.isArray = function (obj) {
+      return Object.prototype.toString.call(obj) === '[object Array]';
+    };
+  }
+
+  if (ARRAY_BUFFER && (root.JS_MD5_NO_ARRAY_BUFFER_IS_VIEW || !ArrayBuffer.isView)) {
+    ArrayBuffer.isView = function (obj) {
+      return typeof obj === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
+    };
+  }
+
+  /**
+   * @method hex
+   * @memberof md5
+   * @description Output hash as hex string
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {String} Hex string
+   * @example
+   * md5.hex('The quick brown fox jumps over the lazy dog');
+   * // equal to
+   * md5('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method digest
+   * @memberof md5
+   * @description Output hash as bytes array
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Array} Bytes array
+   * @example
+   * md5.digest('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method array
+   * @memberof md5
+   * @description Output hash as bytes array
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Array} Bytes array
+   * @example
+   * md5.array('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method arrayBuffer
+   * @memberof md5
+   * @description Output hash as ArrayBuffer
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @example
+   * md5.arrayBuffer('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method buffer
+   * @deprecated This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.
+   * @memberof md5
+   * @description Output hash as ArrayBuffer
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @example
+   * md5.buffer('The quick brown fox jumps over the lazy dog');
+   */
+  /**
+   * @method base64
+   * @memberof md5
+   * @description Output hash as base64 string
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {String} base64 string
+   * @example
+   * md5.base64('The quick brown fox jumps over the lazy dog');
+   */
+  var createOutputMethod = function (outputType) {
+    return function (message) {
+      return new Md5(true).update(message)[outputType]();
+    };
+  };
+
+  /**
+   * @method create
+   * @memberof md5
+   * @description Create Md5 object
+   * @returns {Md5} Md5 object.
+   * @example
+   * var hash = md5.create();
+   */
+  /**
+   * @method update
+   * @memberof md5
+   * @description Create and update Md5 object
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Md5} Md5 object.
+   * @example
+   * var hash = md5.update('The quick brown fox jumps over the lazy dog');
+   * // equal to
+   * var hash = md5.create();
+   * hash.update('The quick brown fox jumps over the lazy dog');
+   */
+  var createMethod = function () {
+    var method = createOutputMethod('hex');
+    if (NODE_JS) {
+      method = nodeWrap(method);
+    }
+    method.create = function () {
+      return new Md5();
+    };
+    method.update = function (message) {
+      return method.create().update(message);
+    };
+    for (var i = 0; i < OUTPUT_TYPES.length; ++i) {
+      var type = OUTPUT_TYPES[i];
+      method[type] = createOutputMethod(type);
+    }
+    return method;
+  };
+
+  var nodeWrap = function (method) {
+    var crypto = eval("require('crypto')");
+    var Buffer = eval("require('buffer').Buffer");
+    var nodeMethod = function (message) {
+      if (typeof message === 'string') {
+        return crypto.createHash('md5').update(message, 'utf8').digest('hex');
+      } else {
+        if (message === null || message === undefined) {
+          throw ERROR;
+        } else if (message.constructor === ArrayBuffer) {
+          message = new Uint8Array(message);
+        }
+      }
+      if (Array.isArray(message) || ArrayBuffer.isView(message) ||
+        message.constructor === Buffer) {
+        return crypto.createHash('md5').update(new Buffer(message)).digest('hex');
+      } else {
+        return method(message);
+      }
+    };
+    return nodeMethod;
+  };
+
+  /**
+   * Md5 class
+   * @class Md5
+   * @description This is internal class.
+   * @see {@link md5.create}
+   */
+  function Md5(sharedMemory) {
+    if (sharedMemory) {
+      blocks[0] = blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+      blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+      blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+      blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+      this.blocks = blocks;
+      this.buffer8 = buffer8;
+    } else {
+      if (ARRAY_BUFFER) {
+        var buffer = new ArrayBuffer(68);
+        this.buffer8 = new Uint8Array(buffer);
+        this.blocks = new Uint32Array(buffer);
+      } else {
+        this.blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+      }
+    }
+    this.h0 = this.h1 = this.h2 = this.h3 = this.start = this.bytes = this.hBytes = 0;
+    this.finalized = this.hashed = false;
+    this.first = true;
+  }
+
+  /**
+   * @method update
+   * @memberof Md5
+   * @instance
+   * @description Update hash
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {Md5} Md5 object.
+   * @see {@link md5.update}
+   */
+  Md5.prototype.update = function (message) {
+    if (this.finalized) {
+      return;
+    }
+
+    var notString, type = typeof message;
+    if (type !== 'string') {
+      if (type === 'object') {
+        if (message === null) {
+          throw ERROR;
+        } else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
+          message = new Uint8Array(message);
+        } else if (!Array.isArray(message)) {
+          if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
+            throw ERROR;
+          }
+        }
+      } else {
+        throw ERROR;
+      }
+      notString = true;
+    }
+    var code, index = 0, i, length = message.length, blocks = this.blocks;
+    var buffer8 = this.buffer8;
+
+    while (index < length) {
+      if (this.hashed) {
+        this.hashed = false;
+        blocks[0] = blocks[16];
+        blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+        blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+        blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+        blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+      }
+
+      if (notString) {
+        if (ARRAY_BUFFER) {
+          for (i = this.start; index < length && i < 64; ++index) {
+            buffer8[i++] = message[index];
+          }
+        } else {
+          for (i = this.start; index < length && i < 64; ++index) {
+            blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
+          }
+        }
+      } else {
+        if (ARRAY_BUFFER) {
+          for (i = this.start; index < length && i < 64; ++index) {
+            code = message.charCodeAt(index);
+            if (code < 0x80) {
+              buffer8[i++] = code;
+            } else if (code < 0x800) {
+              buffer8[i++] = 0xc0 | (code >> 6);
+              buffer8[i++] = 0x80 | (code & 0x3f);
+            } else if (code < 0xd800 || code >= 0xe000) {
+              buffer8[i++] = 0xe0 | (code >> 12);
+              buffer8[i++] = 0x80 | ((code >> 6) & 0x3f);
+              buffer8[i++] = 0x80 | (code & 0x3f);
+            } else {
+              code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff));
+              buffer8[i++] = 0xf0 | (code >> 18);
+              buffer8[i++] = 0x80 | ((code >> 12) & 0x3f);
+              buffer8[i++] = 0x80 | ((code >> 6) & 0x3f);
+              buffer8[i++] = 0x80 | (code & 0x3f);
+            }
+          }
+        } else {
+          for (i = this.start; index < length && i < 64; ++index) {
+            code = message.charCodeAt(index);
+            if (code < 0x80) {
+              blocks[i >> 2] |= code << SHIFT[i++ & 3];
+            } else if (code < 0x800) {
+              blocks[i >> 2] |= (0xc0 | (code >> 6)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+            } else if (code < 0xd800 || code >= 0xe000) {
+              blocks[i >> 2] |= (0xe0 | (code >> 12)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+            } else {
+              code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff));
+              blocks[i >> 2] |= (0xf0 | (code >> 18)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | ((code >> 12) & 0x3f)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
+              blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+            }
+          }
+        }
+      }
+      this.lastByteIndex = i;
+      this.bytes += i - this.start;
+      if (i >= 64) {
+        this.start = i - 64;
+        this.hash();
+        this.hashed = true;
+      } else {
+        this.start = i;
+      }
+    }
+    if (this.bytes > 4294967295) {
+      this.hBytes += this.bytes / 4294967296 << 0;
+      this.bytes = this.bytes % 4294967296;
+    }
+    return this;
+  };
+
+  Md5.prototype.finalize = function () {
+    if (this.finalized) {
+      return;
+    }
+    this.finalized = true;
+    var blocks = this.blocks, i = this.lastByteIndex;
+    blocks[i >> 2] |= EXTRA[i & 3];
+    if (i >= 56) {
+      if (!this.hashed) {
+        this.hash();
+      }
+      blocks[0] = blocks[16];
+      blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+      blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+      blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+      blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+    }
+    blocks[14] = this.bytes << 3;
+    blocks[15] = this.hBytes << 3 | this.bytes >>> 29;
+    this.hash();
+  };
+
+  Md5.prototype.hash = function () {
+    var a, b, c, d, bc, da, blocks = this.blocks;
+
+    if (this.first) {
+      a = blocks[0] - 680876937;
+      a = (a << 7 | a >>> 25) - 271733879 << 0;
+      d = (-1732584194 ^ a & 2004318071) + blocks[1] - 117830708;
+      d = (d << 12 | d >>> 20) + a << 0;
+      c = (-271733879 ^ (d & (a ^ -271733879))) + blocks[2] - 1126478375;
+      c = (c << 17 | c >>> 15) + d << 0;
+      b = (a ^ (c & (d ^ a))) + blocks[3] - 1316259209;
+      b = (b << 22 | b >>> 10) + c << 0;
+    } else {
+      a = this.h0;
+      b = this.h1;
+      c = this.h2;
+      d = this.h3;
+      a += (d ^ (b & (c ^ d))) + blocks[0] - 680876936;
+      a = (a << 7 | a >>> 25) + b << 0;
+      d += (c ^ (a & (b ^ c))) + blocks[1] - 389564586;
+      d = (d << 12 | d >>> 20) + a << 0;
+      c += (b ^ (d & (a ^ b))) + blocks[2] + 606105819;
+      c = (c << 17 | c >>> 15) + d << 0;
+      b += (a ^ (c & (d ^ a))) + blocks[3] - 1044525330;
+      b = (b << 22 | b >>> 10) + c << 0;
+    }
+
+    a += (d ^ (b & (c ^ d))) + blocks[4] - 176418897;
+    a = (a << 7 | a >>> 25) + b << 0;
+    d += (c ^ (a & (b ^ c))) + blocks[5] + 1200080426;
+    d = (d << 12 | d >>> 20) + a << 0;
+    c += (b ^ (d & (a ^ b))) + blocks[6] - 1473231341;
+    c = (c << 17 | c >>> 15) + d << 0;
+    b += (a ^ (c & (d ^ a))) + blocks[7] - 45705983;
+    b = (b << 22 | b >>> 10) + c << 0;
+    a += (d ^ (b & (c ^ d))) + blocks[8] + 1770035416;
+    a = (a << 7 | a >>> 25) + b << 0;
+    d += (c ^ (a & (b ^ c))) + blocks[9] - 1958414417;
+    d = (d << 12 | d >>> 20) + a << 0;
+    c += (b ^ (d & (a ^ b))) + blocks[10] - 42063;
+    c = (c << 17 | c >>> 15) + d << 0;
+    b += (a ^ (c & (d ^ a))) + blocks[11] - 1990404162;
+    b = (b << 22 | b >>> 10) + c << 0;
+    a += (d ^ (b & (c ^ d))) + blocks[12] + 1804603682;
+    a = (a << 7 | a >>> 25) + b << 0;
+    d += (c ^ (a & (b ^ c))) + blocks[13] - 40341101;
+    d = (d << 12 | d >>> 20) + a << 0;
+    c += (b ^ (d & (a ^ b))) + blocks[14] - 1502002290;
+    c = (c << 17 | c >>> 15) + d << 0;
+    b += (a ^ (c & (d ^ a))) + blocks[15] + 1236535329;
+    b = (b << 22 | b >>> 10) + c << 0;
+    a += (c ^ (d & (b ^ c))) + blocks[1] - 165796510;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ (c & (a ^ b))) + blocks[6] - 1069501632;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ (b & (d ^ a))) + blocks[11] + 643717713;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ (a & (c ^ d))) + blocks[0] - 373897302;
+    b = (b << 20 | b >>> 12) + c << 0;
+    a += (c ^ (d & (b ^ c))) + blocks[5] - 701558691;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ (c & (a ^ b))) + blocks[10] + 38016083;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ (b & (d ^ a))) + blocks[15] - 660478335;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ (a & (c ^ d))) + blocks[4] - 405537848;
+    b = (b << 20 | b >>> 12) + c << 0;
+    a += (c ^ (d & (b ^ c))) + blocks[9] + 568446438;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ (c & (a ^ b))) + blocks[14] - 1019803690;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ (b & (d ^ a))) + blocks[3] - 187363961;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ (a & (c ^ d))) + blocks[8] + 1163531501;
+    b = (b << 20 | b >>> 12) + c << 0;
+    a += (c ^ (d & (b ^ c))) + blocks[13] - 1444681467;
+    a = (a << 5 | a >>> 27) + b << 0;
+    d += (b ^ (c & (a ^ b))) + blocks[2] - 51403784;
+    d = (d << 9 | d >>> 23) + a << 0;
+    c += (a ^ (b & (d ^ a))) + blocks[7] + 1735328473;
+    c = (c << 14 | c >>> 18) + d << 0;
+    b += (d ^ (a & (c ^ d))) + blocks[12] - 1926607734;
+    b = (b << 20 | b >>> 12) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[5] - 378558;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[8] - 2022574463;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[11] + 1839030562;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[14] - 35309556;
+    b = (b << 23 | b >>> 9) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[1] - 1530992060;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[4] + 1272893353;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[7] - 155497632;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[10] - 1094730640;
+    b = (b << 23 | b >>> 9) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[13] + 681279174;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[0] - 358537222;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[3] - 722521979;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[6] + 76029189;
+    b = (b << 23 | b >>> 9) + c << 0;
+    bc = b ^ c;
+    a += (bc ^ d) + blocks[9] - 640364487;
+    a = (a << 4 | a >>> 28) + b << 0;
+    d += (bc ^ a) + blocks[12] - 421815835;
+    d = (d << 11 | d >>> 21) + a << 0;
+    da = d ^ a;
+    c += (da ^ b) + blocks[15] + 530742520;
+    c = (c << 16 | c >>> 16) + d << 0;
+    b += (da ^ c) + blocks[2] - 995338651;
+    b = (b << 23 | b >>> 9) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[0] - 198630844;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[7] + 1126891415;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[14] - 1416354905;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[5] - 57434055;
+    b = (b << 21 | b >>> 11) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[12] + 1700485571;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[3] - 1894986606;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[10] - 1051523;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[1] - 2054922799;
+    b = (b << 21 | b >>> 11) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[8] + 1873313359;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[15] - 30611744;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[6] - 1560198380;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[13] + 1309151649;
+    b = (b << 21 | b >>> 11) + c << 0;
+    a += (c ^ (b | ~d)) + blocks[4] - 145523070;
+    a = (a << 6 | a >>> 26) + b << 0;
+    d += (b ^ (a | ~c)) + blocks[11] - 1120210379;
+    d = (d << 10 | d >>> 22) + a << 0;
+    c += (a ^ (d | ~b)) + blocks[2] + 718787259;
+    c = (c << 15 | c >>> 17) + d << 0;
+    b += (d ^ (c | ~a)) + blocks[9] - 343485551;
+    b = (b << 21 | b >>> 11) + c << 0;
+
+    if (this.first) {
+      this.h0 = a + 1732584193 << 0;
+      this.h1 = b - 271733879 << 0;
+      this.h2 = c - 1732584194 << 0;
+      this.h3 = d + 271733878 << 0;
+      this.first = false;
+    } else {
+      this.h0 = this.h0 + a << 0;
+      this.h1 = this.h1 + b << 0;
+      this.h2 = this.h2 + c << 0;
+      this.h3 = this.h3 + d << 0;
+    }
+  };
+
+  /**
+   * @method hex
+   * @memberof Md5
+   * @instance
+   * @description Output hash as hex string
+   * @returns {String} Hex string
+   * @see {@link md5.hex}
+   * @example
+   * hash.hex();
+   */
+  Md5.prototype.hex = function () {
+    this.finalize();
+
+    var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3;
+
+    return HEX_CHARS[(h0 >> 4) & 0x0F] + HEX_CHARS[h0 & 0x0F] +
+      HEX_CHARS[(h0 >> 12) & 0x0F] + HEX_CHARS[(h0 >> 8) & 0x0F] +
+      HEX_CHARS[(h0 >> 20) & 0x0F] + HEX_CHARS[(h0 >> 16) & 0x0F] +
+      HEX_CHARS[(h0 >> 28) & 0x0F] + HEX_CHARS[(h0 >> 24) & 0x0F] +
+      HEX_CHARS[(h1 >> 4) & 0x0F] + HEX_CHARS[h1 & 0x0F] +
+      HEX_CHARS[(h1 >> 12) & 0x0F] + HEX_CHARS[(h1 >> 8) & 0x0F] +
+      HEX_CHARS[(h1 >> 20) & 0x0F] + HEX_CHARS[(h1 >> 16) & 0x0F] +
+      HEX_CHARS[(h1 >> 28) & 0x0F] + HEX_CHARS[(h1 >> 24) & 0x0F] +
+      HEX_CHARS[(h2 >> 4) & 0x0F] + HEX_CHARS[h2 & 0x0F] +
+      HEX_CHARS[(h2 >> 12) & 0x0F] + HEX_CHARS[(h2 >> 8) & 0x0F] +
+      HEX_CHARS[(h2 >> 20) & 0x0F] + HEX_CHARS[(h2 >> 16) & 0x0F] +
+      HEX_CHARS[(h2 >> 28) & 0x0F] + HEX_CHARS[(h2 >> 24) & 0x0F] +
+      HEX_CHARS[(h3 >> 4) & 0x0F] + HEX_CHARS[h3 & 0x0F] +
+      HEX_CHARS[(h3 >> 12) & 0x0F] + HEX_CHARS[(h3 >> 8) & 0x0F] +
+      HEX_CHARS[(h3 >> 20) & 0x0F] + HEX_CHARS[(h3 >> 16) & 0x0F] +
+      HEX_CHARS[(h3 >> 28) & 0x0F] + HEX_CHARS[(h3 >> 24) & 0x0F];
+  };
+
+  /**
+   * @method toString
+   * @memberof Md5
+   * @instance
+   * @description Output hash as hex string
+   * @returns {String} Hex string
+   * @see {@link md5.hex}
+   * @example
+   * hash.toString();
+   */
+  Md5.prototype.toString = Md5.prototype.hex;
+
+  /**
+   * @method digest
+   * @memberof Md5
+   * @instance
+   * @description Output hash as bytes array
+   * @returns {Array} Bytes array
+   * @see {@link md5.digest}
+   * @example
+   * hash.digest();
+   */
+  Md5.prototype.digest = function () {
+    this.finalize();
+
+    var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3;
+    return [
+      h0 & 0xFF, (h0 >> 8) & 0xFF, (h0 >> 16) & 0xFF, (h0 >> 24) & 0xFF,
+      h1 & 0xFF, (h1 >> 8) & 0xFF, (h1 >> 16) & 0xFF, (h1 >> 24) & 0xFF,
+      h2 & 0xFF, (h2 >> 8) & 0xFF, (h2 >> 16) & 0xFF, (h2 >> 24) & 0xFF,
+      h3 & 0xFF, (h3 >> 8) & 0xFF, (h3 >> 16) & 0xFF, (h3 >> 24) & 0xFF
+    ];
+  };
+
+  /**
+   * @method array
+   * @memberof Md5
+   * @instance
+   * @description Output hash as bytes array
+   * @returns {Array} Bytes array
+   * @see {@link md5.array}
+   * @example
+   * hash.array();
+   */
+  Md5.prototype.array = Md5.prototype.digest;
+
+  /**
+   * @method arrayBuffer
+   * @memberof Md5
+   * @instance
+   * @description Output hash as ArrayBuffer
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @see {@link md5.arrayBuffer}
+   * @example
+   * hash.arrayBuffer();
+   */
+  Md5.prototype.arrayBuffer = function () {
+    this.finalize();
+
+    var buffer = new ArrayBuffer(16);
+    var blocks = new Uint32Array(buffer);
+    blocks[0] = this.h0;
+    blocks[1] = this.h1;
+    blocks[2] = this.h2;
+    blocks[3] = this.h3;
+    return buffer;
+  };
+
+  /**
+   * @method buffer
+   * @deprecated This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.
+   * @memberof Md5
+   * @instance
+   * @description Output hash as ArrayBuffer
+   * @returns {ArrayBuffer} ArrayBuffer
+   * @see {@link md5.buffer}
+   * @example
+   * hash.buffer();
+   */
+  Md5.prototype.buffer = Md5.prototype.arrayBuffer;
+
+  /**
+   * @method base64
+   * @memberof Md5
+   * @instance
+   * @description Output hash as base64 string
+   * @returns {String} base64 string
+   * @see {@link md5.base64}
+   * @example
+   * hash.base64();
+   */
+  Md5.prototype.base64 = function () {
+    var v1, v2, v3, base64Str = '', bytes = this.array();
+    for (var i = 0; i < 15;) {
+      v1 = bytes[i++];
+      v2 = bytes[i++];
+      v3 = bytes[i++];
+      base64Str += BASE64_ENCODE_CHAR[v1 >>> 2] +
+        BASE64_ENCODE_CHAR[(v1 << 4 | v2 >>> 4) & 63] +
+        BASE64_ENCODE_CHAR[(v2 << 2 | v3 >>> 6) & 63] +
+        BASE64_ENCODE_CHAR[v3 & 63];
+    }
+    v1 = bytes[i];
+    base64Str += BASE64_ENCODE_CHAR[v1 >>> 2] +
+      BASE64_ENCODE_CHAR[(v1 << 4) & 63] +
+      '==';
+    return base64Str;
+  };
+
+  var exports = createMethod();
+
+  if (COMMON_JS) {
+    module.exports = exports;
+  } else {
+    /**
+     * @method md5
+     * @description Md5 hash function, export to global in browsers.
+     * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+     * @returns {String} md5 hashes
+     * @example
+     * md5(''); // d41d8cd98f00b204e9800998ecf8427e
+     * md5('The quick brown fox jumps over the lazy dog'); // 9e107d9d372bb6826bd81d3542a419d6
+     * md5('The quick brown fox jumps over the lazy dog.'); // e4d909c290d0fb1ca068ffaddf22cbd0
+     *
+     * // It also supports UTF-8 encoding
+     * md5('中文'); // a7bac2239fcdcb3a067903d8077c4a07
+     *
+     * // It also supports byte `Array`, `Uint8Array`, `ArrayBuffer`
+     * md5([]); // d41d8cd98f00b204e9800998ecf8427e
+     * md5(new Uint8Array([])); // d41d8cd98f00b204e9800998ecf8427e
+     */
+    root.md5 = exports;
+    if (AMD) {
+      define(function () {
+        return exports;
+      });
+    }
+  }
+})();

package-lock.json

@@ -1,6 +1,29 @@
 {
-  "name": "testScanner",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {}
+    "name": "PDA广播模式下监听扫描组件",
+    "version": "1.0.0",
+    "lockfileVersion": 2,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "PDA广播模式下监听扫描组件",
+            "version": "1.0.0",
+            "devDependencies": {
+                "js-md5": "^0.7.3"
+            }
+        },
+        "node_modules/js-md5": {
+            "version": "0.7.3",
+            "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
+            "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==",
+            "dev": true
+        }
+    },
+    "dependencies": {
+        "js-md5": {
+            "version": "0.7.3",
+            "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
+            "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==",
+            "dev": true
+        }
+    }
 }

package.json

@@ -11,5 +11,8 @@
             "前端组件",
             "通用组件"
         ]
+    },
+    "devDependencies": {
+        "js-md5": "^0.7.3"
     }
-}
+}

pages.json

@@ -1,15 +1,15 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/login/index",
+			"path": "pages/index/index",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "首页"
 			}
 		},
 		{
-			"path": "pages/index/index",
+			"path": "pages/login/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -67,6 +67,12 @@
 			}
 		},
 		{
+			"path": "pages/extract/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		}
+		,{
 			"path": "pages/abnormal/index",
 			"style": {
 				"navigationStyle": "custom"
@@ -99,6 +105,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/message/message",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -116,7 +131,7 @@
 		"pagePath":"pages/index/index",
 		"text": "首页"
 		}, {
-		"pagePath":"pages/",
+		"pagePath":"pages/message/message",
 		"text": "消息"
 		}, {
 		"pagePath":"pages/mypage/index",

pages/abnormal/index.vue

@@ -1,66 +1,15 @@
 <template>
-  <view class="app-content">
+	<view class="app-content">
 		<!-- <img src="../../static/beijing.png" alt="" class="tuku"> -->
 		<Navs :navname.sync="navname" @fall="fall"></Navs>
 		<view class="content">
-			<view class="content_top">
-				<view class="craid" v-if="cap.name">
-					<view class="craid_data">
-						<p>{{cap.name}}</p>
-					  <span>{{cap.time}}</span>
+			<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="item.exception_type != null?'error':'normal'">{{item.exception_type!=null?item.exception_name:"正常"}}</view>
 					</view>
-					<view class="craid_data">
-						<p>{{cap.ct}}</p>
-					  <span>{{cap.time2}}</span>
-					</view>
-					<view class="aircraft"></view>
-					<view class="craid_data">
-						<p>{{cap.cs}}</p>
-					  <span>{{cap.time3}}</span>
-					</view>
-				</view>
-				<view class="craids" v-if="!cap.name">
-          <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>
-				</view>
-			</view>
-			<view class="content_top">
-				<view class="craid" v-if="caps.name">
-					<view class="craid_data">
-						<p>{{caps.name}}</p>
-					  <span>{{caps.time}}</span>
-					</view>
-					<view class="craid_data">
-						<p>{{caps.ct}}</p>
-					  <span>{{caps.time2}}</span>
-					</view>
-					<view class="aircraft"></view>
-					<view class="craid_data">
-						<p>{{caps.cs}}</p>
-					  <span>{{caps.time3}}</span>
-					</view>
-				</view>
-				<view class="craids" v-if="!caps.name">
-          <p>暂无航班信息</p>
-				</view>
-				<view class="scanning">
-					<view :class="getlooterClasser">
-						<input  class="input"  v-model.trim="endvalue"  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>
-					<view class="gao">*行李信息不一致，请上报处理</view>
-				</view>
-			</view>
-			<view class="footer">
-				<button form-type="submit" class="switchBtndel" >异常处理</button>
-				<button form-type="submit" class="btnyes" >确认提取</button>
+				</scroll-view>
 			</view>
 		</view>
 	</view>
@@ -68,499 +17,402 @@
 
 <script>
 	import Navs from '../../components/header/navs.vue'
-	import maskModel from '../../components/mask-model/mask-model.vue'
 	export default {
 		data() {
 			return {
 				isShow: true,
-				dataheight: '20.75rem',
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
-				input: '',
-				main: null,
-				poll: null,
-				filter:null,
-				pusher:null,
-				intentServer:null,
-				arr: [],
-				navname: '提取',
-				startcode: '扫码',
-				stopcode: '扫码',
+				navname: '异常行李',
 				action: true,
-				listdate: [{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				},
-				{
-					name: '3880491101',
-					types: false
-				}],
-				arr: [],//触发判断
-				startData: {
-					clientX: 0,
-					clientY: 0
-				},
-				stratvalue: '',//航班
-				endvalue: '',//行李
-				cap:{
-					name:'HU7412',
-					time:'2023-02-17',
-					ct: 'CTU',
-					time2: '12:00:00',
-					cs:'CSX',
-					time3: '14:23:00'
-				},
-				caps:{
-					name:'HU7412',
-					time:'2023-02-17',
-					ct: 'CTU',
-					time2: '12:00:00',
-					cs:'CSX',
-					time3: '14:23:00'
-				},
+				listdata:[],
+				exceptionList:[
+					{
+						"type":null,
+						"name":"非异常行李"
+					},
+					{
+						"type":"DPR",
+						"name":"破损"
+					},
+					{
+						"type":"AHL",
+						"name":"少收"
+					},
+					{
+						"type":"OHD",
+						"name":"多收"
+					}
+				],
+				exceptionNameList:["非异常行李","破损","少收","多收"],
+				airport:null
 			}
 		},
-		created(option) {
-		},
-		onLoad(option){
-			// this.navname = JSON.parse(decodeURIComponent(option.item))
-			// if (this.navname == '分拣') {
-      //   this.tabname = '航班'
-			// }
+		created(option) {},
+		onLoad(option) {
+			this.airport = option.airport
+			this.getluggageList(this.$storage.get("airportName"))
 		},
 		onUnload() {
 			// this.$refs.showMask.show();
 		},
 		onShow() {
+			uni.$on("scancodemsg", (data) => {
+				if (data.msg.length > 9) {
+					uni.navigateTo({
+						url: "/pages/baggagecheck/index?luggageNum="+Number(data.msg)
+					})
+				}
+			});
+		},
+		onHide() {
+			uni.$off("scancodemsg");
 		},
 		mounted() {
-			// this.$refs.showMask.show();
-			// console.log(this.stratvalue.length)
 		},
 		computed: {
-			getFooterClass () {
-				return this.stratvalue ? 'scanning_cds' : 'scanning_cd'
-			},
-			getlooterClasser () {
-				return this.endvalue ? 'scanning_cds' : 'scanning_cd'
-			}
 		},
 		components: {
 			Navs,
-			maskModel:maskModel,
 		},
 		methods: {
-			//下拉
-			up () {
-				this.typeShow = false
-				this.maskTitle = '是否确定要拉下该件行李？'
-				this.headername = '下拉提示'
-				this.$refs.showMask.show();
-			},
-			confirm:function(e){//确定按钮
-				console.log('您点击了确定按钮');
-			},
-			cancel:function(){//取消按钮
-				console.log('您点击了取消按钮');
-			},
-			clickOrder () {
-				uni.redirectTo({
-					url: "/pages/baggagecheck/index"
+			async getluggageList(airport){
+				let data = {
+					"serviceId": 3006,
+					
+					"dataContent": [{
+						"outAirport": airport
+					}],
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					console.log(res)
+					if (res.code == "0") {
+						res.returnData.map(item => {
+							this.exceptionList.map(item2 => {
+								if(item.exception_type == item2.type){
+									item["exception_name"] = item2.name
+								}
+							})
+						})
+					}
+	
 				})
 			},
-			fall () {
-				uni.switchTab({
-					url: "/pages/index/index"
+			toDetail(luggageNum){
+				this.currentLuggageNum = luggageNum;
+				uni.navigateTo({
+					url: "/pages/detail/index?luggageNum="+this.currentLuggageNum
 				})
 			},
-			clicker () {
-				this.action = !this.action
-			},
-			movetran (e) {
-				let arr = uni.getSystemInfoSync().windowHeight;
-				this.dataheight = (e.changedTouches[0].clientY/16) + 'rem'
-				if (e.changedTouches[0].clientY/16 > 20.75) {
-					this.dataheight = 20.75 + 'rem'
-				} else if (e.changedTouches[0].clientY/16 < 7.3125) {
-					this.dataheight = 6.3125 + 'rem'
-				}
-			},
-			start(e) {
-				this.startData.clientX = e.changedTouches[0].clientX;
-			},
-			end (e,item) {
-				const subX = e.changedTouches[0].clientX - this.startData.clientX;
-				if (subX > 50) {
-					// console.log('右滑')
-					item.types  = false
-				} else if (subX < -50) {
-					item.types  = true
-					// console.log('左滑')
-				}
-			},
-			checkMore (item) {
-        console.log(item)
+
+			fall() {
+				uni.navigateBack({
+					delta:1
+				})
 			}
 		},
 	}
 </script>
 
 <style lang="scss" scoped>
-.app-content{
-  position: relative;
-	background: rgb(49, 85, 99);
-	>.content{
-		width: 100%;
-		height: calc(100vh - 4.625rem);
+	.app-content {
 		position: relative;
-		// overflow: hidden;
-		// background: rgb(49, 85, 99);
-		>.content_top{
+		background: rgb(49, 85, 99);
+
+		>.content {
 			width: 100%;
+			height: calc(100vh - 5.375rem);
+			position: relative;
+
+			// overflow: hidden;
 			// background: rgb(49, 85, 99);
-			padding-bottom: 1.3125rem;
-			>.craid{
-				// width: 100%;
-				height: 5.625rem;
-				padding: 0 2.5625rem 0 2.5625rem;
-				display: flex;
-				justify-content: space-between;
-				flex-wrap: wrap;
-				align-items: center;
-				>.craid_data{
+			>.content_top {
+				width: 100%;
+				// background: rgb(49, 85, 99);
+				padding-bottom: 1.3125rem;
+
+				>.craid {
+					// width: 100%;
+					height: 5.625rem;
+					padding: 0 2.5625rem 0 2.5625rem;
 					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					align-items: start;
-					>p{
+					justify-content: space-between;
+					flex-wrap: wrap;
+					align-items: center;
+
+					>.craid_data {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: start;
+
+						>p {
+							color: rgb(255, 255, 255);
+							font-family: Noto Sans SC;
+							font-size: 18px;
+							font-weight: 700;
+						}
+
+						>span {
+							color: rgb(255, 255, 255);
+							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%;
+					}
+				}
+
+				>.scanning {
+					height: 12rem;
+					padding: 0 1.5rem 0 1.5rem;
+					opacity: 1;
+					transition: all 3s;
+
+					.scanning_cd {
+						width: 100%;
+						height: 3rem;
+						opacity: 1;
+						transition: all 3s;
+						background: rgb(59, 103, 123);
+						margin-top: 1rem;
+						margin-bottom: .5rem;
+						border-radius: 4px;
+						display: flex;
+						justify-content: center;
+						align-items: center;
 						color: rgb(255, 255, 255);
 						font-family: Noto Sans SC;
-						font-size: 18px;
-						font-weight: 700;
+						font-size: 16px;
+
+						>.log {
+							width: .875rem;
+							height: .875rem;
+							background: url('../../static/saoma.png') no-repeat;
+							background-size: 100% 100%;
+							margin-left: 1rem;
+						}
+
+						>.log_l {
+							width: .125rem;
+							height: 1.3125rem;
+							margin-left: 4rem;
+							background: rgb(255, 255, 255);
+						}
 					}
-					>span{
+
+					.scanning_cds {
+						width: 100%;
+						height: 3rem;
+						opacity: 1;
+						transition: all 3s;
+						background: rgb(51, 161, 165);
+						margin-top: 1rem;
+						margin-bottom: .5rem;
+						border-radius: 4px;
+						display: flex;
+						justify-content: center;
+						align-items: center;
 						color: rgb(255, 255, 255);
 						font-family: Noto Sans SC;
-						font-size: 13px;
-						font-weight: 500;
+						font-size: 16px;
+
+						>.log {
+							width: .875rem;
+							height: .875rem;
+							background: url('../../static/saoma.png') no-repeat;
+							background-size: 100% 100%;
+							margin-left: 1rem;
+						}
+
+						>.log_l {
+							width: .125rem;
+							height: 1.3125rem;
+							margin-left: 4rem;
+							background: rgb(255, 255, 255);
+						}
 					}
 				}
-				>.aircraft{
-					width: 1.75rem;
-          height: 1.75rem;
-					background: url('../../static/hang.png') no-repeat;
-					background-size: 100% 100%;
-				}
 			}
-			>.craids{
-				height: 5.625rem;
-				padding: 0 2.5625rem 0 2.5625rem;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				>p{
-					color: rgb(189, 214, 231);
-					font-family: Noto Sans SC;
-					font-size: 13px;
-					font-weight: 500;
-				}
-			}
-			>.scanning{
-				// height: 12rem;
-				padding: 0 1.5rem 0 1.5rem;
-				opacity: 1;
-				transition: all 3s;
-				>.gao{
-					color: yellow;
-				}
-				.scanning_cd{
+
+			>.content_bootom {
+				width: 100%;
+				// height: calc(100vh - 20.9375rem - 4.375rem);
+				padding-bottom: 0;
+				position: absolute;
+				bottom: 0;
+				top: 20.75rem;
+				// border-radius: 6px 6px 0px 0px;
+				overflow: hidden;
+				background: rgb(255, 255, 255);
+
+				>.choice {
 					width: 100%;
-					height: 3rem;
-					opacity: 1;
-					transition: all 3s;
-					background: rgb(59, 103, 123);
-					margin-top: 1rem;
-					margin-bottom: .5rem;
-					border-radius: 4px;
+					height: 2.5rem;
 					display: flex;
-					justify-content: center;
-					align-items: center;
-					color: rgb(255, 255, 255);
-					font-family: Noto Sans SC;
-					font-size: 16px;
-					>.log{
-						width: .875rem;
-						height: .875rem;
-						background: url('../../static/saoma.png') no-repeat;
-						background-size: 100% 100%;
-						margin-left: 1rem;
-					}
-					>.log_l{
-						width: .125rem;
-						height: 1.3125rem;
-						margin-left: 4rem;
+					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;
+					}
 				}
-				.scanning_cds{
+
+				.up {
 					width: 100%;
-					height: 3rem;
-					opacity: 1;
-					transition: all 3s;
-					background: rgb(51, 161, 165);
-					margin-top: 1rem;
-					margin-bottom: .5rem;
-					border-radius: 4px;
 					display: flex;
-					justify-content: center;
 					align-items: center;
-					color: rgb(255, 255, 255);
-					font-family: Noto Sans SC;
-					font-size: 16px;
-					>.log{
+					margin-left: 1rem;
+					border-bottom: 1px solid rgb(238, 238, 238);
+
+					// transform: all 3s;
+					>.down_up {
 						width: .875rem;
 						height: .875rem;
-						background: url('../../static/saoma.png') no-repeat;
+						background: url('../../static/xia.png') no-repeat;
 						background-size: 100% 100%;
-						margin-left: 1rem;
 					}
-					>.log_l{
-						width: .125rem;
-						height: 1.3125rem;
-						margin-left: 4rem;
-						background: rgb(255, 255, 255);
+					
+					>.error{
+						width: 20%;
+						color:red
+					}
+					>.normal{
+						width: 20%;
+						color:#4682b4 
+					}
+					>.list {
+						width: 70%;
+						position: relative;
+						height: 3.75rem;
+						display: flex;
+						align-items: center;
+						transform: all 3s;
+						right: 0;
+						color: rgb(0, 0, 0);
+						font-family: Noto Sans SC;
+						font-size: 13px;
+						font-weight: 500;
+					}
+
+					>.delete {
+						width: 3.75rem;
+						height: 3.75rem;
+						background: rgb(237, 101, 101);
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						position: relative;
+						right: -3.75rem;
+						transform: all 3s;
+
+						>.log {
+							width: .875rem;
+							height: .875rem;
+							background: url('../../static/vector@1x.png') no-repeat;
+							background-size: 100% 100%;
+						}
 					}
 				}
-			}
-		}
-		>.content_bootom{
-			width: 100%;
-			// height: calc(100vh - 20.9375rem - 4.375rem);
-			padding-bottom: 0;
-			position: absolute;
-			bottom: 0;
-			top: 20.75rem;
-			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;		
-				}
-			}
-			.up{
-				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;
-					background: url('../../static/xia.png') no-repeat;
-					background-size: 100% 100%;
-				}
-				>.list{
-					width: 97%;
-					position: relative;
-					height: 3.75rem;
-					display: flex;
-					align-items: center;
-					transform: all 3s;
-					right: 0;
-					color: rgb(0, 0, 0);
-					font-family: Noto Sans SC;
-					font-size: 13px;
-					font-weight: 500;
-				}
-				>.delete{
-					width: 3.75rem;
-					height: 3.75rem;
-					background: rgb(237, 101, 101);
+
+				.ups {
+					width: 100%;
 					display: flex;
 					align-items: center;
-					justify-content: center;
-					position: relative;
-					right: -3.75rem;
-					transform: all 3s;
-					>.log{
+					margin-left: 1rem;
+					border-bottom: 1px solid rgb(238, 238, 238);
+
+					// transform: all 3s;
+					>.down_up {
 						width: .875rem;
 						height: .875rem;
-						background: url('../../static/vector@1x.png') no-repeat;
-					  background-size: 100% 100%;
+						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%;
+						}
 					}
 				}
-			}
-			.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%;
+
+				.scroll-Y {
+					// height: calc(100% - 2.5rem - 2.75rem - 2.25rem - 2.25rem);
+					height: calc(100% - 2.5rem - 2.75rem);
 				}
-				>.list{
-					width: 97%;
-					position: relative;
-					height: 3.75rem;
-					display: flex;
-					align-items: center;
-					right: 3.75rem;
-					// right: 0;
-					color: rgb(0, 0, 0);
+
+				.but {
+					width: 20.5625rem;
+					height: 2.5rem;
+					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: 13px;
-					font-weight: 500;
-					transform: all 3s;
-				}
-				>.delete{
-					width: 3.75rem;
-					height: 3.75rem;
-					background: rgb(237, 101, 101);
+					font-size: 1rem;
+					margin: 0 auto;
 					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%;
-					}
+					margin-top: 0.25rem;
+					margin-bottom: 2.25rem;
 				}
 			}
-			.scroll-Y {
-				height: calc(100% - 2.5rem - 2.75rem - 2.25rem - 2.25rem);
-			}
-			.but{
-				width: 20.5625rem;
-        height: 2.75rem;
-				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;
-				margin: 0 auto;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				margin-top: 2.25rem;
-				margin-bottom: 2.25rem;
-			}
-		}
-		>.footer{
-			width: 100%;
-			height: 7.4375rem;
-			position: absolute;
-			bottom: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			>.switchBtndel{
-				width: 9.4375rem;
-				height: 2.75rem;
-				box-sizing: border-box;
-				background: rgb(243, 253, 255);
-				border: 1px solid rgb(172, 218, 230);
-				border-radius:
-				4px;
-				color: rgb(59, 150, 159);
-				font-family: Noto Sans SC;
-				font-size: 16px;
-				font-weight: 700;
-			}
-			>.btnyes{
-				width: 9.4375rem;
-				height: 2.75rem;
-				background: rgb(126, 138, 143);
-				border-radius:
-				4px;
-				color: rgb(255, 255, 255);
-				font-family: Noto Sans SC;
-				font-size: 16px;
-				font-weight: 700;
-			}
 		}
 	}
-}
 </style>

pages/baggageEntry/index.vue

@@ -1,14 +1,19 @@
 <template>
-  <view class="app-content">
-    <view class="header"><view class="log" @tap="fall"></view>{{ navname }}</view>
-	<view class="searchInput">
-		<uni-easyinput class="uni-mt-5" :inputBorder='false' suffixIcon="scan" v-model="value" placeholder="请输入行李号" @iconClick="iconClick"></uni-easyinput>
+	<view class="app-content">
+		<view class="header">
+			<view class="log" @tap="fall"></view>{{ navname }}
+		</view>
+		<view class="searchInput">
+			<uni-easyinput class="uni-mt-5" :inputBorder='false' v-model="value" placeholder="请输入行李号"
+				@iconClick="iconClick"></uni-easyinput>
+		</view>
+		<button type="default" v-if="value==''" class="defaultBtn">保存并提交</button>
+		<button type="default" v-else class="sendBtn" @tap="send">保存并提交</button>
+		<!-- 提示信息和下拉弹窗 -->
+		<mask-model :headername="headername" :typeShow="typeShow" :tabname="tabname" ref="showMask" btnType="1"
+			@confirm="confirm" @cancel="cancel" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF"
+			:maskTitle="maskTitle"></mask-model>
 	</view>
-	<button type="default" v-if="value==''" class="defaultBtn">保存并提交</button>
-	<button type="default" v-else class="sendBtn" @tap="send">保存并提交</button>
-	<!-- 提示信息和下拉弹窗 -->
-	<mask-model :headername="headername" :typeShow="typeShow" :tabname="tabname" ref="showMask" btnType="1" @confirm="confirm" @cancel="cancel" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF" :maskTitle="maskTitle"></mask-model>
-  </view>
 </template>
 <script>
 	import Nav from '../../components/header/nav.vue'
@@ -17,101 +22,107 @@
 		data() {
 			return {
 				navname: '行李号录入',
-				value:"",
-				maskTitle:'请核对录入的行李号是否正确',
-				tabname: '',//按钮名称
-				typeShow:true,
+				value: "",
+				maskTitle: '请核对录入的行李号是否正确',
+				tabname: '', //按钮名称
+				typeShow: true,
 				headername: '请核对信息',
 			}
 		},
-		created(option) {
-		},
-		onLoad(){
-		},
-		onUnload() {
-		},
-		onShow() {
-		},
-		mounted() {
-		},
+		created(option) {},
+		onLoad() {},
+		onUnload() {},
+		onShow() {},
+		mounted() {},
 		components: {
 			Nav
 		},
 		methods: {
-		  fall () {
-			uni.navigateBack({
-				delta: 1
-			})
-		  },
-		  iconClick(){
-			alert("点击")
-		  },
-		  send(){
-			  this.typeShow = false
-			  this.maskTitle = '请核对录入的行李号是否正确'
-			  this.headername = '请核对信息'
-			  this.$refs.showMask.show();
-		  },
-		  confirm:function(e){//确定按钮
-		  	console.log('您点击了确定按钮');
-		  },
-		  cancel:function(){//取消按钮
-		  	console.log('您点击了取消按钮');
-		  },
+			fall() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			iconClick() {
+			},
+			send() {
+				this.typeShow = false
+				this.maskTitle = '请核对录入的行李号是否正确'
+				this.headername = '请核对信息'
+				this.$refs.showMask.show();
+			},
+			confirm: function(e) { //确定按钮
+				if(this.value.length>9){
+					let pages = getCurrentPages()
+					let prevPage = pages[pages.length - 2]
+					prevPage.$vm.getluggage(this.value,true)
+					prevPage.$vm.currentLuggageNum = this.value
+					uni.navigateBack({
+						delta: 1
+					})
+				}
+			},
+			cancel: function() { //取消按钮
+				console.log('您点击了取消按钮');
+			},
 		},
 	}
 </script>
 
 <style lang="scss" scoped>
-.app-content{
-  >.header{
-    width: 100%;
-    height: 4.375rem;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    // background: rgba(49,85,99,1);
-    color: rgb(16, 17, 22);
-    font-family: Noto Sans SC;
-    font-size: 1rem;
-    position: relative;
-    >.log{
-      width: .375rem;
-      height: .75rem;
-      font-size: .75rem;
-      position: absolute;
-      left: 1.5rem;
-      background: url('../../static/ico@1x.png') no-repeat;
-      background-size: 100% 100%;
-    }
-  }
-  >.searchInput{
-	  width: calc(100% - 2rem);
-	  margin-left: 1rem;
-	  border-bottom:1px solid rgb(224, 230, 238);
-	  color: rgb(48, 51, 57);
-  }
-  >.defaultBtn{
-	  width: calc(100% - 2rem);
-	  margin-left: 1rem;
-	  height: 44px;
-	  top: 204px;
-	  background: rgb(180, 191, 196);
-	  color: rgb(255, 255, 255);
-	  border-radius:4px;
-	  border: none;
-	  top: 4rem;
-  }
-  >.sendBtn{
-  	  width: calc(100% - 2rem);
-  	  margin-left: 1rem;
-  	  height: 44px;
-  	  top: 204px;
-  	  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%);
-  	  color: rgb(255, 255, 255);
-  	  border-radius:4px;
-  	  border: none;
-  	  top: 4rem;
-  }
-}
+	.app-content {
+		>.header {
+			width: 100%;
+			height: 4.375rem;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			// background: rgba(49,85,99,1);
+			color: rgb(16, 17, 22);
+			font-family: Noto Sans SC;
+			font-size: 1rem;
+			position: relative;
+
+			>.log {
+				width: .375rem;
+				height: .75rem;
+				font-size: .75rem;
+				position: absolute;
+				left: 1.5rem;
+				background: url('../../static/ico@1x.png') no-repeat;
+				background-size: 100% 100%;
+			}
+		}
+
+		>.searchInput {
+			width: calc(100% - 2rem);
+			margin-left: 1rem;
+			border-bottom: 1px solid rgb(224, 230, 238);
+			color: rgb(48, 51, 57);
+		}
+
+		>.defaultBtn {
+			width: calc(100% - 2rem);
+			margin-left: 1rem;
+			height: 44px;
+			top: 204px;
+			background: rgb(180, 191, 196);
+			color: rgb(255, 255, 255);
+			border-radius: 4px;
+			border: none;
+			top: 4rem;
+		}
+
+		>.sendBtn {
+			width: calc(100% - 2rem);
+			margin-left: 1rem;
+			height: 44px;
+			top: 204px;
+			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%);
+			color: rgb(255, 255, 255);
+			border-radius: 4px;
+			border: none;
+			top: 4rem;
+		}
+	}
 </style>

pages/baggagecheck/index.vue

@@ -1,30 +1,40 @@
 <template>
-  <view class="app-content">
-    <view class="header"><view class="log" @tap="fall"></view>{{ navname }}<view class="up">完成</view></view>
-    <view class="content">
-      <view class="list">
-        <p>行李编号</p>
-        <input  class="input"  name="yonghuming"  type="text" 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" 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" 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" 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" value=""  placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="请输入异常原因" />
-      </view>
-      <view class="picturearea">
-        <view class="name">图片上传</view>
-        <!-- <view class="content_list">
+	<view class="app-content">
+		<view class="header">
+			<view class="log" @tap="fall"></view>{{ navname }}
+			<view class="up" @tap="sendData()">完成</view>
+		</view>
+		<view class="content" v-if="luggageData">
+			<view class="list">
+				<p>行李编号</p>
+				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.luggageNum" 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.location_describe" 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=""
+					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=""
+					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="" />
+			</view>
+			<view class="list">
+				<p>异常类型</p>
+				<picker @change="bindPickerChange" :value="index" :range-key="'name'" :range="exceptionList">
+					<view class="uni-input">{{exceptionNameList[index]}}</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>
@@ -35,23 +45,19 @@
             <view class="mg_lg"></view>
           </view>
         </view> -->
-        <!-- <sunui-upimg :url="upPicUrl" :before-upload="onBeforeUpload" ref="upload3" title="+" @upload="handleLoaded3" @change="handleChange3" :number="3">
+				<!-- <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>
-  </view>
+				<mk-upload :imgList="imgList" @onDelete="onDelete" @onChoose="onChoose" />
+			</view>
+		</view>
+	</view>
 </template>
 <script>
 	import Nav from '../../components/header/nav.vue'
-  import mkUpload from "@/components/mk-upload/mk-upload.vue"
+	import mkUpload from "@/components/mk-upload/mk-upload.vue"
 	export default {
 		data() {
 			return {
@@ -64,154 +70,244 @@
 				input: '',
 				main: null,
 				poll: null,
-				filter:null,
-				pusher:null,
-				intentServer:null,
+				filter: null,
+				pusher: null,
+				intentServer: null,
 				arr: [],
 				navname: '异常行李登记',
-        imgList: [
-        ]
+				imgList: [],
+				luggageNum:null,
+				luggageData:null,
+				index:0,
+				exceptionList:[
+					{
+						"type":null,
+						"name":"非异常行李"
+					},
+					{
+						"type":"DPR",
+						"name":"破损"
+					},
+					{
+						"type":"AHL",
+						"name":"少收"
+					},
+					{
+						"type":"OHD",
+						"name":"多收"
+					}
+				],
+				exceptionNameList:["非异常行李","破损","少收","多收"],
 			}
 		},
-		created(option) {
-		},
-		onLoad(){
-		},
-		onUnload() {
-		},
-		onShow() {
-		},
-		mounted() {
+		created(option) {},
+		onLoad(option) {
+			this.luggageNum = option.luggageNum;
+			this.getDetial(this.luggageNum)
 		},
+		onUnload() {},
+		onShow() {},
+		mounted() {},
 		components: {
 			Nav,
-      mkUpload
+			mkUpload
 		},
 		methods: {
-			fall () {
-				uni.redirectTo({
-					url: "/pages/sorting/index"
+			async getDetial(num) {
+				let data = {
+					"serviceId": 3002,
+					"page": 1,
+					"pageSize": 1,
+					"dataContent": {
+						"luggageNum": num, //行李号
+					},
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					if (res.code == "0" && res.returnData.length>0){
+						this.luggageData = res.returnData[0]
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "未查询到该行李信息",
+							duration: 5000
+						});
+					}
+				})
+			},
+			bindPickerChange(e){
+				this.index = e.detail.value
+				this.luggageData.exception_type = this.exceptionList[this.index].type;
+			},
+			async sendData(){
+				this.luggageData.sourceAirport = this.$storage.get('airportName');
+				let data = {
+					"serviceId": 3005,
+					"dataContent": [
+						this.luggageData
+					],
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					if (res.code == "0") {
+						uni.showToast({
+							icon:'none',
+							title: "操作成功",
+							duration: 5000
+						});
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "操作失败",
+							duration: 5000
+						});
+					}
+				})
+			},
+			fall() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			onDelete(index) {
+				console.log(index)
+				//删除成功回调后执行 只做演示
+				uni.showLoading({
+					title: '删除中'
+				});
+				setTimeout(() => {
+					this.imgList.splice(index, 1);
+					wx.showToast({
+						title: '删除成功',
+						icon: 'success',
+						duration: 1000
+					});
+				}, 1000);
+			},
+			onChoose(e) {
+				console.log(e)
+				//上传成功后回调执行push  只做演示
+				uni.showLoading({
+					title: '上传中'
+				});
+				setTimeout(() => {
+					const tempFilePaths = e.tempFilePaths;
+					this.imgList.push(tempFilePaths[0]);
+					uni.hideLoading();
+				}, 1000);
+			},
+			onPreviewTake(index) {
+				console.log(index)
+				wx.showActionSheet({
+					itemList: ['预览图片', '删除图片'],
+					success(res) {
+						console.log(res.tapIndex)
+					},
+					fail(res) {
+						console.log(res.errMsg)
+					}
 				})
 			},
-      onDelete(index){
-        console.log(index)
-        //删除成功回调后执行 只做演示
-        uni.showLoading({
-            title: '删除中'
-        });
-        setTimeout(()=>{
-            this.imgList.splice(index, 1);
-            wx.showToast({
-                title: '删除成功',
-                icon: 'success',
-                duration: 1000
-            });
-        }, 1000);
-      },
-      onChoose(e){
-          console.log(e)
-          //上传成功后回调执行push  只做演示
-          uni.showLoading({
-              title: '上传中'
-          });
-          setTimeout(()=>{
-              const tempFilePaths = e.tempFilePaths;
-              this.imgList.push(tempFilePaths[0]);
-              uni.hideLoading();
-          }, 1000);
-      },
-      onPreviewTake(index){
-          console.log(index)
-          wx.showActionSheet({
-            itemList: ['预览图片', '删除图片'],
-            success (res) {
-              console.log(res.tapIndex)
-            },
-            fail (res) {
-              console.log(res.errMsg)
-            }
-          })
-      },
 		},
 	}
 </script>
 
 <style lang="scss" scoped>
-.app-content{
-  >.header{
-    width: 100%;
-    height: 4.375rem;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    // background: rgba(49,85,99,1);
-    color: rgb(16, 17, 22);
-    font-family: Noto Sans SC;
-    font-size: 1rem;
-    position: relative;
-    >.log{
-      width: .375rem;
-      height: .75rem;
-      font-size: .75rem;
-      position: absolute;
-      left: 1.5rem;
-      background: url('../../static/ico@1x.png') no-repeat;
-      background-size: 100% 100%;
-    }
-    >.up{
-      position: absolute;
-      right: 1.5rem;
-      color: rgb(37, 121, 160);
-      font-family: Noto Sans SC;
-      font-size: .875rem;
-      font-weight: 500;
-    }
-  }
-  >.content{
-    margin-left: 1.5rem;
-    >.list{
-      height: 3.375rem;
-      display: flex;
-      align-items: center;
-      border-bottom: 1px solid rgb(238, 238, 238);
-      >p{
-        color: rgb(0, 0, 0);
-        font-family: Noto Sans SC;
-        font-size: .8125rem;
-        font-weight: 500;
-        margin-right: 2.1875rem;
-      }
-    }
-    >.picturearea{
-      margin-top: 1.875rem;
-      >.name{
-        color: rgb(0, 0, 0);
-        font-family: Noto Sans SC;
-        font-size: .8125rem;
-        font-weight: 500;
-        margin-bottom: 1.25rem;
-      }
-      >.content_list{
-        width: 100%;
-        display: flex;
-        margin-top: 1.25rem;
-        >.mg{
-          width: 5.5rem;
-          height: 5.5rem;
-          background: rgb(197, 207, 211);
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          margin-right: .625rem;
-          >.mg_lg{
-            width: 1.75rem;
-            height: 1.75rem;
-            background: url('../../static/shi.png') no-repeat;
-            background-size: 100% 100%;
-          }
-        }
-      }
-    }
-  }
-}
+	.app-content {
+		>.header {
+			width: 100%;
+			height: 4.375rem;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			// background: rgba(49,85,99,1);
+			color: rgb(16, 17, 22);
+			font-family: Noto Sans SC;
+			font-size: 1rem;
+			position: relative;
+
+			>.log {
+				width: .375rem;
+				height: .75rem;
+				font-size: .75rem;
+				position: absolute;
+				left: 1.5rem;
+				background: url('../../static/ico@1x.png') no-repeat;
+				background-size: 100% 100%;
+			}
+
+			>.up {
+				position: absolute;
+				right: 1.5rem;
+				color: rgb(37, 121, 160);
+				font-family: Noto Sans SC;
+				font-size: .875rem;
+				font-weight: 500;
+			}
+		}
+
+		>.content {
+			margin-left: 1.5rem;
+
+			>.list {
+				height: 3.375rem;
+				display: flex;
+				align-items: center;
+				border-bottom: 1px solid rgb(238, 238, 238);
+
+				>p {
+					color: rgb(0, 0, 0);
+					font-family: Noto Sans SC;
+					font-size: .8125rem;
+					font-weight: 500;
+					margin-right: 2.1875rem;
+				}
+				>.listup {
+					width: .25rem;
+					height: .5rem;
+					background: url('../../static/icos.png') no-repeat;
+					background-size: 100% 100%;
+					position: absolute;
+					right: 1.5rem;
+				}
+			}
+
+			>.picturearea {
+				margin-top: 1.875rem;
+
+				>.name {
+					color: rgb(0, 0, 0);
+					font-family: Noto Sans SC;
+					font-size: .8125rem;
+					font-weight: 500;
+					margin-bottom: 1.25rem;
+				}
+
+				>.content_list {
+					width: 100%;
+					display: flex;
+					margin-top: 1.25rem;
+
+					>.mg {
+						width: 5.5rem;
+						height: 5.5rem;
+						background: rgb(197, 207, 211);
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						margin-right: .625rem;
+
+						>.mg_lg {
+							width: 1.75rem;
+							height: 1.75rem;
+							background: url('../../static/shi.png') no-repeat;
+							background-size: 100% 100%;
+						}
+					}
+				}
+			}
+		}
+	}
 </style>

pages/detail/index.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="app-content">
 		<view class="header">
-			<view class="log" @tap="fall"></view>
+			<view class="log" @tap="fall"></view> <button type="primary" class="send" size="small" v-if="luggageData" @tap="sendData()">提交</button>
 		</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>
     </view> -->
 		<uni-swiper-dot :info="info" :current="current" field="content" :mode="mode">
-			<swiper class="swiper-box"  @change="change"  style="height:11rem">
-				<swiper-item v-for="(item ,index) in info" :key="index" >
+			<swiper class="swiper-box" @change="change" style="height:11rem">
+				<swiper-item v-for="(item ,index) in info" :key="index">
 					<view class="swiper-item">
 						<image style="width:100%" src="../../static/bg.png" mode="widthFix"></image>
 					</view>
@@ -17,130 +17,129 @@
 		</uni-swiper-dot>
 		<view class="content" :style="{top:dataheight}">
 			<uni-section title="行李详情" type="line"></uni-section>
-			<view class="choice" @touchmove="movetran">
+			<view class="choice" @touchmove="movetran" v-if="luggageData">
 				<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="dataheight"
-							type="text" placeholder="航班号" />
+						<uni-easyinput :inputBorder="false" :styles="style" :disabled="true"
+							v-model="luggageData.carrierFlights" type="text" placeholder="航班号" />
 						</uni-forms>
-						<view class="listup"></view>
+						<!-- <view class="listup"></view> -->
 					</view>
-					<view class="list" @click="show('simple')">
+					<view class="list">
 						<view class="lable">航班日期</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="true" v-model="datatime"
-							type="text" placeholder="航班日期" />
+						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="true"
+							v-model="luggageData.carrierFlightsDate" type="text" placeholder="航班日期" />
 						</uni-forms>
-						<view class="listup"></view>
+						<!-- <view class="listup"></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">行李牌号</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false" v-model="dataheight"
-							type="text" placeholder="行李牌号" />
+						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="true"
+							v-model="luggageData.luggageNum" type="text" placeholder="行李牌号" />
 						</uni-forms>
-						<view class="listup"></view>
+						<!-- <view class="listup"></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">操作节点</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false" v-model="dataheight"
-							type="text" placeholder="操作节点" />
-						</uni-forms>
+						<picker @change="bindPickerChange" :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" v-model="dataheight"
-							type="text" placeholder="操作位置" />
+						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false"
+							v-model="luggageData.location_describe" type="text" placeholder="操作位置" />
 						</uni-forms>
 						<view class="listup"></view>
 					</view>
-					<view class="list" @click="show = true">
+					<view class="list">
 						<view class="lable">操作时间</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="true" v-model="datacontime"
-							type="text" placeholder="操作时间" />
+						<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 class="listup"></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">操作人</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false" v-model="dataheight"
-							type="text" placeholder="操作人" />
+						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="true"
+							v-model="luggageData.agentNumber" type="text" placeholder="操作人" />
 						</uni-forms>
-						<view class="listup"></view>
+						<!-- <view class="listup"></view> -->
 					</view>
 					<view class="list">
 						<view class="lable">发往节点</view>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false" v-model="dataheight"
-							type="text" placeholder="发往节点" />
-						</uni-forms>
+						<picker @change="bindPickerChange2" :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" v-model="dataheight"
-							type="text" placeholder="发往位置" />
+						<uni-easyinput :inputBorder="false" :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>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false" v-model="dataheight"
-							type="text" placeholder="特殊行李类型" />
-						</uni-forms>
+						<picker @change="bindPickerChange3" :value="index3" :range-key="'specialTypeName'" :range="specialTypeList">
+							<view class="uni-input">{{specialTypeNameList[index3]}}</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="dataheight"
-							type="text" placeholder="异常类型" />
-						</uni-forms>
+						<picker @change="bindPickerChange4" :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>
-						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false" v-model="dataheight"
-							type="text" placeholder="装车状态" />
-						</uni-forms>
+						<view class="lable">非正常状态码</view>
+						<picker @change="bindPickerChange5" :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" v-model="dataheight"
-							type="text" placeholder="装车序号" />
+						<view class="lable">装载序号</view>
+						<uni-easyinput :inputBorder="false" :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" v-model="dataheight"
-							type="text" placeholder="容器" />
+						<view class="lable">容器编号</view>
+						<uni-easyinput :inputBorder="false" :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" v-model="dataheight"
-							type="text" placeholder="备注" />
+						<uni-easyinput :inputBorder="false" :clearable="false" :styles="style" :disabled="false"
+							v-model="luggageData.luggage_describe" type="text" placeholder="备注" />
 						</uni-forms>
 						<view class="listup"></view>
 					</view>
 				</scroll-view>
 			</view>
 		</view>
-		<luanqing-date-picker 
-				ref="datePickerObj" 
-				:isSimple="mode === 'simple'" 
-				:isMultiple="mode === 'multiple'" 
-				@finishSelectDate="finishSelectDate" 
-				:defaultCheckedList="['2023-03-28','2023-09-25']">
+		<luanqing-date-picker ref="datePickerObj" :isSimple="mode === 'simple'" :isMultiple="mode === 'multiple'"
+			@finishSelectDate="finishSelectDate" :defaultCheckedList="['2023-03-28','2023-09-25']">
 		</luanqing-date-picker>
-		<uv-datetime-picker
-		  :show="show"
-				v-model="value1"
-				mode="datetime"
-				@confirm ='confirm'
-				@close = 'show = false'
-		></uv-datetime-picker>
+		<uv-datetime-picker :show="show" v-model="value1" mode="datetime" @confirm='confirm'
+			@close='show = false'></uv-datetime-picker>
 	</view>
 </template>
 <script>
@@ -151,25 +150,11 @@
 					disableColor: "#fff",
 					color: "#000"
 				},
-				detailedTable: [{
-						name: '离港：HU7410   CKG-CSX (113/171)'
-					},
-					{
-						name: '离港：HU7410   CKG-CSX (113/171)'
-					},
-					{
-						name: '离港：HU7410   CKG-CSX (113/171)'
-					},
-					{
-						name: '离港：HU7410   CKG-CSX (113/171)'
-					},
-					{
-						name: '离港：HU7410   CKG-CSX (113/171)'
-					}
-				],
 				dataheight: '10.75rem',
 				datatime: '2023-06-02',
 				datacontime: '',
+				luggageData: null,
+				luggageDataOld:null,
 				info: [{
 					content: '内容 A'
 				}, {
@@ -179,20 +164,225 @@
 				}],
 				current: 0,
 				mode: 'round',
-				mode: 'simple',
 				show: false,
-        value1: Number(new Date()),
-				formatter:'yy'
+				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":"非异常行李"
+					},
+					{
+						"type":"DPR",
+						"name":"破损"
+					},
+					{
+						"type":"AHL",
+						"name":"少收"
+					},
+					{
+						"type":"OHD",
+						"name":"多收"
+					}
+				],
+				exceptionNameList:["非异常行李","破损","少收","多收"],
+				abnormalList:[
+					{
+						"type":null,
+						"name":"无"
+					},
+					{
+						"type":"NAL",
+						"name":"未被授权的装载"
+					},
+					{
+						"type":"OFF",
+						"name":"已卸载"
+					},
+					{
+						"type":"UNS",
+						"name":"未找到"
+					},
+					{
+						"type":"OND",
+						"name":"在场未装载，未被授权"
+					},
+					{
+						"type":"ONA",
+						"name":"在场未装载，已授权"
+					}
+				],
+				 abnormalNameList:["无","未被授权的装载","已卸载","未找到","在场未装载，未被授权","在场未装载，已授权"],
+				isShow:true
 			}
 		},
-		created(option) {},
-		onLoad() {},
+		created(option) {
+		},
+		onLoad(option) {
+			this.luggageNum = option.luggageNum 
+			// this.luggageNum= "3784551037"
+			this.getNode()
+			this.getSpecialTypeList()
+			this.getDetial(this.luggageNum)
+		},
 		onUnload() {},
-		onShow() {},
-		mounted() {},
+		onShow() {
+			uni.$on("scancodemsg", (data) => {
+				if (data.msg.length > 9) {
+					this.luggageNum = Number(data.msg)
+					this.getDetial(this.luggageNum)
+				}
+			});
+		},
+		onHide() {
+			uni.$off("scancodemsg");
+		},
 		components: {},
 		methods: {
-			confirm (e) {
+			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 getSpecialTypeList(){
+				let data = {
+					"serviceId": 16,
+					"dataContent": {},
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					if (res.code == "0") {
+						this.specialTypeList = res.returnData;
+						this.specialTypeList.unshift(
+						{
+							"specialType": null,
+							"specialTypeName": "非特殊行李",
+						}
+						)
+						this.specialTypeList.map(item => {
+							this.specialTypeNameList.push(item.specialTypeName)
+						})
+					}
+				})
+			},
+			async getDetial(num) {
+				let data = {
+					"serviceId": 3002,
+					"page": 1,
+					"pageSize": 1,
+					"dataContent": {
+						"luggageNum": num, //行李号
+					},
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					this.luggageData = null
+					if (res.code == "0" && res.returnData.length>0) {
+						this.luggageData = res.returnData[0]
+						this.luggageDataOld = JSON.parse(JSON.stringify(res.returnData[0]))
+						this.nodeList.map((item,index)=>{
+							if(res.returnData[0].nodeCode == item.nodeCode){
+								this.index = index
+								this.index2 = index + 1
+							}
+						})
+						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.index4 = index
+							}
+						})
+						this.abnormalList.map((item,index)=>{
+							if(res.returnData[0].abnormalState == item.type){
+								this.index5 = index
+							}
+						})
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "未查询到该行李信息",
+							duration: 5000
+						});
+					}
+				})
+			},
+			async sendData(){
+				this.luggageData.sourceAirport = this.$storage.get('airportName');
+				let data = {
+					"serviceId": 3005,
+					"dataContent": [
+						this.luggageData
+					],
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					console.log(res)
+					if (res.code == "0") {
+						uni.showToast({
+							icon:'none',
+							title: "操作成功",
+							duration: 5000
+						});
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "操作失败",
+							duration: 5000
+						});
+					}
+				})
+			},
+			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){
+				this.index2 = e.detail.value
+				this.luggageData.to_location_describe = this.nodeList[this.index2].nodeDescribe;
+			},
+			bindPickerChange3(e){
+				this.index3 = e.detail.value
+				this.luggageData.specialType = this.nodeList[this.index3].specialType;
+			},
+			bindPickerChange4(e){
+				this.index4 = e.detail.value
+				this.luggageData.exception_type = this.exceptionList[this.index4].type;
+			},
+			bindPickerChange5(e){
+				this.index5 = e.detail.value
+				this.luggageData.abnormalState = this.abnormalList[this.index5].type;
+			},
+			confirm(e) {
 				this.show = false
 				console.log(e.value)
 				let timestamp = e.value
@@ -204,12 +394,12 @@
 				let Hour = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
 				let Minute = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
 				let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
-				let  GMT =  Year + '-' + Moth + '-' + Day + '   '+ Hour +':'+ Minute 
+				let GMT = Year + '-' + Moth + '-' + Day + '   ' + Hour + ':' + Minute
 				this.datacontime = GMT
 			},
-			finishSelectDate(e){
+			finishSelectDate(e) {
 				this.datatime = e[0]
-				console.error("选择了日期：",e);
+				console.error("选择了日期：", e);
 			},
 			movetran(e) {
 				let arr = uni.getSystemInfoSync().windowHeight;
@@ -235,8 +425,8 @@
 				})
 			},
 			fall() {
-				uni.switchTab({
-					url: "/pages/mypage/index"
+				uni.navigateBack({
+					delta: 1
 				})
 			},
 			change(e) {
@@ -252,16 +442,17 @@
 			width: 100%;
 			height: 4.375rem;
 			display: flex;
-			justify-content: center;
+			justify-content: space-between;
 			align-items: center;
 			// background: rgba(49,85,99,1);
 			color: rgb(16, 17, 22);
 			font-family: Noto Sans SC;
 			font-size: 1rem;
 			position: fixed;
-			left:0;
-			top:0;
+			left: 0;
+			top: 0;
 			z-index: 1;
+
 			>.log {
 				width: .375rem;
 				height: .75rem;
@@ -271,7 +462,13 @@
 				background: url('../../static/ico@1x.png') no-repeat;
 				background-size: 100% 100%;
 			}
-
+			>.send{
+				position: absolute;
+				right: 1.5rem;
+				height: 1.5rem;
+				font-size: 1rem;
+				line-height: 1.5rem;
+			}
 			>.up {
 				width: .8456rem;
 				height: .8456rem;

pages/extract/index.vue

@@ -0,0 +1,550 @@
+<template>
+  <view class="app-content">
+		<!-- <img src="../../static/beijing.png" alt="" class="tuku"> -->
+		<Navs :navname="navname" @fall="fall"></Navs>
+		<view class="content">
+			<view class="content_top">
+				<view class="craid" v-if="cap">
+					<view class="craid_data">
+						<p>{{cap.flightNo}}</p>
+					  <span>{{cap.flightDate}}</span>
+					</view>
+					<view class="craid_data">
+						<p>{{cap.outAirport}}</p>
+					  <!-- <span>{{cap.time2}}</span> -->
+					</view>
+					<view class="aircraft"></view>
+					<view class="craid_data">
+						<p>{{cap.landAirport}}</p>
+					  <!-- <span>{{cap.time3}}</span> -->
+					</view>
+				</view>
+				<view class="craids" v-if="!cap">
+          <p>暂无航班信息</p>
+				</view>
+				<view class="scanning">
+					<view :class="getFooterClass">
+						<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>
+				</view>
+			</view>
+			<view class="content_top">
+				<view class="craid" v-if="caps">
+					<view class="craid_data">
+						<p>{{caps.flightNo}}</p>
+					  <span>{{caps.flightDate}}</span>
+					</view>
+					<view class="craid_data">
+						<p>{{caps.outAirport}}</p>
+					  <!-- <span>{{caps.time2}}</span> -->
+					</view>
+					<view class="aircraft"></view>
+					<view class="craid_data">
+						<p>{{caps.landAirport}}</p>
+					  <!-- <span>{{caps.time3}}</span> -->
+					</view>
+				</view>
+				<view class="craids" v-if="!caps">
+					<p>暂无航班信息</p>
+				</view>
+				<view class="scanning">
+					<view :class="getlooterClasser">
+						<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>
+					<view class="gao" v-if="!isMatch">*行李信息不一致，请上报处理</view>
+				</view>
+			</view>
+			<view class="footer">
+				<button form-type="submit" class="switchBtndel" @tap="abnormal()">异常处理</button>
+				<button form-type="submit" class="btnyes" v-if="isSend" @tap="sendData()">确认提取</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Navs from '../../components/header/navs.vue'
+	import maskModel from '../../components/mask-model/mask-model.vue'
+	import {
+		Format
+	} from '@/components/utils/validate'
+	export default {
+		data() {
+			return {
+				isShow: true,
+				input: '',
+				navname: '提取',
+				cap:null,
+				caps:null,
+				luggageNum:null,
+				capluggageNum:null,
+				capsluggageNum:null,
+				isMatch:true,
+				isSend:false,
+			}
+		},
+		created(option) {
+		},
+		onLoad(option){
+			// this.navname = JSON.parse(decodeURIComponent(option.item))
+			// if (this.navname == '分拣') {
+      //   this.tabname = '航班'
+			// }
+		},
+		onUnload() {
+			// this.$refs.showMask.show();
+		},
+		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() {
+			// this.$refs.showMask.show();
+			// console.log(this.stratvalue.length)
+		},
+		computed: {
+			getFooterClass () {
+				return this.cap.luggageNum ? 'scanning_cds' : 'scanning_cd'
+			},
+			getlooterClasser () {
+				return this.caps.luggageNum ? 'scanning_cds' : 'scanning_cd'
+			}
+		},
+		components: {
+			Navs,
+			maskModel:maskModel,
+		},
+		methods: {
+			datatime() {
+				let dataTime = Format("yyyy-MM-dd hh:mm:ss", new Date());
+				return dataTime
+			},
+			async getDetial(num) {
+				let data = {
+					"serviceId": 3002,
+					"page": 1,
+					"pageSize": 1,
+					"dataContent": {
+						"luggageNum": num, //行李号
+					},
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					if (res.code == "0" && res.returnData.length>0) {
+						if(!this.cap){
+							this.cap = res.returnData[0]
+							this.capluggageNum = this.luggageNum
+						}
+						else if(this.cap&&!this.caps){
+							this.caps = res.returnData[0]
+							this.capsluggageNum = this.luggageNum
+							
+						}
+						else if(this.cap&&this.caps){
+							this.cap = null
+							this.caps = null
+							this.capluggageNum = null
+							this.capsluggageNum = null
+							this.cap = res.returnData[0]
+							this.capluggageNum = this.luggageNum
+						}
+						if(this.caps.luggageNum == this.cap.luggageNum){
+							this.isSend = true
+							this.isMatch = true
+						}
+						if(!this.caps){
+							this.isSend = false
+							this.isMatch = true
+						}
+						if(this.caps&&this.caps.luggageNum != this.cap.luggageNum){
+							this.isSend = false
+							this.isMatch = true
+						}
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "未查询到该行李信息",
+							duration: 5000
+						});
+					}
+				})
+			},
+			async sendData(){
+				this.caps.nodeCode = "extract"
+				this.caps.processing_time = this.datatime();
+				this.caps.sourceAirport = this.$storage.get('airportName');
+				let data = {
+					"serviceId": 3005,
+					"dataContent": [
+						this.caps
+					],
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					if (res.code == "0") {
+						uni.showToast({
+							icon:'none',
+							title: "操作提取成功",
+							duration: 5000
+						});
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "操作失败",
+							duration: 5000
+						});
+					}
+				})
+			},
+			abnormal(){
+				uni.navigateTo({
+					url: "/pages/baggagecheck/index?luggageNum="+this.caps.luggageNum
+				})
+			},
+			fall () {
+				uni.switchTab({
+					url: "/pages/index/index"
+				})
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+.app-content{
+  position: relative;
+	background: rgb(49, 85, 99);
+	>.content{
+		width: 100%;
+		height: calc(100vh - 4.625rem);
+		position: relative;
+		// overflow: hidden;
+		// background: rgb(49, 85, 99);
+		>.content_top{
+			width: 100%;
+			// background: rgb(49, 85, 99);
+			padding-bottom: 1.3125rem;
+			>.craid{
+				// width: 100%;
+				height: 5.625rem;
+				padding: 0 2.5625rem 0 2.5625rem;
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
+				align-items: center;
+				>.craid_data{
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: start;
+					>p{
+						color: rgb(255, 255, 255);
+						font-family: Noto Sans SC;
+						font-size: 18px;
+						font-weight: 700;
+					}
+					>span{
+						color: rgb(255, 255, 255);
+						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%;
+				}
+			}
+			>.craids{
+				height: 5.625rem;
+				padding: 0 2.5625rem 0 2.5625rem;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				>p{
+					color: rgb(189, 214, 231);
+					font-family: Noto Sans SC;
+					font-size: 13px;
+					font-weight: 500;
+				}
+			}
+			>.scanning{
+				// height: 12rem;
+				padding: 0 1.5rem 0 1.5rem;
+				opacity: 1;
+				transition: all 3s;
+				>.gao{
+					color: yellow;
+				}
+				.scanning_cd{
+					width: 100%;
+					height: 3rem;
+					opacity: 1;
+					transition: all 3s;
+					background: rgb(59, 103, 123);
+					margin-top: 1rem;
+					margin-bottom: .5rem;
+					border-radius: 4px;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					color: rgb(255, 255, 255);
+					font-family: Noto Sans SC;
+					font-size: 16px;
+					>.log{
+						width: .875rem;
+						height: .875rem;
+						background: url('../../static/saoma.png') no-repeat;
+						background-size: 100% 100%;
+						margin-left: 1rem;
+					}
+					>.log_l{
+						width: .125rem;
+						height: 1.3125rem;
+						margin-left: 4rem;
+						background: rgb(255, 255, 255);
+					}
+				}
+				.scanning_cds{
+					width: 100%;
+					height: 3rem;
+					opacity: 1;
+					transition: all 3s;
+					background: rgb(51, 161, 165);
+					margin-top: 1rem;
+					margin-bottom: .5rem;
+					border-radius: 4px;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					color: rgb(255, 255, 255);
+					font-family: Noto Sans SC;
+					font-size: 16px;
+					>.log{
+						width: .875rem;
+						height: .875rem;
+						background: url('../../static/saoma.png') no-repeat;
+						background-size: 100% 100%;
+						margin-left: 1rem;
+					}
+					>.log_l{
+						width: .125rem;
+						height: 1.3125rem;
+						margin-left: 4rem;
+						background: rgb(255, 255, 255);
+					}
+				}
+			}
+		}
+		>.content_bootom{
+			width: 100%;
+			// height: calc(100vh - 20.9375rem - 4.375rem);
+			padding-bottom: 0;
+			position: absolute;
+			bottom: 0;
+			top: 20.75rem;
+			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;		
+				}
+			}
+			.up{
+				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;
+					background: url('../../static/xia.png') no-repeat;
+					background-size: 100% 100%;
+				}
+				>.list{
+					width: 97%;
+					position: relative;
+					height: 3.75rem;
+					display: flex;
+					align-items: center;
+					transform: all 3s;
+					right: 0;
+					color: rgb(0, 0, 0);
+					font-family: Noto Sans SC;
+					font-size: 13px;
+					font-weight: 500;
+				}
+				>.delete{
+					width: 3.75rem;
+					height: 3.75rem;
+					background: rgb(237, 101, 101);
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					position: relative;
+					right: -3.75rem;
+					transform: all 3s;
+					>.log{
+						width: .875rem;
+						height: .875rem;
+						background: url('../../static/vector@1x.png') no-repeat;
+					  background-size: 100% 100%;
+					}
+				}
+			}
+			.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);
+			}
+			.but{
+				width: 20.5625rem;
+        height: 2.75rem;
+				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;
+				margin: 0 auto;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-top: 2.25rem;
+				margin-bottom: 2.25rem;
+			}
+		}
+		>.footer{
+			width: 100%;
+			height: 7.4375rem;
+			position: absolute;
+			bottom: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			>.switchBtndel{
+				width: 9.4375rem;
+				height: 2.75rem;
+				box-sizing: border-box;
+				background: rgb(243, 253, 255);
+				border: 1px solid rgb(172, 218, 230);
+				border-radius:
+				4px;
+				color: rgb(59, 150, 159);
+				font-family: Noto Sans SC;
+				font-size: 16px;
+				font-weight: 700;
+			}
+			>.btnyes{
+				width: 9.4375rem;
+				height: 2.75rem;
+				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:
+				4px;
+				color: rgb(255, 255, 255);
+				font-family: Noto Sans SC;
+				font-size: 16px;
+				font-weight: 700;
+			}
+			>.unbtnyes{
+				width: 9.4375rem;
+				height: 2.75rem;
+				background: rgb(126, 138, 143);
+				border-radius:
+				4px;
+				color: rgb(255, 255, 255);
+				font-family: Noto Sans SC;
+				font-size: 16px;
+				font-weight: 700;
+			}
+		}
+	}
+}
+</style>

pages/index/index.vue

@@ -1,43 +1,45 @@
 <template>
 	<view class="app-content">
 		<img :src="icon" alt="" class="tuku">
-    <Nav :navname.sync="navname" :navtype="false" ></Nav>
-		<view class="times"><p>{{ newData }}</p>{{ newDataday }}</view>
+		<Nav :navname.sync="navname" :navtype="false" :index="index" @airport="airport"></Nav>
+		<view class="fight" v-if="flightDetail">
+			<view class="fight_card">
+				<p>{{flightDetail.carrierFlights}}</p>
+				<span>{{flightDetail.carrierFlightsDate}}</span>
+			</view>
+			<view class="fight_card">
+				<p>{{flightDetail.outAirport}}</p>
+				<span>{{flightDetail.scheduleTakeOffTime}}</span>
+			</view>
+			<view class="fight_card">
+				<p>{{flightDetail.landAirport}}</p>
+				<span>{{flightDetail.scheduleLandInTime}}</span>
+			</view>
+		</view>
+		<view class="times">
+			<p>{{ newData }}</p>{{ newDataday }}
+		</view>
 		<view class="content">
-      <view class="card" @tap="clickOrder('分拣')">
+			<view class="card" @tap="clickOrder('SORT')">
 				<p>分拣</p>
-				<span>已完成件数</span>
-				<span>50件</span>
 			</view>
-			<view class="card" @tap="clickOrder('装车')">
+			<view class="card" @tap="clickOrder('LOAD')">
 				<p>装车</p>
-				<span>已完成件数</span>
-				<span>50件</span>
 			</view>
-			<view class="card" @tap="clickOrder('装机')">
+			<view class="card" @tap="clickOrder('INFL')">
 				<p>装机</p>
-				<span>已完成件数</span>
-				<span>50件</span>
 			</view>
-			<view class="card" @tap="clickOrder('卸机')">
+			<view class="card" @tap="clickOrder('UNLOAD')">
 				<p>卸机</p>
-				<span>已完成件数</span>
-				<span>50件</span>
 			</view>
-			<view class="card" @tap="clickOrder('到达')">
+			<view class="card" @tap="clickOrder('ARRIVED')">
 				<p>到达</p>
-				<span>已完成件数</span>
-				<span>50件</span>
 			</view>
-			<view class="card" @tap="clickOrder('提取')">
+			<view class="card" @tap="clickOrder('extract')">
 				<p>提取</p>
-				<span>已完成件数</span>
-				<span>50件</span>
 			</view>
-			<view class="card" @tap="clickOrder('异常登记')">
+			<view class="card" @tap="clickOrder('abnormal')">
 				<p>异常登记</p>
-				<span>已完成件数</span>
-				<span>50件</span>
 			</view>
 			<view class="card_no">
 			</view>
@@ -46,122 +48,222 @@
 </template>
 <script>
 	import Nav from '../../components/header/nav.vue'
-	import {allScan, startScan ,stopScan,Format} from '@/components/utils/validate'
+	import {
+		Format
+	} from '@/components/utils/validate'
 	export default {
 		data() {
 			return {
 				input: '',
 				main: null,
 				poll: null,
-				filter:null,
-				pusher:null,
-				intentServer:null,
+				filter: null,
+				pusher: null,
+				intentServer: null,
 				timeShow: true,
 				arr: [],
 				navname: '首页',
 				icon: 'static/beijing.png',
 				newData: '',
-				newDataday: ''
+				newDataday: '',
+				index: 0,
+				flightDetail: null,
+				flightNO: null,
+				airportName:null
 			}
 		},
 		created(option) {
-			this.arr = allScan(this.main,this.poll,this.filter)
-			startScan(this.arr[0],this.arr[1],this.arr[2])
-		},
-		onLoad(){
+			// this.arr = allScan(this.main,this.poll,this.filter)
+			// startScan(this.arr[0],this.arr[1],this.arr[2])
 		},
-		onUnload() {
+		onLoad(option) {
 		},
+		onUnload() {},
 		onShow() {
+			uni.$on("scancodemsg", (data) => {
+				if (data.msg.length > 9) {
+					uni.navigateTo({
+						url: "/pages/detail/index?luggageNum=" + data.msg
+						// url: "/pages/detail/index?luggageNum=3999483183"
+					})
+				}
+			});
+			if (this.$storage.getJson('airport')) {
+				this.index = this.$storage.getJson('airport')
+			}
+			let data = this.$storage.get('searchData');
+			if (data) {
+				this.flightNO = data
+				this.getFlightData()
+			}
+		},
+		onHide() {
+			uni.$off("scancodemsg");
 		},
 		mounted() {
 			this.datatime()
 		},
 		beforeDestroy() {
-			console.log(this.arr[0],this.arr[1])
+			// console.log(this.arr[0],this.arr[1])
+		},
+		components: {
+			Nav
 		},
-	components: {
-		Nav
-	},
 		methods: {
-			datatime () {
+			airport(e){
+				this.airportName = e;
+				this.$storage.set('airportName',e)
+			},
+			datatime() {
 				this.newDataday = Format("yyyy/MM/dd", new Date());
 				setInterval(() => {
 					this.newData = Format("hh:mm", new Date());
 				}, 1000);
 			},
-			clickOrder (data) {
-				uni.navigateTo({
-					url: "/pages/sorting/index?item=" + encodeURIComponent(JSON.stringify(data))
+			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
+						});
+					}
 				})
-				// uni.navigateTo({
-				// 	url: "/pages/myrecords/index"
-				// })
+			},
+			clickOrder(data) {
+				if(data == "extract"){//提取
+					uni.navigateTo({
+						url: "/pages/extract/index"
+					})
+				}
+				else if(data == "abnormal"){//异常行李
+					uni.navigateTo({
+						url: "/pages/abnormal/index?airport="+this.airportName
+					})
+				}
+				else{
+					uni.navigateTo({
+						url: "/pages/sorting/index?item=" + data +"&flightNO="+this.flightNO
+					})
+				}
+				
 			}
 		},
 	}
 </script>
- 
+
 <style lang="scss" scoped>
-.app-content{
-	position: relative;
-	>.tuku{
-		position: absolute;
-		z-index: -1;
-		width: 100%;
-		top: 0;
-	}
-	>.times{
-		width: 100%;
-    height: 4.6875rem;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: rgb(255, 255, 255);
-		font-family: Noto Sans SC;
-		font-size: 18px;
-		font-weight: 700;
-		p{
-			margin-right: .625rem;
+	.app-content {
+		position: relative;
+
+		>.tuku {
+			position: absolute;
+			z-index: -1;
+			width: 100%;
+			top: 0;
 		}
-	}
-	.content{
-		padding: 0 1.5rem 0 1.5rem;
-		display: flex;
-		justify-content: space-around;
-		flex-wrap: wrap;
-		.card{
-			width: 7.5rem;
-			height: 7.5rem;
-			/* 卡片渐变 */
-			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;
+
+		>.fight {
+			padding: 0 1.75rem 0 1.75rem;
+			// height: 3.75rem;
 			display: flex;
-			flex-direction: column;
-			justify-content: center;
 			align-items: center;
-			>p{
-				color: rgb(255, 255, 255);
-				font-family: Noto Sans SC;
-				font-size: 18px;
-				font-weight: 700;
-				margin-bottom: .375rem;
-				line-height: 1.6875rem;
+			justify-content: space-around;
+			margin-top: 1.375rem;
+
+			>.fight_card {
+				display: flex;
+				flex-direction: column;
+				align-items: start;
+				justify-content: center;
+
+				>p {
+					color: rgb(255, 255, 255);
+					font-family: Noto Sans SC;
+					font-size: 16px;
+					font-weight: 700;
+				}
+
+				>span {
+					color: rgb(255, 255, 255);
+					font-family: Noto Sans SC;
+					font-size: 11px;
+					font-weight: 500;
+				}
 			}
-			>span{
-				color: rgb(255, 255, 255);
-				font-family: Noto Sans SC;
-				font-size: 13px;
-				font-weight: 500;
-				line-height: 1.1875rem;
+		}
+
+		>.times {
+			width: 100%;
+			height: 4.6875rem;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: rgb(255, 255, 255);
+			font-family: Noto Sans SC;
+			font-size: 18px;
+			font-weight: 700;
+
+			p {
+				margin-right: .625rem;
 			}
 		}
-		.card_no{
-			width: 7.5rem;
-			height: 7.5rem;
+
+		.content {
+			padding: 0 1.5rem 0 1.5rem;
+			display: flex;
+			justify-content: space-around;
+			flex-wrap: wrap;
+
+			.card {
+				width: 7.5rem;
+				height: 5.5rem;
+				/* 卡片渐变 */
+				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;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+
+				>p {
+					color: rgb(255, 255, 255);
+					font-family: Noto Sans SC;
+					font-size: 18px;
+					font-weight: 700;
+					margin-bottom: .375rem;
+					line-height: 1.6875rem;
+				}
+
+				>span {
+					color: rgb(255, 255, 255);
+					font-family: Noto Sans SC;
+					font-size: 13px;
+					font-weight: 500;
+					line-height: 1.1875rem;
+				}
+			}
+
+			.card_no {
+				width: 7.5rem;
+				height: 7.5rem;
+			}
 		}
 	}
-}
-</style>
+</style>

pages/individual/index.vue

@@ -1,157 +1,173 @@
 <template>
-  <view class="app-content">
-    <view class="header"><view class="log" @tap="clickOrder"></view>{{ navname }}<view class="up">完成</view></view>
-    <view class="cont">
-      <view class="photograph">
+	<view class="app-content">
+		<view class="header">
+			<view class="log" @tap="clickOrder"></view>{{ navname }}
+			<view class="up">完成</view>
+		</view>
+		<view class="cont">
+			<view class="photograph">
 				<!-- <view class="log"  @click="clk(0)"></view> -->
-        <!-- <image :src="urls[0]" @click="clk(0)"></image>
+				<!-- <image :src="urls[0]" @click="clk(0)"></image>
         <image :src="urls[1]" @click="clk(1)"></image> -->
-        <!-- <button @click="clk(0)">按钮触发</button> -->
-        <avatar selWidth="200px" selHeight="400upx" @upload="myUpload" :avatarSrc="url"
-        avatarStyle="width: 200upx; height: 200upx; border-radius: 100%;"></avatar>
+				<!-- <button @click="clk(0)">按钮触发</button> -->
+				<avatar selWidth="200px" selHeight="400upx" @upload="myUpload" :avatarSrc="url"
+					avatarStyle="width: 200upx; height: 200upx; border-radius: 100%;"></avatar>
 			</view>
-    </view>
-    <view class="content">
-      <view class="list">
-        <p>名称</p>
-        <input  class="input"  name="yonghuming"  type="text" 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" value=""  placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="请输入工号" />
-      </view>
-    </view>
-    <view class="butele">退出登录</view>
-  </view>
+		</view>
+		<view class="content">
+			<view class="list">
+				<p>名称</p>
+				<input class="input" name="yonghuming" type="text" 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" value=""
+					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="请输入工号" />
+			</view>
+		</view>
+		<view class="butele" @tap="loginOut">退出登录</view>
+	</view>
 </template>
 <script>
 	import Nav from '../../components/header/nav.vue'
-  import avatar from "../../components/yq-avatar/yq-avatar.vue";
+	import avatar from "../../components/yq-avatar/yq-avatar.vue";
 	export default {
 		data() {
 			return {
 				navname: '个人信息',
-        url: []
+				url: []
 			}
 		},
-		created(option) {
-		},
-		onLoad(){
-		},
-		onUnload() {
-		},
-		onShow() {
-		},
-		mounted() {
-		},
+		created(option) {},
+		onLoad() {},
+		onUnload() {},
+		onShow() {},
+		mounted() {},
 		components: {
 			Nav,
-      avatar
+			avatar
 		},
 		methods: {
-			clickOrder () {
+			loginOut(){
+				this.$storage.clear()
+				uni.redirectTo({
+					url: "/pages/login/index"
+				})
+			},
+			clickOrder() {
 				uni.switchTab({
 					url: "/pages/mypage/index"
 				})
 			},
-      myUpload(rsp) {
-        this.$set(this.urls, rsp.index, rsp.path);
-      },
-      clk(index) {
-        this.$refs.avatar.fChooseImg(index,{
-            selWidth: "300upx", selHeight: "300upx",
-            expWidth: '260upx', expHeight: '260upx'
-        });
-      },
-      myUpload(rsp) {
-        this.url = rsp.path; //更新头像方式一
-        //rsp.avatar.imgSrc = rsp.path; //更新头像方式二
-      }
+			myUpload(rsp) {
+				this.$set(this.urls, rsp.index, rsp.path);
+			},
+			clk(index) {
+				this.$refs.avatar.fChooseImg(index, {
+					selWidth: "300upx",
+					selHeight: "300upx",
+					expWidth: '260upx',
+					expHeight: '260upx'
+				});
+			},
+			myUpload(rsp) {
+				this.url = rsp.path; //更新头像方式一
+				//rsp.avatar.imgSrc = rsp.path; //更新头像方式二
+			}
 		},
 	}
 </script>
 <style lang="scss" scoped>
-  .app-content{
-    >.header{
-      width: 100%;
-      height: 4.375rem;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      // background: rgba(49,85,99,1);
-      color: rgb(16, 17, 22);
-      font-family: Noto Sans SC;
-      font-size: 1rem;
-      position: relative;
-      >.log{
-        width: .375rem;
-        height: .75rem;
-        font-size: .75rem;
-        position: absolute;
-        left: 1.5rem;
-        background: url('../../static/ico@1x.png') no-repeat;
-        background-size: 100% 100%;
-      }
-      >.up{
-        position: absolute;
-        right: 1.5rem;
-        color: rgb(37, 121, 160);
-        font-family: Noto Sans SC;
-        font-size: .875rem;
-        font-weight: 500;
-      }
-    }
-    >.cont{
-      >.photograph{
-        width: 6rem;
-        height: 6rem;
-        background: rgb(197, 207, 211);
-        // background: red;
-        border-radius: 50%;
-        margin: 0 auto;
-        margin-top: .625rem;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        >.log{
-          width: 1.75rem;
-          height: 1.75rem;
-          background: url('../../static/shi.png') no-repeat;
-          background-size: 100% 100%;
-        }
-      }
-    }
-    >.content{
-      margin-left: 1.5rem;
-      margin-top: 2.125rem;
-      margin-bottom: 3rem;
-      >.list{
-        height: 3.375rem;
-        display: flex;
-        align-items: center;
-        border-bottom: 1px solid rgb(238, 238, 238);
-        >p{
-          color: rgb(0, 0, 0);
-          font-family: Noto Sans SC;
-          font-size: .8125rem;
-          font-weight: 500;
-          margin-right: 2.1875rem;
-        }
-      }
-    }
-    >.butele{
-      width: 20.5625rem;
-      height: 2.75rem;
-      background: linear-gradient(165.96deg, rgba(248.17,101.23,53.02,1) -34%,rgba(231.09,13.66,13.66,1) 166%);
-      border-radius: 4px;
-      margin: 0 auto;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: rgb(255, 255, 255);
-      font-family: Noto Sans SC;
-      font-size: 1rem;
-      font-weight: 700;
-    }
-  }
+	.app-content {
+		>.header {
+			width: 100%;
+			height: 4.375rem;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			// background: rgba(49,85,99,1);
+			color: rgb(16, 17, 22);
+			font-family: Noto Sans SC;
+			font-size: 1rem;
+			position: relative;
+
+			>.log {
+				width: .375rem;
+				height: .75rem;
+				font-size: .75rem;
+				position: absolute;
+				left: 1.5rem;
+				background: url('../../static/ico@1x.png') no-repeat;
+				background-size: 100% 100%;
+			}
+
+			>.up {
+				position: absolute;
+				right: 1.5rem;
+				color: rgb(37, 121, 160);
+				font-family: Noto Sans SC;
+				font-size: .875rem;
+				font-weight: 500;
+			}
+		}
+
+		>.cont {
+			>.photograph {
+				width: 6rem;
+				height: 6rem;
+				background: rgb(197, 207, 211);
+				// background: red;
+				border-radius: 50%;
+				margin: 0 auto;
+				margin-top: .625rem;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				>.log {
+					width: 1.75rem;
+					height: 1.75rem;
+					background: url('../../static/shi.png') no-repeat;
+					background-size: 100% 100%;
+				}
+			}
+		}
+
+		>.content {
+			margin-left: 1.5rem;
+			margin-top: 2.125rem;
+			margin-bottom: 3rem;
+
+			>.list {
+				height: 3.375rem;
+				display: flex;
+				align-items: center;
+				border-bottom: 1px solid rgb(238, 238, 238);
+
+				>p {
+					color: rgb(0, 0, 0);
+					font-family: Noto Sans SC;
+					font-size: .8125rem;
+					font-weight: 500;
+					margin-right: 2.1875rem;
+				}
+			}
+		}
+
+		>.butele {
+			width: 20.5625rem;
+			height: 2.75rem;
+			background: linear-gradient(165.96deg, rgba(248.17, 101.23, 53.02, 1) -34%, rgba(231.09, 13.66, 13.66, 1) 166%);
+			border-radius: 4px;
+			margin: 0 auto;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: rgb(255, 255, 255);
+			font-family: Noto Sans SC;
+			font-size: 1rem;
+			font-weight: 700;
+		}
+	}
 </style>

pages/login/index.vue

@@ -8,11 +8,11 @@
 		<view class="form">
 			<view class="inputWrapper">
 				<view class="log"></view>
-				<input  class="input"  name="yonghuming"  type="text" value=""  placeholder-style="font-size:.8125rem;color:rgb(223, 223, 223);display:flex;justify-content: start;" placeholder="请输入登录账号"/>			
+				<input  class="input" name="username"  type="text" v-model="username"  placeholder-style="font-size:.8125rem;color:rgb(223, 223, 223);display:flex;justify-content: start;" placeholder="请输入登录账号"/>			
 			</view>
 			<view class="inputWrapper">
 				<view class="pass"></view>
-				<input  class="input"  name="mima"  type="password" value="" placeholder-style="font-size:.8125rem;color:rgb(223, 223, 223);display:flex;justify-content: start;" placeholder="请输入密码"/>
+				<input  class="input"  name="password"  type="password" v-model="password" placeholder-style="font-size:.8125rem;color:rgb(223, 223, 223);display:flex;justify-content: start;" placeholder="请输入密码"/>
 			</view>
 			
 			
@@ -27,22 +27,70 @@
 		data() {
 			return {
 				title: 'Hello',
-				
-				
-				
-				yonghuming:"",
-				mima:"",
+				username:"",
+				password:"",
 			}
 		},
+		created() {
+			this.getToken()
+		},
 		onLoad() {
 
 		},
 		methods: {
-			
-			login () {
-				uni.switchTab({
-					url: "/pages/index/index"
+			async getToken(){
+				let that = this;
+				let data = {
+						"appid": "appdjmmaf0kerwpf",
+						"appSecret": "appu7zpllz1folzsljm498dcpi0lsog1"
+					}
+				await that.$http.httpPost('/foxlibc/getToken',data).then(res => {
+					if(res.code == "0"){
+						that.$storage.setJson('apps',res.returnData);
+					}
+				})
+			},
+			async login () {
+				const apps = this.$storage.getJson("apps")
+				let that = this;
+				let passWordMD5 = this.$md5(that.password)
+				let data = {
+					"app_token": apps.app_token,
+					"username": that.username,
+					"password": passWordMD5
+				}
+				if(data.username==""||data.password==""){
+					uni.showToast({
+						title: '请输入正确账号密码',
+						icon: 'none',
+						duration: 500
+					});
+					return;
+				}
+				await that.$http.httpPost('/foxlibc/sign-in',data).then(res => {
+					if(res.code=="-1"){
+						uni.showToast({
+							title: '用户名或密码错误',
+							icon: 'none',
+							duration: 500
+						});	
+					}
+					else if(res.code=="0"){
+						that.$storage.setJson('users',res.returnData);
+						uni.switchTab({
+							url: "/pages/index/index"
+						});	
+						
+					}
+					else{
+						uni.showToast({
+							title: '登录失败请联系管理员',
+							icon: 'none',
+							duration: 500
+						});	
+					}
 				})
+				
 			},
 			
 			
@@ -62,23 +110,16 @@
 				data: {
 					yonghuming:yonghuming1,
 					mima:mima1,
-					
-																	
-					
-					
 				},
 				success: (res) => {
 					if(res.data=="5"){
-						
-					wx.showToast({
-						title: '用户名或密码错误',
-						icon: 'none',
-						duration: 500
-					});	
-						
+						wx.showToast({
+							title: '用户名或密码错误',
+							icon: 'none',
+							duration: 500
+						});	
 					}
 					else{
-						
 					uni.navigateTo({
 							url:"/pages/index1/index1",
 							})		

pages/message/message.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		页面开发中
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/mypage/index.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="app-content">
 		<img src="static/beijing.png" alt="" class="tuku">
-		<Nav :navname.sync="navname" :navtype="false" :navtypes="true"></Nav>
+		<Nav :navname.sync="navname" :navtype="false" :navtypes="true" :index="index"></Nav>
     <view class="cont">
 			<view class="photograph"  @tap="upindiv">
 				<img src="static/shuai.png" alt="">
@@ -102,6 +102,7 @@
 				all: false,
 				allshow: false,
 				action: '',
+				index:0,
 				list: [{
 					name: '相机'
 				},
@@ -130,6 +131,20 @@
 		onShow() {
 			// uni.hideTabBar()//关闭导航栏
 			// uni.showTabBar()//显示导航栏
+			uni.$on("scancodemsg", (data) => {
+				if(data.msg.length > 9){
+					uni.navigateTo({
+						// url: "/pages/detail/index?luggageNum=" + data.msg
+						url: "/pages/detail/index?luggageNum=3999483183"
+					})
+				}
+			});
+			if(this.$storage.getJson('airport')){
+				this.index = this.$storage.getJson('airport')
+			}
+		},
+		onHide() {
+			uni.$off("scancodemsg");
 		},
 		mounted() {
 		},

pages/search/index.vue

@@ -1,75 +1,106 @@
 <template>
-  <view class="app-content">
-    <view class="nav">
-      <liu-search @fall="fall" :hotList="hotList" :historyList="historyList" @input="input" @change="change" @changes = 'changes'></liu-search>
-    </view>
-  </view>
+	<view class="app-content">
+		<view class="nav">
+			<liu-search @fall="fall" :historyList="historyList" @input="input" @change="change"
+				@changes='changes'></liu-search>
+		</view>
+		<!-- 提示信息和下拉弹窗 -->
+		<mask-model :headername="headername" :typeShow="typeShow" :tabname="tabname" ref="showMask" btnType="1"
+			@confirm="confirm" @cancel="cancel" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF"
+			:maskTitle="maskTitle"></mask-model>
+	</view>
 </template>
 <script>
 	import Nav from '../../components/header/nav.vue'
+	import maskModel from '../../components/mask-model/mask-model.vue'
 	export default {
 		data() {
 			return {
-				navname: '我的记录',
-        hotList: ['HU7410', 'HU7410', 'HU7410', 'HU7410', 'HU7410', 'HU7410', 'HU7410'],//热门搜索
-        historyList: ['HU7410','HU7410','HU7410','HU7410']
+				historyList: [],
+				maskTitle: '请核对录入的航班号或行李号是否正确',
+				tabname: '', //按钮名称
+				typeShow: true,
+				headername: '请核对信息',
+				value:null
 			}
 		},
-		created(option) {
-		},
-		onLoad(){
-		},
-		onUnload() {
-		},
+		created(option) {},
+		onLoad() {},
+		onUnload() {},
 		onShow() {
+			uni.$on("scancodemsg", (data) => {
+				if (data.msg.length > 9) {
+					uni.navigateTo({
+						url: "/pages/detail/index?luggageNum=" + Number(data.msg)
+					})
+				}
+			});
 		},
 		mounted() {
+			uni.$off("scancodemsg");
 		},
 		components: {
 			Nav
 		},
 		methods: {
-      fall () {
-        uni.switchTab({
-					url: "/pages/index/index"
-				})
-      },
-      changes () {
-        uni.redirectTo({
-					url: "/pages/myrecords/index"
+			fall() {
+				uni.navigateBack({
+					delta: 1
 				})
-      },
-           //搜索内容
-      change(e) {
-        console.log('搜索内容：' + e)
-        uni.redirectTo({
-					url: "/pages/flightdetails/index"
-				})
-      },
-      //input事件
-      input(e){
-          console.log('搜索框输入的内容：' + e)
-      },
+			},
+			changes() {
+				//     uni.redirectTo({
+				// 	url: "/pages/myrecords/index"
+				// })
+			},
+			//搜索内容
+			change(e) {
+				this.value = e
+				this.typeShow = false
+				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"
+					})
+				}
+			},
+			cancel(){},
+			//input事件
+			input(e) {
+				console.log('搜索框输入的内容：' + e)
+			},
 		},
 	}
 </script>
 
 <style lang="scss" scoped>
-.app-content{
-  >.nav{
-    width: 100%;
-    position: relative;
-    display: flex;
-    margin-top: 1.875rem;
-    >.log{
-      width: .375rem;
-      height: .75rem;
-      font-size: .75rem;
-      position: absolute;
-      left: 1.5rem;
-      background: url('../../static/ico@1x.png') no-repeat;
-      background-size: 100% 100%;
-    }
-  }
-}
+	.app-content {
+		>.nav {
+			width: 100%;
+			position: relative;
+			display: flex;
+			margin-top: 1.875rem;
+
+			>.log {
+				width: .375rem;
+				height: .75rem;
+				font-size: .75rem;
+				position: absolute;
+				left: 1.5rem;
+				background: url('../../static/ico@1x.png') no-repeat;
+				background-size: 100% 100%;
+			}
+		}
+	}
 </style>

pages/sorting/index.vue

@@ -1,27 +1,30 @@
 <template>
 	<view class="app-content">
 		<!-- <img src="../../static/beijing.png" alt="" class="tuku"> -->
-		<Navs :navname.sync="navname" @fall="fall"></Navs>
+		<Navs :navname.sync="navname" @fall="fall" :index='index'></Navs>
 		<view class="content">
 			<view class="content_top">
-				<view class="craid">
+				<view class="craid" v-if="flightDetail">
 					<view class="craid_data">
-						<p>HU7412</p>
-						<span>2023-02-17</span>
+						<p>{{flightDetail.carrierFlights}}</p>
+						<span>{{flightDetail.carrierFlightsDate}}</span>
 					</view>
 					<view class="craid_data">
-						<p>CTU</p>
-						<span>12:00:00</span>
+						<p>{{flightDetail.outAirport}}</p>
+						<span>{{flightDetail.scheduleTakeOffTime}}</span>
 					</view>
 					<view class="aircraft"></view>
 					<view class="craid_data">
-						<p>CSX</p>
-						<span>14:23:00</span>
+						<p>{{flightDetail.landAirport}}</p>
+						<span>{{flightDetail.scheduleLandInTime}}</span>
 					</view>
 				</view>
+				<view class="craids" v-if="!flightDetail">
+					<p>暂无航班信息</p>
+				</view>
 				<view class="scanning">
 					<view :class="getFooterClass">
-						<input class="input" v-model.trim="stratvalue" disabled="true" @tap="locationEntry" type="text"
+						<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="请输入操作位置" />
@@ -29,7 +32,7 @@
 						<view class="log"></view>
 					</view>
 					<view :class="getFooterClasser" v-if="navname == '装车'">
-						<input class="input" v-model.trim="stratvalue1" disabled="true" @tap="locationEntry" type="text"
+						<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="请输入容器编号" />
@@ -37,7 +40,7 @@
 						<view class="log"></view>
 					</view>
 					<view :class="getlooterClass">
-						<input class="input" v-model.trim="endvalue" disabled="true" @tap="baggageEntry" type="text"
+						<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="请输入行李号" />
@@ -48,130 +51,157 @@
 			</view>
 			<view class="content_bootom" :style="{top:dataheight}">
 				<view class="choice" @touchmove="movetran">
-					<view :class="action === true ?'handle':'handles'" @tap="clicker">已处理</view>
-					<view :class="action !== true ?'handle':'handles'" @tap="clicker">未处理</view>
+					<view :class="action === true ?'handle':'handles'" @tap="clicker(true)">已处理</view>
+					<view :class="action !== true ?'handle':'handles'" @tap="clicker(false)">未处理</view>
 				</view>
 				<scroll-view scroll-y="true" class="scroll-Y">
-					<view :class="item.types ? 'ups':'up'" v-for="(item, index) in listdate" :key="index"
+					<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.name }}</view>
-						<view class="down_up" @tap="up"></view>
-						<view class="delete">
-							<view class="log" @click="()=>up(item)"></view>
+						<view class="list"  @tap="toDetail(item.luggageNum)">行李编号：{{ item.luggageNum }}</view>
+						<view :class="item.abnormalState!=null?'error':'normal'">{{item.abnormalState!=null?item.abnormalName:"正常"}}</view>
+						<view class="down_up" v-if="pagename == 'LOAD'" @tap="up(item,index)"></view>
+						<view class="delete" v-if="pagename == 'LOAD'">
+							<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>
+						<view :class="item.abnormalState!=null?'error':'normal'">{{item.abnormalState!=null?item.abnormalName:"正常"}}</view>
+						<!-- <view class="down_up" @tap="up"></view> -->
+					</view>
 				</scroll-view>
 				<view class="but" v-if="!action" @tap="clickOrder">一键处理</view>
 			</view>
 		</view>
 		<!-- 提示信息和下拉弹窗 -->
 		<mask-model :headername="headername" :typeShow="typeShow" :tabname="tabname" ref="showMask" btnType="1"
-			@confirm="confirm" @cancel="cancel" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF"
+			@confirm="confirm" @next="next" @load="load" @cancel="cancel" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF"
 			:maskTitle="maskTitle"></mask-model>
+		<!-- 一键弹窗 -->
+		<mask-model :headername="headername" :typeShow="typeShow" ref="showMask2" btnType="1"
+			@confirm="confirm2" @cancel="cancel" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF"
+			:maskTitle="maskTitle2"></mask-model>
+		<!-- 航班开始操作弹窗 -->
+		<mask-model :headername="headername" :typeShow="typeShow" ref="showMask3" btnType="1"
+			@confirm="confirm3" @cancel="cancel3" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF"
+			:maskTitle="maskTitle3"></mask-model>
 	</view>
 </template>
 
 <script>
 	import Navs from '../../components/header/navs.vue'
 	import maskModel from '../../components/mask-model/mask-model.vue'
+	import {
+		Format
+	} from '@/components/utils/validate'
 	export default {
 		data() {
 			return {
 				isShow: true,
 				dataheight: '20.75rem',
 				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
 				input: '',
-				main: null,
-				poll: null,
-				filter: null,
-				pusher: null,
-				intentServer: null,
 				arr: [],
-				navname: '分拣',
-				startcode: '扫码',
-				stopcode: '扫码',
+				navname: '',
 				action: true,
-				listdate: [{
-						name: '3880491101',
-						types: false
-					},
-					{
-						name: '3880491101',
-						types: false
-					},
-					{
-						name: '3880491101',
-						types: false
-					},
-					{
-						name: '3880491101',
-						types: false
-					},
-					{
-						name: '3880491101',
-						types: false
-					},
-					{
-						name: '3880491101',
-						types: false
-					},
-					{
-						name: '3880491101',
-						types: false
-					},
+				listdate:[],
+				listdate1: [],
+				loadNumber:0,
+				listdate2: [],
+				startData: {
+					clientX: 0,
+					clientY: 0
+				},
+				stratvalue: '', //开始位置
+				container_ID:'',
+				endvalue: '', //结束位置
+				maskTitle: '该行李不属于当前航班，请选择处理方式。',
+				maskTitle2:"",
+				maskTitle3:"",
+				tabname: '', //航班名称
+				typeShow: true,
+				headername: '提示信息',
+				flightNO:null,
+				flightDetail:{},
+				index:0,
+				currentLuggageNum:null,
+				pagename:"",
+				currentLuggage:null,
+				currentIndex:null,
+				abnormalList:[
 					{
-						name: '3880491101',
-						types: false
+						"type":null,
+						"name":"无"
 					},
 					{
-						name: '3880491101',
-						types: false
+						"type":"NAL",
+						"name":"未被授权的装载"
 					},
 					{
-						name: '3880491101',
-						types: false
+						"type":"OFF",
+						"name":"已卸载"
 					},
 					{
-						name: '3880491101',
-						types: false
+						"type":"UNS",
+						"name":"未找到"
 					},
 					{
-						name: '3880491101',
-						types: false
+						"type":"OND",
+						"name":"在场未装载，未被授权"
 					},
 					{
-						name: '3880491101',
-						types: false
+						"type":"ONA",
+						"name":"在场未装载，已授权"
 					}
 				],
-				arr: [], //触发判断
-				startData: {
-					clientX: 0,
-					clientY: 0
-				},
-				stratvalue: '', //开始位置
-				stratvalue1:'',
-				endvalue: '', //结束位置
-				maskTitle: '该行李不属于当前航班，请选择处理方式。',
-				tabname: '', //按钮名称
-				typeShow: true,
-				headername: '提示信息',
 			}
 		},
 		created(option) {},
 		onLoad(option) {
-			this.navname = JSON.parse(decodeURIComponent(option.item))
-			if (this.navname == '分拣') {
-				this.tabname = '航班'
+			this.pagename = option.item
+			this.flightNO = option.flightNO
+			this.getNode()
+			switch (this.pagename){
+				case "SORT":
+					this.navname = "分拣"
+					break;
+				case "LOAD":
+					this.navname = "装车"
+					break;
+				case "INFL":
+					this.navname = "装机"
+					break;
+				case "UNLOAD":
+					this.navname = "卸机"
+					break;
+				case "ARRIVED":
+					this.navname = "到达"
+					break;
+				default:
+					break;
+			}
+			if(this.flightNO){
+				this.getFlightData()
+				this.getluggageList()
 			}
 		},
 		onUnload() {
 			// this.$refs.showMask.show();
 		},
-		onShow() {},
+		onShow() {
+			uni.$on("scancodemsg", (data) => {
+				if (data.msg.length > 9) {
+					this.currentLuggageNum = data.msg
+					this.getluggage(this.currentLuggageNum,true)
+				}
+			});
+			if (this.$storage.getJson('airport')) {
+				this.index = this.$storage.getJson('airport')
+			}
+		},
+		onHide() {
+			uni.$off("scancodemsg");
+		},
 		mounted() {
 			// this.$refs.showMask.show();
 			// console.log(this.stratvalue.length)
@@ -181,10 +211,10 @@
 				return this.stratvalue ? 'scanning_cds' : 'scanning_cd'
 			},
 			getlooterClass() {
-				return this.endvalue ? 'scanning_cds' : 'scanning_cd'
+				return this.currentLuggageNum ? 'scanning_cds' : 'scanning_cd'
 			},
 			getFooterClasser() {
-				return this.stratvalue1 ? 'scanning_cds' : 'scanning_cd'
+				return this.container_ID ? 'scanning_cds' : 'scanning_cd'
 			},
 		},
 		components: {
@@ -192,46 +222,330 @@
 			maskModel: maskModel,
 		},
 		methods: {
+			async getNode() {
+				let data = {
+					"serviceId": 3003,
+					"dataContent": {},
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					if (res.code == "0") {
+						res.returnData.map(item => {
+							if(item.nodeCode == this.pagename){
+								this.stratvalue = item.nodeDescribe;
+							}
+						})
+					}
+				})
+			},
+			next(data){
+				this.flightNO = this.currentLuggage.flightNo;
+				this.getFlightData()
+				this.getluggageList()
+				this.$refs.showMask.hide();
+			},
+			load(){
+				this.listdate1.unshift({
+					"luggageNum" : this.currentLuggage.luggageNum
+				})
+				this.setLuggage()
+			},
+			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") {
+						this.flightDetail = res.returnData[0]
+					}
+					this.flightDetail.scheduleTakeOffTime = this.flightDetail.scheduleTakeOffTime.split("T")[1]
+					this.flightDetail.scheduleLandInTime = this.flightDetail.scheduleLandInTime.split("T")[1]
+				})
+			},
+			async getluggageList(){
+				let data = {
+				    "serviceId": 3001,
+				    "dataContent": {
+				        "carrierFlights": this.flightNO,
+				    },
+				    "event": "0"
+				}
+				
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					console.log(res)
+					this.listdate1 = []
+					this.listdate2 = []
+					if (res.code == "0") {
+						this.listdate = res.returnData;
+						res.returnData.map(item => {
+							this.abnormalList.map(item2 => {
+								if(item.abnormalState == item2.type){
+									item.abnormalName = item2.name
+								}
+							})
+							switch (this.pagename){
+								case "SORT":
+									if(item.sorting_time!=null){
+										this.listdate1.push(item)
+									}
+									else{
+										this.listdate2.push(item)
+									}
+									break;
+								case "LOAD":
+									if(item.loading_time!=null){
+										this.listdate1.push(item)
+									}
+									else{
+										this.listdate2.push(item)
+									}
+									break;
+								case "INFL":				
+									if(item.installation_time!=null){
+										this.listdate1.push(item)
+									}
+									else{
+										this.listdate2.push(item)
+									}
+									break;
+								case "UNLOAD":
+									if(item.unloadtime!=null){
+										this.listdate1.push(item)
+									}
+									else{
+										this.listdate2.push(item)
+									}
+									break;
+								case "ARRIVED":
+									if(item.arrivedtime!=null){
+										this.listdate1.push(item)
+									}
+									else{
+										this.listdate2.push(item)
+									}
+									break;
+								default:
+									break;
+							}
+						})
+						this.loadNumber = this.listdate2.length;
+						this.setLuggage()
+					}
+	
+				})
+			},
+			async getluggage(num,isSend){
+				let data = {
+				    "serviceId": 3002,
+				    "page": 1,
+				    "pageSize": 10,
+				    "dataContent": {
+				        "luggageNum":num,//行李号
+				    },
+				    "event": "0"
+				}
+				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){
+							this.setLuggage()
+						}
+						else if(this.flightNO&&this.flightNO != res.returnData[0].flightNo){
+							this.tabname = res.returnData[0].flightNo
+							this.$refs.showMask.show();
+						}
+						else{
+							this.currentIndex = index
+							this.typeShow = false
+							this.maskTitle3 = '是否对航班：'+ res.returnData[0].flightNo + "行李进行"+this.navname+"操作？"
+							this.headername = '提示'
+							this.$refs.showMask.show();
+							this.flightNO = res.returnData[0].flightNo;
+						}
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "未查询到"+this.currentLuggageNum+"行李信息",
+							duration: 5000
+						});
+					}
+				})
+			},
+			setLuggage(){
+				this.currentLuggage.nodeCode = this.pagename;
+				this.currentLuggage.nodeName = this.navname;
+				this.currentLuggage.location_code = this.stratvalue;
+				this.currentLuggage.processing_time = this.datatime();
+				switch (this.pagename){
+					case "SORT":
+						this.listdate2.map((item,index) => {
+							if(item.luggageNum == this.currentLuggageNum && item.sorting_time == null){
+									this.listdate2.splice(index,1)
+									item.sorting_time = this.datatime();
+									item.sortState = true;
+									this.listdate1.unshift(item);
+							}
+						})
+						break;
+					case "LOAD":
+						this.currentLuggage.container_ID = this.container_ID
+						this.currentLuggage.loadNumber = this.loadNumber;
+						this.listdate2.map((item,index) => {
+							if(item.luggageNum == this.currentLuggageNum){
+								if(item.loading_time == null){
+									this.listdate2.splice(index,1)
+									item.loading_time = this.datatime();
+									item.loadState = true;
+									this.listdate1.unshift(item);
+								}
+							}
+						})
+						break;
+					case "INFL":
+						this.listdate2.map((item,index) => {
+							if(item.luggageNum == this.currentLuggageNum){
+								if(item.installation_time == null){
+									this.listdate2.splice(index,1)
+									item.installation_time = this.datatime();
+									this.listdate1.unshift(item);
+								}
+							}
+						})
+						break;
+					case "UNLOAD":
+						this.listdate2.map((item,index) => {
+							if(item.luggageNum == this.currentLuggageNum){
+								if(item.unloadtime == null){
+									this.listdate2.splice(index,1)
+									item.unloadtime = this.datatime();
+									this.listdate1.unshift(item);
+								}
+							}
+						})
+						break;
+					case "ARRIVED":
+						this.listdate2.map((item,index) => {
+							if(item.luggageNum == this.currentLuggageNum){
+								if(item.arrivedtime == null){
+									this.listdate2.splice(index,1)
+									item.arrivedtime = this.datatime();
+									this.listdate1.unshift(item);
+								}
+							}
+						})
+						break;
+					default:
+						break;
+				}
+				this.sendData()
+			},
+			async sendData(type){
+				this.currentLuggage.sourceAirport = this.$storage.get('airportName');
+				let data = {
+					"serviceId": 3005,
+					"dataContent": [
+						this.currentLuggage
+					],
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					console.log(res)
+					if (res.code == "0") {
+						uni.showToast({
+							icon:'none',
+							title: "操作行李："+this.currentLuggageNum+"成功",
+							duration: 5000
+						});
+					}
+					else{
+						uni.showToast({
+							icon:'none',
+							title: "操作失败",
+							duration: 5000
+						});
+					}
+				})
+				
+			},
+			datatime() {
+				let dataTime = Format("yyyy-MM-dd hh:mm:ss", new Date());
+				return dataTime
+			},
 			//下拉
-			up() {
+			up(item,index) {
+				this.currentLuggageNum = item.luggageNum;
+				this.getluggage(this.currentLuggageNum,false);
+				this.currentIndex = index
 				this.typeShow = false
 				this.maskTitle = '是否确定要拉下该件行李？'
 				this.headername = '下拉提示'
 				this.$refs.showMask.show();
 			},
 			confirm: function(e) { //确定按钮
-				console.log('您点击了确定按钮');
+				this.currentLuggage.abnormalState="OFF"
+				this.currentLuggage.abnormalName="拉下"
+				let arr = JSON.parse(JSON.stringify(this.listdate1))
+				arr[this.currentIndex]=JSON.parse(JSON.stringify(this.currentLuggage))
+				this.listdate1 = arr;
+				this.sendData()
+			},
+			confirm2: function(e) { //确定按钮
+				this.listdate2.map((item,index) =>{
+					this.currentLuggage = item;
+					this.setLuggage();
+					this.listdate1.unshift(item)
+				})
+				this.listdate2 = [];
+			},
+			confirm3: function(e) { //确定按钮
+				this.getFlightData();
+				this.getluggageList();
+			},
+			cancel3: function() { //取消按钮
+				this.flightNO=null
 			},
 			cancel: function() { //取消按钮
 				console.log('您点击了取消按钮');
 			},
-			toDetail(){
-				uni.redirectTo({
-					url: "/pages/detail/index"
+			toDetail(num){
+				uni.navigateTo({
+					// url: "/pages/detail/index?luggageNum=" + data.msg
+					url: "/pages/detail/index?luggageNum="+num
 				})
 			},
 			clickOrder() {
-				uni.redirectTo({
-					url: "/pages/baggagecheck/index"
-				})
+				this.typeShow = false
+				this.maskTitle2 = '是否确定要一键'+this.navname+'全部行李？'
+				this.headername = '操作提示'
+				this.$refs.showMask2.show();
 			},
 			baggageEntry() {
-				uni.redirectTo({
+				uni.navigateTo({
 					url: "/pages/baggageEntry/index"
 				})
 			},
 			locationEntry() {
-				uni.redirectTo({
+				uni.navigateTo({
 					url: "/pages/locationEntry/index"
 				})
 			},
 			fall() {
-				uni.switchTab({
-					url: "/pages/index/index"
+				uni.navigateBack({
+					delta:1
 				})
 			},
-			clicker() {
+			clicker(e) {
 				this.action = !this.action
+				if(e != this.action){
+					this.action = e
+				}
 			},
 			movetran(e) {
 				let arr = uni.getSystemInfoSync().windowHeight;
@@ -316,7 +630,19 @@
 						background-size: 100% 100%;
 					}
 				}
-
+				>.craids{
+					height: 5.625rem;
+					padding: 0 2.5625rem 0 2.5625rem;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					>p{
+						color: rgb(189, 214, 231);
+						font-family: Noto Sans SC;
+						font-size: 13px;
+						font-weight: 500;
+					}
+				}
 				>.scanning {
 					height: 12rem;
 					padding: 0 1.5rem 0 1.5rem;
@@ -445,9 +771,17 @@
 						background: url('../../static/xia.png') no-repeat;
 						background-size: 100% 100%;
 					}
-
+					
+					>.error{
+						width: 20%;
+						color:red
+					}
+					>.normal{
+						width: 20%;
+						color:#4682b4 
+					}
 					>.list {
-						width: 97%;
+						width: 70%;
 						position: relative;
 						height: 3.75rem;
 						display: flex;

unpackage/debug/.roid.ins

@@ -1 +0,0 @@
-forceInstall

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

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/login/index","pages/index/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/abnormal/index","pages/baggageEntry/index","pages/locationEntry/index","pages/detail/index"],"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/","text":"消息"},{"pagePath":"pages/mypage/index","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"BRS","compilerVersion":"3.7.11","entryPagePath":"pages/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/login/index","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"首页"}},{"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/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}}];
+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 __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()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

utils/http.js

@@ -0,0 +1,22 @@
+import request from './request'
+
+// 调用的时候第一个参数换成接口地址即可
+export function httpGet(url, params) {
+  return new Promise((resolve, reject)=>{
+      request.get(url, params).then((result)=>{
+          resolve(result)
+      }).catch(err=>{
+          reject(err)
+      });
+  });
+}
+
+export function httpPost(url, params) {
+  return new Promise((resolve, reject)=>{
+      request.post(url, params).then((result)=>{
+          resolve(result)
+      }).catch(err=>{
+          reject(err)
+      });
+  });
+}

utils/request.js

@@ -0,0 +1,73 @@
+import config from "@/config";  // 配置文件
+import storage from "./storage"; // 缓存封装
+
+export default {
+	console(options){
+		if(config.debug){
+			// console.log("<<===============================================>>");
+			// console.log("request start");
+			// console.log("header" + JSON.stringify(options.header));
+			// console.log("method: " + options.method + " URL: " + options.url);
+			// console.log(options.data);
+			// console.log("request end");
+			// console.log("<<===============================================>>");
+		} 
+	},
+	domain(){
+		return config.uni_app_web_api_url.replace("api","");
+	},
+	send(options={}){
+        // loading加载
+        uni.showLoading({
+           title: '加载中'
+        });
+        
+        // 拼接路劲，下面的配置文件会提到
+		options.url = config.uni_app_web_api_url + '' + options.url;
+        // 请求方式
+		options.method = options.method || "GET";
+		
+        // 这里看项目的情况来定，如果是没有token，那就删除这里，上面的storage也不需要引入
+		let users = storage.getJson("users");
+		if(users != null){
+			// options.header = { "user_id" : users.user_id };
+			options.header = { "user_token" : users.user_token,"user_id" : users.user_id  };
+			// options.headers["user_id"] = users.user_id;
+			//       options.headers["user_token"] = users.user_token;
+			// options.data['token'] = users.token
+		}
+		
+		console.log(options);  // 打印请求数据，调试用，上线可以注释
+        
+        // 发起Promise请求
+		return new Promise((resolve, reject) =>{
+			uni.request(options).then(data=>{
+				var [error, res] = data;
+				if(error != null){
+					reject(error);
+				}else{
+                    // 相应拦截、根据后端的状态码来写，可以自行判断和封装
+					if(res.data.error == '1'){
+						uni.hideLoading();
+					}else{
+						resolve(res.data); 
+					}
+				}
+				uni.hideLoading();
+			});
+		});
+	},
+	get(url="",data={}){
+		return this.send({
+			url: url,
+			data: data
+		});
+	},
+	post(url="",data={}){
+		return this.send({
+			url: url,
+			data: data,
+			method: "POST"
+		});
+	}
+};

utils/storage.js

@@ -0,0 +1,31 @@
+export default {
+	
+	set(name,value){
+		uni.setStorageSync(name,value);
+	},
+	
+	setJson(name,value){
+		uni.setStorageSync(name,JSON.stringify(value));
+	},
+	
+	get(name){
+		return uni.getStorageSync(name);
+	},
+	
+	getJson(name){
+		const content = uni.getStorageSync(name);
+		if(!content){
+			return null;
+		}
+		
+		return JSON.parse(content);
+	},
+	
+	remove(name){
+		uni.removeStorageSync(name);
+	},
+	
+	clear(){
+		uni.clearStorageSync();
+	}
+};

utils/utils.js

@@ -0,0 +1,165 @@
+export function msg(content,time=3000){
+	uni.showToast({
+		icon:'none',
+		title: content,
+		duration: time
+	});
+}
+
+export function showLoading(content="加载数据中...",mask=true){
+	uni.showLoading({
+	    title: content,
+		mask: mask
+	});
+}
+
+export function hideLoading(timer=0){
+	if(timer > 0){
+		var t = setTimeout(function () {
+		    uni.hideLoading();
+			clearTimeout(t);
+		}, timer);
+	}else{
+		uni.hideLoading();
+	}
+}
+
+export function in_array(search,array){
+	let flag = false;
+	for(let i in array){
+		if(array[i]==search){
+			flag = true;
+			break;
+		}
+	}
+
+	return flag;
+}
+
+export function isDataType(data,type){
+	return Object.prototype.toString.call(data) === '[object '+type+']';
+}
+
+export function ltrim(str,char){
+	let pos = str.indexOf(char);
+	let sonstr = str.substr(pos+1);
+	return sonstr;
+}
+
+export function rtrim(str,char){
+	let pos = str.lastIndexOf(char);
+	let sonstr = str.substr(0,pos);
+	return sonstr;
+}
+
+/**
+ * 保留当前页面，跳转到应用内的某个页面，使用uni.navigateBack可以返回到原页面。
+ */
+export function navigateTo(url,params){
+	uni.navigateTo({
+		url: parseUrl(url,params),
+		success: res => {},
+		fail: (e) => {
+			console.log(e)
+		},
+		complete: () => {}
+	})
+}
+
+/**
+ * 关闭当前页面，跳转到应用内的某个页面。
+ */
+export function redirectTo(url,params){
+	uni.redirectTo({
+		url: parseUrl(url,params)
+	});
+}
+
+/**
+ * 关闭所有页面，打开到应用内的某个页面。
+ */
+export function reLaunch(url,params){
+	uni.reLaunch({
+		url: parseUrl(url,params)
+	});
+}
+
+/**
+ * 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面。
+ */
+export function switchTab(url,params){
+	uni.switchTab({
+		url: parseUrl(url,params)
+	});
+}
+
+/**
+ * 关闭当前页面，返回上一页面或多级页面
+ */
+export function navigateBack(delta){
+	uni.navigateBack({
+		delta: delta
+	});
+}
+
+/**
+ * 预加载页面，是一种性能优化技术。被预载的页面，在打开时速度更快。
+ */
+export function preloadPage(){
+	uni.preloadPage({
+		url: parseUrl(url,params)
+	});
+}
+
+export function prePage(){
+	let pages = getCurrentPages();
+	let prePage = pages[pages.length - 2];
+	// #ifdef H5
+	return prePage;
+	// #endif
+	return prePage.$vm;
+}
+
+/**
+ * rpx转px
+ * @param int|float num
+ */
+export function rpx2px(num){
+	// const info = uni.getSystemInfoSync()
+	// let scale = 750 / info.windowWidth;
+	// return (Number.isNaN(parseFloat(num)) ? 0 : parseFloat(num)) / scale;
+	return uni.upx2px(num);
+}
+
+/**
+ * @param int|float num
+ */
+export function px2rpx(num){
+	return num/(uni.upx2px(num)/num);
+}
+
+/**
+ * 获取窗口的宽高
+ */
+export function getSystemInfo(){
+	const info = uni.getSystemInfoSync();
+	return {
+		w: info.windowWidth,
+		h: info.windowHeight
+	};
+}
+
+function parseUrl(url,params){
+	let arr = [];
+	let string = '';
+	for(let i in params){
+		arr.push(i + "=" + params[i]);
+	}
+	
+	string = "/pages/" + url;
+	if(arr.length > 0){
+		string += "?" + arr.join("&");
+	}
+	
+	return string;
+}