From 87b5269b87c8dedc046088e82f384e0005a41c69 Mon Sep 17 00:00:00 2001 From: zhouyanli <593579392@qq.com> Date: Thu, 4 Jun 2026 17:06:19 +0800 Subject: [PATCH] Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # wuye-manager-uniapp/pages/index/index.vue 解决冲突 --- wuye-manager-uniapp/pages/index/index.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue index 8804788..af9b00d 100644 --- a/wuye-manager-uniapp/pages/index/index.vue +++ b/wuye-manager-uniapp/pages/index/index.vue @@ -305,12 +305,10 @@ const slelctHomeData = data => { getNoticeData() getInspectionData() } - -onShow(()=>{ - getbannarData() - getInspectionData() +onShow(() => { + getbannarData() + getInspectionData() currentVillageData() - }) onLoad(() => {