From 196d1d4cc922f8aad617ee060877962dc75530d2 Mon Sep 17 00:00:00 2001
From: Kiwi2333 <1329634286@qq.com>
Date: Sat, 25 Jan 2025 14:49:48 +0800
Subject: [PATCH] =?UTF-8?q?Update:=20=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Chat/ContactList.vue | 2 +-
 components/Chat/Msg/RTC.vue     | 5 +++--
 components/menu/ChatMenu.vue    | 3 ---
 composables/hooks/useSetting.ts | 4 ++++
 nuxt.config.ts                  | 3 +++
 pages/index/setting.vue         | 5 +++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/components/Chat/ContactList.vue b/components/Chat/ContactList.vue
index f5651016..7bd037bf 100644
--- a/components/Chat/ContactList.vue
+++ b/components/Chat/ContactList.vue
@@ -319,7 +319,7 @@ onBeforeUnmount(() => {
               </el-badge>
               <div class="flex flex-1 flex-col justify-between truncate">
                 <div flex truncate>
-                  <p truncate font-400>
+                  <p truncate text-black dark:text-white>
                     {{ room.name }}
                   </p>
                   <span ml-a w-fit flex-shrink-0 text-right text-10px text-mini>
diff --git a/components/Chat/Msg/RTC.vue b/components/Chat/Msg/RTC.vue
index 287e93da..fe75bd94 100644
--- a/components/Chat/Msg/RTC.vue
+++ b/components/Chat/Msg/RTC.vue
@@ -19,7 +19,7 @@ const chat = useChatStore();
     v-bind="$attrs"
   >
     <template #body>
-      <div ctx-name="rtc" class="msg-popper min-w-6em cursor-pointer hover:op-80" @click="data.message.body?.type && chat.rollbackCall(data.message.roomId, data.message.body?.type, data)">
+      <div ctx-name="rtc" class="msg-popper min-w-6em flex cursor-pointer items-center hover:op-80" @click="data.message.body?.type && chat.rollbackCall(data.message.roomId, data.message.body?.type, data)">
         <i ctx-name="rtc" class="icon p-2.6" :class="data.message.body?.type === CallTypeEnum.AUDIO ? 'i-solar:end-call-outline' : 'i-solar:videocamera-record-outline'" />
         {{ data.message.content }}
       </div>
@@ -31,8 +31,9 @@ const chat = useChatStore();
 @use './msg.scss';
 .self {
   .msg-popper {
+
     .icon {
-      float: right;
+      order: 1;
       margin-left: 0.5rem;
     }
   }
diff --git a/components/menu/ChatMenu.vue b/components/menu/ChatMenu.vue
index 775dce4c..0c9da9ee 100644
--- a/components/menu/ChatMenu.vue
+++ b/components/menu/ChatMenu.vue
@@ -154,9 +154,6 @@ export interface MenuItem {
 }
 .item {
   --at-apply: "card-rounded-df hover:(bg-color)";
-  .icon {
-    --at-apply: "bg-light dark:bg-none";
-  }
   &.action {
     --at-apply: "!bg-[var(--el-color-primary)] shadow";
     .icon {
diff --git a/composables/hooks/useSetting.ts b/composables/hooks/useSetting.ts
index 1e0fecb5..d5a741b7 100644
--- a/composables/hooks/useSetting.ts
+++ b/composables/hooks/useSetting.ts
@@ -15,6 +15,9 @@ export function useSettingNotice({
   const setting = useSettingStore();
   const showNotice = ref(false);
   const notice = ref<string>("# 暂无内容"); // 公告内容
+  const runtime = useRuntimeConfig();
+
+  const currentVersion = computed(() => setting.isDesktop ? setting.appUploader.version : runtime.public.version);
 
   // 显示新版本 + 当前版本 更新时间线
   const showUpateNoticeLine = ref(false);
@@ -172,6 +175,7 @@ export function useSettingNotice({
   return {
     showNotice,
     notice,
+    currentVersion,
     showUpateNoticeLine,
     showVersionNotice,
     handleCheckUpadate,
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 97f4a362..c31999f7 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -2,11 +2,13 @@
 // import { prismjsPlugin } from "vite-plugin-prismjs";
 // import { pwa } from "./config/pwa";
 import { appDescription, appName } from "./constants/index";
+import * as packageJson from "./package.json";
 import "dayjs/locale/zh-cn";
 
 const BASE_URL = process.env.NUXT_PUBLIC_API_BASE_URL;
 const isSSR = process.env.NUXT_PUBLIC_SPA;
 const mode = process.env.NUXT_PUBLIC_NODE_ENV as "development" | "production" | "test";
+const version = packageJson?.version;
 // 打印
 console.log(`mode:${mode} api_url:${BASE_URL} SSR:${isSSR}`);
 export default defineNuxtConfig({
@@ -18,6 +20,7 @@ export default defineNuxtConfig({
     public: {
       baseUrl: BASE_URL,
       mode,
+      version,
     },
   },
   build: {
diff --git a/pages/index/setting.vue b/pages/index/setting.vue
index e209c8f8..e211f618 100644
--- a/pages/index/setting.vue
+++ b/pages/index/setting.vue
@@ -26,6 +26,7 @@ const {
 const {
   showNotice,
   notice,
+  currentVersion,
   showUpateNoticeLine,
   showVersionNotice,
   handleCheckUpadate,
@@ -154,7 +155,7 @@ const {
       <div class="group h-8 flex-row-bt-c">
         关于更新
         <div class="ml-a flex items-center gap-2 sm:gap-4">
-          <span class="text-0.8rem tracking-0.1em !btn-info" @click="showUpateNoticeLine = true">{{ setting.appUploader.version ? `v${setting.appUploader.version}` : "" }} 更新日志</span>
+          <span class="text-0.8rem tracking-0.1em !btn-info" @click="showUpateNoticeLine = true">{{ currentVersion ? `v${currentVersion}` : "" }} 更新日志</span>
           <template v-if="setting.isDesktop">
             <el-badge
               v-if="!setting.appUploader.isUpdating"
@@ -308,7 +309,7 @@ const {
             >
               <div class="flex items-center text-xl font-bold">
                 v{{ item.version }}
-                <el-tag v-if="item.version === setting.appUploader.version" type="primary" effect="dark" size="small" class="ml-2 text-xs text-dark">
+                <el-tag v-if="item.version === currentVersion" type="primary" effect="dark" size="small" class="ml-2 text-xs text-dark">
                   当前
                 </el-tag>
                 <el-tag v-else-if="item.isLatest" type="danger" effect="dark" size="small" class="ml-2 text-xs text-dark">