diff --git a/src/views/enforce/comprehensiveAnalysis.vue b/src/views/enforce/comprehensiveAnalysis.vue
index beadc5d..eee817c 100644
--- a/src/views/enforce/comprehensiveAnalysis.vue
+++ b/src/views/enforce/comprehensiveAnalysis.vue
@@ -184,7 +184,6 @@ const data = reactive({
     huanPercentage: 0,
     huanPercentageStr: "-",
     uniteTotal: 0,
-    authTotal: 0,
     evaluateTotal: 0,
     complaintTotal: 0,
     lawEnforceCategoryList:[],
@@ -238,7 +237,11 @@ const getWhole = () => {
       if (success.authTotal == null || success.authTotal == 0) {
         data.whole.authTotal = "-";
       } else {
-        data.whole.authTotal = success.authTotal;
+        if (data.submitData.searchType == 'user') {
+          data.whole.authTotal = "-";
+        } else {
+          data.whole.authTotal = success.authTotal;
+        }
       }
       if (success.noticeTotal == null || success.noticeTotal == 0) {
         data.whole.noticeTotal = "-";
diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue
index 77da779..b560f0b 100644
--- a/src/views/enforce/noScanFilter.vue
+++ b/src/views/enforce/noScanFilter.vue
@@ -36,7 +36,7 @@
 
       <div class="search-result">
         <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-          <van-list v-model:loading="data.loading" :finished="data.finished" finished-text="请输入关键字精确搜索" @load="onLoad">
+          <van-list v-model:loading="data.loading" :finished="data.finished" :finished-text="data.hasDates" @load="onLoad">
             <div class="case-item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item)">
               <span class="company-code"><img :src="item.qrCodeUrl"></span>
               <div class="case-title">{{ item.enterpriseName }}</div>
@@ -46,7 +46,7 @@
             </div>
           </van-list>
         </van-pull-refresh>
-          <div class="link-box"><h5>非深圳市注册企业</h5><span @click="toRegister">市外注册企业信息录入<van-icon name="arrow" /></span></div>
+          <div class="link-box" v-if="!data.loading"><h5>非深圳市注册企业</h5><span @click="toRegister">市外注册企业信息录入<van-icon name="arrow" /></span></div>
       </div>
     </div>
   </div>
@@ -87,6 +87,7 @@ const props = defineProps( {
     finished: false,
     refreshing: false,
     curPage: 1,
+    hasDates: '',
   });
   const dataList =  ref([]);
   const loading = ref(false);
@@ -130,12 +131,10 @@ const props = defineProps( {
       queryEnterpriseInfoListAndQrInfo(searchParam, success => {
         data.curPage++;
         data.loading = false;   // 查出结果停止加载
-        console.log('>>>>>>>>>>>>>>>>>>: ', dataList.value.length)
         if (success.total <= dataList.value.length) {
-          
-        console.log('>>>>>>>>卡住了?>>>>>>>>>>: ')
             // 查到最后没数据
             data.finished = true;
+            if(dataList.value.length < 1) {data.hasDates = "请输入关键字精确搜索"}
             return;
         }
         for (let index = 0; index < success.rows.length; index++) {
@@ -144,6 +143,7 @@ const props = defineProps( {
         }
         // this.dataList = success.data
         dataList.value.push(...success.rows);
+        if(dataList.value.length > 0) {data.hasDates = ""}
       }, error => {
       })
     }
@@ -165,11 +165,13 @@ const props = defineProps( {
         data.curPage = 1;
       // 清空列表数据
       dataList.value =  [];
-      finished.value = false;
+      // finished.value = false;
+      data.finished = false
 
       // 重新加载数据
       // 将 loading 设置为 true，表示处于加载状态
-      loading.value = true;
+      // loading.value = true;
+      data.loading = true;
       onLoad();
     }
     // 触底加载
diff --git a/src/views/enterprise/companyFilter.vue b/src/views/enterprise/companyFilter.vue
index 859f46f..44d19f9 100644
--- a/src/views/enterprise/companyFilter.vue
+++ b/src/views/enterprise/companyFilter.vue
@@ -15,7 +15,7 @@
 
             <div class="search-result">
                 <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-                    <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+                    <van-list v-model:loading="loading" :finished="finished" :finished-text="hasDates" @load="onLoad">
                         <div class="case-item" v-for="(item, index) in dataList" :key="index" @click="selectData(item)">
                             <span class="company-code"><img :src="item.qrCodeUrl"></span>
                             <div class="case-title">{{ item.enterpriseName }}</div>
@@ -62,6 +62,7 @@
                 finished: false,
                 refreshing: false,
                 curPage: 1,
+                hasDates: '',
                 router: useRouter()
             }
         },
@@ -92,6 +93,7 @@
                     if (success.total <= this.dataList.length) {
                         // 查到最后没数据
                         this.finished = true;
+                        if(this.dataList.length < 1) {this.hasDates = "请输入关键字精确搜索"}
                         return;
                     }
                     for (let index = 0; index < success.rows.length; index++) {
@@ -100,6 +102,7 @@
                     }
                     // this.dataList = success.data
                     this.dataList.push(...success.rows);
+                    if(this.dataList.length > 0) {this.hasDates = ""}
                 }, error => {
                 })
             },
diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index 8707b70..4843d6d 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -253,7 +253,8 @@ import { da } from 'date-fns/locale';
     // 全部选项选择完毕后，会触发 finish 事件
     const onFinish = ({ selectedOptions }) => {
         data.showRegionCascade = false;
-        data.cascaderValue = selectedOptions.map((option) => option.text).join('')
+        var areaTmp = selectedOptions.map((option) => option.text).join('')
+        data.cascaderValue = areaTmp.replace("暂不选择街道", "");
     };
 
     const showItemPopup=(ind)=>{
diff --git a/src/views/non-law/noScanFilter.vue b/src/views/non-law/noScanFilter.vue
index ac53242..6c3f708 100644
--- a/src/views/non-law/noScanFilter.vue
+++ b/src/views/non-law/noScanFilter.vue
@@ -36,7 +36,7 @@
 
       <div class="search-result">
         <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-          <van-list v-model:loading="data.loading" :finished="data.finished" finished-text="请输入关键字精确搜索" @load="onLoad">
+          <van-list v-model:loading="data.loading" :finished="data.finished" :finished-text="data.hasDates" @load="onLoad">
             <div class="case-item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item)">
               <span class="company-code"><img :src="item.qrCodeUrl"></span>
               <div class="case-title">{{ item.enterpriseName }}</div>
@@ -87,6 +87,7 @@ const props = defineProps( {
     finished: false,
     refreshing: false,
     curPage: 1,
+    hasDates: '',
   });
   const dataList =  ref([]);
   const loading = ref(false);
@@ -132,6 +133,7 @@ const props = defineProps( {
         if (success.total <= dataList.value.length) {
             // 查到最后没数据
             data.finished = true;
+            if(dataList.value.length < 1) {data.hasDates = "请输入关键字精确搜索"}
             return;
         }
         for (let index = 0; index < success.rows.length; index++) {
@@ -140,6 +142,7 @@ const props = defineProps( {
         }
         // this.dataList = success.data
         dataList.value.push(...success.rows);
+        if(dataList.value.length > 0) {data.hasDates = ""}
       }, error => {
       })
     }
@@ -161,11 +164,13 @@ const props = defineProps( {
         data.curPage = 1;
       // 清空列表数据
       dataList.value =  [];
-      finished.value = false;
+      // finished.value = false;
+      data.finished = false
 
       // 重新加载数据
       // 将 loading 设置为 true，表示处于加载状态
-      loading.value = true;
+      // loading.value = true;
+      data.loading = true;
       onLoad();
     }
     // 触底加载