xujing 5 年之前
父節點
當前提交
b7493a3346
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6
    3
      src/pages/auth/index.js

+ 6
- 3
src/pages/auth/index.js 查看文件

14
   getUserInfo() {
14
   getUserInfo() {
15
     const { dispatchUpdateUserInfo } = this.props
15
     const { dispatchUpdateUserInfo } = this.props
16
     const sessionKey = Taro.getStorageSync('sessionKey')
16
     const sessionKey = Taro.getStorageSync('sessionKey')
17
+    Taro.showLoading()
17
     // 获取用户信息
18
     // 获取用户信息
18
     Taro.getUserInfo({
19
     Taro.getUserInfo({
19
       lang: 'zh_CN',
20
       lang: 'zh_CN',
30
 
31
 
31
         // 用户信息保存至服务器
32
         // 用户信息保存至服务器
32
         dispatchUpdateUserInfo(payload).then(res => {
33
         dispatchUpdateUserInfo(payload).then(res => {
34
+          Taro.hideLoading()
33
           this.toPage(true)
35
           this.toPage(true)
34
         })
36
         })
35
       },
37
       },
36
       fail: () => {
38
       fail: () => {
39
+        Taro.hideLoading()
37
         this.toPage(false)
40
         this.toPage(false)
38
       }
41
       }
39
     })
42
     })
43
     const router = Taro.getStorageSync('router') || { query: {} }
46
     const router = Taro.getStorageSync('router') || { query: {} }
44
     const loadOptions = wx.getLaunchOptionsSync()
47
     const loadOptions = wx.getLaunchOptionsSync()
45
 
48
 
46
-    
49
+
47
     console.log('-------router, loadOptions--------->', router, loadOptions)
50
     console.log('-------router, loadOptions--------->', router, loadOptions)
48
 
51
 
49
     let { query, path } = router
52
     let { query, path } = router
53
     } else {
56
     } else {
54
       query = mergeNotNull(query, loadOptions.query)
57
       query = mergeNotNull(query, loadOptions.query)
55
     }
58
     }
56
-    
59
+
57
     console.log('-------query--------->', query)
60
     console.log('-------query--------->', query)
58
-    
61
+
59
     Taro.setStorageSync('firstLoading', '8')
62
     Taro.setStorageSync('firstLoading', '8')
60
     if (!succed && path === 'pages/signin/index') {
63
     if (!succed && path === 'pages/signin/index') {
61
       return
64
       return