xujing 5 years ago
parent
commit
1baa73af9f
2 changed files with 3 additions and 8 deletions
  1. 3
    0
      src/pages/project/h5Page.js
  2. 0
    8
      src/utils/request.js

+ 3
- 0
src/pages/project/h5Page.js View File

7
 import { reportClient } from '@services/report'
7
 import { reportClient } from '@services/report'
8
 import { connect } from '@tarojs/redux'
8
 import { connect } from '@tarojs/redux'
9
 import { ROLE_CODE } from '@constants/user'
9
 import { ROLE_CODE } from '@constants/user'
10
+import { getQrCodeParams } from '@utils/qrcode'
10
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
11
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
11
 const bgImg = require('@assets/helpgroup/bg.png')
12
 const bgImg = require('@assets/helpgroup/bg.png')
12
 
13
 
289
   render() {
290
   render() {
290
     const { pageInfo, webViewVisible, codeParams } = this.state
291
     const { pageInfo, webViewVisible, codeParams } = this.state
291
     const { userInfo: { person } } = this.props
292
     const { userInfo: { person } } = this.props
293
+    const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
292
     const webUrlParams = [
294
     const webUrlParams = [
293
       `personId=${person.personId}`,
295
       `personId=${person.personId}`,
294
       `h5id=${this.$router.params.id}`,
296
       `h5id=${this.$router.params.id}`,
297
+      `consultant=${consultant}`,
295
       `codeParams=${encodeURIComponent(codeParams)}`,
298
       `codeParams=${encodeURIComponent(codeParams)}`,
296
     ].join('&')
299
     ].join('&')
297
 
300
 

+ 0
- 8
src/utils/request.js View File

92
     if (err.message) {
92
     if (err.message) {
93
       errMessage = err.message
93
       errMessage = err.message
94
     }
94
     }
95
-<<<<<<< HEAD
96
-    
97
-    Taro.showToast({
98
-      title: errMessage,
99
-      icon: 'none'
100
-    })
101
-=======
102
     if (showMessage) {
95
     if (showMessage) {
103
 
96
 
104
       Taro.showToast({
97
       Taro.showToast({
106
         icon: 'none'
99
         icon: 'none'
107
       })
100
       })
108
     }
101
     }
109
->>>>>>> cbe91908d12d4a713e5490b4702108ce3186a31e
110
 
102
 
111
     throw new Error(errMessage)
103
     throw new Error(errMessage)
112
   })
104
   })