Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/auto-imports.d.ts

@@ -3,7 +3,6 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
-// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']
@@ -69,6 +68,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

src/components/AIRobot/src/AIRobot.vue

@@ -81,6 +81,7 @@ const prepareGroups = () => {
   itemGroups.value = groups
 }
 const isShowLogin = () => {
+  AIRobotInit()
   const loginCount = JSON.parse(localStorage.getItem('userInfo')).loginCount
   let settimeouttime = 0
   AIIconVisible.value = true
@@ -108,6 +109,7 @@ const Logout = () => {
 
 // 退出登录后隐藏icon
 const checknoPrompt = () => {
+  AIRobotInit()
   AIIconVisible.value = true
 }
 

src/styles/theme-g.scss

@@ -58,6 +58,7 @@
   // tag
   --tag-bg-color: rgba(239, 239, 240, 0.1);
   --tag-info-text-color: #fff;
+  --tag-boder-color: rgba(239, 239, 240, 0.1);
   --tips-bg-color: rgba(26, 28, 32, 1);
   --tag-info-bg-color: rgba(239, 239, 240, 0.1);
 

src/styles/theme.scss

@@ -169,6 +169,7 @@
 
   --color-range-text: #2b2f36;
   --tag-bg-color: rgba(239, 239, 240);
+  --tag-boder-color: #efeff0;
   --tips-bg-color: rgba(26, 28, 32, 1);
   --scoring-bg-color: #f2f4f7;
 

src/views/Booking/src/BookingView.vue

@@ -519,6 +519,7 @@ const SearchInput = () => {
   color: var(--color-neutral-1);
   font-weight: 600;
   font-size: var(--font-size-2);
+  border-color: var(--tag-boder-color);
   background-color: var(--tag-bg-color) !important;
 }
 .iconfont_icon_tip {

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

@@ -11,6 +11,7 @@ import { useThemeStore } from '@/stores/modules/theme'
 import { useNotificationMessage } from '@/stores/modules/notificationMessage'
 import NotificationDrawer from './components/NotificationDrawer.vue'
 import TrainingCard from './components/TrainingCard.vue'
+import emitter from '@/utils/bus'
 
 const notificationMsgStore = useNotificationMessage()
 const themeStore = useThemeStore()
@@ -132,6 +133,7 @@ const handleUserManual = () => {
         }
         if (res.data?.code === 403) {
           sessionStorage.clear()
+          emitter.emit('login-out');
           router.push('/login')
           userStore.logout()
           ElMessage.warning({

src/views/Tracking/src/TrackingView.vue

@@ -767,6 +767,7 @@ const SearchInput = () => {
   color: var(--color-neutral-1);
   font-weight: 600;
   font-size: var(--font-size-2);
+  border-color: var(--tag-boder-color);
   background-color: var(--tag-bg-color) !important;
 }
 .iconfont_icon_tip {