diff --git a/zdxt-modules/zdxt-enforcement-code-common/pom.xml b/zdxt-modules/zdxt-enforcement-code-common/pom.xml index 3f27d084..77c65c7b 100644 --- a/zdxt-modules/zdxt-enforcement-code-common/pom.xml +++ b/zdxt-modules/zdxt-enforcement-code-common/pom.xml @@ -6,7 +6,7 @@ org.dromara zdxt-modules - 5.6.0 + ${revision} zdxt-enforcement-code-common @@ -140,11 +140,5 @@ org.springframework spring-test - - org.springframework - spring-test - - - diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue index 65e86fde..511029d9 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue @@ -210,10 +210,8 @@ const onFileSelected = async (event) => { const openWxScan = () => { let fullUrl = window.location.href; - // let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state=')); - let code = "http"; - // let paramUrl = window.location.href.split("#")[0]; - let paramUrl = "http://jdm.szssfj.cn/enforce/scanQrCode"; + let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state=')); + let paramUrl = window.location.href.split("#")[0]; let param = {code: code, url: paramUrl}; szyptGetToken(param, success => { let resMsg = success.data; @@ -308,7 +306,7 @@ const handleScanResult = (resultStr) => { // 将企业信息存入 sessionStorage,预览页直接使用,无需再调接口 sessionStorage.setItem('enterpriseScanData', JSON.stringify(data)); // 跳转企业详情预览页,携带执法类型参数和企业编号 - router.push({ + router.push({ path: '/enforcement/enterpriseScanPreview', query: { type: enforceType, enterpriseNumber: data.enterpriseNumber } }); @@ -423,7 +421,7 @@ const selectEnterprise = (item) => { showSearchModal.value = false; router.push({ path: '/enforcement/enterpriseScanPreview', - query: { + query: { enterpriseNumber: item.enterpriseNumber, type: enforceType }