From b613bb368d4e678b42d25e94397d0aab3e213438 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 25 二月 2026 09:41:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mini-program/pages/community/community.vue |   70 ++++++++++++++++++++++++++++++-----
 1 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/mini-program/pages/community/community.vue b/mini-program/pages/community/community.vue
index 9e1b9da..aa72118 100644
--- a/mini-program/pages/community/community.vue
+++ b/mini-program/pages/community/community.vue
@@ -9,7 +9,7 @@
 			</view>
 			<view class="search">
 				<u-search placeholder="璇疯緭鍏ュ叧閿瘝" height="36" searchIconColor="#999999" borderColor="#eeeeee"
-					bgColor="rgba(255,255,255,0.9)" :showAction="false" v-model="info" />
+					bgColor="rgba(255,255,255,0.9)" :showAction="false" v-model="info" @search="search" @clear="search" />
 				<view class="search-shai" @click="show = true">
 					<text>绛涢��</text>
 					<image src="/static/icon/ic_shaixuan@2x.png" mode="widthFix"></image>
@@ -38,22 +38,20 @@
 				<view class="sear-item">
 					<view class="sear-item-label">鍒嗙被</view>
 					<view class="sear-item-list">
-						<view class="sear-item-list-item active">缁翠慨</view>
-						<view class="sear-item-list-item">淇濆吇</view>
+						<view :class="item.active ? 'sear-item-list-item active' : 'sear-item-list-item'" v-for="(item, index) in fenlei" :key="item.id" @click="sele(index, 1)">{{item.name}}</view>
 						<view style="width: 216rpx; height: 0;"></view>
 					</view>
 				</view>
 				<view class="sear-item">
 					<view class="sear-item-label">鎵�灞炲搧鐗�</view>
 					<view class="sear-item-list">
-						<view class="sear-item-list-item active">鍝佺墝鍚嶇О</view>
-						<view class="sear-item-list-item">鍝佺墝鍚嶇О</view>
+						<view :class="item.active ? 'sear-item-list-item active' : 'sear-item-list-item'" v-for="(item, index) in pinpai" :key="item.id" @click="sele(index, 2)">{{item.name}}</view>
 						<view style="width: 216rpx; height: 0;"></view>
 					</view>
 				</view>
 				<view class="sear-footer">
-					<view class="sear-footer-btn1">閲嶇疆</view>
-					<view class="sear-footer-btn2">纭</view>
+					<view class="sear-footer-btn1" @click="reset">閲嶇疆</view>
+					<view class="sear-footer-btn2" @click="search">纭</view>
 				</view>
 			</view>
 		</u-popup>
@@ -72,16 +70,68 @@
 				info: '',
 				page: 1,
 				next: true,
-				list: []
+				list: [],
+				fenlei: [],
+				pinpai: []
 			};
 		},
 		onLoad() {
 			this.getList()
+			this.getCategary()
 		},
 		onReachBottom() {
 			this.getList()
 		},
 		methods: {
+			reset() {
+				this.page = 1
+				this.next = true
+				this.list = []
+				this.fenlei.forEach(item => { item.active = false })
+				this.pinpai.forEach(item => { item.active = false })
+				this.show = false
+				this.getList()
+			},
+			search() {
+				this.page = 1
+				this.next = true
+				this.list = []
+				this.show = false
+				this.getList()
+			},
+			sele(index, type) {
+				if (type === 1) {
+					this.fenlei.forEach((item, i) => {
+						item.active = index === i
+					})
+				} else {
+					this.pinpai.forEach((item, i) => {
+						item.active = index === i
+					})
+				}
+			},
+			getCategary() {
+				this.$u.api.getGoodsLabelsByType({
+					type: 0
+				}).then(res => {
+					if (res.code === 200) {
+						res.data.forEach(item => {
+							item.active = false
+						})
+						this.fenlei = res.data
+					}
+				})
+				this.$u.api.getGoodsLabelsByType({
+					type: 1
+				}).then(res => {
+					if (res.code === 200) {
+						res.data.forEach(item => {
+							item.active = false
+						})
+						this.pinpai = res.data
+					}
+				})
+			},
 			jump(id) {
 				uni.navigateTo({
 					url: '/pages/article-details/article-details?id=' + id
@@ -94,8 +144,8 @@
 					page: this.page,
 					model: {
 						info: this.info,
-						brandId: '',
-						labelId: ''
+						brandId: this.pinpai.filter(item => item.active).length > 0 ? this.pinpai.filter(item => item.active)[0].id : null,
+						labelId: this.fenlei.filter(item => item.active).length > 0 ? this.fenlei.filter(item => item.active)[0].id : null
 					}
 				}).then(res => {
 					if (res.code === 200) {

--
Gitblit v1.9.3