From 24e5f5a0101544b73710c08a70a396fcf10feb69 Mon Sep 17 00:00:00 2001 From: 18631081161 <2088094923@qq.com> Date: Sun, 8 Feb 2026 14:31:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A8=E8=8D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniapp/components/UserCard/index.vue | 16 ++++++++++------ miniapp/config/index.js | 2 +- miniapp/pages/index/index.vue | 5 +++++ miniapp/pages/mine/index.vue | 6 +++--- .../XiangYi.AppApi/Controllers/UserController.cs | 2 ++ .../Interfaces/IMemberService.cs | 2 +- .../Services/RecommendService.cs | 4 ++-- .../Services/MemberServicePropertyTests.cs | 2 +- 8 files changed, 25 insertions(+), 14 deletions(-) diff --git a/miniapp/components/UserCard/index.vue b/miniapp/components/UserCard/index.vue index f115691..58cbf44 100644 --- a/miniapp/components/UserCard/index.vue +++ b/miniapp/components/UserCard/index.vue @@ -265,15 +265,19 @@ // 今天看过标签 .viewed-tag { position: absolute; - top: 24rpx; - right: 24rpx; - background: #ff6b6b; - padding: 8rpx 20rpx; - border-radius: 20rpx; + top: 0; + right: 0; + background: rgba(255, 180, 180, 0.65); + padding: 15rpx 24rpx; + border-radius: 0 24rpx 0 24rpx; + display: flex; + align-items: center; + justify-content: center; text { color: #fff; - font-size: 24rpx; + font-size: 22rpx; + line-height: 1; } } diff --git a/miniapp/config/index.js b/miniapp/config/index.js index 6bdbd8d..7794e45 100644 --- a/miniapp/config/index.js +++ b/miniapp/config/index.js @@ -23,7 +23,7 @@ const ENV = { } // 当前环境 - 开发时使用 development，打包时改为 production -const CURRENT_ENV = 'production' +const CURRENT_ENV = 'development' // 导出配置 export const config = { diff --git a/miniapp/pages/index/index.vue b/miniapp/pages/index/index.vue index 53dcade..1fb8a68 100644 --- a/miniapp/pages/index/index.vue +++ b/miniapp/pages/index/index.vue @@ -703,6 +703,11 @@ export default { * @param {number} userId - 用户 ID */ const handleUserClick = (userId) => { + // 本地标记该用户为已查看，返回首页时显示"今天看过"标签 + const user = recommendList.value.find(item => item.userId === userId) + if (user) { + user.viewedToday = true + } navigateToPage(`/pages/profile/detail?userId=${userId}`) } diff --git a/miniapp/pages/mine/index.vue b/miniapp/pages/mine/index.vue index 7515cc5..d4948c2 100644 --- a/miniapp/pages/mine/index.vue +++ b/miniapp/pages/mine/index.vue @@ -29,7 +29,7 @@ - 已绑定的用户（{{ familyMembers.length }}/3） + 已绑定的用户（{{ familyMembers.length }}/2） @@ -392,8 +392,8 @@ export default { return } - if (familyMembers.value.length >= 3) { - uni.showToast({ title: '最多绑定3位家庭成员', icon: 'none' }) + if (familyMembers.value.length >= 2) { + uni.showToast({ title: '最多绑定2位家庭成员', icon: 'none' }) return } diff --git a/server/src/XiangYi.AppApi/Controllers/UserController.cs b/server/src/XiangYi.AppApi/Controllers/UserController.cs index 0f5fd3a..9f37a4e 100644 --- a/server/src/XiangYi.AppApi/Controllers/UserController.cs +++ b/server/src/XiangYi.AppApi/Controllers/UserController.cs @@ -76,6 +76,8 @@ public class UserController : ControllerBase if (currentUserId > 0 && currentUserId != request.UserId) { await _interactService.RecordViewAsync(currentUserId, request.UserId); + // 标记推荐列表中该用户为已查看，首页显示"今天看过"标签 + await _recommendService.MarkAsViewedAsync(currentUserId, request.UserId); } // 获取用户资料 diff --git a/server/src/XiangYi.Application/Interfaces/IMemberService.cs b/server/src/XiangYi.Application/Interfaces/IMemberService.cs index 81613d1..44555e8 100644 --- a/server/src/XiangYi.Application/Interfaces/IMemberService.cs +++ b/server/src/XiangYi.Application/Interfaces/IMemberService.cs @@ -89,5 +89,5 @@ public interface IMemberService /// /// 家庭版最大绑定数量（不含主账号） /// - const int MaxFamilyBindCount = 3; + const int MaxFamilyBindCount = 2; } diff --git a/server/src/XiangYi.Application/Services/RecommendService.cs b/server/src/XiangYi.Application/Services/RecommendService.cs index 528a14d..715d2f6 100644 --- a/server/src/XiangYi.Application/Services/RecommendService.cs +++ b/server/src/XiangYi.Application/Services/RecommendService.cs @@ -357,7 +357,7 @@ public class RecommendService : IRecommendService 0 => NormalUserRecommendCount, // 普通用户：10人 1 => UnlimitedMemberRecommendCount, // 不限时会员：24人 2 => _random.Next(SincereMemberMinRecommendCount, SincereMemberMaxRecommendCount + 1), // 诚意会员：24-29人 - 3 => FamilyMemberRecommendCount, // 家庭版会员：24人 + 3 => _random.Next(SincereMemberMinRecommendCount, SincereMemberMaxRecommendCount + 1), // 家庭版会员：24-29人 4 => UnlimitedMemberRecommendCount, // 限时会员：24人 _ => NormalUserRecommendCount }; @@ -373,7 +373,7 @@ public class RecommendService : IRecommendService 0 => (NormalUserRecommendCount, NormalUserRecommendCount), 1 => (UnlimitedMemberRecommendCount, UnlimitedMemberRecommendCount), 2 => (SincereMemberMinRecommendCount, SincereMemberMaxRecommendCount), - 3 => (FamilyMemberRecommendCount, FamilyMemberRecommendCount), + 3 => (SincereMemberMinRecommendCount, SincereMemberMaxRecommendCount), 4 => (UnlimitedMemberRecommendCount, UnlimitedMemberRecommendCount), _ => (NormalUserRecommendCount, NormalUserRecommendCount) }; diff --git a/server/tests/XiangYi.Application.Tests/Services/MemberServicePropertyTests.cs b/server/tests/XiangYi.Application.Tests/Services/MemberServicePropertyTests.cs index e45e855..86c711c 100644 --- a/server/tests/XiangYi.Application.Tests/Services/MemberServicePropertyTests.cs +++ b/server/tests/XiangYi.Application.Tests/Services/MemberServicePropertyTests.cs @@ -159,7 +159,7 @@ public class FamilyBindLimitPropertyTests [Fact] public void FamilyBind_MaxBindCount_ShouldBeThree() { - Assert.Equal(3, IMemberService.MaxFamilyBindCount); + Assert.Equal(2, IMemberService.MaxFamilyBindCount); } ///