From 8a513e66b502e53531f7347fa51b24d761640655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Tue, 10 Dec 2019 07:19:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=89=8D=E7=AB=AF=E7=9A=84=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/request.js | 70 +++++++++++++++----------------------
 1 file changed, 28 insertions(+), 42 deletions(-)

diff --git a/frontend/src/api/request.js b/frontend/src/api/request.js
index 9c5943f5..5f91f2ac 100644
--- a/frontend/src/api/request.js
+++ b/frontend/src/api/request.js
@@ -1,53 +1,39 @@
 import axios from 'axios'
 import router from '../router'
+import { Message } from 'element-ui'
 
 let baseUrl = process.env.VUE_APP_BASE_URL ? process.env.VUE_APP_BASE_URL : 'http://localhost:8000'
 
-const request = async (method, path, params, data, others = {}) => {
-  try {
-    const url = baseUrl + path
-    const headers = {
-      'Authorization': window.localStorage.getItem('token')
+const request = (method, path, params, data, others = {}) => {
+  const url = baseUrl + path
+  const headers = {
+    'Authorization': window.localStorage.getItem('token')
+  }
+  return axios({
+    method,
+    url,
+    params,
+    data,
+    headers,
+    ...others
+  }).then((response) => {
+    if (response.status === 200) {
+      return Promise.resolve(response)
     }
-    const response = await axios({
-      method,
-      url,
-      params,
-      data,
-      headers,
-      ...others
-    })
-    // console.log(response)
-    return response
-  } catch (e) {
-    if (e.response.status === 401 && router.currentRoute.path !== '/login') {
+    return Promise.reject(response)
+  }).catch((e) => {
+    let response = e.response
+    if (response.status === 400) {
+      Message.error(response.data.error)
+    }
+    if (response.status === 401 && router.currentRoute.path !== '/login') {
+      console.log('login')
       router.push('/login')
     }
-    await Promise.reject(e)
-  }
-
-  // return new Promise((resolve, reject) => {
-  //   const url = baseUrl + path
-  //   const headers = {
-  //     'Authorization': window.localStorage.getItem('token')
-  //   }
-  //   axios({
-  //     method,
-  //     url,
-  //     params,
-  //     data,
-  //     headers,
-  //     ...others
-  //   })
-  //     .then(resolve)
-  //     .catch(error => {
-  //       console.log(error)
-  //       if (error.response.status === 401) {
-  //         router.push('/login')
-  //       }
-  //       reject(error)
-  //     })
-  // })
+    if (response.status === 500) {
+      Message.error(response.data.error)
+    }
+  })
 }
 
 const get = (path, params) => {