xujing 5 lat temu
rodzic
commit
24d51adf43

+ 1
- 1
config/dev.js Wyświetl plik

@@ -11,7 +11,7 @@ module.exports = {
11 11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12 12
     // HOST: '"http://192.168.2.51:8080"',
13 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 16
   weapp: {},
17 17
   h5: {}

+ 1
- 1
config/prod.js Wyświetl plik

@@ -9,7 +9,7 @@ module.exports = {
9 9
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10 10
     // HOST: '"https://lt.pawoma.cn"',
11 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 14
   weapp: {},
15 15
   h5: {}

+ 2
- 1
src/pages/auth/index.js Wyświetl plik

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

+ 1
- 1
src/pages/project/h5Page.js Wyświetl plik

@@ -107,7 +107,7 @@ export default class Index extends Component {
107 107
           this.setState({
108 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 Wyświetl plik

@@ -81,17 +81,13 @@ export default class Index extends Component {
81 81
     })
82 82
   }
83 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,21 +174,22 @@ export default class Index extends Component {
178 174
 
179 175
       const maskVisible = banner && this.props.screenShow !== (banner || {}).contentId
180 176
       if (maskVisible) {
181
-        Taro.hideTabBar({
182
-          animation: true
183
-        })
177
+        Taro.hideTabBar()
178
+      } else {
179
+        Taro.showTabBar()
184 180
       }
185 181
 
186 182
       this.setState({
187 183
         maskVisible,
188 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,9 +401,7 @@ export default class Index extends Component {
404 401
     this.setState({
405 402
       maskVisible: false
406 403
     })
407
-    Taro.showTabBar({
408
-      animation: true
409
-    })
404
+    Taro.showTabBar()
410 405
   }
411 406
 
412 407
   makePhoneCall = () => {

+ 1
- 2
src/utils/login.js Wyświetl plik

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