Merge branch 'feature/3月会员标签'

src/router/index.js

 import Router from 'vue-router';
 import _import from './_import.js';
-import delCache from '@/utils/router-utils.js';
+// import delCache from '@/utils/router-utils.js';
 const errorPage = r => {
   import('view/errorPage/index.vue').then(module => {
     r(module);
@@ -203,12 +203,8 @@ const router = new Router({
   scrollBehavior: () => ({ y: 0 })
 })
 router.beforeEach((to, from, next) => {
-  const { keepAlive, componentName, fromPath = [] } = to.meta || {};
-  fromPath.push('/');
-  // 当前路径的keepAlive为true而且from.path不在fromPath中时，将清除to.path的缓存
-  if (keepAlive && fromPath.every(el => el != from.path)) {
-    delCache(router.apps, componentName);
-  }
+  const { fromPath = [] } = from.meta || {};
+  from.meta.keepAlive = fromPath.includes(to.path);
   next();
 })
 export default router;