From b902b40fda2f1dccca0825277d07908119deecfd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 09:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mini-program/pages/community/community.vue |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/mini-program/pages/community/community.vue b/mini-program/pages/community/community.vue
index aa72118..faf1696 100644
--- a/mini-program/pages/community/community.vue
+++ b/mini-program/pages/community/community.vue
@@ -17,13 +17,13 @@
 			</view>
 		</view>
 		<view class="list">
-			<view class="list-item" v-for="(item, index) in list" :key="index" @click="jump(item.id)">
+			<view class="list-item" v-for="(item, index) in list" :key="index" @click="jump(item.id, item.contentType, item.content)">
 				<view class="info">
 					<view class="info-title">{{item.name}}</view>
 					<view class="info-desc" v-if="item.contentInfo">{{item.contentInfo}}</view>
 					<view class="info-data">
-						<view class="tips">{{item.lablesName}}</view>
-						<text>{{item.looknum || 0}} 闃呰锝渰{item.createDate}}</text>
+						<view class="tips" :style="{ border: '1rpx solid' + item.param, color: item.param }">{{item.lablesName}}</view>
+						<text>{{item.looknum > 999 ? '999+' : item.looknum  || 0}} 闃呰锝渰{item.createDate.substring(0, 16)}}</text>
 					</view>
 				</view>
 				<view class="image" v-if="item.imgurlfull">
@@ -132,10 +132,16 @@
 					}
 				})
 			},
-			jump(id) {
-				uni.navigateTo({
-					url: '/pages/article-details/article-details?id=' + id
-				})
+			jump(id, contentType, url) {
+				if (contentType == 0) {
+					uni.navigateTo({
+						url: '/pages/article-details/article-details?id=' + id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pagesA/pages/webview/webview?url=' + url
+					})
+				}
 			},
 			getList() {
 				if (!this.next) return;
@@ -179,7 +185,7 @@
 				width: 100%;
 				display: flex;
 				flex-direction: column;
-				margin-top: 48rpx;
+				margin-top: 28rpx;
 				.sear-item-label {
 					font-weight: 500;
 					font-size: 32rpx;
@@ -205,6 +211,7 @@
 						font-weight: 400;
 						font-size: 28rpx;
 						color: #333333;
+						margin-bottom: 20rpx;
 					}
 				}
 			}
@@ -257,6 +264,10 @@
 					display: flex;
 					flex-direction: column;
 					.info-title {
+						width: calc(100vw - 60rpx - 220rpx);
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
 						font-weight: 600;
 						font-size: 32rpx;
 						color: #222222;
@@ -272,16 +283,20 @@
 						align-items: center;
 						margin-top: 20rpx;
 						.tips {
+							max-width: 110rpx;
 							height: 40rpx;
 							line-height: 40rpx;
+							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							// display: flex;
+							// align-items: center;
+							// justify-content: center;
 							padding: 0 8rpx;
 							box-sizing: border-box;
-							background: rgba(0,183,117,0.1);
 							border-radius: 8rpx;
-							
 							font-weight: 400;
 							font-size: 22rpx;
-							color: #00B775;
 							margin-right: 20rpx;
 						}
 						text {

--
Gitblit v1.9.3