refactor: 优化路由及分页 (#330)

fix #328

Author: vanoneang

.env.development

@@ -1,3 +1,3 @@
 ENV = 'development'
 
-VUE_APP_BASE_URL = 'http://localhost:5000/'
+VUE_APP_BASE_URL = 'http://127.0.0.1:5000/'

.env.production

@@ -1,3 +1,3 @@
 
 
-VUE_APP_BASE_URL = 'http://localhost:5000/'
+VUE_APP_BASE_URL = 'http://127.0.0.1:5000/'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lin-cms",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "private": true,
   "scripts": {
     "serve": "node script/plugin-get-config.js && vue-cli-service serve",

src/component/base/table/lin-table.vue

@@ -55,6 +55,7 @@
       layout="prev, pager, next"
       :page-size="pagination.pageSize ? pagination.pageSize : 10"
       :total="pagination.pageTotal ? pagination.pageTotal : null"
+      :current-page="pagination.currentPage ? pagination.currentPage : 1"
       @current-change="currentChange"
     ></el-pagination>
   </div>

src/component/layout/side-bar.vue

@@ -77,16 +77,12 @@
           </el-submenu>
 
           <!-- 一级else -->
-          <el-menu-item
-            class="subMenuContent"
-            :index="idMap[item.name]"
-            @click="goto(item.path)"
-            v-else
-            :key="idMap[item.name]"
-          >
-            <i v-if="!filterIcon(item.icon)" :class="item.icon"></i> <img v-else :src="item.icon" class="imgIcon" />
-            <span slot="title">{{ item.title }}</span>
-          </el-menu-item>
+          <router-link :to="item.path" :key="item.name" v-else>
+            <el-menu-item class="subMenuContent" :index="idMap[item.name]" :key="idMap[item.name]">
+              <i v-if="!filterIcon(item.icon)" :class="item.icon"></i> <img v-else :src="item.icon" class="imgIcon" />
+              <span slot="title">{{ item.title }}</span>
+            </el-menu-item>
+          </router-link>
         </template>
       </el-menu>
     </div>
@@ -118,7 +114,6 @@ export default {
       default: false,
     },
   },
-  created() {},
   mounted() {
     this.eventBus.$on('removeSidebarSearch', () => {
       this.showSidebarSearch = false
@@ -130,11 +125,6 @@ export default {
     })
   },
   methods: {
-    goto(path) {
-      this.$router.push({
-        path,
-      })
-    },
     filterIcon(icon) {
       return icon.indexOf('/') !== -1
     },
@@ -151,10 +141,6 @@ export default {
       }, 200)
     },
     search(val) {
-      // if (!val) {
-      //   this.showSearchList = false
-      //   return
-      // }
       this.groups = []
 
       // 深度遍历配置树, 摘取叶子节点作为路由部分

src/config/error-code.js

@@ -1,14 +1,15 @@
 const errorCode = {
   777: '前端错误码未定义',
   999: '服务器未知错误',
-  10000: '认证失败',
+  10000: '未携带令牌',
   10020: '资源不存在',
   10030: '参数错误',
-  10040: 'assessToken令牌失效',
-  10050: 'assessToken令牌过期',
+  10041: 'assessToken损坏',
+  10042: 'refreshToken损坏',
+  10051: 'assessToken过期',
+  10052: 'refreshToken过期',
   10060: '字段重复',
   10070: '不可操作',
-  10100: 'refreshToken异常',
 }
 
 export default errorCode

src/lin/plugin/axios.js

@@ -116,17 +116,17 @@ _axios.interceptors.response.use(
     return new Promise(async (resolve, reject) => {
       const { url } = res.config
 
-      // refresh_token 异常，直接登出
-      if (code === 10000 || code === 10100) {
+      // refreshToken相关，直接登出
+      if (code === 10000 || code === 10042 || code === 10052) {
         setTimeout(() => {
           store.dispatch('loginOut')
           const { origin } = window.location
           window.location.href = origin
         }, 1500)
         return resolve(null)
       }
-      // 令牌相关，刷新令牌
-      if (code === 10040 || code === 10041 || code === 10050 || code === 10051) {
+      // assessToken相关，刷新令牌
+      if (code === 10041 || code === 10051) {
         const cache = {}
         if (cache.url !== url) {
           cache.url = url