From b72adf9a7a0034c2ad3b418d94b7ce678e801096 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Fri, 20 Sep 2024 09:49:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=B1=95=E7=A4=BA=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enforce/noScanFilter.vue     | 13 +++++++++----
 src/views/enterprise/companyFilter.vue | 10 +++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue
index 0aee8f8..48ac8a9 100644
--- a/src/views/enforce/noScanFilter.vue
+++ b/src/views/enforce/noScanFilter.vue
@@ -38,7 +38,7 @@
         <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
           <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
             <div class="case-item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item)">
-              <span class="company-code"><img src="../../assets/images/code-ex.jpg"></span>
+              <span class="company-code"><img :src="item.qrCodeUrl"></span>
               <div class="case-title">{{ item.enterpriseName }}</div>
               <!-- <div class="case-depart">{{ item.phonenumber }}</div>
               <div class="case-time">{{ item.loginName }}</div> -->
@@ -54,8 +54,9 @@
 <script setup>
 import {ref,defineEmits,getCurrentInstance,defineProps } from 'vue';
 // import {queryUsers} from '../../api/user'
-import {queryEnterpriseInfoList} from '@/api/enterprise'
+import {queryEnterpriseInfoList,queryEnterpriseInfoListAndQrInfo} from '@/api/enterprise'
 import {getDict} from "@/api/Home";
+import {baseUrl} from "@/config/env";
 const {useCommon} = $globalStore;
 //子组件调用父组件方法
 const emits = defineEmits(['reciveData','close']);
@@ -113,7 +114,7 @@ const props = defineProps( {
     }
     const queryList = () =>{
       searchParam.pageNum = (curPage.value-1)*searchParam.pageSize;
-      queryEnterpriseInfoList(searchParam, success => {
+      queryEnterpriseInfoListAndQrInfo(searchParam, success => {
         curPage.value++;
         loading.value = false;   // 查出结果停止加载
         if (success.total <= dataList.value.length) {
@@ -121,6 +122,10 @@ const props = defineProps( {
           finished.value = true;
           return;
         }
+        for (let index = 0; index < success.rows.length; index++) {
+          const element = success.rows[index];
+          element.qrCodeUrl = baseUrl + element.qrCodeUrl
+        }
         // this.dataList = success.data
         dataList.value.push(...success.rows);
       }, error => {
@@ -132,7 +137,7 @@ const props = defineProps( {
       onRefresh();
     }
     const cancel = () =>{
-      searchParam.enterpriseName = '';
+      searchParam.searchValue = '';
       search()
     }
     const selectData = (item) =>{
diff --git a/src/views/enterprise/companyFilter.vue b/src/views/enterprise/companyFilter.vue
index a186636..ebae3ea 100644
--- a/src/views/enterprise/companyFilter.vue
+++ b/src/views/enterprise/companyFilter.vue
@@ -17,7 +17,7 @@
                 <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
                     <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
                         <div class="case-item" v-for="(item, index) in dataList" :key="index" @click="selectData(item)">
-                            <span class="company-code"><img src="../../assets/images/code-ex.jpg"></span>
+                            <span class="company-code"><img :src="item.qrCodeUrl"></span>
                             <div class="case-title">{{ item.enterpriseName }}</div>
                             <!-- <div class="case-depart">{{ item.phonenumber }}</div>
                             <div class="case-time">{{ item.loginName }}</div> -->
@@ -32,7 +32,7 @@
 <script>
     import {ref} from 'vue'
     // import {queryUsers} from '../../api/user'
-    import {queryEnterpriseInfoList} from '../../api/enterprise'
+    import {queryEnterpriseInfoList,queryEnterpriseInfoListAndQrInfo} from '@/api/enterprise'
 
     const {useCommon} = $globalStore
     export default {
@@ -83,7 +83,7 @@
             },
             queryList() {
                 this.searchParam.pageNum = (this.curPage-1)*this.searchParam.pageSize;
-                queryEnterpriseInfoList(this.searchParam, success => {
+                queryEnterpriseInfoListAndQrInfo(this.searchParam, success => {
                     this.curPage++;
                     this.loading = false;   // 查出结果停止加载
                     if (success.total <= this.dataList.length) {
@@ -91,6 +91,10 @@
                         this.finished = true;
                         return;
                     }
+                    for (let index = 0; index < success.rows.length; index++) {
+                      const element = success.rows[index];
+                      element.qrCodeUrl = baseUrl + element.qrCodeUrl
+                    }
                     // this.dataList = success.data
                     this.dataList.push(...success.rows);
                 }, error => {