Browse Source

扫码返回了 . 后面要咋弄不知道了 .

dev
蟑螂恶霸 1 month ago
parent
commit
f1b450e988
  1. 2
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java
  2. 1
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue
  3. 12
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue
  4. 2
      zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHome.vue

2
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;
}
}

1
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();

12
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();
}
};
@ -248,13 +251,7 @@ const ClickScan = () => {
scanType: ['qrCode', 'barCode'], //
success: (res) => {
//
console.log("=========== 扫码返回 ===========")
console.log(res)
if(isHttpLink(res.resultStr)){
handleScanResult(res.resultStr);
}else{
showFailToast("该二维码不正确");
}
console.log("=========== 扫码返回 ===========", res)
},
error: function(res) {
console.log("错误回调",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); //

2
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;

Loading…
Cancel
Save