Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/dash/compoents/notice.vue

src/views/dash/compoents/agency.vue

@@ -1,13 +1,7 @@
 <template>
   <div class="full-width flex flex-col">
     <div class="bold font-16 full-width text-left">{{ title }}</div>
-    <div class="flex flex-center flex-justify-between mt-15" v-for="item in 6">
-      <div>hhhhhhhhhhhhhhhhhhhhhhh dddddddfghjj</div>
-      <div class="flex flex-center">
-        <span class="mr-20 grey-9 font-13">2023-09-23 12:34</span>
-        <div class="read">已读</div>
-      </div>
-    </div>
+    <el-empty class="padding-bottom" description="暂无数据"></el-empty>
   </div>
 </template>
 

src/views/dash/compoents/notice.vue

@@ -36,7 +36,7 @@ export default {
     }
   },
   mounted() {
-    this.setInTime = setInterval(this.showMarquee, 3000)
+    this.setInTime = setInterval(this.showMarquee, 5000)
   },
   unmounted() {
     clearInterval(this.setInTime) // 页面销毁时清除定时器

src/views/dash/index.vue

@@ -31,9 +31,9 @@
         <agency :type="2" />
       </el-card>
     </div>
-    <el-card :shadow="hover" class="mt-20">
-      <read />
-    </el-card>
+    <!--    <el-card :shadow="hover" class="mt-20">-->
+    <!--      <read />-->
+    <!--    </el-card>-->
   </div>
 </template>