Merge pull request #861 from LittleFish-233/master

看板娘介绍优先完全匹配，优化广场页面样式
CnGal · Jan 28, 2025 · 18568e4 · 18568e4
2 parents 8d970d3 + 6fe012e
commit 18568e4
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 31 deletions.
diff --git a/CnGalWebSite/CnGalWebSite.APIServer/Controllers/RobotAPIController.cs b/CnGalWebSite/CnGalWebSite.APIServer/Controllers/RobotAPIController.cs
@@ -131,6 +131,7 @@ public async Task<ActionResult<Result>> GetArgValueAsync(GetArgValueModel model)
                     .Where(s => s.IsHidden == false && string.IsNullOrWhiteSpace(s.DisplayName) == false)
                     .Where(s => entryName.Length < 2 ? (s.DisplayName == entryName || s.AnotherName == entryName) : (s.DisplayName.Contains(entryName) || (s.AnotherName != null && s.AnotherName.Contains(entryName))))
                     .Select(s => new { s.Id, s.DisplayName })
+                    .OrderBy(s => s.DisplayName.Length)
                     .FirstOrDefaultAsync();
 
                 if (entry == null)

diff --git a/CnGalWebSite/CnGalWebSite.Shared.Component/Tags/TagChildEntryInforTip.razor b/CnGalWebSite/CnGalWebSite.Shared.Component/Tags/TagChildEntryInforTip.razor
@@ -5,7 +5,7 @@
             <img class="img-fluid" src="@Model.MainImage" alt="@Model.Name">
         </div>
         <div class="pa-3">
-            <div class="name text-truncate-1 title-large mb-1">@Model.Name</div>
+            <div class="name text-truncate-1 title-medium mb-1">@Model.Name</div>
             <div class="brief text-truncate-3 label-large">@Model.BriefIntroduction</div>
         </div>
     }
@@ -16,7 +16,7 @@
                 <img class="img-fluid" src="@Model.MainImage" style=" border-radius: 50%;">
             </div>
             <div class="pt-3">
-                <div class="name text-center text-truncate-1 title-large mb-1">@Model.Name</div>
+                <div class="name text-center text-truncate-1 title-medium mb-1">@Model.Name</div>
                 <div class="brief text-center  text-truncate-3 label-large">@Model.BriefIntroduction</div>
             </div>
         </div>

diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Home/Square/LotteryViewTip.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Home/Square/LotteryViewTip.razor
@@ -5,20 +5,25 @@
         </div>
         <div class="pa-3">
             <header style=" display: flex; align-items: center;" class="mb-2">
-                @if (DateTime.Now.ToCstTime() < Model.BeginTime)
-                {
-                    <CnGalWebSite.Shared.MasaComponent.PC.Home.Cards.Shared.IconChip Text="未开始" />
-                }
-                else if (DateTime.Now.ToCstTime() > Model.EndTime)
-                {
-                    <CnGalWebSite.Shared.MasaComponent.PC.Home.Cards.Shared.IconChip Text="已结束" />
-                }
-                else
-                {
-                    <CnGalWebSite.Shared.MasaComponent.PC.Home.Cards.Shared.IconChip Text="正在进行" />
-                }
-
-                <div class="fw-bold mb-0 text-truncate-2 title-large">@Model.Name</div>
+
+                <div class="text-truncate-2 ">
+
+                    @if (DateTime.Now.ToCstTime() < Model.BeginTime)
+                    {
+                        <span class="type-inline-chip">未开始</span>
+                    }
+                    else if (DateTime.Now.ToCstTime() > Model.EndTime)
+                    {
+                        <span class="type-inline-chip">已结束</span>
+                    }
+                    else
+                    {
+                        <span class="type-inline-chip">正在进行</span>
+                    }
+
+                    <span class="title-medium">@Model.Name</span>
+
+                </div>
             </header>
             <span class=" text-truncate-3 label-large">
                 @Model.BriefIntroduction

diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Home/Square/VoteViewTip.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Home/Square/VoteViewTip.razor
@@ -5,20 +5,24 @@
         </div>
         <div class="pa-3">
             <header style=" display: flex; align-items: center;" class="mb-2">
-                @if (DateTime.Now.ToCstTime() < Model.BeginTime)
-                {
-                    <CnGalWebSite.Shared.MasaComponent.PC.Home.Cards.Shared.IconChip Text="未开始" />
-                }
-                else if (DateTime.Now.ToCstTime() > Model.EndTime)
-                {
-                    <CnGalWebSite.Shared.MasaComponent.PC.Home.Cards.Shared.IconChip Text="已结束" />
-                }
-                else
-                {
-                    <CnGalWebSite.Shared.MasaComponent.PC.Home.Cards.Shared.IconChip Text="正在进行" />
-                }
+                <div class="text-truncate-2 ">
 
-                <div class="fw-bold mb-0 text-truncate-2 title-large">@Model.Name</div>
+                    @if (DateTime.Now.ToCstTime() < Model.BeginTime)
+                    {
+                        <span class="type-inline-chip">未开始</span>
+                    }
+                    else if (DateTime.Now.ToCstTime() > Model.EndTime)
+                    {
+                        <span class="type-inline-chip">已结束</span>
+                    }
+                    else
+                    {
+                        <span class="type-inline-chip">正在进行</span>
+                    }
+
+                    <span class="title-medium">@Model.Name</span>
+
+                </div>
             </header>
             <span class=" text-truncate-3 label-large">
                 @Model.BriefIntroduction

diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Tags/Home/RandomTagViewTip.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Tags/Home/RandomTagViewTip.razor
@@ -6,7 +6,7 @@
                 <img style="width: 300px;height: 140px;" src="@Model.MainImage" alt="@Model.Name">
             </div>
             <div class="pa-3">
-                <div class="name text-truncate-1 title-large mb-1">@Model.Name</div>
+                <div class="name text-truncate-1 title-medium mb-1">@Model.Name</div>
                 <div class="brief text-truncate-3 label-large">@Model.BriefIntroduction</div>
             </div>
         </div>
@@ -19,7 +19,7 @@
                     <img src="@Model.MainImage" style=" border-radius: 50%;width: 80px;height: 80px;">
                 </div>
                 <div class="pt-3">
-                    <div class="name text-center text-truncate-1 title-large mb-1">@Model.Name</div>
+                    <div class="name text-center text-truncate-1 title-medium mb-1">@Model.Name</div>
                     <div class="brief text-center  text-truncate-3 label-large">@Model.BriefIntroduction</div>
                 </div>
             </div>