From d155bc8ed197339e70dc18b34ea62bd62e133200 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Mon, 15 Apr 2024 17:55:04 +0800
Subject: [PATCH] 更新

---
 common/setting.js                          |    4 ++--
 subPackage/house/member/householdLabel.vue |   28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/setting.js b/common/setting.js
index d954d12..1d2fd98 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -10,8 +10,8 @@
 	version: '2.0.0',
 	// 开发环境接口Url
 	// devUrl: 'http://z4042833u6.wicp.vip',
-	devUrl: 'http://192.168.2.111:9528',
-	// devUrl: 'https://srgdjczzxtpt.com:2080/api',
+	// devUrl: 'http://192.168.2.111:9528',
+	devUrl: 'https://srgdjczzxtpt.com:2080/api',
 	// devUrl: 'https://kt39592615.goho.co',
 	minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
 	// minioBaseUrl: "http://192.168.0.101:9528/",
diff --git a/subPackage/house/member/householdLabel.vue b/subPackage/house/member/householdLabel.vue
index d70c892..8ed330d 100644
--- a/subPackage/house/member/householdLabel.vue
+++ b/subPackage/house/member/householdLabel.vue
@@ -23,26 +23,26 @@
 				</view>
 				<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">
-							<view class="label-btn-box">
-								<view v-for="(i, k) in c.children" :key="k">
-									<u-button size="mini" type="primary" :color="$setLabelColor(i.color)"
-										:style="{color: $setLabelColor(i.color) && '#fff'}" :text="i.name"
-										@click="showLabelPopup(i,index,k)"></u-button>
+					<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">
+								<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)"
+											:style="{color: $setLabelColor(i.color) && '#fff'}" :text="i.name"
+											@click="showLabelPopup(i,index,f)"></u-button>
+									</view>
 								</view>
-							</view>
-						</u-collapse-item>
-					</u-collapse>
-					<!-- </block> -->
-					<!-- <view class="label-btn-box" v-else>
+							</u-collapse-item>
+						</u-collapse>
+					</block>
+					<view class="label-btn-box" v-else>
 						<view v-for="(item, k) in item.children" :key="k">
 							<u-button size="mini" type="primary" :color="$setLabelColor(item.color)"
 								:style="{color: $setLabelColor(item.color) && '#fff'}" :text="item.name"
 								@click="showLabelPopup(item,index,k)"></u-button>
 						</view>
-					</view> -->
+					</view>
 				</view>
 			</view>
 		</view>

--
Gitblit v1.9.3