张延森 3 年之前
父節點
當前提交
ee4c3f97c2
共有 4 個文件被更改,包括 12 次插入7 次删除
  1. 1
    1
      src/app.js
  2. 3
    3
      src/services/person.js
  3. 8
    2
      src/store/models/person.js
  4. 0
    1
      src/utils/preFetchData.js

+ 1
- 1
src/app.js 查看文件

@@ -20,7 +20,7 @@ class App extends Component {
20 20
       Taro.login({
21 21
         success: (res) => {
22 22
           const { code } = res;
23
-          login({ code })
23
+          login({ code, personId: fetchData.personId })
24 24
         }
25 25
       })
26 26
     }).catch(() => {

+ 3
- 3
src/services/person.js 查看文件

@@ -2,14 +2,14 @@ import request from '@/utils/request'
2 2
 
3 3
 /**
4 4
  * 登录
5
- * @param {*} params 
5
+ * @param {*} data 
6 6
  * @returns 
7 7
  */
8
-export const signIn = (params) => request('/login', { params, method: 'post' })
8
+export const signIn = (data) => request('/login', { data, method: 'post' })
9 9
 
10 10
 /**
11 11
  * 授权手机
12 12
  * @param {*} data 
13 13
  * @returns 
14 14
  */
15
-export const authPhone = (data) => request('/auth-user', { data, method: 'put' })
15
+export const authPhone = (data) => request('/auth-phone', { data, method: 'put' })

+ 8
- 2
src/store/models/person.js 查看文件

@@ -8,10 +8,16 @@ export default () => {
8 8
 
9 9
   const login = (params) => {
10 10
     signIn(params).then((res) => {
11
-      const { person : taPerson, personRoleList, sessionKey } = res;
11
+      const { person : taPerson, personRoleList, sessionKey, qrcode } = res;
12 12
       setPerson(taPerson);
13 13
       setPersonRoles(personRoleList);
14
-      Taro.setStorage({ key: 'sessionKey', data: sessionKey })
14
+
15
+      if (sessionKey) {
16
+        Taro.setStorage({ key: 'sessionKey', data: sessionKey })
17
+      }
18
+      if (qrcode) {
19
+        Taro.setStorage({ key: 'qrcode', data: qrcode })
20
+      }
15 21
     })
16 22
   }
17 23
 

+ 0
- 1
src/utils/preFetchData.js 查看文件

@@ -11,7 +11,6 @@ export default () => {
11 11
 
12 12
           Taro.setStorage({ key: 'token', data: token })
13 13
           Taro.setStorage({ key: 'sessionKey', data: sessionKey })
14
-          Taro.setStorage({ key: 'qrcode', data: qrcode })
15 14
 
16 15
           resolve(otherData)
17 16
         } else {