From b906e3e8a24544358207a02c7fc05605041dbd73 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Tue, 3 Dec 2024 11:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=89=AB=E6=8F=8F=E8=90=A5?=
 =?UTF-8?q?=E4=B8=9A=E6=89=A7=E7=85=A7=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/http/index.js                   | 11 ++++++++++-
 src/views/enforce/qrCodeLoading.vue |  3 ++-
 src/views/enforce/scanQrCode.vue    |  9 +++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/http/index.js b/src/http/index.js
index 97e1016..5a42cb6 100644
--- a/src/http/index.js
+++ b/src/http/index.js
@@ -29,11 +29,20 @@ const _delete = (url, params, success, error) => {
 const _form = (url, params, success, error) => {
   return request("FORM", url, params, success, error);
 };
+const  isHttpLink = (url) =>{
+  return url.indexOf("http://") === 0 || url.indexOf("https://") === 0;
+}
 
 function request(type, url, params, success, error) {
+  var targetUrl = "";
+  if(isHttpLink(url)){
+     targetUrl = url
+  }else{
+    targetUrl = baseUrl + url
+  }
   let config = {
     method: type,
-    url: baseUrl + url,
+    url: targetUrl,
     data: params,
   };
   if (type == "GET") {
diff --git a/src/views/enforce/qrCodeLoading.vue b/src/views/enforce/qrCodeLoading.vue
index 0ca5bc1..c7a478c 100644
--- a/src/views/enforce/qrCodeLoading.vue
+++ b/src/views/enforce/qrCodeLoading.vue
@@ -32,7 +32,7 @@
     const intervalId = ref(null);
     const data = reactive({
       showNoScanPicker: ref(false),
-      qrCodeImg: baseUrl + "/profile/upload/2024/11/29/03043b8531b8e1aad5a0f72d2fc605f0.jpg",
+      qrCodeImg: "",
     });
     const indexSens = ref(3);
     const butText = ref("点击跳转企业画像....,"+indexSens.value+"秒后自动跳转");
@@ -146,6 +146,7 @@
         startTimer(route?.query?.enterpriseNumber);
         console.log("企业统一信用代码：",route?.query?.enterpriseNumber)
         console.log("企业二维码地址：",route?.query?.qrCodeUrl)
+        data.qrCodeImg = baseUrl + route?.query?.qrCodeUrl;
     })
     //定时器
     const startTimer = (enterpriseNumber) => {
diff --git a/src/views/enforce/scanQrCode.vue b/src/views/enforce/scanQrCode.vue
index 80031b4..00ec54b 100644
--- a/src/views/enforce/scanQrCode.vue
+++ b/src/views/enforce/scanQrCode.vue
@@ -52,7 +52,6 @@
 
 
               <div class="record">如遇网络异常、设备故障无法登录系统的情况，<a @click="toSign">补录 >></a></div>
-              <div class="record"><a @click="toQrView">二维码 >></a></div>
         </div>
                              <!-- <div class="recommend_box">
                                <van-cell :border="false" title="推荐" />
@@ -182,9 +181,9 @@
                             //   onClose: openEnterpriseView(element.enterpriseNumber)
                             // })
                             //跳转企业二维码中间页面
-                            // toQrView(element.qrCodeGenerateHistory.qrCodeUrl,element.enterpriseNumber)
+                            toQrView(element.enterpriseNumber,element.qrCodeGenerateHistory.qrCodeUrl)
                             //测试
-                            toQrView("/profile/upload/2024/11/29/03043b8531b8e1aad5a0f72d2fc605f0.jpg","91440300769156389U");
+                            // toQrView("/profile/upload/2024/11/29/03043b8531b8e1aad5a0f72d2fc605f0.jpg","91440300769156389U");
                         } else {
                             showFailToast(success.message);
                             router.push({
@@ -264,7 +263,7 @@
     };
 
     onMounted(() => {
-        new Vconsole();
+        // new Vconsole();
     })
 
     // 返回
@@ -287,8 +286,6 @@
     };
     
     const toQrView = (enterpriseNumber,qrCodeUrl) => {
-      // qrCodeUrl = "/profile/upload/2024/11/29/03043b8531b8e1aad5a0f72d2fc605f0.jpg";
-      // enterpriseNumber = "91440300769156389U";
       router.push({
         path: "/qrCodeLoading",
         query: {