merge test

src/layout/components/Navbar.vue

@@ -5,8 +5,12 @@
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
 
-    <div class="right-menu">
-      <template v-if="device!=='mobile'">
+    <div style="padding-top: 5px; padding-right: 38px;">
+      <navbar-right :blackTitle='true'/>
+    </div>
+
+    <!-- <div class="right-menu"> -->
+      <!-- <template v-if="device!=='mobile'"> -->
         <!-- <search id="header-search" class="right-menu-item" /> -->
 
         <!-- 站内信 -->
@@ -18,27 +22,27 @@
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip> -->
 
-      </template>
+      <!-- </template> -->
 
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        <div class="avatar-wrapper">
+      <!-- <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+        <div class="avatar-wrapper"> -->
           <!-- <img :src="avatar" class="user-avatar"> -->
-          <span v-if="nickname" class="user-nickname">{{ nickname }}</span>
+          <!-- <span v-if="nickname" class="user-nickname">{{ nickname }}</span>
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
           <router-link to="/user/profile">
             <el-dropdown-item>个人中心</el-dropdown-item>
-          </router-link>
+          </router-link> -->
           <!-- <el-dropdown-item @click.native="setting = true">
             <span>布局设置</span>
           </el-dropdown-item> -->
-          <el-dropdown-item divided @click.native="logout">
+          <!-- <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
-      </el-dropdown>
-    </div>
+      </el-dropdown> -->
+    <!-- </div> -->
   </div>
 </template>
 
@@ -51,7 +55,8 @@ import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import NotifyMessage from '@/layout/components/Message'
-import {getPath} from "@/utils/ruoyi";
+// import {getPath} from "@/utils/ruoyi";
+import NavbarRight from './NavbarRight.vue'
 
 export default {
   components: {
@@ -61,7 +66,8 @@ export default {
     Screenfull,
     SizeSelect,
     Search,
-    NotifyMessage
+    NotifyMessage,
+    NavbarRight
   },
   computed: {
     ...mapGetters([