Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

config/prod.js

@@ -9,7 +9,7 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    Version:'V3.5.5_2019-12-24'
+    Version:'V3.5.5_2019-12-25'
   },
   weapp: {},
   h5: {}

src/pages/activity/detail/index.js

@@ -12,6 +12,7 @@ import { getQrCodeParams } from '@utils/qrcode'
 import { getCardDetail } from '@services/card'
 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
+import AuthorizationComponent from '@components/authorizationComponent'
 import {
   addActivityShareNum,
   signupActivity,
@@ -87,9 +88,29 @@ export default class Detail extends Component {
     const consultant = this.$router.params.consultant || router.query.consultant
     const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
     const recommender = this.$router.params.recommender || router.query.recommender || ""
+
     queryActivityDetail(id).then(res => {
       Taro.hideLoading()
       const { isSaved, isSign } = res
+
+      savePoint({
+        event: 'detail',
+        eventType: 'activity',
+        propertyName: '活动详情',
+        buildingId: res.buildingId,
+        targetId: res.dynamicId,
+        consultantId: consultantId,
+        sharePersonId: recommender,
+        data: '{}'
+      }).then(res1 => {
+        this.setState({
+          recordId: res1.recordId
+        })
+        console.log('活动详情')
+      }).catch(err => {
+        console.log(err, "err")
+      })
+
       this.setState({
         detail: res,
         isSaved,
@@ -107,21 +128,7 @@ export default class Detail extends Component {
       })
       WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
-      savePoint({
-        event: 'detail',
-        eventType: 'activity',
-        propertyName: '活动详情',
-        buildingId: res.buildingId,
-        targetId: res.dynamicId,
-        consultantId: consultantId,
-        sharePersonId: recommender,
-        data: '{}'
-      }).then(res1 => {
-        this.setState({
-          recordId: res1.recordId
-        })
-        console.log('活动详情')
-      })
+
     })
 
     if (consultant) {
@@ -177,6 +184,7 @@ export default class Detail extends Component {
     })
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
     const shareData = shareContents && shareContents.length ? shareContents[0] : { shareContentTitle: title, shareContentImg: imgUrl };
+    console.log(`/pages/activity/detail/index?id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}&consultantId=${consultantId}`)
     return {
       title: shareData.shareContentTitle,
       path: `/pages/activity/detail/index?id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}&consultantId=${consultantId}`,//分享地址
@@ -383,6 +391,7 @@ export default class Detail extends Component {
     const { userInfo: { person: { phone, personId, nickname, name } } } = this.props
     return (
       <Block>
+        <AuthorizationComponent>
         {/* 生成海报 */}
         {posterVisible && (<Poster data={posterData} toggle={this.togglePosterStatus}></Poster>)}
 
@@ -495,6 +504,7 @@ export default class Detail extends Component {
             </View>
           )
         }
+      </AuthorizationComponent>
       </Block>
     )
   }

src/pages/news/detail/index.js

@@ -140,7 +140,7 @@ export default class NewsDetail extends Component {
     })
   }
 
-  currentPageAndParams () {
+  currentPageAndParams() {
     const { detail: { newsId } } = this.state
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
@@ -206,20 +206,6 @@ export default class NewsDetail extends Component {
     Taro.showLoading()
     queryNewsDetail(newsId).then(res => {
       Taro.hideLoading()
-      this.setState({
-        detail: res,
-        loaded: true,
-        isSaved: res.isSave
-      }, () => {
-        const { detail } = this.state
-        if (detail.posters && detail.posters.length && detail.posters[0].posterImg) {
-          this.setState({
-            posterShow: 'flex'
-          })
-        }
-      })
-
-      // WxParse.wxParse('article', 'html', res.newsDetail, this.$scope, 0)
       // 埋点
       savePoint({
         event: 'detail',
@@ -236,6 +222,22 @@ export default class NewsDetail extends Component {
         })
         console.info('资讯详情')
       })
+    
+      this.setState({
+        detail: res,
+        loaded: true,
+        isSaved: res.isSave
+      }, () => {
+        const { detail } = this.state
+        if (detail.posters && detail.posters.length && detail.posters[0].posterImg) {
+          this.setState({
+            posterShow: 'flex'
+          })
+        }
+      })
+
+      WxParse.wxParse('article', 'html', res.newsDetail, this.$scope, 0)
+
     })
 
     if (consultant) {

src/pages/project/banner/index.js

@@ -3,7 +3,7 @@ import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
 // import { cdn } from '@constants/api'
 import './index.scss'
 import emptyImg from '@assets/empty.png'
-import { transferImage} from '@utils/tools'
+import { transferImage } from '@utils/tools'
 
 export default class SwiperBanner extends Component {
   static defaultProps = {
@@ -16,7 +16,7 @@ export default class SwiperBanner extends Component {
 
   }
 
-  changeCurrent (event) {
+  changeCurrent(event) {
     // const { isChange } = this.props
     const current = event.detail.current
 
@@ -25,15 +25,15 @@ export default class SwiperBanner extends Component {
     //    this.props.onChange(current)
     // } 
 
-  this.props.onChange &&  this.props.onChange(current)
+    this.props.onChange && this.props.onChange(current)
 
 
   }
 
-  onBannerClick (item) {
+  onBannerClick(item) {
     this.props.onClick(item)
   }
-  render () {
+  render() {
     const { list, style, indicatorDots, current } = this.props
 
     // console.log('banner', list)

src/pages/project/index.js

@@ -97,6 +97,7 @@ export default class Index extends Component {
 
       Taro.hideTabBar()
       this.getLocation()
+      this.getIndexShareInfo()
 
       Taro.setNavigationBarTitle({ title: this.props.userInfo.miniApp.name })
 
@@ -113,7 +114,15 @@ export default class Index extends Component {
       })
     })
   }
-
+  getIndexShareInfo() {
+    getIndexShare().then(res => {
+      this.setState({
+        shareImg: (res || {}).imgUrl,
+        imgDocument: (res || {}).imgDocument,
+      })
+      console.log(res, '首页分享信息')
+    })
+  }
 
   toChatList() {
     // const { dispatch } = getStore()
@@ -124,12 +133,7 @@ export default class Index extends Component {
   }
   componentDidShow() {
 
-    getIndexShare().then(res => {
-      this.setState({
-        shareImg: (res || {}).imgUrl,
-        imgDocument: (res || {}).imgDocument,
-      })
-    })
+    this.getIndexShareInfo()
     if (this.props.curCity.id) {
       ready.queue(() => {
         // Taro.hideTabBar()
@@ -613,13 +617,13 @@ export default class Index extends Component {
               <View className="section section-top" style={{ marginTop: 0, paddingTop: 0 }}>
                 <View
                   style={{
-                    height: '500rpx', position: 'relative'
+                    height: '464rpx', position: 'relative'
                   }}>
                   {
                     this.state.visBanner && (
                       <Banner
                         style={{
-                          height: '500rpx'
+                          height: '464rpx'
                         }}
                         indicatorDots={false}
                         list={this.state.bannerList}