diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java index 27abdd8c..b17de690 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.*; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -299,4 +298,5 @@ public class AppEnfLoginController extends LoginController { } return null; } + } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue index d8f76775..33293c57 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue @@ -211,6 +211,7 @@ onMounted(() => { // isLoading.value = false; //设置已经初始化 useCommon.SET_IS_FIRST_LOAD(false); + console.log(useCommon) fetchNoticeList(); fetchBannerList(); 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 914ea07e..193bb833 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 @@ -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); // 默认未选中,字典加载后设置 diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHome.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHome.vue index 53dfeaa2..e2691686 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHome.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHome.vue @@ -231,7 +231,7 @@ const hasUserInfo = () => { }; onMounted(() => { - new Vconsolefrom(); + // new Vconsolefrom(); console.log("企业端 Home onMounted"); // new Vconsolefrom(); //debugger;