yuantianjiao 6 years ago
parent
commit
38f7053995
3 changed files with 11 additions and 19 deletions
  1. 3
    5
      src/pages/login/index.vue
  2. 1
    4
      src/pages/system/cmsManager/bannerManager/index.vue
  3. 7
    10
      src/util/ajax.js

+ 3
- 5
src/pages/login/index.vue View File

@@ -58,11 +58,9 @@ export default {
58 58
       this.$ajax(this.$api.login.signin.url, {
59 59
         method: this.$api.login.signin.method,
60 60
         data: {
61
-          bodyData: {
62
-            username: userName,
63
-            password: passWord,
64
-            token: token
65
-          }
61
+          username: userName,
62
+          password: passWord,
63
+          token: token
66 64
         }
67 65
       }).then(res => {
68 66
         console.log(res)

+ 1
- 4
src/pages/system/cmsManager/bannerManager/index.vue View File

@@ -138,11 +138,8 @@ export default {
138 138
         method: this.$api.cms.imageList.method,
139 139
         data: {
140 140
           pagenum: '1'
141
-        },
142
-        urlData: {
143
-          a: 1
144 141
         }
145
-      }).then(res => {
142
+      }, { a: 1 }).then(res => {
146 143
         console.log(res)
147 144
         this.tableData = res.list
148 145
       }).catch(msg => {

+ 7
- 10
src/util/ajax.js View File

@@ -7,6 +7,8 @@ const Axios = axios.create({
7 7
   timeout: 60000,
8 8
   responseType: 'json',
9 9
   withCredentials: true,
10
+  queryData: {},
11
+  urlData: {},
10 12
   headers: {
11 13
     'Content-Type': 'multipart/form-data'
12 14
   }
@@ -14,18 +16,14 @@ const Axios = axios.create({
14 16
 
15 17
 Axios.interceptors.request.use((config) => {
16 18
   // 处理请求data,若为get请求,拼到url后面,若为post请求,直接添加到body中
17
-  config.data = config.data || {}
18
-  config.data.bodyData = config.data.bodyData || {}
19
-  config.data.urlData = config.data.urlData || {}
20
-  config.data.queryData = config.data.queryData || {}
21
-  let urlData = qs.stringify(config.data.urlData)
22
-  let queryData = qs.stringify(config.data.queryData)
19
+  let urlData = qs.stringify(config.urlData)
20
+  let queryData = qs.stringify(config.queryData)
23 21
   // 判断是通过斜杠传参还是通过query传参
24 22
   if (config.url.indexOf(':') > -1) {
25
-    if (typeof urlData === 'object') {
26
-      config.url = Object.keys(urlData).reduce((url, k) => { // 此方法对每个元素进行处理
23
+    if (typeof config.urlData === 'object') {
24
+      config.url = Object.keys(config.urlData).reduce((url, k) => { // 此方法对每个元素进行处理
27 25
         const re = new RegExp(`:${k}(?!w)`, 'i')
28
-        return url.replace(re, urlData[k])
26
+        return url.replace(re, config.urlData[k])
29 27
       }, config.url)
30 28
     } else {
31 29
       config.url = config.url.slice(0, config.url.indexOf(':')) + urlData
@@ -35,7 +33,6 @@ Axios.interceptors.request.use((config) => {
35 33
       config.url += '?' + queryData
36 34
     }
37 35
   }
38
-  config.data = config.data.bodyData
39 36
   let fm = new FormData()
40 37
   for (let k in config.data) {
41 38
     if (Array.isArray(config.data[k])) {