bug fix

src/pages/activity/detail/assemble.js

@@ -11,6 +11,7 @@ import dayjs from 'dayjs'
 // import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
 import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
+import { getQrCodeParams } from '@utils/qrcode'
 import {
   getGroupDetail,
   createGroupActivity,
@@ -95,18 +96,26 @@ export default class Detail extends Component {
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.groupActivityId) {
-      let id = this.$router.params.id
-      let recordId = this.$router.params.recordId
+      const router = Taro.getStorageSync('router')
+      let id = this.$router.params.id || router.query.id
+      let recordId = this.$router.params.recordId || router.query.recordId
 
       if (!id) {
-        const router = Taro.getStorageSync('router')
-        id = router.query.id
-        recordId = router.query.recordId
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          this.setState({ id: res.id, recordId: res.recordId }, () => {
+            this.loadDetail()
+          })
+        }).catch(err => {
+          Taro.showToast({
+            title: '没有找到活动',
+            icon: 'none'
+          })
+        })
+      } else {
+        this.setState({ id, recordId }, () => {
+          this.loadDetail()
+        })
       }
-
-      this.setState({ id, recordId }, () => {
-        this.loadDetail()
-      })
     }
   }
 

src/pages/activity/detail/assistance.js

@@ -11,6 +11,7 @@ import dayjs from 'dayjs'
 // import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
 import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
+import { getQrCodeParams } from '@utils/qrcode'
 import {
   getHelpDetail,
   createHelpActivity,
@@ -95,18 +96,27 @@ export default class Detail extends Component {
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.helpActivityId) {
-      let id = this.$router.params.id
-      let initiateId = this.$router.params.initiateId
+      const router = Taro.getStorageSync('router')
+      let id = this.$router.params.id || router.query.id
+      let initiateId = this.$router.params.initiateId || router.query.initiateId
 
       if (!id) {
-        const router = Taro.getStorageSync('router')
-        id = router.query.id
-        initiateId = router.query.initiateId
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          this.setState({ id: res.id, initiateId: res.initiateId }, () => {
+            this.loadDetail()
+          })
+        }).catch(err => {
+          Taro.showToast({
+            title: '没有找到活动',
+            icon: 'none'
+          })
+        })
+      } else {
+        this.setState({ id, initiateId }, () => {
+          this.loadDetail()
+        })
       }
 
-      this.setState({ id, initiateId }, () => {
-        this.loadDetail()
-      })
     }
   }
 

src/pages/activity/detail/index.js

@@ -8,6 +8,7 @@ import WxParse from '@components/wxParse/wxParse'
 import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
 import { getDownloadURL, times, transferImage } from '@utils/tools'
+import { getQrCodeParams } from '@utils/qrcode'
 import {
   addActivityShareNum,
   signupActivity,
@@ -47,10 +48,25 @@ export default class Detail extends Component {
   componentWillMount() {
     ready.queue(() => {
       const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id || '2fe920719b8b0db50011441462e647ad'
-      this.setState({ id }, () => {
-        this.loadDetail()
-      })
+      // const id = this.$router.params.id || router.query.id || '2fe920719b8b0db50011441462e647ad'
+
+      const id = this.$router.params.id || router.query.id
+      if (!id) {
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          this.setState({ id: res.id }, () => {
+            this.loadDetail()
+          })
+        }).catch(err => {
+          Taro.showToast({
+            title: '没有找到活动',
+            icon: 'none'
+          })
+        })
+      } else {
+        this.setState({ id }, () => {
+          this.loadDetail()
+        })
+      }
     })
   }
   componentWillUnmount() {

src/pages/card/index.js

@@ -36,14 +36,11 @@ export default class Index extends Component {
     recordId: null,
     isSave: false,
     bound: false,
-    modalStatus: false,
     grantPhoneVisible: false, // 授权手机弹框
   }
 
   componentWillMount() {
     ready.queue(() => {
-      // const router = Taro.getStorageSync('router')
-      // const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
       // 分享场景需要先授权手机, 再授权头像
       const options = wx.getLaunchOptionsSync()
       if (sceneInShare(options.scene)) {
@@ -66,19 +63,20 @@ export default class Index extends Component {
     const router = Taro.getStorageSync('router')
     const id = this.$router.params.id || router.query.id
 
-    if (router.query.id) {
-      this.setState({
-        cardId: id,
-        modalStatus: true
-      }, this.loadCardDetail)
+    if (!id) {
+      getQrCodeParams(this.$router.params.scene).then(res => {
+        this.setState({ cardId: res.id }, this.loadCardDetail)
+        addCardUv(res.id)
+      }).catch(err => {
+        Taro.showToast({
+          title: '没有找到卡片',
+          icon: 'none'
+        })
+      })
     } else {
-      this.setState({
-        cardId: id,
-        modalStatus: false
-      }, this.loadCardDetail)
+      this.setState({ cardId: id }, this.loadCardDetail)
+      addCardUv(id)
     }
-
-    addCardUv(id)
   }
 
   componentWillReceiveProps(nextProps) {
@@ -377,7 +375,6 @@ export default class Index extends Component {
       const { cardInfo, userInfo: { person } } = this.props
       if (person.personId != cardInfo.id) {
         reportClient(payload).then(res => {
-          this.hideModal()
           this.setState({ bound: true })
           if (res !== 'bound') {
             Taro.showToast({
@@ -439,11 +436,6 @@ export default class Index extends Component {
     }
   }
 
-  hideModal() {
-    this.setState({
-      modalStatus: false
-    })
-  }
   handleAuthPhoneSuccess = (phone) => {
     const { person = {} } = this.props.userInfo || {}
     if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
@@ -463,7 +455,7 @@ export default class Index extends Component {
     })
   }
   render() {
-    const { makePosterStatus, posterData, modalStatus, grantPhoneVisible } = this.state
+    const { makePosterStatus, posterData, grantPhoneVisible } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
     const { person: { personType, personId, phone, tel } } = userInfo
     const { unReadNum, picture, visitors, id, isReport } = cardInfo
@@ -475,8 +467,6 @@ export default class Index extends Component {
     const isConsultant = personType === ROLE_CODE['CONSULTANT']
     const hadPhone = (phone || tel) ? true : false  // nb
     const visibleChatBtn = !isConsultant && !isSelf
-    // const visibleConfirmModal = modalStatus && !isReport && !isSelf && (personType === ROLE_CODE['DRIFT'] || personType === ROLE_CODE['CUSTOMER'])
-    const visibleConfirmModal = modalStatus && !isReport && !isSelf
     const showAuthPhone = grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone
     return (
       <Block>
@@ -487,23 +477,6 @@ export default class Index extends Component {
           showAuthPhone &&
           <AchievePhone user={userInfo.person} onCancel={this.handeAuthPhoneFail} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
-        {
-          // !showAuthPhone && visibleConfirmModal && (
-          //   <View className="modal">
-          //     <View className="modal-mask" onClick={this.hideModal}></View>
-          //     <View className="modal-body">
-          //       <View className="modal-body__con">请确认是否成为他的客户？</View>
-          //       {
-          //         hadPhone ? (
-          //           <Button onClick={this.handleModalConfirm} className='modal-body__btn'>确认</Button>
-          //         ) : (
-          //             <Button open-type="getPhoneNumber" onGetphonenumber={this.handleGetPhone} className='modal-body__btn'>确认</Button>
-          //           )
-          //       }
-          //     </View>
-          //   </View>
-          // )
-        }
 
         {this.state.loaded && (
           <View className='mycard'>

src/pages/news/detail/index.js

@@ -8,6 +8,7 @@ import BackHomeBtn from '@components/BackHomeBtn'
 import Notice from '@components/Notice'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
 import { getDownloadURL, transferImage } from '@utils/tools'
+import { getQrCodeParams } from '@utils/qrcode'
 import {
   addNewsUv,
   favorNews,
@@ -41,12 +42,26 @@ export default class NewsDetail extends Component {
       console.info('news-1:', router)
       console.info('news-2:', this.$router)
 
-      const newsId = this.$router.params.id || router.query.id || '16'
+      const newsId = this.$router.params.id || router.query.id
 
-      this.setState({ newsId }, () => {
-        this.loadDetail()
-        addNewsUv(newsId)
-      })
+      if (!newsId) {
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          this.setState({ newsId: res.id }, () => {
+            this.loadDetail()
+            addNewsUv(res.id)
+          })
+        }).catch(err => {
+          Taro.showToast({
+            title: '没有找到资讯',
+            icon: 'none'
+          })
+        })
+      } else {
+        this.setState({ newsId }, () => {
+          this.loadDetail()
+          addNewsUv(newsId)
+        })
+      }
     })
   }
 

src/pages/project/index.js

@@ -60,6 +60,8 @@ export default class Index extends Component {
       this.loadOpenScreenBanner()
       this.getLocation()
 
+      Taro.setNavigationBarTitle({ title: this.props.userInfo.miniApp.name })
+
       savePoint({
         event: 'index',
         eventType: 'main',