From afd3eab5d9db604134f570586ccd5598d38ce799 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 30 十二月 2022 15:07:21 +0800
Subject: [PATCH] 1.项目实现更换皮肤功能

---
 src/layout/components/Navbar.vue |   69 +++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index cafa44b..f5db9f5 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -6,17 +6,14 @@
 
     <div class="right-menu">
 
-      <template v-if="device!=='mobile'">
+      <!--      <template v-if="device!=='mobile'">-->
+      <template>
         <search id="header-search" class="right-menu-item" />
-
         <!--        <error-log class="errLog-container right-menu-item hover-effect" />-->
-
-        <!--        <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
-
+        <screenfull id="screenfull" class="right-menu-item hover-effect" />
         <!--        <el-tooltip content="Global Size" effect="dark" placement="bottom">-->
         <!--          <size-select id="size-select" class="right-menu-item hover-effect" />-->
         <!--        </el-tooltip>-->
-
       </template>
 
       <el-dropdown class="avatar-container" trigger="click">
@@ -90,13 +87,15 @@
 import { getCookie } from '@/utils/auth'
 import { UpdateUserPassword } from '@/api/user'
 import Search from '@/components/HeaderSearch'
+import Screenfull from '@/components/Screenfull'
 
 const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   components: {
     Breadcrumb,
     Hamburger,
-    Search
+    Search,
+    Screenfull
   },
   computed: {
     ...mapGetters([
@@ -194,6 +193,8 @@
 </script>
 
 <style lang="scss" scoped>
+$main_color: #42b983;
+
 .navbar {
   height: 50px;
   overflow: hidden;
@@ -274,32 +275,32 @@
     }
   }
 
-  .footerButton {
-    display: flex;
-    justify-content: end;
-  }
-
-  ::v-deep .el-button--primary {
-    background-color: #42b983 !important;
-    height: 30px;
-    display: flex;
-    align-items: center;
-    //border: 1px solid $main_color;
-    border: none;
-    padding: 0 20px;
-  }
-
-  ::v-deep .el-button--default {
-    background-color: #ffffff !important;
-    height: 30px;
-    display: flex;
-    align-items: center;
-    padding: 0 20px;
-  }
-
-  ::v-deep .el-input__inner {
-    height: 30px;
-    line-height: 30px;
-  }
+  //.footerButton {
+  //  display: flex;
+  //  justify-content: end;
+  //}
+  //
+  //::v-deep .el-button--primary {
+  //  background-color: $main_color !important;
+  //  height: 30px;
+  //  display: flex;
+  //  align-items: center;
+  //  //border: 1px solid $main_color;
+  //  border: none;
+  //  padding: 0 20px;
+  //}
+  //
+  //::v-deep .el-button--default {
+  //  background-color: #ffffff !important;
+  //  height: 30px;
+  //  display: flex;
+  //  align-items: center;
+  //  padding: 0 20px;
+  //}
+  //
+  //::v-deep .el-input__inner {
+  //  height: 30px;
+  //  line-height: 30px;
+  //}
 }
 </style>

--
Gitblit v1.9.3