Merge branch 'xy-ly' into fly

src/utils/request.js

@@ -1,4 +1,6 @@
 import axios from "axios";
+import { MessageBox, Message } from 'element-ui'
+import router from '../router/index'
 
 const service = axios.create({
   // process.env.NODE_ENV === 'development' 来判断是否开发环境
@@ -16,16 +18,35 @@ service.interceptors.request.use((config) => {
   return config;
 });
 service.interceptors.response.use(
-  (response) => {
+  // (response) => {
-    if (response.status === 200) {
+  //   if (response.status === 200) {
-      return response.data;
+  //     return response.data;
+  //   } else {
+  //     Promise.reject();
+  //   }
+  // },
+  // (error) => {
+  //   console.log(error);
+  //   return Promise.reject();
+  // }
+
+
+  response => {
+    const res = response.data
+    if (res.code !== 200) {
+      Message({ message: res.msg || 'Error',  type: 'error', duration: 5 * 1000 })
+      if (res.code === 401) {
+        // Message({ message: '重新登录', type: 'error', duration: 5 * 1000 })
+        router.push('/login')
+      }
+      return Promise.reject(new Error(res.msg || 'Error'))
     } else {
-      Promise.reject();
+      return res
     }
   },
-  (error) => {
+  error => {
-    console.log(error);
+    Message({ message: error.message, type: 'error', duration: 5 * 1000 })
-    return Promise.reject();
+    return Promise.reject(error)
   }
 );