qrcode

src/pages/project/h5Page.js

@@ -7,6 +7,7 @@ import ready from '@utils/ready'
 import { reportClient } from '@services/report'
 import { connect } from '@tarojs/redux'
 import { ROLE_CODE } from '@constants/user'
+import { getQrCodeParams } from '@utils/qrcode'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
 const bgImg = require('@assets/helpgroup/bg.png')
 
@@ -289,9 +290,11 @@ export default class Index extends Component {
   render() {
     const { pageInfo, webViewVisible, codeParams } = this.state
     const { userInfo: { person } } = this.props
+    const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
     const webUrlParams = [
       `personId=${person.personId}`,
       `h5id=${this.$router.params.id}`,
+      `consultant=${consultant}`,
       `codeParams=${encodeURIComponent(codeParams)}`,
     ].join('&')
 

src/utils/request.js

@@ -92,13 +92,6 @@ export const fetch = async (options) => {
     if (err.message) {
       errMessage = err.message
     }
-<<<<<<< HEAD
-    
-    Taro.showToast({
-      title: errMessage,
-      icon: 'none'
-    })
-=======
     if (showMessage) {
 
       Taro.showToast({
@@ -106,7 +99,6 @@ export const fetch = async (options) => {
         icon: 'none'
       })
     }
->>>>>>> cbe91908d12d4a713e5490b4702108ce3186a31e
 
     throw new Error(errMessage)
   })