|
@@ -1,17 +1,11 @@
|
1
|
1
|
import Taro from "@tarojs/taro";
|
2
|
2
|
import { getQueryString } from ".";
|
3
|
3
|
|
4
|
|
-
|
5
|
|
-
|
6
|
4
|
export default (url, options) => {
|
7
|
5
|
const { params, header, ...leftOptions } = options || {}
|
8
|
|
-
|
9
|
|
-
|
10
|
6
|
const queryStr = getQueryString(params)
|
11
|
|
-
|
12
|
7
|
const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
|
13
|
8
|
const nwUrl = `${HOST}/api${urlWithParams}`
|
14
|
|
-
|
15
|
9
|
const authToken = Taro.getStorageSync('token')
|
16
|
10
|
const tokenHeader = authToken ? { 'X-Authorization-JWT': authToken } : {}
|
17
|
11
|
const nwHeader = {
|
|
@@ -19,9 +13,6 @@ export default (url, options) => {
|
19
|
13
|
...tokenHeader,
|
20
|
14
|
}
|
21
|
15
|
|
22
|
|
-
|
23
|
|
-
|
24
|
|
-
|
25
|
16
|
return new Promise((resolve, reject) => {
|
26
|
17
|
Taro.request({
|
27
|
18
|
...leftOptions,
|
|
@@ -36,12 +27,9 @@ export default (url, options) => {
|
36
|
27
|
resolve(data)
|
37
|
28
|
} else {
|
38
|
29
|
console.error(res)
|
39
|
|
-
|
40
|
|
-
|
41
|
30
|
reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
|
42
|
31
|
}
|
43
|
32
|
},
|
44
|
|
-
|
45
|
33
|
fail: (err) => {
|
46
|
34
|
const message = err.message || err.errMsg || err
|
47
|
35
|
|