[baozhangchao] 3 years ago
parent
commit
9c7856c18c
3 changed files with 10 additions and 6 deletions
  1. 1
    1
      src/app.js
  2. 2
    3
      src/services/login.js
  3. 7
    2
      src/utils/request.js

+ 1
- 1
src/app.js View File

13
     Taro.login({
13
     Taro.login({
14
       success: (res) => {
14
       success: (res) => {
15
         const { code } = res;
15
         const { code } = res;
16
-        // login({ code })
16
+        login({ code })
17
       }
17
       }
18
     })
18
     })
19
 
19
 

+ 2
- 3
src/services/login.js View File

1
 import request from '@/utils/request'
1
 import request from '@/utils/request'
2
 /**
2
 /**
3
  * 登录
3
  * 登录
4
- * @param {*} id 
4
+ * @param {*} data 
5
  * @returns 
5
  * @returns 
6
- * loginParam?login哪个接口。。
7
  */
6
  */
8
-export const login = (data) => request(`/loginParam  `, { method: 'post', data })
7
+export const login = (data) => request('/login', { data, method: 'post' })

+ 7
- 2
src/utils/request.js View File

1
 import Taro from '@tarojs/taro'
1
 import Taro from '@tarojs/taro'
2
 import { getQueryString } from './codeSegment'
2
 import { getQueryString } from './codeSegment'
3
 
3
 
4
-
4
+let appid
5
 
5
 
6
 export default (url, options) => {
6
 export default (url, options) => {
7
   const { params, skipError, header, ...leftOptions } = options || {}
7
   const { params, skipError, header, ...leftOptions } = options || {}
8
   const queryStr = getQueryString(params)
8
   const queryStr = getQueryString(params)
9
 
9
 
10
+  if (!appid) {
11
+    const { miniProgram } = Taro.getAccountInfoSync
12
+    appid = miniProgram.appid
13
+  }
14
+
10
   const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
15
   const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
11
-  const nwUrl = `${HOST}/api/wx${urlWithParams}`
16
+  const nwUrl = `${HOST}/api/wx${appid}${urlWithParams}`
12
 
17
 
13
   const authToken = Taro.getStorageSync('token')
18
   const authToken = Taro.getStorageSync('token')
14
   const tokenHeader = authToken ? { 'X-Authorization-JWT': authToken } : {}
19
   const tokenHeader = authToken ? { 'X-Authorization-JWT': authToken } : {}