From 8ddcd81c8393fb574bfb2cd172dfbe772a84bee9 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 16 Apr 2024 14:46:19 +0800
Subject: [PATCH] 更新
---
subPackage/grid/comprehensive.vue | 2 +-
pages/home/index.vue | 8 ++++----
subPackage/house/member/householdLabel.vue | 12 +++++++++---
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index c776cb5..148dc59 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -820,12 +820,12 @@
},
//初始化
- init() {
+ async init() {
this.selectRole = uni.getStorageSync("activeRole")
- this.getMenuList()
- this.getBanner();
this.getSiteList()
- this.getNoticeList()
+ await this.getMenuList()
+ await this.getBanner();
+ await this.getNoticeList()
// this.getTaskCount();
},
diff --git a/subPackage/grid/comprehensive.vue b/subPackage/grid/comprehensive.vue
index e706fb9..2720d19 100644
--- a/subPackage/grid/comprehensive.vue
+++ b/subPackage/grid/comprehensive.vue
@@ -18,7 +18,7 @@
<view class="detail bgc-ff">
<caption-row title="网格基本情况" />
<view class="detail-content f-28">
- <text v-for="i in houseList" v-if="i.aoiName">{{i.aoiName?i.aoiName:''}} {{i.buildingName}} </text>
+ <text v-for="i in houseList" v-if="i.aoiName">{{i.aoiName?i.aoiName:''}} {{i.buildingName|| ""}} </text>
</view>
</view>
diff --git a/subPackage/house/member/householdLabel.vue b/subPackage/house/member/householdLabel.vue
index 8ed330d..e2b1649 100644
--- a/subPackage/house/member/householdLabel.vue
+++ b/subPackage/house/member/householdLabel.vue
@@ -24,8 +24,8 @@
<view v-for="(item, index) in labelBtnList" :key="index" class="label-crad">
<newBoxTitle :title="item.name"></newBoxTitle>
<block v-if="item.children[0].children.length">
- <u-collapse accordion :border="false" v-for="(c, k) in item.children" :key="k">
- <u-collapse-item :title="c.name">
+ <u-collapse accordion :border="false">
+ <u-collapse-item :title="c.name" v-for="(c, k) in item.children" :key="k">
<view class="label-btn-box">
<view v-for="(i, f) in c.children" :key="f">
<u-button size="mini" type="primary" :color="$setLabelColor(i.color)"
@@ -203,7 +203,13 @@
// 将细类放到一起
this.labelBtnList.forEach(e => {
e.children.forEach(f => {
- labelChildAll.push(f)
+ if (e.children.length) {
+ f.children.forEach(k => {
+ labelChildAll.push(k)
+ })
+ } else {
+ labelChildAll.push(f)
+ }
})
})
--
Gitblit v1.9.3