From 77afd2a1331cbeb671b59fa5b39571168ead352b Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Sat, 29 Feb 2020 14:17:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84sidebar=E5=92=8Cnavbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 12 +-----------
 src/layout/index.vue             | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fb51eee..a69b077 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShow" class="navbar">
+  <div class="navbar">
     <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 
     <breadcrumb class="breadcrumb-container" />
@@ -39,16 +39,6 @@ import Hamburger from '@/components/Hamburger'
 export default {
   data() {
     return {
-      isShow: true
-    }
-  },
-  mounted() {
-    if(/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)) {
-      this.isShow = false
-      window.pc = false
-    } else {
-      this.isShow = true
-      window.pc = true
     }
   },
   components: {
diff --git a/src/layout/index.vue b/src/layout/index.vue
index db22a7b..990d151 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div :class="classObj" class="app-wrapper">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
-    <sidebar class="sidebar-container" />
-    <div class="main-container">
+    <sidebar class="sidebar-container" v-if="isShow" />
+    <div class="main-container" :style="{'margin-left': isShow ? '': '0'}">
       <div :class="{'fixed-header':fixedHeader}">
-        <navbar />
+        <navbar v-if="isShow"/>
       </div>
       <app-main />
     </div>
@@ -22,6 +22,11 @@ export default {
     Sidebar,
     AppMain
   },
+  data() {
+    return {
+      isShow: true
+    }
+  },
   mixins: [ResizeMixin],
   computed: {
     sidebar() {
@@ -42,6 +47,13 @@ export default {
       }
     }
   },
+  mounted() {
+    if(/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)) {
+      this.isShow = false
+    } else {
+      this.isShow = true
+    }
+  },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })