Merge branch 'junjie_dev' into 'master'

# Conflicts:
#   conflict src/views/Jyh/Home/index.vue

src/views/Jyh/Home/index.vue

@@ -2,7 +2,7 @@
   <div class="home-container">
     <div class="home-content">
       <div class="home-title">
-        <img src="@/assets/imgs/home/home-title-logo-2x.webp" alt="logo" />
+        <img src="@/assets/imgs/logo.png" alt="logo" />
         <h1>可信开源代码库</h1>
       </div>
       <div class="home-search" ref="homeSearch" :class="{ 'glow-border': inputGlow }">
@@ -59,9 +59,9 @@
         <div class="info-title">
           <div class="sub-title">
             <img src="@/assets/imgs/home/informIcon@2x.png">
-            <span>信息公示</span>
+            <span>预警公告</span>
           </div>
-          <a class="devui-link" @click="checkMore">更多 ></a>
+          <a v-if="isLogin" class="devui-link" @click="checkMore">更多 ></a>
         </div>
         <div class="info-content">
           <d-timeline :direction="'vertical'" :time-position="'right'" :position="'right'">
@@ -89,7 +89,7 @@
     </div>
   </div>
 
-  <d-modal class="warning-modal" v-model="warningModalVisable" title="主题：" style="width: 600px;">
+  <d-modal class="warning-modal" v-model="warningModalVisable" title="" style="width: 600px;">
     <EarlyWarningDetail :warningData="currentWarning" :type="'user'"></EarlyWarningDetail>
   </d-modal>
 </template>
@@ -100,9 +100,10 @@ import { useRoute, useRouter } from 'vue-router';
 import AdvanceSearch from '@/components/AdvanceSearch/index.vue';
 import { getHomeNoticeList } from '@/api/jyh'
 import EarlyWarningDetail from '@/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue';
-import { useAccountStore } from '@/stores/user';
+import { useDiscussGetUserInfo } from '@/api/discussion/hook';
 
-const userStore = useAccountStore();
+// 获取当前用户信息 & 是否登录
+const { isLogin = false, userInfo = {}} = useDiscussGetUserInfo();
 const route = useRoute();
 const router = useRouter();
 const inputGlow = ref(false);
@@ -202,7 +203,7 @@ const openWarningDetail = (event, index) => {
       item.dotColor = '';
     }
   })
-  
+
   warningModalVisable.value = true;
   currentWarning.value = event;
 }
@@ -269,7 +270,7 @@ getNoticeList();
 
       img {
         width: 50px;
-        filter: brightness(0);
+        //filter: brightness(0);
       }
     }
 
@@ -409,7 +410,7 @@ getNoticeList();
   flex: 1;
   overflow: hidden;
   margin-right: 8px;
-  
+
   span {
     white-space: nowrap;
     overflow: hidden;