Merge branch 'dev' into dev_g

src/components/NotificationMessageCard/src/components/EventCard.vue

@@ -225,6 +225,7 @@ const jumpTracking = (data: EventCardPropsData) => {
       .see-all-icon {
         width: 68px;
         height: 24px;
+        font-size: 12px;
         :deep(span) {
           color: var(--color-theme);
         }

src/utils/tools.ts

@@ -108,3 +108,17 @@ export const getDateFormat = () => {
     return 'DD/MM/YYYY' // 其他地区默认 DD/MM/YYYY 格式
   }
 }
+
+/**
+ * 返回用户设备是否是Mac系统或者iPhone系统
+ * @returns {boolean}
+ */
+export const isMacOS = () => {
+  const userAgent = navigator.userAgent
+
+  if (userAgent.includes('iPhone') || userAgent.includes('iPad') || userAgent.includes('Mac')) {
+    return true
+  } else {
+    return false
+  }
+}

src/views/Layout/src/components/Header/components/NotificationDrawer.vue

@@ -110,7 +110,7 @@ const notificationListRef = ref<HTMLElement | null>(null)
               class="el-button--text"
               @click="handleViewAll"
             >
-              <span class="font_family icon-icon_confirm_b show-icon"></span>
+              <span class="font_family icon-icon_jumplink_b1 show-icon"></span>
               <span>View all</span>
             </el-button>
             <el-button

src/views/SystemMessage/src/SystemMessage.vue

@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import NotificationMessageCard from '@/components/NotificationMessageCard/src/NotificationMessageCard.vue'
 import { useNotificationMessage } from '@/stores/modules/notificationMessage'
+import { isMacOS } from '@/utils/tools'
 
+const isMac = isMacOS()
 const activeCardTypeName = ref(sessionStorage.getItem('activeCardTypeName') || 'Milestone Update')
 
 const notificationMsgStore = useNotificationMessage()
@@ -136,7 +138,11 @@ onMounted(() => {
             >
               <div v-if="item === activeCardTypeName" class="active-sign"></div>
               <span>{{ item }}</span>
-              <div class="count" v-if="handleShowCount(item, index)">
+              <div
+                class="count"
+                :style="{ 'padding-top': isMac ? 0 : '1px' }"
+                v-if="handleShowCount(item, index)"
+              >
                 <span>{{ handleShowCount(item, index) }}</span>
               </div>
             </div>
@@ -150,7 +156,11 @@ onMounted(() => {
         >
           <div v-if="activeCardTypeName === 'Feature Update'" class="active-sign"></div>
           <span>Feature Update</span>
-          <div class="count" v-if="handleShowCount('Feature Update', tabCountList.length - 1)">
+          <div
+            class="count"
+            :style="{ 'padding-top': isMac ? 0 : '1px' }"
+            v-if="handleShowCount('Feature Update', tabCountList.length - 1)"
+          >
             <span>{{ handleShowCount('Feature Update', tabCountList.length - 1) }}</span>
           </div>
         </div>
@@ -173,7 +183,11 @@ onMounted(() => {
           <el-tab-pane label="Unread" name="Unread">
             <template #label>
               <span style="margin-right: 4px">Unread</span>
-              <div class="count" v-if="unreadNotificationList.length">
+              <div
+                class="count"
+                :style="{ 'padding-top': isMac ? 0 : '1px' }"
+                v-if="unreadNotificationList.length"
+              >
                 <span>{{ handleCount(unreadNotificationList.length) }}</span>
               </div>
             </template>
@@ -218,8 +232,6 @@ onMounted(() => {
   .count {
     display: inline-flex;
     height: 18px;
-    min-width: 18px;
-    padding-top: 1px;
     padding-left: 5px;
     padding-right: 5px;
     background-color: var(--color-theme);

src/views/SystemSettings/src/components/PersonalProfile.vue

@@ -1,11 +1,9 @@
 <script setup lang="ts">
 import dayjs from 'dayjs'
-import { isEuropean, getDateFormat } from '@/utils/tools'
+import { isEuropean } from '@/utils/tools'
 import ChangePasswordDialog from '@/views/Layout/src/components/Header/components/ChangePasswordDialog.vue'
 import { useUserStore } from '@/stores/modules/user'
-import { useThemeStore } from '@/stores/modules/theme'
 
-const themeStore = useThemeStore()
 const userStore = useUserStore()
 const form = reactive({
   firstName: userStore.userInfo?.first_name,