diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index d5dc2743..60bf3fa0 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -63,7 +63,11 @@ } else { wxScan = wxScan.parent.wx; } - wxScan.scanQRCode({ + var result = "1614903417674964992";//当needResult为1时返回处理结果 + var req = {}; + req.qrCode = result; + outboundLogic(req); + /*wxScan.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果, scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有 @@ -82,7 +86,7 @@ } - }); + });*/ }); @@ -321,7 +325,7 @@ shade: 0.2, maxmin: true, shadeClose: true, - area: ['70%', '70%'], + area: ['100%', '100%'], content: '/ScanBarOrQrCodeOut_selectMaterial?pid=' + place.id + '&mcode=' + mcode + '&depositoryId=' + place.did, end: function () { let flagForSelect = layui.$("#flagForSelect").val(); @@ -409,7 +413,7 @@ shade: 0.2, maxmin: true, shadeClose: true, - area: ['70%', '70%'], + area: ['100%', '100%'], content: '/ScanBarOrQrCodeOut_selectMaterial?pid=' + 0 + '&mcode=' + mcode + '&depositoryId=' + depository.id, end: function () { let flagForSelect = layui.$("#flagForSelect").val(); diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html index 2a6bf069..e12326a0 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html @@ -48,37 +48,46 @@ lay-filter="data-search-btn"> 搜 索 + - + + -
- -
-