Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side

# Conflicts:
#	wuye-manager-uniapp/pages/index/index.vue

wuye-manager-uniapp/pages/index/index.vue

@@ -156,7 +156,7 @@
 
 <script setup>
 import { ref } from 'vue'
-import { onLoad, onUnload ,onShow} from '@dcloudio/uni-app'
+import { onLoad, onUnload, onShow } from '@dcloudio/uni-app'
 import {
   getCurrentVillage,
   getTodayInspection,
@@ -215,7 +215,7 @@ const goToMyTicket = () => {
 // 跳转到 今日巡检
 const goToDaysInspection = () => {
   uni.navigateTo({
-    url: '/pageSubPack/inspection/toDays_inscpection'
+    url: '/pageSubPack/inspection/toDays_inscpection?type=0'
   })
 }
 // 跳转到 巡检记录
@@ -305,10 +305,12 @@ const slelctHomeData = data => {
   getNoticeData()
   getInspectionData()
 }
+
 onShow(()=>{
    getbannarData()
    getInspectionData()
    currentVillageData()
+
 })
 
 onLoad(() => {