diff --git a/Yi.Ai.Vue3/src/App.vue b/Yi.Ai.Vue3/src/App.vue index e1bab0c5..ac1b0a53 100644 --- a/Yi.Ai.Vue3/src/App.vue +++ b/Yi.Ai.Vue3/src/App.vue @@ -1,28 +1,58 @@ @@ -86,7 +80,7 @@ function formatTime(time: string) { v-model="isDialogVisible" title="系统公告" :width="dialogWidth" - :close-on-click-modal="false" + :close-on-click-modal="true" class="announcement-dialog" >
@@ -95,61 +89,71 @@ function formatTime(time: string) {
- - - - - - - - -
+
-
-

{{ activity.title }}

- - 进行中 - - - 已结束 - + +
+ + +
+ + 进行中 + + + 已结束 + +
-

{{ activity.description }}

-
+
@@ -158,70 +162,45 @@ function formatTime(time: string) {
- -
-

最新公告

-
-
-

- - - - {{ announcement.title }} -

- {{ formatTime(announcement.publishTime) }} -
-

{{ announcement.content.substring(0, 100) }}...

- - 查看详情 - -
-
- - -
-

历史公告

+ +
-
-

{{ announcement.title }}

-

{{ announcement.content.substring(0, 80) }}...

- - 查看详情 - +
+
+

+ {{ announcement.title }} +

+
+ + +
+

+ {{ line }} +

+
+
- +
diff --git a/Yi.Ai.Vue3/src/components/userPersonalCenter/components/PremiumPackageInfo.vue b/Yi.Ai.Vue3/src/components/userPersonalCenter/components/PremiumPackageInfo.vue new file mode 100644 index 00000000..5dff94eb --- /dev/null +++ b/Yi.Ai.Vue3/src/components/userPersonalCenter/components/PremiumPackageInfo.vue @@ -0,0 +1,590 @@ + + + + + diff --git a/Yi.Ai.Vue3/src/components/userPersonalCenter/components/PremiumService.vue b/Yi.Ai.Vue3/src/components/userPersonalCenter/components/PremiumService.vue index 7032219d..70828b77 100644 --- a/Yi.Ai.Vue3/src/components/userPersonalCenter/components/PremiumService.vue +++ b/Yi.Ai.Vue3/src/components/userPersonalCenter/components/PremiumService.vue @@ -1,7 +1,7 @@ - diff --git a/Yi.Ai.Vue3/src/components/userPersonalCenter/components/PremiumUsageList.vue b/Yi.Ai.Vue3/src/components/userPersonalCenter/components/PremiumUsageList.vue new file mode 100644 index 00000000..f3b21e3a --- /dev/null +++ b/Yi.Ai.Vue3/src/components/userPersonalCenter/components/PremiumUsageList.vue @@ -0,0 +1,948 @@ + + + + + diff --git a/Yi.Ai.Vue3/src/layouts/components/Header/components/AnnouncementBtn.vue b/Yi.Ai.Vue3/src/layouts/components/Header/components/AnnouncementBtn.vue index 5502fddc..37ae05a7 100644 --- a/Yi.Ai.Vue3/src/layouts/components/Header/components/AnnouncementBtn.vue +++ b/Yi.Ai.Vue3/src/layouts/components/Header/components/AnnouncementBtn.vue @@ -1,30 +1,33 @@