Merge remote-tracking branch 'origin/master'

@@ -2,10 +2,13 @@
   <div id="app">
   <div id="app">
     <transition
     <transition
       :name="`route-view-${yoho.direction}`">
       :name="`route-view-${yoho.direction}`">
-      <!-- <keep-alive>
+      <keep-alive>
         <router-view v-if="$route.meta.keepAlive"></router-view>
         <router-view v-if="$route.meta.keepAlive"></router-view>
-      </keep-alive> -->
-      <router-view></router-view>
+      </keep-alive>
+    </transition>
+    <transition
+      :name="`route-view-${yoho.direction}`">
+      <router-view v-if="!$route.meta.keepAlive"></router-view>
     </transition>
     </transition>
     <div class="fps" v-if="showFps">
     <div class="fps" v-if="showFps">
       {{fps}}
       {{fps}}

@@ -10,6 +10,6 @@ export default [{
   name: 'topic',
   name: 'topic',
   component: () => import(/* webpackChunkName: "article" */ './topic'),
   component: () => import(/* webpackChunkName: "article" */ './topic'),
   meta: {
   meta: {
-    keepAlive: true
+    keepAlive: false
   }
   }
 }];
 }];