From 69e2baf5518079bfc16cfadc2fb29842fb3de85d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 14 一月 2020 21:02:48 +0800
Subject: [PATCH] 加入userName

---
 WebService/src/main/resources/components/pageFramePackage/nav/nav.html |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/WebService/src/main/resources/components/pageFramePackage/nav/nav.html b/WebService/src/main/resources/components/pageFramePackage/nav/nav.html
index 5557958..87f80b4 100644
--- a/WebService/src/main/resources/components/pageFramePackage/nav/nav.html
+++ b/WebService/src/main/resources/components/pageFramePackage/nav/nav.html
@@ -8,6 +8,11 @@
         </form>
     </div>
     <ul class="nav navbar-top-links navbar-right">
+        <li style="padding: 20px" v-if="logo == 'HC'">
+            <span class="m-r-sm text-muted welcome-message">
+                <a target="_blank" href="https://www.bilibili.com/video/av78427253">婕旂ず瑙嗛</a>
+            </span>
+        </li>
         <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle"
                data-toggle="dropdown"
@@ -19,27 +24,27 @@
                 <span class="caret"></span>
             </a>
 
-            <div class="dropdown-menu" v-for="currentCommunity in navCommunityInfo.communityInfos">
-                <a class="dropdown-item" v-on:click="changeCommunity(currentCommunity)">{{currentCommunity.name}}</a>
-                <a href="/flow/enterCommunity" class="dropdown-item">
+            <div class="dropdown-menu" >
+                <a class="dropdown-item" v-for="currentCommunity in navCommunityInfo.communityInfos" v-on:click="changeCommunity(currentCommunity)">{{currentCommunity.name}}</a>
+                <a href="/flow/enterCommunity" class="dropdown-item text-center">
                     <strong>鍏ラ┗灏忓尯</strong>
                     <i class="fa fa-angle-right"></i>
                 </a>
             </div>
         </li>
         <li style="padding: 20px">
-            <span class="m-r-sm text-muted welcome-message">娆㈣繋璁块棶HC灏忓尯绠$悊绯荤粺锛寋{userName}}锛�</span>
+            <span class="m-r-sm text-muted welcome-message">娆㈣繋璁块棶{{logo}}灏忓尯绠$悊绯荤粺锛寋{userName}}锛�</span>
         </li>
         <li class="dropdown">
             <a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
-                <i class="fa fa-bell"></i> <span class="label label-primary">{{nav.noticeSize}}</span>
+                <i class="fa fa-bell"></i> <span class="label label-primary">{{nav.total}}</span>
             </a>
             <ul class="dropdown-menu dropdown-alerts">
                 <li v-for="notice in nav.notices">
-                    <a href="mailbox.html" class="dropdown-item">
+                    <a v-on:click="_noticeDetail(notice)" class="dropdown-item">
                         <div>
-                            <i class="fa fa-envelope fa-fw"></i> {{notice.msg}}
-                            <span class="float-right text-muted small">{{notice.date}}</span>
+                            <i class="fa fa-envelope fa-fw"></i> {{notice.title}}
+                            <span class="float-right text-muted small">{{notice.createTime}}</span>
                         </div>
                     </a>
                     <div class="dropdown-divider"></div>

--
Gitblit v1.8.0