123

App.vue

@@ -30,8 +30,8 @@
 		},
 		onHide: function() {
 			console.log('App Hide')
-			let arr = allScan(this.main,this.poll,this.filter)
-			stopScan(arr[0],arr[1],arr[2])
+			// let arr = allScan(this.main,this.poll,this.filter)
+			stopScan()
 		}
 	}
 </script>

components/header/nav.vue

@@ -72,6 +72,8 @@
 					if(res.code == "0"){
 						res.returnData.map(item =>{
 							this.airportList.push(item['IATACode'])
+							
+							this.airportList.sort()
 						})
 						this.$storage.setJson('airportList',this.airportList);
 						let num = this.valueIndex;
@@ -90,7 +92,19 @@
 					url: "/pages/search/index"
 				})
 			},
-			
+			compareDesc(propertyName) {
+			  return function(object1, object2) {
+			    var value1 = object1[propertyName];
+			    var value2 = object2[propertyName];
+			    if(value2 < value1) {
+			      return -1;
+			    } else if(value2 > value1) {
+			      return 1;
+			    } else {
+			      return 0;
+			    }
+			  }
+			},
 			//搜索框输入事件
 			inputSearch() {
 				this.$emit('input', this.searchText)

components/utils/validate.js

@@ -84,6 +84,8 @@
 //   HTML5_PLUS_RUNTIME_MAIN_ACTIVITY.registerReceiver(POC_KEY_DOWN_OBJ, filter); // 注册功能
 // }
 //初始化?
+let obj1 = null
+let obj2 = null
 export function allScan(HTML5_PLUS_RUNTIME_MAIN_ACTIVITY,POC_KEY_DOWN_OBJ,filter,typeset) {
   let HTML5_PLUS_REFLECT_BROADCASTRECEIVER = "io.dcloud.feature.internal.reflect.BroadcastReceiver" // html5+ 创建数据监听api
   let HTML5_PLUS_CONTENT_INTENT = "android.content.Intent" // html5+ 初始化上下文
@@ -129,6 +131,8 @@ export function allScan(HTML5_PLUS_RUNTIME_MAIN_ACTIVITY,POC_KEY_DOWN_OBJ,filter
   filter.addAction(HTML5_PLUS_KEY_DOWN); // 按钮对按钮，广播
   filter.addAction(SCANOBJ.SCAN_RESULT); // 红外 扫描结果，广播
   // HTML5_PLUS_RUNTIME_MAIN_ACTIVITY.registerReceiver(POC_KEY_DOWN_OBJ, filter); // 注册功能
+  obj1 = HTML5_PLUS_RUNTIME_MAIN_ACTIVITY
+  obj2 = POC_KEY_DOWN_OBJ
   let arr = [HTML5_PLUS_RUNTIME_MAIN_ACTIVITY,POC_KEY_DOWN_OBJ,filter]
   return arr
   // if (typeset === 0) {//为0时候是开始//其他为结束
@@ -139,11 +143,11 @@ export function allScan(HTML5_PLUS_RUNTIME_MAIN_ACTIVITY,POC_KEY_DOWN_OBJ,filter
 }
 //开始
 export function startScan(HTML5_PLUS_RUNTIME_MAIN_ACTIVITY,POC_KEY_DOWN_OBJ,filter){
-  HTML5_PLUS_RUNTIME_MAIN_ACTIVITY.registerReceiver(POC_KEY_DOWN_OBJ, filter);
+  obj1.registerReceiver(obj2, filter);
 }
 //结束
 export function stopScan(HTML5_PLUS_RUNTIME_MAIN_ACTIVITY,POC_KEY_DOWN_OBJ){
-  HTML5_PLUS_RUNTIME_MAIN_ACTIVITY.unregisterReceiver(POC_KEY_DOWN_OBJ);
+  obj1.unregisterReceiver(obj2);
 }
 export function byteToString (arr) {
   if(typeof arr === 'string') {

main.js

@@ -3,24 +3,33 @@ 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
 
+
+//audio
+// Vue.prototype.$scanAudio = function(){
+// 	let muisc = null;
+// 	muisc = uni.createInnerAudioContext();
+// 	muisc.src = "../../static/voice.mp3";
+// 	muisc.play();
+// 	muisc.onEnd(() => {
+// 		muisc = null
+// 	})
+// }
+
+Vue.prototype.$scanAudio = uni.createInnerAudioContext();
+
 // #ifndef VUE3
 import Vue from 'vue'
 
 // ********** devapi *********
-// import { DEVAPI } from "@/components/scan-code/scan-code"
-// let devAPI = new DEVAPI()
-// devAPI.initDevAPI()
-// import {broadcastScan} from '@/components/utils/validate'
-// Vue.prototype.$broadcastScan=broadcastScan
 App.mpType = 'app'
 const app = new Vue({
     ...App

manifest.json

@@ -2,14 +2,14 @@
     "name" : "BRS",
     "appid" : "__UNI__5D0FFCC",
     "description" : "BRS",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.1",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
-		"compatible": {
-		"ignoreVersion": true
-		},
+        "compatible" : {
+            "ignoreVersion" : true
+        },
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
@@ -22,7 +22,10 @@
         /* 模块配置 */
         "modules" : {
             "Barcode" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "VideoPlayer" : {},
+            "Record" : {},
+            "Webview-x5" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -113,6 +116,20 @@
                     "pid" : "",
                     "parameters" : {}
                 }
+            },
+            "SmallSix-SixUniTts" : {
+                "__plugin_info__" : {
+                    "name" : "语音播报-安卓端原生插件-SixUniTts",
+                    "description" : "原生安卓端语音播报插件",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=7689",
+                    "android_package_name" : "uni.UNID0E0DD8",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "7689",
+                    "parameters" : {}
+                }
             }
         }
     },

node_modules/.package-lock.json

@@ -4,6 +4,11 @@
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
+        "node_modules/image-tools": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/image-tools/-/image-tools-1.4.0.tgz",
+            "integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ=="
+        },
         "node_modules/js-md5": {
             "version": "0.7.3",
             "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",

node_modules/image-tools/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "javascript.format.insertSpaceAfterKeywordsInControlFlowStatements": true
+}

node_modules/image-tools/README.md

@@ -0,0 +1,76 @@
+# image-tools
+图像转换工具，可用于如下环境：uni-app、微信小程序、5+APP、浏览器（需允许跨域）
+
+## 使用方式
+
+### NPM
+
+```
+npm i image-tools --save
+```
+
+```js
+import { pathToBase64, base64ToPath } from 'image-tools'
+```
+
+### 直接下载
+
+```js
+// 以下路径需根据项目实际情况填写
+import { pathToBase64, base64ToPath } from '../../js/image-tools/index.js'
+```
+
+## API
+
+### pathToBase64
+
+从图像路径转换为base64，uni-app、微信小程序和5+APP使用的路径不支持网络路径，如果是网络路径需要先使用下载API下载下来。
+
+```js
+pathToBase64(path)
+  .then(base64 => {
+    console.log(base64)
+  })
+  .catch(error => {
+    console.error(error)
+  })
+```
+
+### base64ToPath
+
+将图像base64保存为文件，返回文件路径。
+
+```js
+base64ToPath(base64)
+  .then(path => {
+    console.log(path)
+  })
+  .catch(error => {
+    console.error(error)
+  })
+```
+
+## 提示
+
+可以利用promise来串行和并行的执行多个任务
+
+```js
+// 并行
+Promise.all(paths.map(path => pathToBase64(path)))
+  .then(res => {
+    console.log(res)
+    // [base64, base64...]
+  })
+  .catch(error => {
+    console.error(error)
+  })
+// 串行
+paths.reduce((promise, path) => promise.then(res => pathToBase64(path).then(base64 => (res.push(base64), res))), Promise.resolve([]))
+  .then(res => {
+    console.log(res)
+    // [base64, base64...]
+  })
+  .catch(error => {
+    console.error(error)
+  })
+```

node_modules/image-tools/index.js

@@ -0,0 +1,196 @@
+function getLocalFilePath(path) {
+    if (path.indexOf('_www') === 0 || path.indexOf('_doc') === 0 || path.indexOf('_documents') === 0 || path.indexOf('_downloads') === 0) {
+        return path
+    }
+    if (path.indexOf('file://') === 0) {
+        return path
+    }
+    if (path.indexOf('/storage/emulated/0/') === 0) {
+        return path
+    }
+    if (path.indexOf('/') === 0) {
+        var localFilePath = plus.io.convertAbsoluteFileSystem(path)
+        if (localFilePath !== path) {
+            return localFilePath
+        } else {
+            path = path.substr(1)
+        }
+    }
+    return '_www/' + path
+}
+
+function dataUrlToBase64(str) {
+    var array = str.split(',')
+    return array[array.length - 1]
+}
+
+var index = 0
+function getNewFileId() {
+    return Date.now() + String(index++)
+}
+
+function biggerThan(v1, v2) {
+    var v1Array = v1.split('.')
+    var v2Array = v2.split('.')
+    var update = false
+    for (var index = 0; index < v2Array.length; index++) {
+        var diff = v1Array[index] - v2Array[index]
+        if (diff !== 0) {
+            update = diff > 0
+            break
+        }
+    }
+    return update
+}
+
+export function pathToBase64(path) {
+    return new Promise(function(resolve, reject) {
+        if (typeof window === 'object' && 'document' in window) {
+            if (typeof FileReader === 'function') {
+                var xhr = new XMLHttpRequest()
+                xhr.open('GET', path, true)
+                xhr.responseType = 'blob'
+                xhr.onload = function() {
+                    if (this.status === 200) {
+                        let fileReader = new FileReader()
+                        fileReader.onload = function(e) {
+                            resolve(e.target.result)
+                        }
+                        fileReader.onerror = reject
+                        fileReader.readAsDataURL(this.response)
+                    }
+                }
+                xhr.onerror = reject
+                xhr.send()
+                return
+            }
+            var canvas = document.createElement('canvas')
+            var c2x = canvas.getContext('2d')
+            var img = new Image
+            img.onload = function() {
+                canvas.width = img.width
+                canvas.height = img.height
+                c2x.drawImage(img, 0, 0)
+                resolve(canvas.toDataURL())
+                canvas.height = canvas.width = 0
+            }
+            img.onerror = reject
+            img.src = path
+            return
+        }
+        if (typeof plus === 'object') {
+            plus.io.resolveLocalFileSystemURL(getLocalFilePath(path), function(entry) {
+                entry.file(function(file) {
+                    var fileReader = new plus.io.FileReader()
+                    fileReader.onload = function(data) {
+                        resolve(data.target.result)
+                    }
+                    fileReader.onerror = function(error) {
+                        reject(error)
+                    }
+                    fileReader.readAsDataURL(file)
+                }, function(error) {
+                    reject(error)
+                })
+            }, function(error) {
+                reject(error)
+            })
+            return
+        }
+        if (typeof wx === 'object' && wx.canIUse('getFileSystemManager')) {
+            wx.getFileSystemManager().readFile({
+                filePath: path,
+                encoding: 'base64',
+                success: function(res) {
+                    resolve('data:image/png;base64,' + res.data)
+                },
+                fail: function(error) {
+                    reject(error)
+                }
+            })
+            return
+        }
+        reject(new Error('not support'))
+    })
+}
+
+export function base64ToPath(base64) {
+    return new Promise(function(resolve, reject) {
+        if (typeof window === 'object' && 'document' in window) {
+            base64 = base64.split(',')
+            var type = base64[0].match(/:(.*?);/)[1]
+            var str = atob(base64[1])
+            var n = str.length
+            var array = new Uint8Array(n)
+            while (n--) {
+                array[n] = str.charCodeAt(n)
+            }
+            return resolve((window.URL || window.webkitURL).createObjectURL(new Blob([array], { type: type })))
+        }
+        var extName = base64.split(',')[0].match(/data\:\S+\/(\S+);/)
+        if (extName) {
+            extName = extName[1]
+        } else {
+            reject(new Error('base64 error'))
+        }
+        var fileName = getNewFileId() + '.' + extName
+        if (typeof plus === 'object') {
+            var basePath = '_doc'
+            var dirPath = 'uniapp_temp'
+            var filePath = basePath + '/' + dirPath + '/' + fileName
+            if (!biggerThan(plus.os.name === 'Android' ? '1.9.9.80627' : '1.9.9.80472', plus.runtime.innerVersion)) {
+                plus.io.resolveLocalFileSystemURL(basePath, function(entry) {
+                    entry.getDirectory(dirPath, {
+                        create: true,
+                        exclusive: false,
+                    }, function(entry) {
+                        entry.getFile(fileName, {
+                            create: true,
+                            exclusive: false,
+                        }, function(entry) {
+                            entry.createWriter(function(writer) {
+                                writer.onwrite = function() {
+                                    resolve(filePath)
+                                }
+                                writer.onerror = reject
+                                writer.seek(0)
+                                writer.writeAsBinary(dataUrlToBase64(base64))
+                            }, reject)
+                        }, reject)
+                    }, reject)
+                }, reject)
+                return
+            }
+            var bitmap = new plus.nativeObj.Bitmap(fileName)
+            bitmap.loadBase64Data(base64, function() {
+                bitmap.save(filePath, {}, function() {
+                    bitmap.clear()
+                    resolve(filePath)
+                }, function(error) {
+                    bitmap.clear()
+                    reject(error)
+                })
+            }, function(error) {
+                bitmap.clear()
+                reject(error)
+            })
+            return
+        }
+        if (typeof wx === 'object' && wx.canIUse('getFileSystemManager')) {
+            var filePath = wx.env.USER_DATA_PATH + '/' + fileName
+            wx.getFileSystemManager().writeFile({
+                filePath: filePath,
+                data: dataUrlToBase64(base64),
+                encoding: 'base64',
+                success: function() {
+                    resolve(filePath)
+                },
+                fail: function(error) {
+                    reject(error)
+                }
+            })
+            return
+        }
+        reject(new Error('not support'))
+    })
+}

node_modules/image-tools/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "image-tools",
+  "version": "1.4.0",
+  "description": "图像转换工具，可用于如下环境：uni-app、微信小程序、5+APP、浏览器",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhetengbiji/image-tools.git"
+  },
+  "keywords": [
+    "base64"
+  ],
+  "author": "Shengqiang Guo",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/zhetengbiji/image-tools/issues"
+  },
+  "homepage": "https://github.com/zhetengbiji/image-tools#readme",
+  "devDependencies": {
+    "@types/html5plus": "^1.0.0"
+  }
+}

package-lock.json

@@ -7,10 +7,18 @@
         "": {
             "name": "PDA广播模式下监听扫描组件",
             "version": "1.0.0",
+            "dependencies": {
+                "image-tools": "^1.4.0"
+            },
             "devDependencies": {
                 "js-md5": "^0.7.3"
             }
         },
+        "node_modules/image-tools": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/image-tools/-/image-tools-1.4.0.tgz",
+            "integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ=="
+        },
         "node_modules/js-md5": {
             "version": "0.7.3",
             "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
@@ -19,6 +27,11 @@
         }
     },
     "dependencies": {
+        "image-tools": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/image-tools/-/image-tools-1.4.0.tgz",
+            "integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ=="
+        },
         "js-md5": {
             "version": "0.7.3",
             "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",

package.json

@@ -14,5 +14,8 @@
     },
     "devDependencies": {
         "js-md5": "^0.7.3"
+    },
+    "dependencies": {
+        "image-tools": "^1.4.0"
     }
 }

pages/abnormal/index.vue

@@ -50,13 +50,16 @@
 		},
 		created(option) {},
 		onLoad(option) {
-			this.airport = option.airport
-			this.getluggageList(this.$storage.get("airportName"))
+			this.airport = this.$storage.get("airportName")
+			this.getluggageList(this.airport)
 		},
 		onUnload() {
 			uni.$off("scancodemsg");
 		},
 		onShow() {
+			if(this.airport){
+				this.getluggageList(this.airport)
+			}
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
 					uni.navigateTo({
@@ -66,7 +69,7 @@
 			});
 		},
 		onHide() {
-			
+			uni.$off("scancodemsg");
 		},
 		mounted() {
 		},

pages/baggagecheck/index.vue

@@ -2,7 +2,7 @@
 	<view class="app-content">
 		<view class="header">
 			<view class="log" @tap="fall"></view>{{ navname }}
-			<view class="up" v-if="luggageData" @tap="sendData()">完成</view>
+
 		</view>
 		<view class="craids" v-if="!luggageData">
 			<p>暂无行李信息</p>
@@ -11,47 +11,52 @@
 		<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="" />
+				<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.flightNo" disabled="true" value=""
-					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="" />
+				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.carrierFlights"
+					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.flightDate" disabled="true" value=""
-					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="" />
+				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.carrierFlightsDate"
+					disabled="true" value="" placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);"
+					placeholder="" />
 			</view>
 			<view class="list">
 				<p>当前节点</p>
-				<picker @change="bindPickerChange1" :placeholderStyle="placeholderStyle" :value="index1" :range-key="'nodeName'" :range="nodeList">
-					<view class="uni-input">{{nodeNameList[index]}}</view>
+				<picker @change="bindPickerChange1" :placeholderStyle="placeholderStyle" :value="index1"
+					:range-key="'nodeName'" :range="nodeList">
+					<view class="uni-input">{{nodeNameList[index1]}}</view>
 				</picker>
 				<view class="listup"></view>
 			</view>
 			<view class="list">
 				<p>当前位置</p>
-				<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false" :styles="style" :disabled="false"
-					v-model="luggageData.location_describe" type="text" placeholder="操作位置" />
+				<uni-easyinput :inputBorder="false" :placeholderStyle="placeholderStyle" :clearable="false"
+					:styles="style" :disabled="false" v-model="luggageData.location_describe" type="text"
+					placeholder="操作位置" />
 				</uni-forms>
 				<view class="listup"></view>
 			</view>
 			<view class="list">
 				<p>当前状态</p>
-				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.currentResult"  value=""
+				<input class="input" name="yonghuming" type="text" v-model.trim="luggageData.currentResult" value=""
 					placeholder-style="font-size:.8125rem;color:rgb(197, 197, 197);" placeholder="" />
 				<view class="listup"></view>
 			</view>
 			<view class="list">
 				<p>异常类型</p>
-				<picker @change="bindPickerChange" :value="index" :range-key="'name'" :range="exceptionList">
-					<view class="uni-input">{{exceptionNameList[index]}}</view>
+				<picker @change="bindPickerChange" :value="index" :range-key="'type'" :range="exceptionList">
+					<view class="uni-input">{{exceptionList[index].type?exceptionList[index].type:"无"}}</view>
 				</picker>
 				<view class="listup"></view>
 			</view>
 			<view class="picturearea">
+				
 				<view class="name">图片上传</view>
 				<!-- <view class="content_list">
           <view class="mg">
@@ -72,11 +77,19 @@
 				<mk-upload :imgList="imgList" @onDelete="onDelete" @onChoose="onChoose" />
 			</view>
 		</view>
+		<view class="up" v-if="luggageData" @tap="sendData()">提交</view>
 	</view>
 </template>
 <script>
 	import Nav from '../../components/header/nav.vue'
 	import mkUpload from "@/components/mk-upload/mk-upload.vue"
+	import {
+		translateapp
+	} from "@/utils/compress.js"
+	import {
+		pathToBase64,
+		base64ToPath
+	} from 'image-tools'
 	export default {
 		data() {
 			return {
@@ -100,38 +113,39 @@
 				arr: [],
 				navname: '异常行李登记',
 				imgList: [],
-				luggageNum:null,
-				luggageData:null,
-				index:0,
-				index1:0,
-				exceptionList:[
-					{
-						"type":null,
-						"name":"非异常行李"
+				ImgObjList: [],
+				luggageNum: null,
+				luggageData: null,
+				index: 0,
+				index1: 0,
+				exceptionList: [{
+						"type": null,
+						"name": "非异常行李"
 					},
 					{
-						"type":"DPR",
-						"name":"破损"
+						"type": "DPR",
+						"name": "破损"
 					},
 					{
-						"type":"AHL",
-						"name":"少收"
+						"type": "AHL",
+						"name": "少收"
 					},
 					{
-						"type":"OHD",
-						"name":"多收"
+						"type": "OHD",
+						"name": "多收"
 					}
 				],
-				exceptionNameList:["非异常行李","破损","少收","多收"],
-				nodeList:[],
-				nodeNameList:[]
+				exceptionNameList: ["非异常行李", "破损", "少收", "多收"],
+				nodeList: [],
+				nodeNameList: [],
+				isGet:true
 			}
 		},
 		created(option) {},
 		onLoad(option) {
 			this.luggageNum = option.luggageNum;
 			this.getNode()
-			if(this.luggageNum.length>9){
+			if (this.luggageNum.length > 9) {
 				this.getDetial(this.luggageNum)
 			}
 		},
@@ -139,22 +153,31 @@
 			uni.$off("scancodemsg");
 		},
 		onShow() {
+			uni.$off("scancodemsg");
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
 					this.luggageNum = data.msg.trim()
-					this.getDetial(this.luggageNum)
-				}
-				else{
-				uni.showToast({
-					icon:'none',
-					title: "请扫描规范条码",
-					duration: 5000
-				});
+					if (this.luggageNum.length > 9) {
+						if(this.isGet==true){
+							this.getDetial(this.luggageNum);
+							this.isGet = false;
+							setTimeout(function(){
+								this.isGet = true;
+							},500)
+						}
+					}
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: "请扫描规范条码",
+						duration: 5000
+					});
 				}
 			})
-				
+
 		},
 		onHide() {
+			uni.$off("scancodemsg");
 		},
 		mounted() {},
 		components: {
@@ -188,33 +211,40 @@
 					"event": "0"
 				}
 				await this.$http.httpPost('/openApi/query', data).then(res => {
-					if (res.code == "0" && res.returnData.length>0){
+					if (res.code == "0" && res.returnData.length > 0) {
 						this.luggageData = res.returnData[0]
-						this.nodeList.map((item,index)=>{
-							if(res.returnData[0].nodeCode == item.nodeCode){
+						this.getImgList()
+						this.nodeList.map((item, index) => {
+							if (res.returnData[0].nodeCode == item.nodeCode) {
 								this.index1 = index
 							}
 						})
-					}
-					else{
+						this.exceptionList.map((item, index) => {
+							if (res.returnData[0].exception_type == item.type) {
+								this.index = index
+							}
+						})
+					} else {
+						this.$scanAudio.src = "../../static/hqxl.mp3"
+						this.$scanAudio.play()
 						uni.showToast({
-							icon:'none',
+							icon: 'none',
 							title: "未查询到该行李信息",
 							duration: 5000
 						});
 					}
 				})
 			},
-			bindPickerChange(e){
+			bindPickerChange(e) {
 				this.index = e.detail.value
 				this.luggageData.exception_type = this.exceptionList[this.index].type;
 			},
-			bindPickerChange1(e){
+			bindPickerChange1(e) {
 				this.index1 = e.detail.value
 				this.luggageData.nodeCode = this.nodeList[this.index1].nodeCode;
 				this.luggageData.location_describe = this.nodeList[this.index1].nodeDescribe;
 			},
-			async sendData(){
+			async sendData() {
 				this.luggageData.sourceAirport = this.$storage.get('airportName');
 				this.luggageData.ID = null;
 				this.luggageData.dataType = "BPM";
@@ -230,14 +260,15 @@
 				await this.$http.httpPost('/openApi/query', data).then(res => {
 					if (res.code == "0") {
 						uni.showToast({
-							icon:'none',
+							icon: 'none',
 							title: "操作成功",
 							duration: 5000
 						});
-					}
-					else{
+					} else {
+						this.$scanAudio.src = "../../static/czsb.mp3"
+						this.$scanAudio.play()
 						uni.showToast({
-							icon:'none',
+							icon: 'none',
 							title: "操作失败",
 							duration: 5000
 						});
@@ -249,32 +280,128 @@
 					delta: 1
 				})
 			},
+			async sendImg(upImgList) {
+				let data = {
+					"serviceId": 30051,
+					"dataContent": upImgList,
+					"event": "1"
+				}
+				await this.$http.httpPost('/openApi/newdata', data).then(res => {
+					if (res.code == "0") {
+						uni.hideLoading();
+						this.getImgList()
+						uni.showToast({
+							icon: 'none',
+							title: "上传成功",
+							duration: 5000
+						});
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: "上传失败",
+							duration: 5000
+						});
+					}
+				})
+			},
+			async getImgList() {
+				let data = {
+					"serviceId": 30051,
+					"page": 1,
+					"pageSize": 999,
+					"dataContent": {
+						"carrflights": this.luggageData.carrierFlights,
+						"carrierFlightsDate": this.luggageData.carrierFlightsDate,
+						"luggageNum": this.luggageData.luggageNum
+					},
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					if (res.code == "0") {
+						this.imgList = [];
+						this.ImgObjList = res.returnData;
+						res.returnData.map(item => {
+							if (item.luggagePic) {
+								this.imgList.push(item.luggagePic);
+							}
+						})
+
+					} else {
+						this.imgList = [];
+						uni.showToast({
+							icon: 'none',
+							title: "获取图片失败",
+							duration: 5000
+						});
+					}
+				})
+			},
+			async deleteImg(index) {
+				let data = {
+					"serviceId": 30051,
+					"dataContent": [{
+						"filter": [{
+							"left": "(",
+							"column": "id",
+							"comparator": "=",
+							"value": this.ImgObjList[index].id, 
+							"right": ")",
+							"connector": "and"
+						}]
+					}],
+					"event": "3"
+				}
+				await this.$http.httpPost('/openApi/movedata', data).then(res => {
+					if (res.code == "0") {
+						this.getImgList()
+						wx.showToast({
+							title: '删除成功',
+							icon: 'success',
+							duration: 3000
+						});
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: "删除图片失败",
+							duration: 5000
+						});
+					}
+				})
+			},
 			onDelete(index) {
 				console.log(index)
 				//删除成功回调后执行 只做演示
 				uni.showLoading({
 					title: '删除中'
 				});
-				setTimeout(() => {
-					this.imgList.splice(index, 1);
-					wx.showToast({
-						title: '删除成功',
-						icon: 'success',
-						duration: 1000
-					});
-				}, 1000);
+				this.deleteImg(index)
 			},
 			onChoose(e) {
 				console.log(e)
-				//上传成功后回调执行push  只做演示
 				uni.showLoading({
 					title: '上传中'
 				});
-				setTimeout(() => {
-					const tempFilePaths = e.tempFilePaths;
-					this.imgList.push(tempFilePaths[0]);
-					uni.hideLoading();
-				}, 1000);
+				// let upImgList = []
+				// this.newImgList = []
+				e.tempFilePaths.map(item => {
+					translateapp(item, 70, imgUrl => {
+						pathToBase64(imgUrl).then(path => {
+							let upImgList = []
+							let newData = {
+								"carrflights": this.luggageData.carrierFlights,
+								"carrierFlightsDate": this.luggageData.carrierFlightsDate,
+								"luggageNum": this.luggageData.luggageNum,
+								"luggagePic": path,
+							}
+							// this.newImgList.push(path)
+							upImgList.push(newData)
+							this.sendImg(upImgList)
+							// upImgList.push(newData)
+						}).catch(error => {
+							uni.hideLoading();
+						})
+					})
+				})
 			},
 			onPreviewTake(index) {
 				console.log(index)
@@ -294,6 +421,23 @@
 
 <style lang="scss" scoped>
 	.app-content {
+		>.up {
+			position: fixed;
+			bottom: 10px;
+			left: calc((100% - 20.5625rem) / 2);
+			width: 20.5625rem;
+			height: 3rem;
+			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;
+		}
+
 		>.header {
 			width: 100%;
 			height: 4.375rem;
@@ -316,31 +460,30 @@
 				background-size: 100% 100%;
 			}
 
-			>.up {
-				position: absolute;
-				right: 1.5rem;
-				color: rgb(37, 121, 160);
+
+		}
+
+		>.craids {
+			margin-top: 10rem;
+			height: 5.625rem;
+			padding: 0 2.5625rem 0 2.5625rem;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			>p {
+				color: rgb(75, 84, 91);
 				font-family: Noto Sans SC;
-				font-size: .875rem;
+				font-size: 13px;
 				font-weight: 500;
 			}
 		}
-		>.craids{
-				margin-top:10rem;
-				height: 5.625rem;
-				padding: 0 2.5625rem 0 2.5625rem;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				>p{
-					color: rgb(75, 84, 91);
-					font-family: Noto Sans SC;
-					font-size: 13px;
-					font-weight: 500;
-				}
-			}
+
 		>.content {
 			margin-left: 1.5rem;
+			height: calc(100vh - 8rem);
+			overflow-x: hidden;
+			overflow-y: auto;
 
 			>.list {
 				height: 3.375rem;
@@ -355,6 +498,7 @@
 					font-weight: 500;
 					margin-right: 2.1875rem;
 				}
+
 				>.listup {
 					width: .25rem;
 					height: .5rem;

pages/detail/index.vue

@@ -1,16 +1,16 @@
 <template>
 	<view class="app-content">
 		<view class="header">
-			<view class="log" @tap="fall"></view> <button type="primary" class="send" size="small" v-if="luggageData" @tap="sendData()">提交</button>
+			<view class="log" @tap="fall"></view> 
 		</view>
 		<!--    <view class="nav">
       <view :class="action === index ? 'nav_lists': 'nav_list'" v-for="(item, index) in list" :key="index" @tap="lop(index)">{{item.name}}</view>
     </view> -->
-		<uni-swiper-dot :info="info" :current="current" field="content" :mode="mode">
+		<uni-swiper-dot :info="imgList" :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-item v-for="(item ,index) in imgList" :key="index" @tap="openImg(index)">
 					<view class="swiper-item">
-						<image style="width:100%" src="../../static/bg.png" mode="widthFix"></image>
+						<image style="width:100%" :src="item" mode="scaleToFill"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -70,23 +70,23 @@
 					</view>
 					<view class="list">
 						<view class="lable">特殊行李类型</view>
-						<picker @change="bindPickerChange3" :placeholderStyle="placeholderStyle" :value="index3" :range-key="'specialTypeName'" :range="specialTypeList">
-							<view class="uni-input">{{specialTypeNameList[index3]}}</view>
+						<picker @change="bindPickerChange3" :placeholderStyle="placeholderStyle" :value="index3" :range-key="'specialType'" :range="specialTypeList">
+							<view class="uni-input">{{specialTypeList[index3].specialType?specialTypeList[index3].specialType:"无"}}</view>
 						</picker>
 						<view class="listup"></view>
 					</view>
 					
 					<view class="list">
 						<view class="lable">异常类型</view>
-						<picker @change="bindPickerChange4" :placeholderStyle="placeholderStyle" :value="index4" :range-key="'name'" :range="exceptionList">
-							<view class="uni-input">{{exceptionNameList[index4]}}</view>
+						<picker @change="bindPickerChange4" :placeholderStyle="placeholderStyle" :value="index4" :range-key="'type'" :range="exceptionList">
+							<view class="uni-input">{{exceptionList[index4].type?exceptionList[index4].type:"无"}}</view>
 						</picker>
 						<view class="listup"></view>
 					</view>
 					<view class="list">
 						<view class="lable">非正常状态码</view>
-						<picker @change="bindPickerChange5" :placeholderStyle="placeholderStyle" :value="index5" :range-key="'name'" :range="abnormalList">
-							<view class="uni-input">{{abnormalNameList[index5]}}</view>
+						<picker @change="bindPickerChange5" :placeholderStyle="placeholderStyle" :value="index5" :range-key="'type'" :range="abnormalList">
+							<view class="uni-input">{{abnormalList[index5].type?abnormalList[index5].type:"无"}}</view>
 						</picker>
 						<view class="listup"></view>
 					</view>
@@ -111,9 +111,12 @@
 						</uni-forms>
 						<view class="listup"></view>
 					</view>
+					<mk-upload :imgList="imgList" @onDelete="onDelete" @onChoose="onChoose" />
 				</scroll-view>
 			</view>
+			
 		</view>
+		<button type="primary" class="send" size="small" v-if="luggageData" @tap="sendData()">提交</button>
 		<luanqing-date-picker ref="datePickerObj" :isSimple="mode === 'simple'" :isMultiple="mode === 'multiple'"
 			@finishSelectDate="finishSelectDate" :defaultCheckedList="['2023-03-28','2023-09-25']">
 		</luanqing-date-picker>
@@ -122,9 +125,19 @@
 	</view>
 </template>
 <script>
+	import mkUpload from "@/components/mk-upload/mk-upload.vue"
+	import {
+		translateapp
+	} from "@/utils/compress.js"
+	import {
+		pathToBase64,
+		base64ToPath
+	} from 'image-tools'
 	export default {
 		data() {
 			return {
+				imgList:[],
+				ImgObjList: [],
 				placeholderStyle: "color:000",
 				style: {
 					disableColor: "#fff",
@@ -135,13 +148,6 @@
 				datacontime: '',
 				luggageData: null,
 				luggageDataOld:null,
-				info: [{
-					content: '内容 A'
-				}, {
-					content: '内容 B'
-				}, {
-					content: '内容 C'
-				}],
 				current: 0,
 				mode: 'round',
 				show: false,
@@ -221,15 +227,21 @@
 		},
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
-				if (data.msg.length > 9) {
+				if (data.msg.trim().length > 9) {
 					this.luggageNum = data.msg.trim()
 					this.getDetial(this.luggageNum)
 				}
+				if(data.msg.trim().length < 9){
+					this.luggageData.container_ID = data.msg.trim()
+				}
 			});
 		},
 		onHide() {
+			uni.$off("scancodemsg");
+		},
+		components: {
+			mkUpload
 		},
-		components: {},
 		methods: {
 			async getNode() {
 				let data = {
@@ -281,6 +293,7 @@
 					this.luggageData = null
 					if (res.code == "0" && res.returnData.length>0) {
 						this.luggageData = res.returnData[0]
+						this.getImgList()
 						this.luggageDataOld = JSON.parse(JSON.stringify(res.returnData[0]))
 						this.nodeList.map((item,index)=>{
 							if(res.returnData[0].nodeCode == item.nodeCode){
@@ -305,6 +318,9 @@
 						})
 					}
 					else{
+						this.$scanAudio.src = "../../static/hqxl.mp3"
+						this.$scanAudio.play()
+						this.imgList = []
 						uni.showToast({
 							icon:'none',
 							title: "未查询到该行李信息",
@@ -319,19 +335,6 @@
 				this.luggageData.dataType = "BPM";
 				this.luggageData.agentNumber = this.$storage.getJson("users").user_name;
 				this.luggageData.device_ID = uni.getDeviceInfo().deviceId;
-				// this.sourceData['ID'] = null;
-				// this.sourceData['dataType'] = "BPM";
-				// this.sourceData['agentNumber'] = this.luggageData.agentNumber;
-				// this.sourceData['loadNumber'] = this.luggageData.loadNumber;
-				// this.sourceData['container_ID'] = this.luggageData.container_ID;
-				// this.sourceData['luggage_describe'] = this.luggageData.luggage_describe;
-				// this.sourceData['nodeCode'] = this.luggageData.nodeCode;
-				// this.sourceData['location_describe'] = this.luggageData.location_describe;
-				// this.sourceData['to_location_describe'] = this.luggageData.to_location_describe;
-				// this.sourceData['specialType'] = this.luggageData.specialType;
-				// this.sourceData['exception_type'] = this.luggageData.exception_type;
-				// this.sourceData['abnormalState'] = this.luggageData.abnormalState;
-				// this.luggageData.sourceData = JSON.stringify(this.sourceData);
 				let data = {
 					"serviceId": 3005,
 					"dataContent": [
@@ -340,7 +343,6 @@
 					"event": "0"
 				}
 				await this.$http.httpPost('/openApi/query', data).then(res => {
-					console.log(res)
 					if (res.code == "0") {
 						uni.showToast({
 							icon:'none',
@@ -349,6 +351,8 @@
 						});
 					}
 					else{
+						this.$scanAudio.src = "../../static/czsb.mp3"
+						this.$scanAudio.play()
 						uni.showToast({
 							icon:'none',
 							title: "操作失败",
@@ -395,6 +399,153 @@
 				let GMT = Year + '-' + Moth + '-' + Day + '   ' + Hour + ':' + Minute
 				this.datacontime = GMT
 			},
+			
+			async sendImg(upImgList) {
+				let data = {
+					"serviceId": 30051,
+					"dataContent": upImgList,
+					"event": "1"
+				}
+				await this.$http.httpPost('/openApi/newdata', data).then(res => {
+					if (res.code == "0") {
+						uni.hideLoading();
+						this.getImgList()
+						uni.showToast({
+							icon: 'none',
+							title: "上传成功",
+							duration: 5000
+						});
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: "上传失败",
+							duration: 5000
+						});
+					}
+				})
+			},
+			async getImgList() {
+				let data = {
+					"serviceId": 30051,
+					"page": 1,
+					"pageSize": 999,
+					"dataContent": {
+						"carrflights": this.luggageData.carrierFlights,
+						"carrierFlightsDate": this.luggageData.carrierFlightsDate,
+						"luggageNum": this.luggageData.luggageNum
+					},
+					"event": "0"
+				}
+				await this.$http.httpPost('/openApi/query', data).then(res => {
+					if (res.code == "0") {
+						this.imgList = [];
+						this.ImgObjList = res.returnData;
+						res.returnData.map(item => {
+							if (item.luggagePic) {
+								this.imgList.push(item.luggagePic);
+							}
+						})
+			
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: "获取图片失败",
+							duration: 5000
+						});
+					}
+				})
+			},
+			async deleteImg(index) {
+				let data = {
+					"serviceId": 30051,
+					"dataContent": [{
+						"filter": [{
+							"left": "(",
+							"column": "id",
+							"comparator": "=",
+							"value": this.ImgObjList[index].id, 
+							"right": ")",
+							"connector": "and"
+						}]
+					}],
+					"event": "3"
+				}
+				await this.$http.httpPost('/openApi/movedata', data).then(res => {
+					if (res.code == "0") {
+						this.getImgList()
+						wx.showToast({
+							title: '删除成功',
+							icon: 'success',
+							duration: 3000
+						});
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: "删除图片失败",
+							duration: 5000
+						});
+					}
+				})
+			},
+			onDelete(index) {
+				console.log(index)
+				//删除成功回调后执行 只做演示
+				uni.showLoading({
+					title: '删除中'
+				});
+				this.deleteImg(index)
+			},
+			onChoose(e) {
+				console.log(e)
+				uni.showLoading({
+					title: '上传中'
+				});
+				// let upImgList = []
+				// this.newImgList = []
+				e.tempFilePaths.map(item => {
+					translateapp(item, 70, imgUrl => {
+						pathToBase64(imgUrl).then(path => {
+							let upImgList = []
+							let newData = {
+								"carrflights": this.luggageData.carrierFlights,
+								"carrierFlightsDate": this.luggageData.carrierFlightsDate,
+								"luggageNum": this.luggageData.luggageNum,
+								"luggagePic": path,
+							}
+							// this.newImgList.push(path)
+							upImgList.push(newData)
+							this.sendImg(upImgList)
+							// upImgList.push(newData)
+						}).catch(error => {
+							uni.hideLoading();
+						})
+					})
+				})
+			},
+			onPreviewTake(index) {
+				console.log(index)
+				wx.showActionSheet({
+					itemList: ['预览图片', '删除图片'],
+					success(res) {
+						console.log(res.tapIndex)
+					},
+					fail(res) {
+						console.log(res.errMsg)
+					}
+				})
+			},
+			openImg(index){
+				const imgList = this.imgList;
+				const isReverse = false;
+				const currentIndex = isReverse ? (imgList.length - index) - 1 : index
+				const imgLists = isReverse ? imgList.reverse() : imgList;
+				uni.previewImage({
+					current: currentIndex,
+					urls: imgLists
+				});
+			},
+			
+			
 			finishSelectDate(e) {
 				this.datatime = e[0]
 				console.error("选择了日期：", e);
@@ -436,6 +587,22 @@
 
 <style lang="scss" scoped>
 	.app-content {
+		>.send{
+			position: fixed;
+			bottom: 10px;
+			left: calc((100% - 20.5625rem) / 2);
+			width: 20.5625rem;
+			height: 3rem;
+			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;
+		}
 		>.header {
 			width: 100%;
 			height: 4.375rem;
@@ -460,13 +627,7 @@
 				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

@@ -6,8 +6,8 @@
 			<view class="content_top">
 				<view class="craid" v-if="cap">
 					<view class="craid_data">
-						<p>{{cap.flightNo}}</p>
-					  <span>{{cap.flightDate}}</span>
+						<p>{{cap.carrierFlights}}</p>
+					  <span>{{cap.carrierFlightsDate}}</span>
 					</view>
 					<view class="craid_data">
 						<p>{{cap.outAirport}}</p>
@@ -33,8 +33,8 @@
 			<view class="content_top">
 				<view class="craid" v-if="caps">
 					<view class="craid_data">
-						<p>{{caps.flightNo}}</p>
-					  <span>{{caps.flightDate}}</span>
+						<p>{{caps.carrierFlights}}</p>
+					  <span>{{caps.carrierFlightsDate}}</span>
 					</view>
 					<view class="craid_data">
 						<p>{{caps.outAirport}}</p>
@@ -108,6 +108,7 @@
 			});
 		},
 		onHide() {
+			uni.$off("scancodemsg");
 			
 		},
 		mounted() {
@@ -170,6 +171,7 @@
 							this.capsluggageNum = null
 							this.cap = res.returnData[0]
 							this.capluggageNum = this.luggageNum
+							this.isSend = false
 						}
 						if(this.caps.luggageNum == this.cap.luggageNum){
 							this.isSend = true
@@ -181,10 +183,12 @@
 						}
 						if(this.caps&&this.caps.luggageNum != this.cap.luggageNum){
 							this.isSend = false
-							this.isMatch = true
+							this.isMatch = false
 						}
 					}
 					else{
+						this.$scanAudio.src = "../../static/hqxl.mp3"
+						this.$scanAudio.play()
 						uni.showToast({
 							icon:'none',
 							title: "未查询到该行李信息",
@@ -195,6 +199,7 @@
 			},
 			async sendData(){
 				this.caps.nodeCode = "extract"
+				this.caps.nodeName = "提取"
 				this.caps.processing_time = this.datatime();
 				this.caps.sourceAirport = this.$storage.get('airportName');
 				this.caps.ID = null;
@@ -217,6 +222,8 @@
 						});
 					}
 					else{
+						this.$scanAudio.src = "../../static/czsb.mp3"
+						this.$scanAudio.play()
 						uni.showToast({
 							icon:'none',
 							title: "操作失败",

pages/index/index.vue

@@ -120,7 +120,7 @@
 		},
 		onLoad(option) {
 		},
-		onUnload() {},
+		onUnload() {uni.$off("scancodemsg");},
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
 				if (data.msg.length > 9) {
@@ -143,7 +143,6 @@
 				this.flightDate = this.flightDetail.carrierFlightsDate
 				// this.getFlightData()
 			}
-			
 		},
 		onHide() {
 			uni.$off("scancodemsg");

pages/message/message.vue

@@ -24,6 +24,11 @@
 				}
 			});
 		},
+		onLoad(){
+		},
+		onUnload() {
+			uni.$off("scancodemsg");
+		},
 		onHide() {
 			uni.$off("scancodemsg");
 		},

pages/mypage/index.vue

@@ -127,6 +127,7 @@
 		onLoad(){
 		},
 		onUnload() {
+			uni.$off("scancodemsg");
 		},
 		onShow() {
 			// uni.hideTabBar()//关闭导航栏

pages/search/index.vue

@@ -55,6 +55,7 @@
 				}
 			});
 		},
+		onHide() {uni.$off("scancodemsg");},
 		mounted() {
 		},
 		components: {
@@ -62,7 +63,6 @@
 		},
 		methods: {
 			toIndex(item){
-				console.log(item)
 				this.$storage.setJson('searchData',item);
 				// this.$storage.set('flightDate',item.carrierFlightsDate);
 				uni.switchTab({
@@ -143,6 +143,8 @@
 						}
 					}
 					else{
+						this.$scanAudio.src = "../../static/hqhb.mp3"
+						this.$scanAudio.play()
 						uni.showToast({
 							icon:'none',
 							title: "无此航班号信息，请确认航班号",

pages/sorting/index.vue

@@ -53,22 +53,22 @@
 			</view>
 			<view class="content_bootom" :style="{top:dataheight}">
 				<view class="choice" @touchmove="movetran">
-					<view :class="action === true ?'handle':'handles'" @tap="clicker(true)">已处理</view>
-					<view :class="action !== true ?'handle':'handles'" @tap="clicker(false)">未处理</view>
+					<view :class="action === true ?'handle':'handles'" @tap="clicker(true)">已处理({{listdate1.length}}件)</view>
+					<view :class="action !== true ?'handle':'handles'" @tap="clicker(false)">未处理({{listdate2.length}}件)</view>
 				</view>
 				<scroll-view scroll-y="true" class="scroll-Y">
 					<view v-if="action === true" :class="item.types ? 'ups':'up'" v-for="(item, index) in listdate1" :key="index"
 						@touchstart="start" @touchend="(e)=>end(e,item)">
 						<view class="list"  @tap="toDetail(item.luggageNum)">行李编号：{{ item.luggageNum }}</view>
-						<view :class="item.abnormalState!=null?'error':'normal'">{{item.abnormalState!=null?item.abnormalName:"正常"}}</view>
-						<view class="down_up" v-if="pagename == 'LOAD' && item.abnormalState!='OFF'" @tap="up(item,index)"></view>
-						<view class="delete" v-if="pagename == 'LOAD' && item.abnormalState!='OFF'">
+						<view :class="item.abnormalType!=null?'error':'normal'">{{item.abnormalType!=null?item.abnormalType:"正常"}}</view>
+						<view class="down_up" v-if="pagename == 'LOAD' && item.abnormalType!='OFF'" @tap="up(item,index)"></view>
+						<view class="delete" v-if="pagename == 'LOAD' && item.abnormalType!='OFF'">
 							<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="item.abnormalType!=null?'error':'normal'">{{item.abnormalType!=null?item.abnormalType:"正常"}}</view>
 						<!-- <view class="down_up" @tap="up"></view> -->
 					</view>
 				</scroll-view>
@@ -192,20 +192,27 @@
 		},
 		onUnload() {
 			uni.$off("scancodemsg");
-			// this.$refs.showMask.show();
 		},
 		onShow() {
 			uni.$on("scancodemsg", (data) => {
-				if (data.msg.length > 9) {
+				if (data.msg.trim().length > 9) {
 					this.currentLuggageNum = data.msg.trim()
 					this.getluggage(this.currentLuggageNum,true)
 				}
+				if(data.msg.trim().length < 9){
+					this.container_ID = data.msg.trim()
+				}
 			});
 			if (this.$storage.getJson('airport')) {
 				this.index = this.$storage.getJson('airport')
 			}
+			if(this.flightNO!="null"&&this.flightNO){
+				this.getFlightData()
+				this.getluggageList()
+			}
 		},
 		onHide() {
+			uni.$off("scancodemsg");
 		},
 		mounted() {
 			// this.$refs.showMask.show();
@@ -262,17 +269,18 @@
 				})
 			},
 			next(data){
-				this.flightNO = this.currentLuggage.flightNo;
-				this.flightDate = this.currentLuggage.flightDate;
+				this.flightNO = this.currentLuggage.carrierFlights;
+				this.flightDate = this.currentLuggage.carrierFlightsDate;
+				this.loadNumber = 0;
 				this.getFlightData()
 				this.getluggageList()
 				this.$refs.showMask.hide();
 			},
 			load(){
-				this.listdate1.unshift({
-					"luggageNum" : this.currentLuggage.luggageNum
-				})
-				this.setLuggage()
+				this.currentLuggage.carrierFlights = this.flightNO
+				this.currentLuggage.carrierFlightsDate = this.flightDate;
+				let datas = this.setLuggage()
+				this.sendData(datas)
 			},
 			async getFlightData() {
 				let data = {
@@ -311,6 +319,8 @@
 						}
 					}
 					else{
+						this.$scanAudio.src = "../../static/hqhb.mp3"
+						this.$scanAudio.play()
 						uni.showToast({
 							icon:'none',
 							title: "未查询到"+this.flightNO+"航班信息",
@@ -322,6 +332,8 @@
 			async getluggageList(){
 				let data = {
 				    "serviceId": 3001,
+					"page": 1,
+					"pageSize": 999,
 				    "dataContent": {
 				        "carrierFlights": this.flightNO,
 						"carrierFlightsDate":this.flightDate
@@ -330,14 +342,13 @@
 				}
 				
 				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){
+								if(item.abnormalType == item2.type){
 									item.abnormalName = item2.name
 								}
 							})
@@ -345,6 +356,7 @@
 								case "SORT":
 									if(item.sorting_time!=null){
 										this.listdate1.push(item)
+										this.listdate1.sort(this.compareDesc("sorting_time"))
 									}
 									else{
 										this.listdate2.push(item)
@@ -353,6 +365,7 @@
 								case "LOAD":
 									if(item.loading_time!=null){
 										this.listdate1.push(item)
+										this.listdate1.sort(this.compareDesc("loading_time"))
 									}
 									else{
 										this.listdate2.push(item)
@@ -361,6 +374,7 @@
 								case "INFL":				
 									if(item.installation_time!=null){
 										this.listdate1.push(item)
+										this.listdate1.sort(this.compareDesc("installation_time"))
 									}
 									else{
 										this.listdate2.push(item)
@@ -369,6 +383,7 @@
 								case "UNLOAD":
 									if(item.unloadtime!=null){
 										this.listdate1.push(item)
+										this.listdate1.sort(this.compareDesc("unloadtime"))
 									}
 									else{
 										this.listdate2.push(item)
@@ -377,6 +392,7 @@
 								case "ARRIVED":
 									if(item.arrivedtime!=null){
 										this.listdate1.push(item)
+										this.listdate1.sort(this.compareDesc("arrivedtime"))
 									}
 									else{
 										this.listdate2.push(item)
@@ -386,8 +402,15 @@
 									break;
 							}
 						})
-						this.loadNumber = this.listdate2.length;
-						this.setLuggage()
+						console.log(this.loadNumber)
+						if(this.loadNumber == 0&&this.currentLuggageNum!=null){
+							this.loadNumber = this.listdate1.length;
+							let datas = this.setLuggage()
+							this.sendData(datas)
+						}
+						else{
+							this.loadNumber = this.listdate1.length;
+						}
 					}
 	
 				})
@@ -406,22 +429,29 @@
 					if(res.code == "0"&&res.returnData.length>0){
 						this.currentLuggage = res.returnData[0];
 						console.log(this.flightNO)
-						if(this.flightNO !="null"&&this.flightNO&&this.flightNO == res.returnData[0].flightNo&&isSend==true){
-							this.setLuggage()
+						if(this.flightNO !="null"&&this.flightNO&&this.flightNO == res.returnData[0].carrierFlights&&isSend==true){
+							let datas = this.setLuggage()
+							this.sendData(datas)
 						}
-						else if(this.flightNO !="null"&&this.flightNO&&this.flightNO != res.returnData[0].flightNo){
-							this.tabname = res.returnData[0].flightNo
+						else if(this.flightNO !="null"&&this.flightNO&&this.flightNO != res.returnData[0].carrierFlights){
+							this.tabname = res.returnData[0].carrierFlights
 							this.typeShow = true
 							this.$refs.showMask.show();
+							this.$scanAudio.src = "../../static/qzcz.mp3"
+							this.$scanAudio.play()
 						}
 						else if(this.flightNO =="null"){
 							this.typeShow = false
-							this.maskTitle3 = '是否对航班：'+ res.returnData[0].flightNo + "行李进行"+this.navname+"操作？"
+							this.maskTitle3 = '是否对航班：'+ res.returnData[0].carrierFlights + "行李进行"+this.navname+"操作？"
 							this.headername = '提示'
 							this.$refs.showMask3.show();
+							this.$scanAudio.src = "../../static/kscz.mp3"
+							this.$scanAudio.play()
 						}
 					}
 					else{
+						this.$scanAudio.src = "../../static/hqxl.mp3"
+						this.$scanAudio.play()
 						uni.showToast({
 							icon:'none',
 							title: "未查询到"+this.currentLuggageNum+"行李信息",
@@ -430,97 +460,66 @@
 					}
 				})
 			},
-			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;
+			setLuggage(data){
+				let arr = []
+				if(data){
+					data.map(item => {
+						item.nodeCode = this.pagename;
+						item.nodeName = this.navname;
+						item.location_code = this.stratvalue;
+						item.container_ID = this.container_ID
+						item.loadNumber = this.loadNumber++;
+						item.sourceAirport = this.$storage.get('airportName');
+						item.ID = null;
+						item.dataType = "BPM";
+						item.agentNumber = this.$storage.getJson("users").user_name;
+						item.device_ID = uni.getDeviceInfo().deviceId;
+						arr.push(item)
+					})
+					return arr
+				}
+				else{
+					this.currentLuggage.nodeCode = this.pagename;
+					this.currentLuggage.nodeName = this.navname;
+					this.currentLuggage.location_code = this.stratvalue;
+					this.currentLuggage.container_ID = this.container_ID
+					this.currentLuggage.loadNumber = this.loadNumber++;
+					this.currentLuggage.sourceAirport = this.$storage.get('airportName');
+					this.currentLuggage.ID = null;
+					this.currentLuggage.dataType = "BPM";
+					this.currentLuggage.agentNumber = this.$storage.getJson("users").user_name;
+					this.currentLuggage.device_ID = uni.getDeviceInfo().deviceId;
+					arr.push(this.currentLuggage)
+					return arr
 				}
-				this.sendData()
+				
 			},
-			async sendData(type){
-				this.currentLuggage.sourceAirport = this.$storage.get('airportName');
-				this.currentLuggage.ID = null;
-				this.currentLuggage.dataType = "BPM";
-				this.currentLuggage.agentNumber = this.$storage.getJson("users").user_name;
-				this.currentLuggage.device_ID = uni.getDeviceInfo().deviceId;
+			async sendData(result){
+				let that = this;
 				let data = {
 					"serviceId": 3005,
-					"dataContent": [
-						this.currentLuggage
-					],
+					"dataContent": result,
 					"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
-						});
+						if(result.length>1){
+							setTimeout(function(){
+								uni.showToast({
+									icon:'none',
+									title: "操作行李成功",
+									duration: 5000
+								});
+								that.getluggageList()
+							},3000)
+						}
+						else{
+							this.getluggageList()
+						}
 					}
 					else{
+						this.$scanAudio.src = "../../static/czsb.mp3"
+						this.$scanAudio.play()
 						uni.showToast({
 							icon:'none',
 							title: "操作失败",
@@ -541,30 +540,37 @@
 				this.currentIndex = index
 				this.typeShow = false
 				this.maskTitle = '是否确定要拉下该件行李？'
-				this.headername = '下拉提示'
+				this.headername = '拉下提示'
 				this.$refs.showMask.show();
+				this.$scanAudio.src = "../../static/sflx.mp3"
+				this.$scanAudio.play()
 			},
 			confirm: function(e) { //确定按钮
 				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()
+				let datas = this.setLuggage()
+				this.sendData(datas)
 			},
-			confirm2: function(e) { //确定一键操作按钮
-				this.cancel()
-				this.listdate2.map((item,index) =>{
-					this.currentLuggage = item;
-					this.currentLuggageNum = item.luggageNum;
-					this.setLuggage();
-					this.listdate1.unshift(item)
-				})
-				this.listdate2 = [];
+			confirm2(e) { //确定一键操作按钮
+				uni.showToast({
+					icon:'none',
+					title: "操作中",
+					duration: 5000
+				});
+				let data = this.listdate2
+				let datas = this.setLuggage(data)
+				this.sendData(datas)
+				// this.listdate2.map((item,index) =>{
+				// 	this.currentLuggage = item;
+				// 	this.currentLuggageNum = item.luggageNum;
+					
+				// 	this.sendData()
+				// })
 			},
+			
 			confirm3: function(e) { //确定按钮
-				this.flightNO = this.currentLuggage.flightNo
-				this.flightDate = this.currentLuggage.flightDate
+				this.flightNO = this.currentLuggage.carrierFlights
+				this.flightDate = this.currentLuggage.carrierFlightsDate
 				this.getFlightData();
 				this.getluggageList();
 			},
@@ -585,6 +591,8 @@
 				this.maskTitle2 = '是否确定要一键'+this.navname+'全部行李？'
 				this.headername = '操作提示'
 				this.$refs.showMask2.show();
+				this.$scanAudio.src = "../../static/yjzc.mp3"
+				this.$scanAudio.play()
 			},
 			baggageEntry() {
 				uni.navigateTo({
@@ -607,6 +615,21 @@
 					this.action = e
 				}
 			},
+			
+			compareDesc(propertyName) {
+			  return function(object1, object2) {
+			    var value1 = object1[propertyName];
+			    var value2 = object2[propertyName];
+			    if(value2 < value1) {
+			      return -1;
+			    } else if(value2 > value1) {
+			      return 1;
+			    } else {
+			      return 0;
+			    }
+			  }
+			},
+			
 			movetran(e) {
 				let arr = uni.getSystemInfoSync().windowHeight;
 				this.dataheight = (e.changedTouches[0].clientY / 16) + 'rem'

utils/compress.js

@@ -0,0 +1,91 @@
+/**
+ * APP端图片压缩
+ *  参数说明：
+ *  img 图片url
+ *  scale缩放比例 1-100
+ *  callback 回调设置返回值 
+*/
+export function translateapp(img, scale, callback) {
+ 
+		plus.io.resolveLocalFileSystemURL(img, (entry) => { //通过URL参数获取目录对象或文件对象
+			entry.file((file) => { // 可通过entry对象操作图片 
+				console.log('压缩前图片信息:' + JSON.stringify(file)); //压缩前图片信息
+				if (file.size > 22400) { //   如果大于500Kb进行压缩
+					plus.zip.compressImage({ // 5+ plus.zip.compressImage 了解一下，有详细的示例
+						src: img, //src: 压缩原始图片的路径    
+						dst: img.replace('.png', 'yasuo.png').replace('.PNG',
+								'yasuo.PNG').replace('.jpg', 'yasuo.jpg')
+							.replace('.JPG', 'yasuo.JPG'),
+						width: '40%', //dst: (String 类型 )压缩转换目标图片的路径，这里先在后面原始名后面加一个yasuo区分一下
+						height: '40%', //width,height: (String 类型 )缩放图片的宽度,高度
+						quality: scale, //quality: (Number 类型 )压缩图片的质量
+						overwrite: true, //overwrite: (Boolean 类型 )覆盖生成新文件
+						// format:'jpg'   //format: (String 类型 )压缩转换后的图片格式
+					}, (event) => {
+						console.log('压缩后图片信息:' + JSON.stringify(event)); 
+						//返回压缩后的图片路径
+						callback(event.target);
+					}, function(err) {
+						 console.log('Resolve file URL failed: ' + err.message);
+					});
+				} else { //else小于500kb跳过压缩，直接返回现有的src
+					callback(img);
+					
+				}
+			});
+		}, (e) => { // 返回错误信息
+			 console.log('Resolve file URL failed: ' + e.message);
+		});
+	
+}
+/**
+ * H5端图片压缩
+ *  参数说明：
+ *  imgSrc 图片url
+ *  scale缩放比例 0-1
+ *  type 返回图片类型  默认blob 
+ *  callback 回调设置返回值 
+*/
+export function translate(imgSrc, scale, type , callback) {
+	var img = new Image();
+	img.src = imgSrc;
+	img.onload = function() {
+		var that = this;
+		var h = that.height; // 默认按比例压缩
+		var w = that.width;
+		var canvas = document.createElement('canvas');
+		var ctx = canvas.getContext('2d');
+		var width = document.createAttribute("width");
+		width.nodeValue = w;
+		var height = document.createAttribute("height");
+		height.nodeValue = h;
+		canvas.setAttributeNode(width);
+		canvas.setAttributeNode(height);
+		ctx.drawImage(that, 0, 0, w,h);
+		var base64 = canvas.toDataURL('image/jpeg', scale);//压缩比例
+		canvas = null;
+		if(type == 'base64'){
+			callback(base64);
+		}else{
+			var blob = base64ToBlob(base64); 
+			var blobUrl = window.URL.createObjectURL(blob);//blob地址
+			callback(blobUrl);
+		}
+	}
+}
+// base转Blob
+export function base64ToBlob(base64) { 
+	var arr = base64.split(','),
+		mime = arr[0].match(/:(.*?);/)[1],
+		bstr = atob(arr[1]),
+		n = bstr.length,
+		u8arr = new Uint8Array(n);
+	while (n--) {
+		u8arr[n] = bstr.charCodeAt(n);
+	}
+	return new Blob([u8arr], {
+		type: mime
+	});
+}
+ 
+ 

utils/request.js

@@ -55,6 +55,13 @@ export default {
 					}
 				}
 				uni.hideLoading();
+			}).catch(data =>{
+				uni.showToast({
+					icon: 'none',
+					title: "服务器错误",
+					duration: 5000
+				});
+				uni.hideLoading();
 			});
 		});
 	},