|
|
|
@ -114,9 +114,12 @@ let html5QrCode = null; |
|
|
|
* 点击扫码入口 |
|
|
|
*/ |
|
|
|
const toScanPageView = () => { |
|
|
|
console.log("appEnv: ", appEnv); |
|
|
|
if (appEnv === 'dev') { |
|
|
|
console.log("dev----------------------<") |
|
|
|
openHtml5QrcodeScanner(); |
|
|
|
} else { |
|
|
|
console.log("pro----------------------<") |
|
|
|
openWxScan(); |
|
|
|
} |
|
|
|
}; |
|
|
|
@ -247,24 +250,18 @@ const ClickScan = () => { |
|
|
|
needResult: 1, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果, |
|
|
|
scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码,默认二者都有 |
|
|
|
success: (res) => { |
|
|
|
// 页面跳转 |
|
|
|
console.log("=========== 扫码返回 ===========") |
|
|
|
console.log(res) |
|
|
|
if(isHttpLink(res.resultStr)){ |
|
|
|
handleScanResult(res.resultStr); |
|
|
|
}else{ |
|
|
|
showFailToast("该二维码不正确"); |
|
|
|
} |
|
|
|
}, |
|
|
|
error: function(res) { |
|
|
|
console.log("错误回调",res) |
|
|
|
if (res.errMsg.indexOf('function_not_exist') > 0) { |
|
|
|
showFailToast('版本过低请升级') |
|
|
|
} |
|
|
|
}, |
|
|
|
cancel: (res) => { |
|
|
|
console.log('err', res); |
|
|
|
}, |
|
|
|
// 页面跳转 |
|
|
|
console.log("=========== 扫码返回 ===========", res) |
|
|
|
}, |
|
|
|
error: function(res) { |
|
|
|
console.log("错误回调",res) |
|
|
|
if (res.errMsg.indexOf('function_not_exist') > 0) { |
|
|
|
showFailToast('版本过低请升级') |
|
|
|
} |
|
|
|
}, |
|
|
|
cancel: (res) => { |
|
|
|
console.log('err', res); |
|
|
|
}, |
|
|
|
}); |
|
|
|
}; |
|
|
|
|
|
|
|
@ -325,6 +322,7 @@ const isHttpLink = (url) => { |
|
|
|
return url.indexOf('http://') === 0 || url.indexOf('https://') === 0; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
// ========== 手动搜索企业弹窗 ========== |
|
|
|
const showSearchModal = ref(false); |
|
|
|
const selectedReason = ref(-1); // 默认未选中,字典加载后设置 |
|
|
|
|