优化细节

n3e97 · Nov 29, 2018 · a7f2d9d · a7f2d9d
1 parent ade24e1
commit a7f2d9d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -11,5 +11,5 @@ export default {
 <style lang="less">
 // 这里是坑啊，文件路径中好像不能用@符号
 // 引入全局样式
-@import "./assets/styles/global.less";
+@import "./assets/less/global.less";
 </style>
diff --git a/src/assets/styles/global.less → src/assets/less/global.less b/src/assets/styles/global.less → src/assets/less/global.less
diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue
@@ -5,7 +5,7 @@
         <h3 class="logo">
           <span class="rythm twist1">{{toggSiderBar ? 'VUE': 'AUTO VUE'}}</span>
         </h3>
-        <el-menu background-color="#324157" text-color="#ddd" :default-active="$route.path" :unique-opened="isUnique" :router="isRouter" mode="vertical" :collapse="toggSiderBar">
+        <el-menu background-color="#324157" text-color="#ddd" :default-active="$route.path" :unique-opened="true" :router="true" mode="vertical" :collapse="toggSiderBar">
             <template v-for="item in menu">
                 <el-submenu v-if="item.children.length !== 0" :index="item.router" :key="item.router">
                     <template slot="title">
@@ -63,8 +63,6 @@ export default {
   data() {
     return {
       isMusicOn: false,
-      isUnique: true,
-      isRouter: true,
       menu: localStorage.menu ? JSON.parse(localStorage.menu) : []
     };
   },

diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
@@ -15,7 +15,7 @@
                         <i class="fa fa-language" title="切换语言" @click="toggleLanguage"></i>
                     </el-col>
                     <el-col :span="2">
-                        <i class="fa fa-arrows-alt" title="切换全屏" @click="toggleFullscreen"></i>
+                        <i :class="[isFullscreen? 'fa-compress': 'fa-arrows-alt','fa ']" title="切换全屏" @click="toggleFullscreen"></i>
                     </el-col>
                     <el-col :span="3">
                         <i class="fa fa-sign-out logout" title="退出" @click.prevent="logout"></i>
@@ -32,7 +32,8 @@ export default {
   name: 'topbar',
   data() {
     return {
-      userName: localStorage.userName || ''
+      userName: localStorage.userName || '',
+      isFullscreen: false
     }
   },
   computed: {
@@ -52,13 +53,12 @@ export default {
     },
     toggleFullscreen() {
       if (!screenfull.enabled) {
-        this.$message({
-          message: '您的浏览器不支持全屏',
-          type: 'warning'
-        })
+        this.$message.warning('您的浏览器不支持全屏')
         return false
       }
       screenfull.toggle()
+      // isFullscreen 居然是反的
+      this.isFullscreen = !screenfull.isFullscreen
     },
     logout() {
       localStorage.clear()