Merge pull request #292 from TaleLin/handle-error

lucienstar · web-flow · commit ccfe9e051845 · 2020-02-24T18:40:04.000+08:00
Handle error
diff --git a/README.md b/README.md
@@ -97,7 +97,16 @@ QQ群搜索：林间有风 或 643205479
 
 ## 版本日志
 
-最新版本 `0.2.2`
+最新版本 `0.3.1`
+
+### 0.3.1
+
+1. `F` 增加历史栏高度
+
+### 0.3.0
+
+1. `A` 新增一个用户可以属于多个分组
+2. `F` 权限相关 auth right 统一替换为 permission
 
 ### 0.2.2
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lin-cms",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "private": true,
   "scripts": {
     "serve": "node script/plugin-get-config.js && vue-cli-service serve",
diff --git a/src/assets/img/error-page/logo.png b/src/assets/img/error-page/logo.png
diff --git a/src/assets/img/login/team-name.png b/src/assets/img/login/team-name.png
diff --git a/src/assets/styles/realize/lin-variables.scss b/src/assets/styles/realize/lin-variables.scss
@@ -6,8 +6,8 @@ $sidebar-background: #192a5e;
 
 $navbar-height: 30px;
 $navbar-padding: 20px;
-$header-height: 72px;
-$reusetab-height: 29px;
+$header-height: 86px;
+$reusetab-height: 40px;
 
 $navbar-background: #BECCD8;
 $appmain-background: #F9FAFB;
diff --git a/src/components/layout/ReuseTab.vue b/src/components/layout/ReuseTab.vue
@@ -229,7 +229,7 @@ export default {
 
   .active {
     box-sizing: border-box;
-    height: 30px;
+    height: 40px;
     color: #ffffff;
     background: $theme;
     border: none;
diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
@@ -282,7 +282,7 @@ export default {
 
   .mobile-logo {
     width: 64px;
-    height: 72px;
+    height: 86px;
     display: flex;
     justify-content: center;
     align-items: center;
diff --git a/src/components/layout/User.vue b/src/components/layout/User.vue
@@ -312,12 +312,9 @@ export default {
             data: {
               nickname: this.nickname,
             },
-            params: {
-              showBackend: true,
-            },
+            showBackend: true,
           })
             .then(res => {
-              debugger
               if (res.code < window.SUCCESS_CODE) {
                 this.$message({
                   type: 'success',
diff --git a/src/config/index.js b/src/config/index.js
@@ -6,7 +6,7 @@ const Config = {
   sideBarLevel: 3, // 侧边栏层级限制, 3表示三级, 可设置 2 和 3
   showSidebarSearch: true, // 默认打开侧边栏搜索
   defaultRoute: '/about', // 默认打开的路由
-  useFrontEndErrorMsg: true, // 默认采用后端返回异常
+  useFrontEndErrorMsg: false, // 默认采用后端返回异常
 }
 
 export default Config
diff --git a/src/lin/models/user.js b/src/lin/models/user.js
@@ -1,4 +1,4 @@
-import { post, get, put } from '@/lin/plugins/axios'
+import _axios, { post, get, put } from '@/lin/plugins/axios'
 import { saveTokens } from '../utils/token'
 import store from '@/store'
 
@@ -8,7 +8,12 @@ export default class User {
    * @param {object} data 注册信息
    */
   static register(data) {
-    return post('cms/user/register', data, { handleError: true })
+    return _axios({
+      method: 'post',
+      url: 'cms/user/register',
+      data,
+      handleError: true,
+    })
   }
 
   /**
diff --git a/src/lin/plugins/axios.js b/src/lin/plugins/axios.js
@@ -109,12 +109,13 @@ _axios.interceptors.request.use(
 // Add a response interceptor
 _axios.interceptors.response.use(
   async res => {
+    console.log('res--------', res)
     let { code, message } = res.data // eslint-disable-line
     if (res.status.toString().charAt(0) === '2') {
       return res.data
     }
     return new Promise(async (resolve, reject) => {
-      const { params, url } = res.config
+      const { url } = res.config
 
       // refresh_token 异常，直接登出
       if (code === 10000 || code === 10100) {
@@ -137,24 +138,20 @@ _axios.interceptors.response.use(
           return resolve(result)
         }
       }
-      // 本次请求添加 params 参数：handleError 为 true，用户自己try catch，框架不做处理
-      if (params && params.handleError) {
+      // 如果本次请求添加了 handleError: true，用户自己try catch，框架不做处理
+      if (res.config.handleError) {
         return reject(res)
       }
       console.log('message', message)
-      if (Config.useFrontEndErrorMsg) {
-        // 这一次请求添加 params 参数：showBackend 为 true, 弹出后端返回错误信息
-        if (params && !params.showBackend) {
-          // 弹出前端自定义错误信息
-          const errorArr = Object.entries(ErrorCode).filter(v => v[0] === code.toString())
-          // 匹配到前端自定义的错误码
-          if (errorArr.length > 0) {
-            if (errorArr[0][1] !== '') {
-              message = errorArr[0][1] // eslint-disable-line
-            }
-          } else {
-            message = ErrorCode['777']
-          }
+      // 如果本次请求添加了 showBackend: true, 弹出后端返回错误信息
+      if (Config.useFrontEndErrorMsg && !res.config.showBackend) {
+        // 弹出前端自定义错误信息
+        const errorArr = Object.entries(ErrorCode).filter(v => v[0] === code.toString())
+        // 匹配到前端自定义的错误码
+        if (errorArr.length > 0 && errorArr[0][1] !== '') {
+          message = errorArr[0][1] // eslint-disable-line
+        } else {
+          message = ErrorCode['777']
         }
       }
 
diff --git a/src/models/book.js b/src/models/book.js
@@ -1,14 +1,18 @@
 /* eslint-disable class-methods-use-this */
-import { post, get, put, _delete } from '@/lin/plugins/axios'
+import _axios, { get, put, _delete } from '@/lin/plugins/axios'
 
 // 我们通过 class 这样的语法糖使模型这个概念更加具象化，其优点：耦合性低、可维护性。
 class Book {
   // constructor() {}
 
   // 类中的方法可以代表一个用户行为
-  async addBook(info) {
-    const res = await post('v1/book', info, { handleError: true })
-    return res
+  async addBook(data) {
+    return _axios({
+      method: 'post',
+      url: 'v1/book',
+      data,
+      handleError: true,
+    })
   }
 
   // 在这里通过 async await 语法糖让代码同步执行
@@ -30,8 +34,11 @@ class Book {
   }
 
   async getBooks() {
-    const res = await get('v1/book', { handleError: true })
-    return res
+    return _axios({
+      method: 'get',
+      url: 'v1/book',
+      handleError: true,
+    })
   }
 }
 
diff --git a/src/views/about/About.vue b/src/views/about/About.vue
@@ -6,7 +6,7 @@
           <img src="../../assets/img/about/welcome.png" class="welcome-title" alt="" />
           <div class="subtitle">
             <div class="guide">您还可以点击林间有风官方网站，查看更多作品</div>
-            <div class="link"><a href="http://www.7yue.pro" target="_blank">http://www.7yue.pro</a></div>
+            <div class="link"><a href="https://www.talelin.com" target="_blank">https://talelin.com</a></div>
           </div>
         </div>
         <img class="welcome-bg" src="../../assets/img/about/header-bg.png" alt="" />
diff --git a/src/views/book/BookAdd.vue b/src/views/book/BookAdd.vue
@@ -59,7 +59,7 @@ export default {
           this.resetForm(formName)
         }
       } catch (error) {
-        this.$message.error(error.data.message)
+        this.$message.error('图书添加失败，请检测填写信息')
         console.log(error)
       }
     },
diff --git a/src/views/center/Center.vue b/src/views/center/Center.vue
@@ -295,9 +295,7 @@ export default {
             data: {
               nickname: this.nickname,
             },
-            params: {
-              showBackend: true,
-            },
+            showBackend: true,
           })
             .then(res => {
               if (res.code < window.SUCCESS_CODE) {
diff --git a/src/views/home/Home.vue b/src/views/home/Home.vue
@@ -85,10 +85,10 @@ export default {
     }
 
     this.eventBus.$on('noReuse', () => {
-      this.$refs.operate.style.height = '71px'
+      this.$refs.operate.style.height = '86px'
     })
     this.eventBus.$on('hasReuse', () => {
-      this.$refs.operate.style.height = '43px'
+      this.$refs.operate.style.height = '45px'
     })
   },
   inject: ['eventBus'],
diff --git a/src/views/log/Log.vue b/src/views/log/Log.vue
@@ -64,7 +64,7 @@
           </div>
         </div>
       </div>
-      <div class="nothing">暂无日志信息</div>
+      <div class="nothing" v-else>暂无日志信息</div>
     </div>
   </div>
 </template>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "lin-cms",`
`3`		`- "version": "0.3.0",`
	`3`	`+ "version": "0.3.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"serve": "node script/plugin-get-config.js && vue-cli-service serve",`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ const Config = {`
`6`	`6`	`sideBarLevel: 3, // 侧边栏层级限制, 3表示三级, 可设置 2 和 3`
`7`	`7`	`showSidebarSearch: true, // 默认打开侧边栏搜索`
`8`	`8`	`defaultRoute: '/about', // 默认打开的路由`
`9`		`- useFrontEndErrorMsg: true, // 默认采用后端返回异常`
	`9`	`+ useFrontEndErrorMsg: false, // 默认采用后端返回异常`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`export default Config`