xujing 5 年前
父节点
当前提交
24d51adf43
共有 6 个文件被更改,包括 22 次插入27 次删除
  1. 1
    1
      config/dev.js
  2. 1
    1
      config/prod.js
  3. 2
    1
      src/pages/auth/index.js
  4. 1
    1
      src/pages/project/h5Page.js
  5. 16
    21
      src/pages/project/index.js
  6. 1
    2
      src/utils/login.js

+ 1
- 1
config/dev.js 查看文件

11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
     // HOST: '"http://192.168.2.51:8080"',
12
     // HOST: '"http://192.168.2.51:8080"',
13
     // WSS_HOST: '"ws://192.168.2.51:8080"',
13
     // WSS_HOST: '"ws://192.168.2.51:8080"',
14
-    Version: 'V3.5.2.2_12122'
14
+    Version: 'V3.5.2.2_12132'
15
   },
15
   },
16
   weapp: {},
16
   weapp: {},
17
   h5: {}
17
   h5: {}

+ 1
- 1
config/prod.js 查看文件

9
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
9
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
     // HOST: '"https://lt.pawoma.cn"',
10
     // HOST: '"https://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    Version:'V3.5.2.2_2019-12-12'
12
+    Version:'V3.5.2.2_2019-12-13'
13
   },
13
   },
14
   weapp: {},
14
   weapp: {},
15
   h5: {}
15
   h5: {}

+ 2
- 1
src/pages/auth/index.js 查看文件

41
   toPage(succed) {
41
   toPage(succed) {
42
     const router = Taro.getStorageSync('router')
42
     const router = Taro.getStorageSync('router')
43
     const { query, path } = router
43
     const { query, path } = router
44
-
44
+    
45
+    Taro.setStorageSync('firstLoading', '8')
45
     if (!succed && path === 'pages/signin/index') {
46
     if (!succed && path === 'pages/signin/index') {
46
       return
47
       return
47
     }
48
     }

+ 1
- 1
src/pages/project/h5Page.js 查看文件

107
           this.setState({
107
           this.setState({
108
             codeParams: codeParams || ''
108
             codeParams: codeParams || ''
109
           })
109
           })
110
-          console.log(res, "解析二维码返回值")
110
+          // console.log(codeParams, "解析二维码返回值")
111
         })
111
         })
112
       }
112
       }
113
 
113
 

+ 16
- 21
src/pages/project/index.js 查看文件

81
     })
81
     })
82
   }
82
   }
83
   componentDidShow() {
83
   componentDidShow() {
84
-    if (Taro.getStorageSync('firstLoading') != '8') {
85
-      Taro.showTabBar({
86
-        animation: false
84
+
85
+    if (this.props.curCity.id) {
86
+      ready.queue(() => {
87
+        console.log('我又隐藏啦,哈哈哈哈')
88
+        Taro.hideTabBar()
89
+        this.loadData()
87
       })
90
       })
88
-      if (this.props.curCity.id) {
89
-        ready.queue(() => {
90
-          // debugger
91
-          this.loadData()
92
-        })
93
-      }
94
-      Taro.setStorageSync('firstLoading', '6')
95
     }
91
     }
96
   }
92
   }
97
 
93
 
178
 
174
 
179
       const maskVisible = banner && this.props.screenShow !== (banner || {}).contentId
175
       const maskVisible = banner && this.props.screenShow !== (banner || {}).contentId
180
       if (maskVisible) {
176
       if (maskVisible) {
181
-        Taro.hideTabBar({
182
-          animation: true
183
-        })
177
+        Taro.hideTabBar()
178
+      } else {
179
+        Taro.showTabBar()
184
       }
180
       }
185
 
181
 
186
       this.setState({
182
       this.setState({
187
         maskVisible,
183
         maskVisible,
188
         maskBanner: banner || {}
184
         maskBanner: banner || {}
189
       }, () => {
185
       }, () => {
186
+        if (Taro.getStorageSync('firstLoading') != '8') {
187
+          const { dispatch } = getStore()
188
+          dispatch({ type: SET_SCREEN_SHOWED, payload: (banner || {}).contentId })
190
 
189
 
191
-
192
-        const { dispatch } = getStore()
193
-        dispatch({ type: SET_SCREEN_SHOWED, payload: (banner || {}).contentId })
194
-
195
-
190
+        } else {
191
+          Taro.setStorageSync('firstLoading', '6')
192
+        }
196
       })
193
       })
197
     })
194
     })
198
   }
195
   }
404
     this.setState({
401
     this.setState({
405
       maskVisible: false
402
       maskVisible: false
406
     })
403
     })
407
-    Taro.showTabBar({
408
-      animation: true
409
-    })
404
+    Taro.showTabBar()
410
   }
405
   }
411
 
406
 
412
   makePhoneCall = () => {
407
   makePhoneCall = () => {

+ 1
- 2
src/utils/login.js 查看文件

31
 
31
 
32
         // 用户信息已授权获取成功
32
         // 用户信息已授权获取成功
33
         if (miniAuthorized) {
33
         if (miniAuthorized) {
34
+   
34
           console.log(data, "data=============")
35
           console.log(data, "data=============")
35
           // 保存用户信息
36
           // 保存用户信息
36
           // dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
37
           // dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
46
           ]
47
           ]
47
 
48
 
48
           if (noAuthPages.indexOf(path) === -1 || !sceneInShare(scene)) {
49
           if (noAuthPages.indexOf(path) === -1 || !sceneInShare(scene)) {
49
-
50
-            Taro.setStorageSync('firstLoading', '8')
51
             Taro.reLaunch({
50
             Taro.reLaunch({
52
               url: '/pages/auth/index'
51
               url: '/pages/auth/index'
53
             })
52
             })