Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/home/index.vue

src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div :class="{ fullscreen: isFullscreen }">
     <template>
       <transition name="router-fade" mode="out-in">
         <keep-alive>
@@ -17,7 +17,9 @@
 export default {
   name: "app",
   data() {
-    return {};
+    return {
+      isFullscreen: false // 是否全屏
+    };
   }
 };
 </script>
@@ -30,4 +32,9 @@ export default {
 .router-fade-leave-to {
   opacity: 0;
 }
+.fullscreen {
+  .van-nav-bar {
+    background-color: red;
+  }
+}
 </style>

src/views/home/index.vue

@@ -8,7 +8,7 @@
       bind:click-right=""
     >
     </van-nav-bar> -->
-    <div class="dropdown-div">
+    <div v-show="activeTabName === 0" class="dropdown-div">
       <van-dropdown-menu active-color="#1989fa">
         <van-dropdown-item
           v-model="engineeringWorkChooseValue"