TBtools-新增礼品商城路由

htmldev/TBTools/build/webpack.base.conf.js

@@ -80,7 +80,7 @@ module.exports = {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]'),
           publicPath: function (url) {
-            return url.replace(/static/, '..')
+            return process.env.NODE_ENV === 'production' ? url.replace(/static/, '..') : url
           }
         }
       }

htmldev/TBTools/src/router/index.js

@@ -126,7 +126,9 @@ const mineRoutes = [
         name: 'payCheck',
         meta: {
           title: '充值',
-          isTab: true
+          isTab: true,
+          isUseCache: false,
+          keepAlive: true
         }
       },
       {
@@ -135,13 +137,46 @@ const mineRoutes = [
         name: 'payWallet',
         meta: {
           title: '我的钱包',
-          isTab: true
+          isTab: true,
+          isUseCache: false,
+          keepAlive: true
         }
       }
     ]
   }
 ]
 
+// 礼品商城
+const mallRoutes = [
+  {
+    path: '/mall',
+    component: _import('modules/mall/index'),
+    name: 'mall',
+    meta: {
+      title: '礼品商城',
+      isUseCache: false
+    }
+  },
+  {
+    path: '/mall/goods-detail/:goodsId',
+    component: _import('modules/mall/goods-detail'),
+    name: 'goodsDetail',
+    meta: {
+      title: '商品详情',
+      isUseCache: false
+    }
+  },
+  {
+    path: '/mall/goods-order/:goodsId',
+    component: _import('modules/mall/goods-order'),
+    name: 'goodsDetail',
+    meta: {
+      title: '确认订单',
+      isUseCache: false
+    }
+  }
+]
+
 // 主入口路由(需嵌套上左右整体布局)
 const mainRoutes = {
   path: '/',
@@ -158,7 +193,8 @@ const mainRoutes = {
     { path: '/register', component: _import('modules/account/register'), name: 'register', meta: { title: '注册' } },
     { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页', isTab: true } },
     ...toolsRoutes,
-    ...mineRoutes
+    ...mineRoutes,
+    ...mallRoutes
   ]
 }
 

htmldev/TBTools/src/views/main-content.vue

@@ -3,8 +3,9 @@
     <!-- 主入口标签页 e -->
     <el-card :body-style="siteContentViewHeight">
       <keep-alive>
-        <router-view/>
+        <router-view v-if="$route.meta.keepAlive"></router-view>
       </keep-alive>
+      <router-view v-if="!$route.meta.keepAlive"></router-view>
     </el-card>
   </main>
 </template>

htmldev/TBTools/src/views/main-navbar.vue

@@ -21,7 +21,7 @@
           </el-dropdown>
         </li>
         <li>
-          <router-link :to="{name: 'home'}">礼品商城</router-link>
+          <router-link :to="{name: 'mall'}">礼品商城</router-link>
         </li>
       </ul>
       <template v-if="token">
@@ -37,7 +37,9 @@
         </el-dropdown>
       </template>
       <template v-else>
-        <router-link class="btn-login" :active-class="'active'" :to="{name: 'login'}" replace>登录</router-link>
+        <router-link class="btn-login" :class="$route.name !== 'register' ? 'active' : ''" :to="{name: 'login'}"
+                     replace>登录
+        </router-link>
         <router-link class="btn-register" :active-class="'active'" :to="{name: 'register'}" replace>注册</router-link>
       </template>
     </div>

htmldev/TBTools/src/views/modules/mall/goods-pay.vue

@@ -1,13 +0,0 @@
-<template>
-  <div>goods-pay</div>
-</template>
-
-<script>
-export default {
-  name: 'goods-pay'
-}
-</script>
-
-<style scoped>
-
-</style>

htmldev/TBTools/src/views/modules/mine/index.vue

@@ -3,8 +3,9 @@
     <MainSidebar/>
     <div class="mine-main">
       <keep-alive>
-        <router-view/>
+        <router-view v-if="$route.meta.keepAlive"></router-view>
       </keep-alive>
+      <router-view v-if="!$route.meta.keepAlive"></router-view>
     </div>
   </div>
 </template>

htmldev/TBTools/src/views/modules/mine/pay/pay-check.vue

@@ -59,7 +59,7 @@ export default {
       payConfig: {}
     }
   },
-  activated () {
+  created () {
     this.funInit()
   },
   methods: {

htmldev/TBTools/src/views/modules/mine/pay/pay-wallet.vue

@@ -109,7 +109,7 @@ export default {
       userInfo: {}
     }
   },
-  activated () {
+  created () {
     this.getDataList()
   },
   methods: {