diff --git a/manifest.json b/manifest.json
index 06bc8fb..b1187c2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -87,12 +87,12 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/app" : {
-                    "target" : "http://192.168.100.108:8088", //目标接口域名http://192.168.1.16:8012
+                    "target" : "http://127.0.0.1:8008", //目标接口域名http://192.168.1.16:8012
                     "changeOrigin" : true, //是否跨域
                     "secure" : true // 设置支持https协议的代理
                 },
                 "/callComponent" : {
-                    "target" : "http://192.168.100.108:8088", //目标接口域名http://192.168.1.16:8012
+                    "target" : "http://127.0.0.1:8008", //目标接口域名http://192.168.1.16:8012
                     "changeOrigin" : true, //是否跨域
                     "secure" : true // 设置支持https协议的代理
                 }
diff --git a/pages/excuteOneInspection/excuteOneInspection.vue b/pages/excuteOneInspection/excuteOneInspection.vue
index 0dca91f..40e5fff 100644
--- a/pages/excuteOneInspection/excuteOneInspection.vue
+++ b/pages/excuteOneInspection/excuteOneInspection.vue
@@ -98,7 +98,8 @@
 					imgTitle: '巡检图片',
 					canEdit: true
 				},
-				sourceType: ['camera']
+				sourceType: ['camera'],
+				fromPage:''
 			}
 		},
 
@@ -128,6 +129,7 @@
 			this.inspectionId = option.inspectionId;
 			this.inspectionName = option.inspectionName;
 			this.itemId = option.itemId;
+			this.fromPage = option.fromPage
 
 			this.communityId = getCurrentCommunity().communityId;
 			let _userInfo = this.java110Context.getUserInfo();
@@ -304,6 +306,12 @@
 						success: function(res) {
 							_that.onoff = true;
 							if (res.statusCode == 200) {
+								if(_that.fromPage == 'QrCode'){
+									uni.navigateTo({
+										url:'/pages/inspection/inspection'
+									});
+									return;
+								}
 								uni.navigateBack({
 									delta: 1
 								})
diff --git a/pages/excuteOneQrCodeInspection/excuteOneQrCodeInspection.vue b/pages/excuteOneQrCodeInspection/excuteOneQrCodeInspection.vue
index bced969..8e6855f 100644
--- a/pages/excuteOneQrCodeInspection/excuteOneQrCodeInspection.vue
+++ b/pages/excuteOneQrCodeInspection/excuteOneQrCodeInspection.vue
@@ -73,7 +73,7 @@
 							url: '/pages/excuteOneInspection/excuteOneInspection?taskDetailId=' +
 								_item.taskDetailId + "&taskId=" + _item.taskId +
 								"&inspectionId=" + _that.inspectionId + "&inspectionName=" + _that
-								.inspectionName + "&itemId=" + _that.itemId
+								.inspectionName + "&itemId=" + _that.itemId+"&fromPage=QrCode"
 						});
 
 					}