From 74988a80bf582f7fdb844a6d4c3b74aefef5bc40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sat, 10 Aug 2024 17:44:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8A=E7=BA=BF=E8=B4=A2=E5=AF=8C?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Analyses/BbsUserAnalyseService.cs | 17 ++++++---- Yi.Bbs.Vue3/src/components/AvatarInfo.vue | 32 +++++++++---------- .../activity/components/ActivityNav.vue | 8 ++--- Yi.Bbs.Vue3/src/views/home/Index.vue | 8 ++--- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs index 1865860e..63588b25 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs @@ -34,13 +34,13 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses /// /// [HttpGet("analyse/bbs-user/register")] - public async Task> GetRegisterAsync([FromQuery] PagedResultRequestDto input) + public async Task> GetRegisterAsync() { using (DataFilter.DisablePermissionHandler()) { var users = await _bbsUserManager._userRepository._DbQueryable - .Where(u=>u.CreationTime>=DateTime.Now.AddMonths(-3)) + .Where(u => u.CreationTime >= DateTime.Now.AddMonths(-3)) .LeftJoin((u, info) => u.Id == info.UserId) .Select((u, info) => new BbsUserGetListOutputDto() { @@ -52,7 +52,6 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses Experience = info.Experience, CreationTime = u.CreationTime }) - .ToListAsync(); var minCreateUser = users.MinBy(x => x.CreationTime); @@ -84,11 +83,15 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses /// 财富排行榜 /// /// - [HttpGet("analyse/bbs-user/money-top")] - public async Task> GetMoneyTopAsync([FromQuery] PagedResultRequestDto input) + [HttpGet("analyse/bbs-user/money-top/{userId?}")] + public async Task> GetMoneyTopAsync([FromQuery] PagedResultRequestDto input, + [FromRoute] Guid? userId) { using (DataFilter.DisablePermissionHandler()) { + var pageIndex = input.SkipCount; + + RefAsync total = 0; var output = await _bbsUserManager._userRepository._DbQueryable .LeftJoin((u, info) => u.Id == info.UserId) @@ -102,10 +105,10 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses Icon = u.Icon, Level = info.Level, UserLimit = info.UserLimit, - Order = SqlFunc.RowNumber(u.Id) + Order = SqlFunc.RowNumber(SqlFunc.Desc(info.Money)) } ) - .ToPageListAsync(input.SkipCount, input.MaxResultCount, total); + .ToPageListAsync(pageIndex, input.MaxResultCount, total); output.ForEach(x => { x.LevelName = _bbsUserManager._levelCacheDic[x.Level].Name; }); return new PagedResultDto diff --git a/Yi.Bbs.Vue3/src/components/AvatarInfo.vue b/Yi.Bbs.Vue3/src/components/AvatarInfo.vue index 8c2db951..86ee167a 100644 --- a/Yi.Bbs.Vue3/src/components/AvatarInfo.vue +++ b/Yi.Bbs.Vue3/src/components/AvatarInfo.vue @@ -12,14 +12,13 @@
{{ userInfo.nick }}
- {{ userInfo.level }}-{{userInfo.levelName}} 等级 + {{ userInfo.level + }}-{{ userInfo.levelName }} 等级
- - + +
{{ props.time }}
@@ -32,13 +31,7 @@ V8 核心 - 关注 + 关注 @@ -71,7 +64,7 @@ const userInfo = reactive({ id: "", level: "", userLimit: "", - userName:"" + userName: "" }); const iconUrl = ref("/acquiesce.png"); const iconUrlHandler = (icon) => { @@ -109,11 +102,11 @@ const Init = () => { userInfo.nick = props.userInfo.nick; userInfo.role = props.userInfo.role; userInfo.id = props.userInfo.id; - userInfo.money=props.userInfo.money; + userInfo.money = props.userInfo.money; userInfo.level = props.userInfo.level; userInfo.userLimit = props.userInfo.userLimit; - userInfo.userName= props.userInfo.userName; - userInfo.levelName= props.userInfo.levelName; + userInfo.userName = props.userInfo.userName; + userInfo.levelName = props.userInfo.levelName; iconUrl.value = iconUrlHandler(userInfo.icon); } @@ -154,6 +147,7 @@ const Init = () => { display: flex; justify-content: space-between; align-items: center; + } .avatar-left, @@ -161,15 +155,18 @@ const Init = () => { display: flex; justify-content: space-between; align-items: center; + .content { margin-left: 10px; } + .nick { display: flex; align-items: center; justify-content: space-between; font-weight: bold; - > div { + + >div { margin-right: 10px; } } @@ -179,6 +176,7 @@ const Init = () => { display: flex; flex: 2; } + .el-avatar { margin-right: 1rem; --el-avatar-bg-color: none; diff --git a/Yi.Bbs.Vue3/src/layout/activity/components/ActivityNav.vue b/Yi.Bbs.Vue3/src/layout/activity/components/ActivityNav.vue index 280a2ec7..d4fe25db 100644 --- a/Yi.Bbs.Vue3/src/layout/activity/components/ActivityNav.vue +++ b/Yi.Bbs.Vue3/src/layout/activity/components/ActivityNav.vue @@ -26,14 +26,14 @@ - + 银行 - + - + - 娱乐城(暂未开放) + 排行榜 diff --git a/Yi.Bbs.Vue3/src/views/home/Index.vue b/Yi.Bbs.Vue3/src/views/home/Index.vue index 188812de..b330ab05 100644 --- a/Yi.Bbs.Vue3/src/views/home/Index.vue +++ b/Yi.Bbs.Vue3/src/views/home/Index.vue @@ -103,10 +103,10 @@ - + - + @@ -241,10 +241,10 @@ const activeList = [ { name: "签到", path: "/activity/sign", icon: "Present" }, { name: "等级", path: "/activity/level", icon: "Ticket" }, { name: "大转盘", path: "/activity/lucky", icon: "Sunny" }, - { name: "银行", path: "/activity/bank", icon: "Money" }, + { name: "银行", path: "/activity/bank", icon: "CreditCard" }, { name: "任务", path: "/activity/sign", icon: "Memo" }, - { name: "娱乐城", path: "/activity/sign", icon: "Sunrise" }, + { name: "排行榜", path: "/activity/money", icon: "Money" }, { name: "开始", path: "/start", icon: "Position" }, { name: "聊天室", path: "/chat", icon: "ChatRound" }, ];