admingit/PropertyApp
1
0
Fork 0
mirror of https://gitee.com/java110/PropertyApp.git synced 2026-02-23 21:36:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化二维码

Browse Source
This commit is contained in:
java110 2023-08-02 13:06:07 +08:00
parent 1776347723
commit 71ae99dd54
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -87,12 +87,12 @@
"disableHostCheck" : true, "disableHostCheck" : true,
"proxy" : { "proxy" : {
"/app" : { "/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, //是否跨域 "changeOrigin" : true, //是否跨域
"secure" : true // 设置支持https协议的代理 "secure" : true // 设置支持https协议的代理
}, },
"/callComponent" : { "/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, //是否跨域 "changeOrigin" : true, //是否跨域
"secure" : true // 设置支持https协议的代理 "secure" : true // 设置支持https协议的代理
} }

10
pages/excuteOneInspection/excuteOneInspection.vue
View File

@ -98,7 +98,8 @@
imgTitle: '巡检图片', imgTitle: '巡检图片',
canEdit: true canEdit: true
}, },
sourceType: ['camera'] sourceType: ['camera'],
fromPage:''
} }
}, },
@ -128,6 +129,7 @@
this.inspectionId = option.inspectionId; this.inspectionId = option.inspectionId;
this.inspectionName = option.inspectionName; this.inspectionName = option.inspectionName;
this.itemId = option.itemId; this.itemId = option.itemId;
this.fromPage = option.fromPage
this.communityId = getCurrentCommunity().communityId; this.communityId = getCurrentCommunity().communityId;
let _userInfo = this.java110Context.getUserInfo(); let _userInfo = this.java110Context.getUserInfo();
@ -304,6 +306,12 @@
success: function(res) { success: function(res) {
_that.onoff = true; _that.onoff = true;
if (res.statusCode == 200) { if (res.statusCode == 200) {
if(_that.fromPage == 'QrCode'){
uni.navigateTo({
url:'/pages/inspection/inspection'
});
return;
}
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}) })

2
pages/excuteOneQrCodeInspection/excuteOneQrCodeInspection.vue
View File

@ -73,7 +73,7 @@
url: '/pages/excuteOneInspection/excuteOneInspection?taskDetailId=' + url: '/pages/excuteOneInspection/excuteOneInspection?taskDetailId=' +
_item.taskDetailId + "&taskId=" + _item.taskId + _item.taskDetailId + "&taskId=" + _item.taskId +
"&inspectionId=" + _that.inspectionId + "&inspectionName=" + _that "&inspectionId=" + _that.inspectionId + "&inspectionName=" + _that
.inspectionName + "&itemId=" + _that.itemId .inspectionName + "&itemId=" + _that.itemId+"&fromPage=QrCode"
}); });
} }