From e8f957f3441b99a5813182a6719616dfa999a50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Thu, 15 Aug 2024 21:38:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8A=E7=BA=BF=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Managers/BankManager.cs                        |  2 +-
 .../src/layout/activity/components/ActivityNav.vue |  4 ++--
 .../views/assignment/components/AssignmentCard.vue | 14 +++++++-------
 Yi.Bbs.Vue3/src/views/home/Index.vue               |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs
index 142eed73..800b828a 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs
@@ -15,7 +15,7 @@ namespace Yi.Framework.Bbs.Domain.Managers
     /// </summary>
     public class BankManager : DomainService
     {
-        private const decimal DefalutRate = 1.3m;
+        private const decimal DefalutRate = 1.2m;
         private ISqlSugarRepository<BankCardAggregateRoot> _repository;
         private ILocalEventBus _localEventBus;
         private ISqlSugarRepository<InterestRecordsAggregateRoot> _interestRepository;
diff --git a/Yi.Bbs.Vue3/src/layout/activity/components/ActivityNav.vue b/Yi.Bbs.Vue3/src/layout/activity/components/ActivityNav.vue
index 2e099297..fc254fda 100644
--- a/Yi.Bbs.Vue3/src/layout/activity/components/ActivityNav.vue
+++ b/Yi.Bbs.Vue3/src/layout/activity/components/ActivityNav.vue
@@ -16,9 +16,9 @@
       <el-icon>
         <Memo />
       </el-icon>
-      <span>任务列表(暂未开放)</span>
+      <span>任务列表</span>
     </el-menu-item>
-    <el-menu-item index="4" :route="{ path: '/activity/lucky' }">
+    <el-menu-item index="4" :route="{ path: '/activity/assignment' }">
       <el-icon>
         <HelpFilled />
       </el-icon>
diff --git a/Yi.Bbs.Vue3/src/views/assignment/components/AssignmentCard.vue b/Yi.Bbs.Vue3/src/views/assignment/components/AssignmentCard.vue
index bfbf5246..dc474e13 100644
--- a/Yi.Bbs.Vue3/src/views/assignment/components/AssignmentCard.vue
+++ b/Yi.Bbs.Vue3/src/views/assignment/components/AssignmentCard.vue
@@ -15,9 +15,9 @@ watch(() => props.data, (n, o) => {
 
 //任务类型
 const assignmentTypeEnum = {
-  "Daily": "每日任务",
-  "Weekly": "每周任务",
-  "Novice": "新手任务"
+  "Daily": {name:"每日任务",backgroundColor:"#fff"},
+  "Weekly":{name:"每周任务",backgroundColor:"#fff"} ,
+  "Novice": {name:"新手任务",backgroundColor:"#fff"}
 }
 const computedAssignmentState = computed(() => {
 
@@ -39,7 +39,7 @@ const btnAssignmentStateEnum = {
 <template>
   <div class="card-box">
     <div class="left">
-      <div class="left-type">{{ assignmentTypeEnum[cardData.assignmentType] }}</div>
+      <div class="left-type" :style="{backgroundColor:assignmentTypeEnum[cardData.assignmentType].backgroundColor}">{{ assignmentTypeEnum[cardData.assignmentType].name }}</div>
       <div class="content">
         <div class="content-title">
         <h2>{{ cardData.name }}</h2>
@@ -50,8 +50,7 @@ const btnAssignmentStateEnum = {
             :text-inside="true"
             :stroke-width="20"
             :percentage=" Math.round((cardData.currentStepNumber/cardData.totalStepNumber)*100)"
-            striped
-            striped-flow
+
             status="success"
         />
        <span>{{cardData.currentStepNumber}}/{{cardData.totalStepNumber}}</span>
@@ -63,7 +62,8 @@ const btnAssignmentStateEnum = {
 
     <div class="right">
       <div class="right-btn">
-        <h5>过期时间：{{ cardData.expireTime ==null? "无限制": dayjs(cardData.expireTime).format('YYYY年M月D日') }}</h5>
+       
+        <h5> {{cardData.expireTime ==null?"":"过期时间:"+dayjs(cardData.expireTime).format('YYYY年M月D日')}}</h5>
        <h5>奖励：<span style="color: #FF0000;font-weight: bolder ">{{cardData.rewardsMoneyNumber}}</span> 钱钱</h5>
         <el-button @click="onClick()" :disabled="computedAssignmentState.isDisabled" :type="computedAssignmentState.backgroundColor">
           {{ computedAssignmentState.name }}
diff --git a/Yi.Bbs.Vue3/src/views/home/Index.vue b/Yi.Bbs.Vue3/src/views/home/Index.vue
index 1c276fe2..bff31b08 100644
--- a/Yi.Bbs.Vue3/src/views/home/Index.vue
+++ b/Yi.Bbs.Vue3/src/views/home/Index.vue
@@ -248,7 +248,7 @@ const activeList = [
   {name: "大转盘", path: "/activity/lucky", icon: "Sunny"},
   {name: "银行", path: "/activity/bank", icon: "CreditCard"},
 
-  {name: "任务", path: "/activity/sign", icon: "Memo"},
+  {name: "任务", path: "/activity/assignment", icon: "Memo"},
   {name: "排行榜", path: "/money", icon: "Money"},
   {name: "开始", path: "/start", icon: "Position"},
   {name: "聊天室", path: "/chat", icon: "ChatRound"},