From 55e00580d852ce826f706a276ef1501428f5fcbc Mon Sep 17 00:00:00 2001
From: "1960116313@qq.com" <1960116313@qq.com>
Date: Fri, 26 Jan 2024 17:15:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AppTaskMenuList/index.vue      |  3 +-
 src/components/AppUserInfo/index.vue          | 33 +++++++++++++++++--
 src/store/moules/userStore/index.d.ts         |  6 ++++
 src/utils/axios/index.ts                      |  2 +-
 src/views/task/components/BasicTask/index.vue | 12 +++++--
 src/views/task/components/DailyTask/index.vue |  7 +++-
 .../task/components/NoviceTask/index.vue      |  7 +++-
 src/views/task/components/TaskList/index.vue  |  8 ++++-
 src/views/task/index.vue                      | 12 ++++---
 9 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/src/components/AppTaskMenuList/index.vue b/src/components/AppTaskMenuList/index.vue
index 052ea65..029ab38 100644
--- a/src/components/AppTaskMenuList/index.vue
+++ b/src/components/AppTaskMenuList/index.vue
@@ -5,6 +5,7 @@ import { computed, inject, ref } from 'vue'
 import type { Task } from './index.d'
 import { useTaskListStore } from '@/store/moules/taskListStore'
 
+const emits = defineEmits(['select'])
 const taskListStore = useTaskListStore()
 const sectionRefs = inject<Task<ComponentPublicInstance>>('sectionRefs')
 const taskContainer = inject<Ref<HTMLElement>>('taskContainer')
@@ -35,7 +36,7 @@ const list = computed(() => [
 // 切换任务
 function handleClick(index: number, task: string) {
   activeIndex.value = index
-
+  emits('select', task)
   if (!sectionRefs) {
     return
   }
diff --git a/src/components/AppUserInfo/index.vue b/src/components/AppUserInfo/index.vue
index 93a3637..c3d1251 100644
--- a/src/components/AppUserInfo/index.vue
+++ b/src/components/AppUserInfo/index.vue
@@ -1,6 +1,6 @@
 <!-- 子菜单与内容容器布局组件 -->
 <script setup lang="ts">
-import { Divider } from 'ant-design-vue'
+import { Divider, Popover } from 'ant-design-vue'
 
 import { computed } from 'vue'
 import money from '@/assets/images/money.png'
@@ -33,7 +33,35 @@ function separator(num: number | string) {
         </div>
       </div>
       <div class="num">
-        {{ (info?.totalPoints ?? 0) > 0 ? separator(info?.totalPoints as number) : 0 }}
+        <Popover placement="top" trigger="hover">
+          <template #title>
+            <span> 当前套餐：{{ info?.goodsName }}</span>
+          </template>
+          <template #content>
+            <div class="meal flex justify-between p-t-10px">
+              <div>GPT3.5版本</div>
+              <div>{{ separator(info?.gpt35Num as number) }}条</div>
+            </div>
+            <div class="meal flex justify-between p-t-10px">
+              <div>GPT4.0版本</div>
+              <div>{{ separator(info?.gpt40Num as number) }}条</div>
+            </div>
+            <div class="meal flex justify-between p-t-10px">
+              <div>AI绘图</div>
+              <div>{{ separator(info?.pictureNum as number) }}幅</div>
+            </div>
+
+            <div class="meal flex justify-between p-t-10px">
+              <div>图片分析</div>
+              <div>{{ separator(info?.imageAnalysisNum as number) }}次</div>
+            </div>
+            <div class="meal flex justify-between p-t-10px">
+              <div>知识库</div>
+              <div>{{ separator(info?.knowledgeBaseNum as string) }}</div>
+            </div>
+          </template>
+          {{ (info?.totalPoints ?? 0) > 0 ? separator(info?.totalPoints as number) : 0 }}
+        </Popover>
       </div>
       <div class="pay" @click="handleRecharge">
         充值
@@ -100,6 +128,7 @@ function separator(num: number | string) {
       font-weight: normal;
       color: #000000;
       line-height: 21px;
+      cursor: pointer;
     }
     .pay {
       width: 45px;
diff --git a/src/store/moules/userStore/index.d.ts b/src/store/moules/userStore/index.d.ts
index b78ec36..3ca74f6 100644
--- a/src/store/moules/userStore/index.d.ts
+++ b/src/store/moules/userStore/index.d.ts
@@ -24,4 +24,10 @@ export interface ChatInfoType {
   createdDay: number
   newUserFlag: boolean
   inviteCode: string
+  goodsName: string
+  gpt35Num: number
+  gpt40Num: number
+  pictureNum: number
+  imageAnalysisNum: number
+  knowledgeBaseNum: string
 }
diff --git a/src/utils/axios/index.ts b/src/utils/axios/index.ts
index b7ba283..b1f0445 100644
--- a/src/utils/axios/index.ts
+++ b/src/utils/axios/index.ts
@@ -231,7 +231,7 @@ const transform: AxiosTransform = {
   responseInterceptorsCatch: (axiosInstance: AxiosInstance, error: any) => {
     const { response, code, message, config } = error || {}
     const errorMessageMode = config?.requestOptions?.errorMessageMode || 'none'
-    const msg: string = response?.data?.msg ?? ''
+    const msg: string = response?.data?.msg || response?.data?.error_description
     const err: string = error?.toString?.() ?? ''
     let errMessage = ''
 
diff --git a/src/views/task/components/BasicTask/index.vue b/src/views/task/components/BasicTask/index.vue
index ecb6a76..c2faf2d 100644
--- a/src/views/task/components/BasicTask/index.vue
+++ b/src/views/task/components/BasicTask/index.vue
@@ -13,9 +13,13 @@ import receive from '@/assets/images/task/ylq.png'
 import unclaimed from '@/assets/images/task/dlq.png'
 import { useUserStore } from '@/store/moules/userStore/index'
 
+const { active } = defineProps({
+  active: {
+    type: Boolean,
+  },
+})
 const userStore = useUserStore()
 const taskListStore = useTaskListStore()
-
 // 历史弹窗布尔
 const visible = ref<boolean>(false)
 // 签到数据
@@ -75,7 +79,7 @@ function handleInvite() {
 
 <template>
   <div class="basic-task-box">
-    <div class="title">
+    <div class="title" :class="{ 'slant-shadow': active }">
       基础任务
     </div>
     <div class="contant flex flex-row">
@@ -470,4 +474,8 @@ function handleInvite() {
     }
   }
 }
+
+.slant-shadow {
+  color: #000000;
+}
 </style>
diff --git a/src/views/task/components/DailyTask/index.vue b/src/views/task/components/DailyTask/index.vue
index 5b2cc31..611c17d 100644
--- a/src/views/task/components/DailyTask/index.vue
+++ b/src/views/task/components/DailyTask/index.vue
@@ -5,6 +5,11 @@ import type { TaskType } from '../TaskList/index.d'
 import { dailyTask } from '@/api/task/index'
 import { useTaskListStore } from '@/store/moules/taskListStore'
 
+const { active } = defineProps({
+  active: {
+    type: Boolean,
+  },
+})
 const taskListStore = useTaskListStore()
 const totalScore = ref(0)
 const list = ref<TaskType[]>([])
@@ -24,7 +29,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <TaskList title="每日任务" :list="list" :total-score="totalScore" :finished-task-count="finishedTaskCount" @update-list="getTaskList()" />
+  <TaskList title="每日任务" :active="active" :list="list" :total-score="totalScore" :finished-task-count="finishedTaskCount" @update-list="getTaskList()" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/task/components/NoviceTask/index.vue b/src/views/task/components/NoviceTask/index.vue
index fdaf589..ff72455 100644
--- a/src/views/task/components/NoviceTask/index.vue
+++ b/src/views/task/components/NoviceTask/index.vue
@@ -5,6 +5,11 @@ import type { TaskType } from '../TaskList/index.d'
 import { noviceTask } from '@/api/task/index'
 import { useTaskListStore } from '@/store/moules/taskListStore'
 
+const { active } = defineProps({
+  active: {
+    type: Boolean,
+  },
+})
 const taskListStore = useTaskListStore()
 const totalScore = ref(0)
 const list = ref<TaskType[]>([])
@@ -23,7 +28,7 @@ onBeforeMount(() => {
 </script>
 
 <template>
-  <TaskList v-if="list" title="新手任务" :list="list" :total-score="totalScore" :finished-task-count="finishedTaskCount" @update-list="getTaskList()" />
+  <TaskList title="新手任务" :active="active" :list="list" :total-score="totalScore" :finished-task-count="finishedTaskCount" @update-list="getTaskList()" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/task/components/TaskList/index.vue b/src/views/task/components/TaskList/index.vue
index ad602a1..56dd13e 100644
--- a/src/views/task/components/TaskList/index.vue
+++ b/src/views/task/components/TaskList/index.vue
@@ -25,6 +25,9 @@ const props = defineProps({
     type: Array as PropType<TaskType[]>,
     default: (): TaskType[] => [], // 默认空数组 [],
   },
+  active: {
+    type: Boolean,
+  },
 })
 const emit = defineEmits(['updateList'])
 const reactiveList: ComputedRef<TaskType[]> = computed(() => props.list)
@@ -59,7 +62,7 @@ const dynamicStyle = computed(() => {
 
 <template>
   <div class="nvoice-task-box">
-    <div class="title">
+    <div class="title" :class="{ 'slant-shadow': active }">
       {{ title }}
     </div>
     <div class="nvoice-contant">
@@ -257,4 +260,7 @@ const dynamicStyle = computed(() => {
     }
   }
 }
+.slant-shadow {
+  color: #000000;
+}
 </style>
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index 9d4906e..22258a8 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -19,21 +19,23 @@ const task4 = ref<Ref<ComponentPublicInstance> | null>(null)
 const sectionRefs = { task1, task2, task3, task4 }
 provide('sectionRefs', sectionRefs)
 provide('taskContainer', taskContainer)
+
+const selected = ref('task1')
 </script>
 
 <template>
   <AppContainerBox>
     <template #subMenu>
       <AppSubMenuTitle title="任务中心"></AppSubMenuTitle>
-      <AppTaskMenuList></AppTaskMenuList>
+      <AppTaskMenuList @select="selected = $event"></AppTaskMenuList>
       <AppUserInfo />
     </template>
     <template #content>
       <div ref="taskContainer" class="w-full h-full overflow-auto">
-        <BasicTask ref="task1" />
-        <NoviceTask ref="task2" />
-        <DailyTask ref="task3" />
-        <!-- <OtherTask ref="task4" /> -->
+        <BasicTask ref="task1" :active="selected === 'task1'" />
+        <NoviceTask ref="task2" :active="selected === 'task2'" />
+        <DailyTask ref="task3" :active="selected === 'task3'" />
+        <!-- <OtherTask ref="task4" :active="selected === 'task4'" /> -->
       </div>
     </template>
   </AppContainerBox>