diff --git a/.hbuilderx/debug.config.json b/.hbuilderx/debug.config.json
new file mode 100644
index 00000000..2d620d9f
--- /dev/null
+++ b/.hbuilderx/debug.config.json
@@ -0,0 +1,4 @@
+{
+    "rootPathIndex": 1,
+    "webRoot": "${projectDir}"
+}
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 582561b0..6b10e906 100644
--- a/.hbuilderx/launch.json
+++ b/.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"
+        },
+        {
+            "openVueDevtools" : true,
+            "type" : "uni-app:h5"
+        }
     ]
 }
diff --git a/src/main.js b/src/main.js
index 7e00e72f..2058bfd2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,7 +34,7 @@ export function createApp() {
 	app.use(uView)
 	app.component('comMessage', comMessage)
 	console.log("网络22请求")
-	startApp(app);
+	// startApp(app);
 	return {
 		app,
 	};
@@ -57,10 +57,10 @@ export function startApp(app) {
 				// getApp().globalData.feed_configList = res.data.feed_configList;
 				// getApp().globalData.isDevelopment = res.data.baseInfo.isDevelopment.value
 				// Vue.prototype.$dev_url = res.data.baseInfo.dev.value;
-				console.log("网络",res.data.baseInfo.request_url.value)
-				console.log("开发环境12",res.data.baseInfo.isDevelopment.value)
-				uni.setStorageSync("request_url",res.data.baseInfo.request_url.value)
-				uni.setStorageSync("isDevelopment",res.data.baseInfo.isDevelopment.value)
+				// console.log("网络",res.data.baseInfo.request_url.value)
+				// console.log("开发环境12",res.data.baseInfo.isDevelopment.value)
+				// uni.setStorageSync("request_url",res.data.baseInfo.request_url.value)
+				// uni.setStorageSync("isDevelopment",res.data.baseInfo.isDevelopment.value)
 			}
 		},
 		fail: (error) => {
diff --git a/src/manifest.json b/src/manifest.json
index 47a05797..949117c2 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -20,7 +20,11 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Bluetooth" : {},
+            "Barcode" : {},
+            "Camera" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -42,7 +46,8 @@
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "minSdkVersion" : 23
             },
             /* ios打包配置 */
             "ios" : {
diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue
index c7577781..1144cd7f 100644
--- a/src/mycomponents/scan/winComScan.vue
+++ b/src/mycomponents/scan/winComScan.vue
@@ -7,7 +7,7 @@
 				<view class="conbox">
 					<textarea v-model="scanMsg" trim="all" maxlength="1000" style="margin-left: 5px;width: 90%;"
 						:focus="boxfocus" :placeholder="placeholderValue" @focus="getfocus" @blur="losefocus"
-						@input="handelScanMsg" :cursor="cursorIndex"></textarea>
+						@input="handelScanMsg" :cursor="cursorIndex" ></textarea>
 				</view>
 
 				<view class="uni-flex uni-row space-between u-col-center">
@@ -63,8 +63,7 @@
 	export default {
 		name: "winComScan",
 		emits: ["getResult"],
-		components: {
-		},
+		components: {},
 		props: {
 			placeholder: {
 				type: String,
@@ -101,12 +100,34 @@
 			}
 		},
 		mounted() {
-			//#ifndef APP-PLUS
+
+			// #ifdef H5
 			if (document.querySelector('textarea') != null) {
 				document.querySelector('textarea').setAttribute('inputmode', 'none')
 			}
-			//#endif
+			// #endif 
+			// #ifdef APP-PLUS
+			// 
+			// uni.onKeyboardHeightChange(res => {
+			//   console.log(res.height)
+			//   if(res.height>0){
+			// 	  // uni.hideKeyboard();
+			// 	  plus.key.hideSoftKeybord();
+			//   }
+			// })
+			// 
+			// uni.onWindowResize((res) => {
+			// 	plus.key.hideSoftKeybord()
+			// })
+			// plus.key.hideSoftKeybord();
+			// setInterval(function(){
+			// 	plus.key.hideSoftKeybord();
+			//         // uni.hideKeyboard();//隐藏软键盘
+			//         // plus.key.hideSoftKeybord();
+			//     },60);
 			
+			// #endif 
+
 			// if (this.$el.querySelector('textarea') != null) {
 			// 	this.$el.querySelector('textarea').setAttribute('inputmode', 'none')
 			// }
@@ -120,6 +141,17 @@
 			this.placeholderValue = '请扫描' + this.placeholder;
 		},
 		methods: {
+			hide() {
+				// 只是解决软键盘的闪现
+				var interval = setInterval(function() {
+					uni.hideKeyboard(); //隐藏软键盘
+					console.log('刷新')
+				}, 60);
+				setTimeout(() => {
+					clearInterval(interval);
+					console.log('停止刷新')
+				}, 2000);
+			},
 			getValue() {
 				return this.scanMsg
 			},
@@ -151,7 +183,7 @@
 							that.getfocus();
 							this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
 								if (res) {
-									that.scanMsg=""
+									that.scanMsg = ""
 									that.getfocus();
 								}
 							})
@@ -241,4 +273,4 @@
 
 <style scoped lang="scss">
 
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 15073162..84edfb09 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -333,6 +333,13 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/inspect/job/inspectFullDetail",
+			"style": {
+				"navigationBarTitleText": "全检检验详情",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path": "pages/putaway/job/putawayJob",
 			"style": {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e255d99e..d6a4889b 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -123,6 +123,7 @@
 			if (uni.getStorageSync("hasLogin")) {
 				this.getMenuItemTop()
 			}
+			
 
 		},
 		onHide() {
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 0223ec7b..4a9ffd22 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -146,7 +146,6 @@
 
 		},
 		onLoad() {
-
 			getCaptchaImage().then(res => {
 				if (res) {
 					var code = res.data.img;