张延森 5 lat temu
commit
6ce111f946
1 zmienionych plików z 7 dodań i 4 usunięć
  1. 7
    4
      src/pages/project/h5Page.js

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

@@ -80,7 +80,7 @@ export default class Index extends Component {
80 80
     const router = Taro.getStorageSync('router')
81 81
 
82 82
     const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
83
-    const firstShare = this.$router.params.firstShare || person.personId
83
+    const firstShare = this.$router.params.firstShare || router.query.firstShare || person.personId
84 84
     const id = this.$router.params.id || router.query.id || ""
85 85
 
86 86
     let queryParams = [
@@ -90,7 +90,6 @@ export default class Index extends Component {
90 90
       `id=${id}`
91 91
     ]
92 92
 
93
-
94 93
     const res = [
95 94
       'pages/project/h5Page',
96 95
       queryParams.join('&'),
@@ -293,19 +292,23 @@ export default class Index extends Component {
293 292
     const { userInfo: { person } } = this.props
294 293
     const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
295 294
     const h5id = this.$router.params.id || router.query.id || ""
295
+    const firstShare = this.$router.params.firstShare || router.query.firstShare || person.personId
296 296
     const webUrlParams = [
297 297
       `personId=${person.personId}`,
298 298
       `h5id=${h5id}`,
299 299
       `consultant=${consultant}`,
300
+      `firstShare=${firstShare}`,
300 301
       `codeParams=${encodeURIComponent(codeParams)}`,
301 302
     ].join('&')
302 303
 
303
-    console.log(`${pageInfo.h5Address}?${webUrlParams}`)
304
+    console.log('----web-h5------>', `${pageInfo.h5Address}?${webUrlParams}`)
305
+
306
+    const showH5 = pageInfo.h5Address && pageInfo.h5Address !== 'about' && pageInfo.h5Address !== 'http://about' && pageInfo.h5Address !== 'https://about'
304 307
 
305 308
     return (
306 309
       <Block>
307 310
         {this.renderMaskBanner()}
308
-        {webViewVisible && <WebView src={`${pageInfo.h5Address}?${webUrlParams}`} />}
311
+        {webViewVisible && showH5 && <WebView src={`${pageInfo.h5Address}?${webUrlParams}`} />}
309 312
       </Block>
310 313
     )
311 314
   }