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.4_2019-12-182140'
+    Version:'V3.5.4_2019-12-191441'
   },
   weapp: {},
   h5: {}

project.config.json

@@ -1,7 +1,7 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "知与行互动",
+	"description": "知与行联调",
 	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,

src/app.js

@@ -5,7 +5,7 @@ import "@styles/icon.scss";
 import "@components/wxParse/wxParse.scss";
 import Index from './pages/auth/index'
 import { Provider } from '@tarojs/redux'
-import { getQueryString } from '@utils/tools'
+import { parseQueryString } from '@utils/tools'
 
 import {
   getCodeScene,
@@ -176,7 +176,7 @@ class App extends Component {
     })
   }
   componentDidMount() {
-    console.info('app componentDidMount')
+    // console.info('app componentDidMount')
   }
   componentWillMount(params) {
     // console.info('app componentWillMount', params)
@@ -185,7 +185,7 @@ class App extends Component {
 
   initData () {
     // console.info('app componentDidShow')
-    console.info('router1', this.$router.params)
+    console.info('router1', this.$router)
     console.info('ready status1', ready)
 
     // 获取城市列表
@@ -229,33 +229,39 @@ class App extends Component {
   getRouterParams() {
     return new Promise(resolve => {
       const router = this.$router.params
-      let { query: { scene: paramsId } } = router
-console.log(paramsId,'paramsId---')
+      const originQuery = { ...router.query };
+      let { query: { scene: paramsId }, scene } = router
+
+      // query 里面如果跟同级场景一样, 说明是小程序原生场景值
+      if (paramsId === scene) {
+        paramsId = undefined
+      }
+
       if (paramsId) {
         // 扫码进入
         getCodeScene(paramsId).then(res => {
           let params = JSON.parse(res).scene
-          let _from = getQueryString(params, 'from')
-          let _recommender = getQueryString(params, 'recommender')
-          let id = getQueryString(params, 'id')
-          let agentCode = getQueryString(params, 'agentCode')
+          let { from: _from, recommender: _recommender, id, ...left } = parseQueryString(params) || {}
+
           router.query = Object.assign(router.query, {
+            originQuery,
             id,
             paramsId,
             from: _from,
             recommender: _recommender,
             params,
             targetId: id,
-            agentCode
+            ...left,
           })
 
           resolve(router)
         })
       } else {
         router.query = Object.assign(router.query, {
-          paramsId: router.query.id ? router.query.id : '',
-          from: 'search',
-          recommender: router.query.recommender ? router.query.recommender : ''
+          originQuery,
+          paramsId: router.query.id || '',
+          from: router.query.from || 'search',
+          recommender: router.query.recommender || ''
         })
 
         resolve(router)

src/components/achieveAvatar/index.js

@@ -84,7 +84,6 @@ export default class Index extends Component {
   }
   render() {
     const { user = {} } = this.props
-    console.log('---------renderMaskBanner--------')
 
     return (
       <Block>

src/components/achievePhone/index.js

@@ -4,7 +4,7 @@ import './index.scss'
 
 const grantIcon = require('@assets/helpgroup/shouquan.png')
 const logoImg = require('@assets/index/logo.png')
-const bgImg = require('@assets/helpgroup/bg.png')
+const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
 
 export default class Index extends Component {
 

src/components/consultant/index.js

@@ -1,7 +1,6 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import { transferImage } from '@utils/tools'
-import { reportClient } from '@services/report'
 import * as noticeType from '@constants/common.js'
 
 export default class Index extends Component {
@@ -17,30 +16,6 @@ export default class Index extends Component {
     }
     componentDidMount() {
 
-    }
-    // 报备客户
-    reportClient() {
-
-        // const router = Taro.getStorageSync('router')
-        // const consultant = this.$router.params.consultant || router.query.consultant || ""
-        // const {
-        //     userInfo: { person: { phone, tel, userId } }
-        // } = this.props
-        // // debugger
-        // if (consultant && consultant != userId) {
-        //     const realPhone = phone || tel
-        //     const payload = {
-        //         realtyConsultant: consultant, //报备人 置业顾问
-        //         phone: realPhone,
-        //         showToast: false
-        //     }
-
-        //     reportClient(payload).then(res => {
-        //         console.log('恭喜您绑定成功')
-        //     }).catch(err => {
-        //         console.error(err)
-        //     })
-        // }
     }
     //   悬浮框显示隐藏
     handleClick() {

src/components/taro-plugin-canvas/index.js

@@ -288,8 +288,6 @@ export default class CanvasDrawer extends Component {
   }
 
   render() {
-    console.log('------render canvas----')
-
     const { pxWidth, pxHeight, debug } = this.state;
     if(pxWidth && pxHeight){
       return (

src/pages/activity/detail/assemble.js

@@ -254,6 +254,10 @@ export default class Detail extends Component {
     const { userInfo } = this.props
 
     Taro.showLoading()
+    const router = Taro.getStorageSync('router')
+    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 || ""
     getGroupDetail(id, recordId).then(res => {
       this.stopTicker()
 
@@ -293,14 +297,15 @@ export default class Detail extends Component {
         eventType: 'group',
         propertyName: '拼团详情',
         buildingId: res.taShareActivity.buildingId,
+        consultantId: consultantId,
+        sharePersonId: recommender,
         targetId: id,
         data: '{"recordId":"' + recordId + '"}'
       }).then((res) => {
         this.setState({ pointRecordId: res.recordId })
       })
     })
-    const router = Taro.getStorageSync('router')
-    const consultant = this.$router.params.consultant || router.query.consultant
+
     if (consultant) {
       this.reportClientFn()
       getCardDetail(consultant).then(res => {
@@ -316,9 +321,9 @@ export default class Detail extends Component {
 
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const { userInfo: { person: { phone, tel, userId } } } = this.props
+    const { userInfo: { person: { phone, tel, personId } } } = this.props
 
-    if (consultant && consultant != userId) {
+    if (consultant && consultant != personId) {
       const realPhone = phone || tel
       const payload = {
         realtyConsultant: consultant, //报备人 置业顾问
@@ -337,12 +342,14 @@ export default class Detail extends Component {
     const { id, recordId } = this.state
     const { userInfo: { person: { personId, personType } } } = this.props
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
 
     let queryParams = [
       `id=${id}`,
       `from=group_share`,
       `recommender=${personId}`,
       `consultant=${consultant}`,
+      `consultantId=${consultantId}`,
     ]
     if (recordId) {
       queryParams.push(`recordId=${recordId}`)
@@ -360,7 +367,7 @@ export default class Detail extends Component {
 
   onShareAppMessage = () => {
     const { shares, detail: { groupActivityId } } = this.state
-    const currentPage = this.currentPageAndParams().join('?')
+    const currentPage = `/${this.currentPageAndParams().join('?')}`
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
 
@@ -602,8 +609,8 @@ export default class Detail extends Component {
 
     const posterConfigs = this.transTPLs2Configs(posterTpls, posterData)
 
-    console.log('------posterData------', posterData)
-    console.log('------posterConfigs------', posterConfigs)
+    // console.log('------posterData------', posterData)
+    // console.log('------posterConfigs------', posterConfigs)
 
     const isJoin = memberList.filter(x => x.personId === userInfo.person.personId)[0] || isStarter
 

src/pages/activity/detail/assistance.js

@@ -257,6 +257,10 @@ export default class Detail extends Component {
     const { userInfo } = this.props
 
     Taro.showLoading()
+    const router = Taro.getStorageSync('router')
+    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 || ""
     getHelpDetail(id, initiateId).then(res => {
       this.stopTicker()
 
@@ -297,14 +301,15 @@ export default class Detail extends Component {
         eventType: 'help',
         propertyName: '助力详情',
         buildingId: res.helpActivity.buildingId,
+        consultantId: consultantId,
+        sharePersonId: recommender,
         targetId: id,
         data: '{"initiateId":"' + initiateId + '"}'
       }).then((res) => {
         this.setState({ pointRecordId: res.recordId })
       })
     })
-    const router = Taro.getStorageSync('router')
-    const consultant = this.$router.params.consultant || router.query.consultant
+
     if (consultant) {
       this.reportClientFn()
       getCardDetail(consultant).then(res => {
@@ -320,9 +325,9 @@ export default class Detail extends Component {
 
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const { userInfo: { person: { phone, tel, userId } } } = this.props
+    const { userInfo: { person: { phone, tel, personId } } } = this.props
 
-    if (consultant && consultant != userId) {
+    if (consultant && consultant != personId) {
       const realPhone = phone || tel
       const payload = {
         realtyConsultant: consultant, //报备人 置业顾问
@@ -339,14 +344,16 @@ export default class Detail extends Component {
 
   currentPageAndParams() {
     const { id, initiateId } = this.state
-    const { userInfo: { person: { personId, personType } } } = this.props
+    const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
 
     let queryParams = [
       `id=${id}`,
       `from=help_share`,
       `recommender=${personId}`,
       `consultant=${consultant}`,
+      `consultantId=${consultantId}`,
     ]
     if (initiateId) {
       queryParams.push(`initiateId=${initiateId}`)
@@ -363,7 +370,7 @@ export default class Detail extends Component {
 
   onShareAppMessage = () => {
     const { shares, id } = this.state
-    const currentPage = this.currentPageAndParams().join('?')
+    const currentPage = `/${this.currentPageAndParams().join('?')}`
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
 
@@ -396,7 +403,7 @@ export default class Detail extends Component {
   handleHelp = () => {
     const { userInfo: { miniApp: { tpls } } } = this.props
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HELP && x.isSubscribe == true))[0].tplId
-    const that=this
+    const that = this
     wx.requestSubscribeMessage({
       tmplIds: [tplId],
       success(res) {
@@ -412,7 +419,7 @@ export default class Detail extends Component {
         that.setState({ submitting: true }, () => {
           const { detail, initiateDetail } = that.state
           const person = that.props.userInfo.person
-    
+
           giveFriendHelp({
             buildingId: detail.buildingId,
             helpActivityId: detail.helpActivityId,
@@ -425,7 +432,7 @@ export default class Detail extends Component {
             Taro.hideLoading()
             const helpList = that.state.helpList || []
             helpList.push(res.helpRecord)
-    
+
             that.setState({
               submitting: false,
               helpList,
@@ -433,16 +440,16 @@ export default class Detail extends Component {
               initiateId: res.helpInitiateRecord.helpRecordInitiateId,
               helpState: res.helpInitiateRecord.status === undefined ? HelpInProcess : res.helpInitiateRecord.status,
             })
-    
+
             Taro.showToast({
               title: '助力成功',
               icon: 'success'
             })
-    
+
           }).catch(err => {
             console.log('err:', err)
             Taro.hideLoading()
-    
+
             Taro.showToast({
               title: '失败: ' + err.message,
               icon: 'none'
@@ -455,7 +462,7 @@ export default class Detail extends Component {
         })
       }
     })
-   
+
   }
 
   // 发起我的助力
@@ -501,7 +508,7 @@ export default class Detail extends Component {
   askForHelp = () => {
     const { userInfo: { miniApp: { tpls } } } = this.props
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HELP && x.isSubscribe == true))[0].tplId
-    const that=this
+    const that = this
     wx.requestSubscribeMessage({
       tmplIds: [tplId],
       success(res) {

src/pages/activity/detail/index.js

@@ -81,6 +81,10 @@ export default class Detail extends Component {
   loadDetail() {
     const { id } = this.state
     Taro.showLoading()
+    const router = Taro.getStorageSync('router')
+    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
@@ -107,6 +111,8 @@ export default class Detail extends Component {
         propertyName: '活动详情',
         buildingId: res.buildingId,
         targetId: res.dynamicId,
+        consultantId: consultantId,
+        sharePersonId: recommender,
         data: '{}'
       }).then(res1 => {
         this.setState({
@@ -115,8 +121,7 @@ export default class Detail extends Component {
         console.log('活动详情')
       })
     })
-    const router = Taro.getStorageSync('router')
-    const consultant = this.$router.params.consultant || router.query.consultant
+
     if (consultant) {
       this.reportClientFn()
       getCardDetail(consultant).then(res => {
@@ -132,9 +137,9 @@ export default class Detail extends Component {
 
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const { userInfo: { person: { phone, tel, userId } } } = this.props
+    const { userInfo: { person: { phone, tel, personId } } } = this.props
 
-    if (consultant && consultant != userId) {
+    if (consultant && consultant != personId) {
       const realPhone = phone || tel
       const payload = {
         realtyConsultant: consultant, //报备人 置业顾问
@@ -149,7 +154,7 @@ export default class Detail extends Component {
     }
   }
   onShareAppMessage = () => {
-    const { detail: { shareContents, title, dynamicId, url } } = this.state
+    const { detail: { shareContents, title, dynamicId, imgUrl } } = this.state
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     console.log(dynamicId, "path")
     console.log(personId, "personId")
@@ -170,11 +175,10 @@ export default class Detail extends Component {
     })
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
     return {
-      title: shareContents[0].shareContentTitle,
-      path: `/pages/activity/detail/index?id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}`,//分享地址
-      imageUrl: shareContents[0].shareContentImg
+      title: shareContents[0].shareContentTitle || title,
+      path: `/pages/activity/detail/index?id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}&consultantId=${consultantId}`,//分享地址
+      imageUrl: shareContents[0].shareContentImg || imgUrl
     }
-
   }
 
   handleSignup() {
@@ -246,13 +250,14 @@ export default class Detail extends Component {
       }
 
       const { userInfo: { person, miniApp } } = this.props
-      const { avatarurl, nickname, personId, personType, phone, tel } = person
+      const { avatarurl, nickname, personId, personType, phone, tel, userId } = person
       const { detail: { dynamicId, posters, createDate } } = this.state
       const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+      const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
       const phoneNum = phone || tel
 
       const payload = {
-        "scene": `id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}`,
+        "scene": `id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}&consultantId=${consultantId}`,
         "page": 'pages/activity/detail/index',
       }
 

src/pages/activity/index.js

@@ -57,8 +57,8 @@ export default class Index extends Component {
     if (cityId) {
       payload.cityId = cityId
     }
+
     // 从个人中心过来
-    console.log(this.router, "from")
     if (from === 'mine') {
       payload.mine = true
     }
@@ -114,7 +114,7 @@ export default class Index extends Component {
       const {records, list, total, current, pages} = res || {}
       const _list = records || list || []
       const newList = current <= 1 ? _list: this.state.list.concat(_list)
-console.log(res,'---res-------')
+
       this.setState({
         list: newList,
         isEmpty: total == 0,

src/pages/activity/item/index.js

@@ -16,7 +16,6 @@ export default class Item extends Component {
     const { data, style } = this.props
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        {console.log(data,'----data-----')}
          <Image className="pic" mode="aspectFill" src={transferImage(data.mainImg ||data.listImgUrl|| data.imgUrl)}></Image>
         <View className="box">
           <View className="title">{data.title}</View>

src/pages/checkin/index.js

@@ -121,7 +121,7 @@ export default class checkin extends Component {
   render () {
     const { dynamic = {}, enlist = {}, person = {} } = this.state.data || {}
     const { activityStatus } = dynamic || {}
-    console.log(enlist, 'enlist')
+    // console.log(enlist, 'enlist')
     return (
       <View className="checkin" style="width:100vw;height:100vh;" >
 

src/pages/city/index.js

@@ -74,7 +74,6 @@ export default class Index extends Component {
           scrollY>
 
           <View className="search-wrap">
-            {console.log(searchList, "-----------searchListview----------")}
             <Search placeholder="搜索意向城市" onInput={this.handleSearch} onSearch={this.handleSearch}></Search>
             {
               keywords && (
@@ -83,7 +82,6 @@ export default class Index extends Component {
                     searchList.length > 0 ? (
                       searchList.map(item => (
                         <View key={item.id} className="list-item" onClick={this.handleSelected.bind(this, item)}>{item.name}
-                          {console.log(item, "-------item------")}
                         </View>
                       ))
                     ) : <View className="empty">暂无结果</View>

src/pages/news/detail/index.js

@@ -41,7 +41,11 @@ export default class NewsDetail extends Component {
     consultShow: false  // 置业顾问悬浮框显示隐藏
   }
 
-  componentWillMount() {
+  componentWillMount(options) {
+    console.log('================options========================', options)
+    console.log('===========wx.getLaunchOptionsSync()===========', wx.getLaunchOptionsSync())
+    console.log('================this.$router===================', this.$router)
+
     console.info('ready status3', ready)
     ready.queue(() => {
       const router = Taro.getStorageSync('router')
@@ -80,9 +84,10 @@ export default class NewsDetail extends Component {
 
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const { userInfo: { person: { phone, tel, userId } }} = this.props
+    const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
+    const { userInfo: { person: { phone, tel, userId } } } = this.props
 
-    if (consultant && consultant != userId) {
+    if (consultant && consultant != personId) {
       const realPhone = phone || tel
       const payload = {
         realtyConsultant: consultant, //报备人 置业顾问
@@ -132,6 +137,30 @@ export default class NewsDetail extends Component {
       url: `/pages/project/index`
     })
   }
+
+  currentPageAndParams () {
+    const { detail: { newsId } } = this.state
+    const { userInfo: { person: { personId, personType, userId } } } = this.props
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+
+    let queryParams = [
+      `id=${newsId}`,
+      `from=news_share`,
+      `recommender=${personId}`,
+      `consultant=${consultant}`,
+      `consultantId=${consultantId}`,
+    ]
+
+    const res = [
+      'pages/news/detail/index',
+      queryParams.join('&'),
+    ]
+
+    console.log('--page-params->', res)
+    return res
+  }
+
   onShareAppMessage = () => {
     const { detail: { shareContents, newsName, newsId, newsImg } } = this.state
     const { userInfo: { person: { personId, personType, userId } } } = this.props
@@ -150,18 +179,28 @@ export default class NewsDetail extends Component {
       console.info('资讯详情分享')
     })
 
+    const shareData = shareContents && shareContents.length ? shareContents[0] : { shareContentTitle: newsName, shareContentImg: newsImg };
+
     // 分享埋点
     addNewsShareNum(newsId)
 
+    const [path, params] = this.currentPageAndParams();
+
+    console.log('----share-url---->', `/${path}?${params}`)
+
     return {
-      title: shareContents[0].shareContentTitle,
-      path: `/pages/news/detail/index?id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}`,//分享地址
-      imageUrl: shareContents[0].shareContentImg
+      title: shareData.shareContentTitle,
+      path: `/${path}?${params}`,//分享地址
+      imageUrl: shareData.shareContentImg
     }
   }
 
   loadDetail() {
     const { newsId } = this.state
+    const router = Taro.getStorageSync('router')
+    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 || ""
     Taro.showLoading()
     queryNewsDetail(newsId).then(res => {
       Taro.hideLoading()
@@ -186,6 +225,8 @@ export default class NewsDetail extends Component {
         propertyName: '资讯详情',
         buildingId: res.buildingId,
         targetId: res.newsId,
+        consultantId: consultantId,
+        sharePersonId: recommender,
         data: '{}'
       }).then(res => {
         this.setState({
@@ -194,8 +235,7 @@ export default class NewsDetail extends Component {
         console.info('资讯详情')
       })
     })
-    const router = Taro.getStorageSync('router')
-    const consultant = this.$router.params.consultant || router.query.consultant
+
     if (consultant) {
       this.reportClientFn()
       getCardDetail(consultant).then(res => {
@@ -214,27 +254,29 @@ export default class NewsDetail extends Component {
         return
       }
       const { userInfo: { person, miniApp } } = this.props
-      const { avatarurl, nickname, personId, personType, phone, tel } = person
-      const { newsId, detail: { posters, newsName, createDate } } = this.state
-      const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
-      const phoneNum = phone || tel
-      const payload = {
-        "scene": `id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}`,
-        "page": 'pages/news/detail/index',
-      }
+      const { avatarurl, nickname, personId, personType, phone, tel, userId } = person
+      const { newsId, detail: { posters, newsName, createDate, newsImg = '' } } = this.state
+      // const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+      // const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+      // const phoneNum = phone || tel
+
+      const [page, scene] = this.currentPageAndParams();
+
+      const payload = { page, scene }
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');
 
+      const posterDt = posters && posters.length ? posters[0] : { posterTitle: newsName, posterDescription: '', posterImg: newsImg }
+
       getMiniQrcode(payload).then(qrcode => {
         let data = {
           qrcode,//小程序二维码
           nickname,//访问者名字
           avatarurl: _avatarurl,//访问者头像
-          title: posters[0].posterTitle,//资讯海报标题
-          posterDescription: posters[0].posterDescription,//资讯海报描述
+          title: posterDt.posterTitle,//资讯海报标题
+          posterDescription: posterDt.posterDescription,//资讯海报描述
           createDate: createDate,//资讯时间
-          poster: posters[0].posterImg,
+          poster: posterDt.posterImg,
           miniAppName: miniApp.name,
-
         }
         resolve(data)
       })

src/pages/person/customerAnalysis/myCustomer.js

@@ -489,7 +489,7 @@ export default class myCustomer extends Taro.Component {
           </View>
           <View className='user__left__phone'>{customerDetail.phone}
             <Image onClick={this.handleTelClick.bind(this, customerDetail)} style="width:36rpx;height:36rpx;margin-left:20rpx;background:rgba(255,219,179,0.2);padding: 14rpx;border-radius: 30rpx;" src={phoneImg} />
-            <Image onClick={this.handleChatClick.bind(this, item)} style="width:36rpx;height:36rpx;margin-left:40rpx;background:rgba(255,219,179,0.2);padding: 14rpx;border-radius: 30rpx;" src={messageImg} />
+            <Image onClick={this.handleChatClick.bind(this, customerDetail)} style="width:36rpx;height:36rpx;margin-left:40rpx;background:rgba(255,219,179,0.2);padding: 14rpx;border-radius: 30rpx;" src={messageImg} />
           </View>
         </View>
         <AtTabs height="calc(100vh - 300rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>

src/pages/person/menus.js

@@ -17,7 +17,7 @@ const icons = {
   consultant: require('@assets/mine/consultant.png'),
   customerAnalysis: require('@assets/mine/customerAnalysis.png'),
   fenxi: require('@assets/mine/fenxi.png'),
-  share: require('@assets/mine/accessrecord.png'),
+  share: require('@assets/mine/share.png'),
 }
 
 const DRIFT = ROLE_CODE['DRIFT']

src/pages/project/activity/index.js

@@ -0,0 +1,81 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
+import { queryHelpGroup } from '@services/news'
+import { transferImage } from '@utils/tools'
+import ActivityItem from '../../activity/item'
+import dayjs from 'dayjs'
+import './index.scss'
+
+const bgImg = require('@assets/index/background.png')
+
+export default class SwiperBanner extends Component {
+
+    state = {
+        helpGroupList: []
+    }
+
+
+    componentWillMount() {
+        this.loadHelpGroupList()
+    }
+
+
+
+    loadHelpGroupList() {
+        queryHelpGroup({ cityId: this.props.cityId, buildingId: '' }).then(res => {
+            this.setState({
+                helpGroupList: res || []
+            })
+        })
+    }
+
+    render() {
+        if (!this.state.helpGroupList.length) return null;
+
+        return (
+            <View className="activity-box" style={`background: url(${transferImage(bgImg)}) no-repeat center;background-size: 100% 100%;`}>
+                <View className="section-head">
+                    <View className="section-head__title">热门活动 </View>
+                    <View className="section-head__more" >
+                        查看更多<Text className="iconfont icon-more"></Text>
+                    </View>
+                </View>
+                <ScrollView scrollX>
+                    <View className='activity-list'>
+                        {
+                            this.state.helpGroupList.length > 1 &&
+                            this.state.helpGroupList.map((item, index) => (
+                                <View className='item' key={index + 'act'}>
+                                    {/* {(data.type == 'help' || data.type == 'group') && */}
+                                    <View className={item.type == '1' ? 'type' : 'type2'}>{item.type == '1' ? '助力' : '拼团'}</View>
+                                    {/* } */}
+                                    <Image className="img" src={require('@assets/shop/bg.jpg')}></Image>
+                                    <View className="title">破晓·内容生态下半场的版权之道—2019企业啦啦啦啦</View>
+                                    <View className="time">参与截止时间</View>
+                                    <View className="time">2019年10月20日 10:08:20</View>
+                                    <View className="btn nostart">未开始</View>
+                                    {/* {item.endDate && */}
+                                        {/* <View className={data.activityStatus == 0 ? "btn jionin " : data.activityStatus == 1 ? "btn nostart" : data.activityStatus == 2 ? "btn jioned" : "btn"}>{data.activityStatus == 0 ? "立即参与" : data.activityStatus == 1 ? "未开始" : data.activityStatus == 2 ? "已结束" : "已参与"}</View> */}
+                        
+                                    {/* } */}
+                                </View>
+                            ))
+                        }
+                        {
+                            this.state.helpGroupList.length == 1 &&
+                            this.state.helpGroupList.map((item, index) => (
+                                <ActivityItem
+                                    data={item}
+                                    key={item.dynamicId}
+                                    onClick={this.handleItemClick}>
+                                </ActivityItem>
+                            ))
+                        }
+
+                    </View>
+                </ScrollView>
+
+            </View>
+        )
+    }
+}

src/pages/project/activity/index.scss

@@ -0,0 +1,126 @@
+@import "@styles/theme.scss";
+@import "@styles/mixins.scss";
+
+.activity-box{
+
+    height:626px;
+    background:#fff;
+    box-shadow:0px 2px 12px 2px rgba(0,0,0,0.08);
+    padding: 0 30px;
+    border-top:20px solid #f5f5f5;
+    position: relative;
+    .section-head  {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin: 30px 0;
+     
+        .section-head__title {
+            font-size: 40px;
+            font-weight: 600;
+          }
+          .section-head__more {
+            font-size: 26px;
+            color: #A1A1A1;
+            display: flex;
+            align-items: center;
+
+      
+            .iconfont {
+              font-size: 26px;
+              color: #A1A1A1;
+              font-family: "iconfont" !important;
+              margin-left: 6px;
+
+            }
+            .icon-more:before {
+                content: "\e636";       
+            }
+          }
+        }
+    .activity-list{
+        position: relative;
+        -webkit-overflow-scrolling: touch;
+        overflow: hidden;
+        display: inline-flex;
+        padding-bottom: 10px;
+        .item{
+            width:330px;
+            height:452px;
+            background:#fff;
+            box-shadow: 0 4px  8px 0 rgba(0, 0, 0, 0.16);
+            margin: 0 20px  0 2px;
+            border-radius:12px;
+            position: relative;
+            .type{
+                position: absolute;
+                left:0;
+                top:0;
+                color: #fff;
+                background:#F6B61D;
+                padding: 10px 36px;
+                border-radius: 12px 0 12px 0;
+                font-size: 24px;
+              }
+              .type2{
+                position: absolute;
+                left:0;
+                top:0;
+                color: #fff;
+                background:#BB9C79;
+                padding: 12px 36px;
+                border-radius: 12px 0 12px 0;
+                font-size: 24px;
+            
+              }
+            .img{
+              width: 330px;
+              height: 186px;  
+              border-radius:12px 12px 0 0;
+            }
+            .title{
+                overflow: hidden;
+                text-overflow: ellipsis;
+                display: -webkit-box;
+                -webkit-line-clamp: 2;
+                line-clamp: 2;
+                -webkit-box-orient: vertical;
+                height: 80px;
+                color: #666666;
+                font-size: 28px;
+                margin: 16px 10px 4px 10px;
+            }
+            .time{
+                color: #999;
+                font-size: 24px;
+                margin: 4px 10px ;
+            }
+            .btn {
+
+                background:#DADADA;
+                border-radius:30px;
+                text-align: center;
+                color: white;
+                display: block;
+                width: 148px;
+                font-size: 26px;
+                height: 48px;
+                line-height: 48px;
+                margin-top: 14px;
+                margin: 20px auto;
+              }
+              .jionin{
+                background:#FF6A6A;
+              }
+                  .nostart {
+                
+                background:#FDC080;
+              }
+              .jioned{
+                background: #9B9B9B;
+              }
+        }
+        
+    }
+    
+  }

src/pages/project/album/index.js

@@ -74,8 +74,6 @@ export default class Index extends Component {
     return (
       <View className='photos'>
         <View className="around-tab">
-          {console.log(listimg, '-----listimg---------')}
-          {console.log(imgList, '-------imgList-------')}
           {listimg.map((item, index) => {
             const { apartmentName } = item || {}
             const buildingImgList = item.buildingImgList || []

src/pages/project/banner/index.js

@@ -36,7 +36,7 @@ export default class SwiperBanner extends Component {
   render () {
     const { list, style, indicatorDots, current } = this.props
 
-    console.log('banner', list)
+    // console.log('banner', list)
     return (
       <View className='home-banner' style={style}>
         <Swiper

src/pages/project/detail/index.js

@@ -109,16 +109,14 @@ export default class Index extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+
   // 报备客户
   reportClientFn() {
-
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const {
-      userInfo: { person: { phone, tel, userId } }
-    } = this.props
+    const { userInfo: { person: { phone, tel, personId } } } = this.props
 
-    if (consultant && consultant != userId) {
+    if (consultant && consultant != personId) {
       const realPhone = phone || tel
       const payload = {
         realtyConsultant: consultant, //报备人 置业顾问
@@ -132,9 +130,33 @@ export default class Index extends Component {
       })
     }
   }
+
+  currentPageAndParams () {
+    const {
+      projectDetail: { buildingId },
+      userInfo: { person: { personId, personType, userId } }
+    } = this.props
+
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+
+    const queryParams = [
+      `id=${buildingId}`,
+      'from=building_share',
+      `recommender=${personId}`,
+      `consultant=${consultant}`,
+      `consultantId=${consultantId}`,
+    ]
+
+    return [
+      'pages/project/detail/index',
+      queryParams.join('&'),
+    ]
+  }
+
   onShareAppMessage = () => {
     const {
-      projectDetail: { shareContents, buildingName, buildingId, poster },
+      projectDetail: { shareContents, buildingName, buildingId, poster = '' },
       userInfo: { person: { personId, personType, userId } }
     } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
@@ -151,11 +173,15 @@ export default class Index extends Component {
     }).then(res => {
       console.log('项目详情分享')
     })
-    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+
+    const [page, params] = this.currentPageAndParams()
+
+    const shareData = shareContents && shareContents.length ? shareContents[0] : { shareContentTitle: buildingName, shareContentImg: poster }
+
     return {
-      title: shareContents[0].shareContentTitle,//分享内容
-      path: `/pages/project/detail/index?id=${buildingId}&from=building_share&recommender=${personId}&consultant=${consultant}`,//分享地址
-      imageUrl: shareContents[0].shareContentImg
+      title: shareData.shareContentTitle,//分享内容
+      path: `/${page}?${params}`,//分享地址
+      imageUrl: shareData.shareContentImg
     }
   }
 
@@ -173,12 +199,18 @@ export default class Index extends Component {
 
       addItemUv(id)
       // 埋点
+      const router = Taro.getStorageSync('router')
+      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 || ""
       savePoint({
         event: 'detail',
         eventType: 'building',
         propertyName: '项目详情',
         targetId: id,
         buildingId: id,
+        consultantId: consultantId,
+        sharePersonId: recommender,
         data: '{}'
       }).then(res => {
         this.setState({
@@ -186,18 +218,18 @@ export default class Index extends Component {
         })
         console.log('项目详情')
       })
-    })
-    const router = Taro.getStorageSync('router')
-    const consultant = this.$router.params.consultant || router.query.consultant
-    if (consultant) {
-      this.reportClientFn()
-      getCardDetail(consultant).then(res => {
-        this.setState({
-          consultData: res,
-          consultShow: true
+      if (consultant) {
+        this.reportClientFn()
+        getCardDetail(consultant).then(res => {
+          this.setState({
+            consultData: res,
+            consultShow: true
+          })
         })
-      })
-    }
+      }
+    })
+  
+  
   }
 
   loadHelpGroupList() {
@@ -340,7 +372,6 @@ export default class Index extends Component {
     this.navigateTo('/pages/card/fans/index?type=item&id=' + buildingId)
   }
 
-
   getPhoneNumber(e, item) {
     getUserPhone(e, (phoneNumber) => {
       const { userInfo: { person: { personId, nickname, name } } } = this.props
@@ -374,16 +405,14 @@ export default class Index extends Component {
       }
       con
       const {
-        userInfo: { person: { avatarurl, nickname, personId, personType }, miniApp },
+        userInfo: { person: { avatarurl, nickname, personId, personType, userId }, miniApp },
         projectDetail: { posters, buildingId, poster, price, buildingRestaurant, createDate, buildingName, tel, buildingTag, uvList = {} }
       } = this.props
       const { total = 0 } = uvList
-      const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
-      const phoneNum = person.phone || person.tel
-      const payload = {
-        "scene": `id=${buildingId}&from=building_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}`,
-        "page": 'pages/project/detail/index',
-      }
+
+      const [page, scene] = this.currentPageAndParams();   
+      const payload = {page, scene}
+
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');
 
       getMiniQrcode(payload).then(qrcode => {

src/pages/project/h5Page.js

@@ -11,7 +11,7 @@ import { getQrCodeParams } from '@utils/qrcode'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
 import { isEmpty } from '@utils/tools'
 
-const bgImg = require('@assets/helpgroup/bg.png')
+const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
 
 @connect(state => state.user, { ...actions })
 export default class Index extends Component {
@@ -67,7 +67,7 @@ export default class Index extends Component {
   // 分享好友
   onShareAppMessage = () => {
     const { pageInfo } = this.state
-    const currentPage = this.currentPageAndParams().join('?')
+    const currentPage = `/${this.currentPageAndParams().join('?')}`
     console.log(currentPage)
     return {
       title: pageInfo.shareTitle,
@@ -91,12 +91,14 @@ export default class Index extends Component {
     const { h5Id } = this.state
     const router = Taro.getStorageSync('router') || { query: {} }
 
-    const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
+    // const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.personId : ""
+    const consultantId = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
     const firstShare = this.$router.params.firstShare || router.query.firstShare || person.personId
 
     let queryParams = [
       `sharePersonId=${person.personId}`,
-      `consultant=${consultant}`,
+      `consultant=${consultantId}`,
+      // `consultantId=${consultantId}`,
       `firstShare=${firstShare}`,
       `id=${h5Id}`
     ]
@@ -172,7 +174,6 @@ export default class Index extends Component {
         console.log(phone, "phone#########")
         // 头像手机号都有
         if (phone) {
-
           this.reportClient()
           this.success()
           this.setState({
@@ -245,6 +246,7 @@ export default class Index extends Component {
     }
     console.log("授权头像成功！")
   }
+
   // 授权用户信息
   getUserInfo() {
     const { dispatchUpdateUserInfo } = this.props
@@ -298,14 +300,12 @@ export default class Index extends Component {
 
   // 报备客户
   reportClient() {
-
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const {
-      userInfo: { person: { phone, tel, userId } }
-    } = this.props
+    const { userInfo: { person: { phone, tel, personId, userId, personType } } } = this.props
+    const isConsultant = personType == ROLE_CODE['CONSULTANT']
 
-    if (consultant && consultant != userId) {
+    if (isConsultant && consultant != userId) {
       const realPhone = phone || tel
       const payload = {
         realtyConsultant: consultant, //报备人 置业顾问
@@ -358,7 +358,7 @@ export default class Index extends Component {
 
     const showH5 = !isEmpty(h5Id) && pageInfo.h5Address && pageInfo.h5Address !== 'about' && pageInfo.h5Address !== 'http://about' && pageInfo.h5Address !== 'https://about'
 
-    console.log('----web-h5------>', showH5, `${pageInfo.h5Address}?${webUrlParams}`)
+    // console.log('----web-h5------>', showH5, `${pageInfo.h5Address}?${webUrlParams}`)
 
     return (
       <Block>

src/pages/project/index.js

@@ -4,13 +4,13 @@ import './index.scss'
 import ProjectItem from './item'
 import Banner from './banner'
 import Newsbanner from './newsbanner'
-import HelpGroupBanner from './swiper'
+import Activity from './activity'
+import BannerTwo from './swiper'
 // import ActivityItem from '../activity/item'
 import ready from '@utils/ready'
 import { getLocationCity } from '@services/map'
-
 import { queryBanners, savePoint, updatePoint } from '@services/common'
-import { queryNewsList, queryHelpGroup } from '@services/news'
+import { queryHelpGroup } from '@services/news'
 import { queryActivityList } from '@services/activity'
 import { dispatchCitySelected } from '@actions/city'
 import { ROLE_CODE, DECREASE_UNREADNUM } from '@constants/user'
@@ -79,7 +79,6 @@ export default class Index extends Component {
     adImage: advImageOfApp,
     bannerList: [],
     helpGroupList: [],
-    newsList: [],
     activityList: [],
     recordId: null,
     visBanner: false,
@@ -139,7 +138,7 @@ export default class Index extends Component {
     let defaultCity = cityList.filter(item => {
       return item.id == org.defaultCityId
     })[0]
-    console.log('-----defaultCity-->', defaultCity)
+    // console.log('-----defaultCity-->', defaultCity)
 
     Taro.getLocation().then(location => {
       Taro.setStorageSync('lat', location.latitude)
@@ -152,7 +151,7 @@ export default class Index extends Component {
         let curCity = cityList.filter(item => {
           return item.name == res.name || ''
         })
-        console.log('-----curCity-->', curCity)
+        // console.log('-----curCity-->', curCity)
         this.updateCity(curCity[0] || defaultCity)
       }).catch(err => {
         Taro.showToast({
@@ -187,7 +186,6 @@ export default class Index extends Component {
   loadData() {
     this.loadBannerList()
     this.loadHelpGroupList()
-    this.loadNewsList()
     this.loadOpenScreenBanner()
     // this.loadActivityList()
     this.loadList()
@@ -259,28 +257,6 @@ export default class Index extends Component {
   }
 
 
-  loadNewsList() {
-    const { curCity } = this.props
-    const payload = {
-      pageNumber: 1,
-      pageSize: 999
-    }
-    if (curCity.id) {
-      payload.cityId = curCity.id
-    }
-
-    this.setState({
-      newsList: [{}]
-    }, () => {
-      queryNewsList(payload).then(res => {
-        this.setState({
-          newsList: res.records || []
-        })
-      })
-    })
-  }
-
-
   loadList() {
     const { keywords } = this.state
     const { curCity } = this.props
@@ -328,7 +304,7 @@ export default class Index extends Component {
       console.log('首页分享')
     })
     return {
-      title: `${this.props.userInfo.miniApp.name || '橙蕉'} 精准获客平台`,//分享内容
+      title: `${this.props.userInfo.miniApp.name || '橙蕉'} 精准获客平台`,//分享内容
       path: `/pages/project/index?from=share&recommender=${personId}`,//分享地址
       imageUrl: this.state.shareImg
     }
@@ -435,9 +411,7 @@ export default class Index extends Component {
   }
 
   handleMaskBannerClick(data) {
-
     this.redirectTo(data)
-
   }
 
   handleLocationClick() {
@@ -463,25 +437,11 @@ export default class Index extends Component {
   // DRIFT: 'drift', // 游客
   // CUSTOMER: 'customer' // 客户
   toRecomonedPage() {
-    const {
-      userInfo: { person: { personType } }
-    } = this.props
 
-    if (personType === ROLE_CODE['DRIFT'] || !personType) {
-      // 游客或者客户 区别是否有电话
-      // this.setState({
-      //   achieve: true
-      // })
-      Taro.navigateTo({
-        url: `/pages/agent/recommend/index?type=index&cityId=` + this.props.curCity.id
-      })
-    } else {
+    Taro.navigateTo({
+      url: `/pages/agent/recommend/index?type=index&cityId=` + this.props.curCity.id
+    })
 
-      Taro.navigateTo({
-        url: `/pages/agent/recommend/index?type=index&cityId=` + this.props.curCity.id
-      })
-      console.log(this.props.curCity.id, "this.props.curCity.id")
-    }
   }
   toMapHouse() {
     Taro.navigateTo({
@@ -497,21 +457,13 @@ export default class Index extends Component {
       url: `/pages/agent/recommend/index?type=index&cityId=` + curCity.id
     })
   }
-  toNewsList() {
-    Taro.getApp().props.projectIndex = 1
-    Taro.switchTab({
-      url: `/pages/activity/activity`,
-      fail: res => {
-        Taro.getApp().props.projectIndex = 0
-      }
-    })
-  }
+
 
   renderProjectList() {
     const { proList: { records = [] } } = this.props
-    const { helpGroupList } = this.state
+
     const list = records.filter(item => item.isMain === 1)
-    console.log(records, 'proList')
+    // console.log(records, 'proList')
     return (
       <Block>
         {
@@ -519,7 +471,7 @@ export default class Index extends Component {
             < View className="houses" >
               <View className="section-head">
                 <View style="display:flex;align-items:center">
-                  <Text className="section-head__title" onClick={this.handleProItemClick}>全部楼盘
+                  <Text className="section-head__title" onClick={this.handleProItemClick}>推荐楼盘
                 </Text>
                   <Image src={require('@assets/index/map.png')} onClick={this.toMapHouse} className='map-img'></Image>
                   <Text className='map-txt' onClick={this.toMapHouse}>地图看房</Text>
@@ -542,25 +494,6 @@ export default class Index extends Component {
           )
         }
 
-        {
-          helpGroupList.length > 0 &&
-          <View
-            style={{
-              position: 'relative', padding: '20px 15px 0 15px'
-            }}>
-
-            <HelpGroupBanner
-              style={{
-                borderRadius: '6px',
-                height: '230rpx'
-              }}
-              indicatorDots={false}
-              list={helpGroupList}
-              onClick={this.handleHelpGroupClick}>
-            </HelpGroupBanner>
-          </View>
-        }
-
         <View className="last-text">已经到底了~</View>
       </Block>
     )
@@ -592,10 +525,29 @@ export default class Index extends Component {
       url: '/pages/news/detail/index?id=' + item.newsId
     })
   }
+  toNewsList() {
+    Taro.getApp().props.projectIndex = 1
+    Taro.switchTab({
+      url: `/pages/activity/activity`,
+      fail: res => {
+        Taro.getApp().props.projectIndex = 0
+      }
+    })
+  }
+  toShopMallPage() {
+    Taro.switchTab({
+      url: `/pages/shop/index`
+    })
+  }
+  toPolicyPage() {
+    Taro.navigateTo({
+      url: '/pages/policy/index?from=mine',
+    })
+  }
 
   render() {
     const { curCity } = this.props
-    const { newsList, achieve, adImage } = this.state
+    const { achieve, helpGroupList } = this.state
     const { userInfo: { person: { personType, phone } } } = this.props
     const { unReadNum, userInfo: { person } } = this.props
     return (
@@ -606,18 +558,29 @@ export default class Index extends Component {
             {!achieve && <ScrollView
               scrollY
               className='home'>
+              <View className="top-box">
+                <View className="search" onClick={this.handleToHouseList}>
+                  <Image className="search-icon" src={require('@assets/index/search.png')} />
+                  <Input className="search-input" placeholder-style="color:#B8B8B8" placeholder="输入你想查询的楼盘"></Input>
+                </View>
+                <View className="location" onClick={this.handleLocationClick}>
+                  <Image className="location-icon" src={require('@assets/index/location.png')} />
+                  <Text className="location-text">{curCity.id ? curCity.shortname : '正在定位'}</Text>
+                  <View class="arrow_down"></View>
+                </View>
+              </View>
               <View className="section section-top" style={{ marginTop: 0, paddingTop: 0 }}>
                 <View
                   style={{
-                    height: '600rpx', position: 'relative'
+                    height: '464rpx', position: 'relative'
                   }}>
                   {
                     this.state.visBanner && (
                       <Banner
                         style={{
-                          height: '600rpx'
+                          height: '464rpx'
                         }}
-                        indicatorDots={true}
+                        indicatorDots={false}
                         list={this.state.bannerList}
                         onClick={this.handleBannerClick}
                         onChange={() => (1)}
@@ -626,18 +589,7 @@ export default class Index extends Component {
                     )
                   }
                 </View>
-                <View className="top-box">
-                  <View className="search" onClick={this.handleToHouseList}>
-                    <Image className="search-icon" src={require('@assets/search.png')} />
-                    <Input className="search-input" placeholder-style="color:#fff" placeholder="输入你想查询的楼盘"></Input>
-                  </View>
-                  <View className="location" onClick={this.handleLocationClick}>
-                    <Image className="location-icon" src={require('@assets/map.png')} />
-                    <Text className="location-text">{curCity.id ? curCity.name : '正在定位'}</Text>
-                  </View>
-                </View>
-
-                {
+                {/* {
                   (personType !== ROLE_CODE['CONSULTANT']) && (
                     <View className='section sectionn-customer' style={newsList.length ? "padding-bottom:0rpx;" : ""} >
                       <View className='section-content' onClick={this.toRecomonedPage.bind(this, personType)}>
@@ -660,17 +612,63 @@ export default class Index extends Component {
                       </View>
                     </View>
                   )
-                }
+                } */}
 
               </View>
-              <Newsbanner cityId={curCity.id} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
-
+              <View className="mune-box" style={personType == ROLE_CODE['CONSULTANT'] ? "padding:0 8%" : ""}>
+                <View className="mune-item" onClick={this.toShopMallPage}>
+                  <Image src={require('@assets/index/mall-icon.png')} className='icon'></Image>
+                  <View className="mune-text">
+                    积分商城
+                  </View>
+                </View>
+                <View className="mune-item" onClick={this.toPolicyPage}>
+                  <Image src={require('@assets/index/encyclopedia-icon.png')} className='icon'></Image>
+                  <View className="mune-text">
+                    购房百科
+                  </View>
+                </View>
+                {
+                  (personType !== ROLE_CODE['CONSULTANT']) &&
+                  <View className="mune-item" onClick={this.toRecomonedPage}>
+                    <Image src={require('@assets/index/recommend-icon.png')} className='icon'></Image>
+                    <View className="mune-text">
+                      推荐客户
+                  </View>
+                  </View>
+                }
+                <View className="mune-item" onClick={this.toMapHouse}>
+                  <Image src={require('@assets/index/map-icon.png')} className='icon'></Image>
+                  <View className="mune-text">
+                    地图找房
+                  </View>
+                </View>
+              </View>
+              <View style="border-bottom:20rpx solid #f5f5f5">
+                {
+                  helpGroupList.length > 0 &&
+                  <View
+                    style={{
+                      position: 'relative', padding: '20px 15px 0 15px'
+                    }}>
+
+                    <BannerTwo
+                      style={{
+                        borderRadius: '6px',
+                        height: '230rpx'
+                      }}
+                      indicatorDots={false}
+                      list={helpGroupList}
+                      onClick={this.handleHelpGroupClick}>
+                    </BannerTwo>
+                  </View>
+                }
+                <Newsbanner cityId={curCity.id} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
+                <Activity cityId={curCity.id} />
+              </View >
               {/* 推荐楼盘 */}
               {this.renderProjectList()}
-
             </ScrollView>}
-            {/* user={person} onSuccess={()=>this.handleAuthPhoneSuccess(curCity) */}
-            {/* {achieve && <View style="width:100%;height:100%"><Authorize ></Authorize>  </View>} */}
             {this.state.maskVisible && this.renderMaskBanner()}
             <View className="chat-box" onClick={this.toChatList}>
               {unReadNum > 0 && <View className="red-dot"></View >}

src/pages/project/index.scss

@@ -17,66 +17,82 @@
   width: 100%;
   align-items: center;
   justify-content: space-between;
-  position: absolute;
-  top: 5%;
-  left: 0;
-  padding: 0 60px;
+  padding: 20px 30px;
+  background-color: #fff;
+  .search {
+    height: 60px;
+    line-height: 60px;
+    background:rgba(0,0,0,0.04);
+    -webkit-box-pack: start;
+    -webkit-justify-content: flex-start;
+    -ms-flex-pack: start;
+    border-radius: 30px;
+    @extend .flex;
+    justify-content: flex-start;
+    width: 500px;
+    &-icon {
+    width: 26px;
+    height: 24px;
+    margin: 0 16px 0 20px ;
+    }
+    &-input {
+      font-size: 24px;
+      color: #B8B8B8;
+    }
+  }
   .location {
     @extend .flex;
     justify-content: center;
-    padding: 0 12px;
-    background:rgba(0,0,0,0.2);
-    border-radius:12px;
     height: 60px;
     line-height: 60px;
-    
+    width: 154px;
+    text-align: center;
     &-text {
-      font-size: 25px;
-      padding-left: 13px;
-      color: #fff;
+      font-size: 26px;
+      padding: 0 8px;
+      color: $primary-color;
       @include text-ellipsis; 
-      width: 100px;
+      max-width: 120px;
       text-align: center;
     }
-  
     &-icon {
       width: 14px;
       height: 20px;
       animation: bigger 1s ease 3 both;
     }
+    .arrow_down {
+      width: 0;
+      height: 0;
+      border-left: 8px solid transparent;
+      border-right: 8px solid transparent;
+      border-top: 8px solid $primary-color;
+    }
   }
-  
-  .search {
 
-    height: 60px;
-    line-height: 60px;
-    background:rgba(0,0,0,0.2);
-    -webkit-box-pack: start;
-    -webkit-justify-content: flex-start;
-    -ms-flex-pack: start;
-    border-radius: 12px;
-    @extend .flex;
-    justify-content: flex-start;
-    width: 440px;
-  
-    &-icon {
-    width: 26px;
-    height: 26px;
-    margin: 0 16px 0 20px ;
-    }
-    &-input {
-      font-size: 24px;
-      color: #fff;
-    }
+}
+.mune-box{
+  width:690px;
+  height:188px;
+  background:#fff;
+  box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
+  border-radius:12px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: -94px auto 0 auto;
+  position: relative;
+  .mune-item{
+    text-align: center;
+    width: 25%;
+    .icon{
+      width:80px;
+      height:80px;
 
+    }
   }
 }
 
 
-
-
-
-
 .section {
   background: white;
   padding: 30px ;
@@ -86,17 +102,20 @@
 
     &__title {
       font-size: 40px;
-      font-weight: bold;
+      font-weight: 600;
       // font-family: PingFangSC;
     }
 
     &__more {
       font-size: 26px;
-      color: $text-color-lighter;
+      color: #A1A1A1;
+      display: flex;
+      align-items: center;
 
       .iconfont {
         font-size: 26px;
-        color: $text-color-lighter;
+        color: #A1A1A1;
+        margin-left: 6px;
       }
     }
   }
@@ -106,10 +125,25 @@
   align-items: center;
   justify-content: space-between;
   margin: 30px;
-  height:80px;
+  height:112px;
   background:#fff;
   box-shadow:0px 2px 10px 0px rgba(0,0,0,0.12);
-  padding: 0 20px;
+  padding:  20px ;
+  .left-text{
+    padding-right: 20px;
+    border-right: 2px solid rgba(0,0,0,0.04);
+    .up{
+      font-size: 28px;
+      color: #F6B61D;
+      font-weight: 600;
+    }
+    .down{
+      font-size: 28px;
+      color: #888;
+      font-weight: 600;
+    }
+  }
+ 
   .notice-icon{
     width: 40px ;
     height: 32px;
@@ -118,12 +152,26 @@
   }
   .notice-swiper{
     height: 80px;
-    width: 500px;
-    line-height: 80px;
+    width: 440px;
+    margin-left: 20px;
+    .date{
+      font-size:22px;
+      color:#888;
+      display: flex;
+      align-items: center;
+      line-height: 44px;
+      .dot{
+        width: 6px;
+        height: 6px;
+        border-radius: 4px;
+        background-color: #F6B61D;
+        margin-right: 12px;
+      }
+    }
     .notice-text{
-      font-size: 28px;
-      color: #888888;
-      width: 450px;
+      font-size: 26px;
+      color: #353535;
+      width: 390px;
       @include text-ellipsis;
     }
   }
@@ -453,10 +501,9 @@
 }
 .last-text{
   font-size: 28px;
-  color: #dcdcdc;
+  color: #999;
   text-align: center;
-  margin-bottom: 60px;
-  margin-top: 40px;
+  margin: 40px 0;
 }
 @keyframes moveY {
   0% {

src/pages/project/item/index.js

@@ -25,7 +25,6 @@ export default class Index extends Component {
     return (
       <View className='item' onClick={onClick.bind(this, data)}>
         <View className='item__top'>
-          {console.log(data, 'data')}
           <Image className='item__img' mode="aspectFill" src={transferImage(imgSrc)}></Image>
           {data.marketStatus &&
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}

src/pages/project/newsbanner/index.js

@@ -1,6 +1,7 @@
 import Taro, { Component } from '@tarojs/taro'
 import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
 import { queryNewsList } from '@services/news'
+import dayjs from 'dayjs'
 
 export default class SwiperBanner extends Component {
   static options = {
@@ -16,36 +17,36 @@ export default class SwiperBanner extends Component {
   timer = null;
 
   componentWillReceiveProps(nextProps) {
-    
+
     // if (nextProps.cityId != this.state.lastCity) {
-      const payload = {
-        pageNumber: 1,
-        pageSize: 999,
-        cityId: nextProps.cityId,
-      }
+    const payload = {
+      pageNumber: 1,
+      pageSize: 999,
+      cityId: nextProps.cityId,
+    }
 
-      queryNewsList(payload).then(res => {
-        if (JSON.stringify(this.state.list) !== JSON.stringify(res.records || [])) {
+    queryNewsList(payload).then(res => {
+      if (JSON.stringify(this.state.list) !== JSON.stringify(res.records || [])) {
 
-          this.setState({
-            list: res.records || [],
-            lastCity: nextProps.cityId,
-            current: 0,
-          }, () => {
-            if (this.state.list.length > 1) {
-              this.clearTimer()
-              this.timer = setInterval(() => {
-                let current = this.state.current + 1
-                if (current >= this.state.list.length) {
-                  current = 0
-                }
-    
-                this.setState({ current })
-              }, 3000)
-            }
-          })
-        }
-      })  
+        this.setState({
+          list: res.records || [],
+          lastCity: nextProps.cityId,
+          current: 0,
+        }, () => {
+          if (this.state.list.length > 1) {
+            this.clearTimer()
+            this.timer = setInterval(() => {
+              let current = this.state.current + 1
+              if (current >= this.state.list.length) {
+                current = 0
+              }
+
+              this.setState({ current })
+            }, 3000)
+          }
+        })
+      }
+    })
     // }
   }
 
@@ -66,12 +67,15 @@ export default class SwiperBanner extends Component {
     return (
       <View className="notice-box">
         <View style="display: flex;align-items: center;">
-          <Image className="notice-icon" src={require('@assets/notice.png')}></Image>
+          <View className="left-text">
+            <View className="up"> 地产</View >
+            <View className="down"> 头条</View >
+          </View >
+
+          {/* <Image className="notice-icon" src={require('@assets/notice.png')}></Image> */}
           <Swiper
             className='notice-swiper'
             circular
-            // autoplay
-            // interval="3000"
             vertical="true"
             current={this.state.current}
           >
@@ -80,6 +84,7 @@ export default class SwiperBanner extends Component {
                 return (
                   <SwiperItem key={`news-${inx}`}>
                     <View className="notice-text" onClick={() => this.props.onClick(item)}>
+                    <View className="date"><View className="dot"></View>{dayjs(item.createDate).format('YYYY-MM-DD')}</View>
                       {item.newsName}
                     </View>
                   </SwiperItem>

src/reducers/city.js

@@ -11,7 +11,7 @@ const INITIAL_STATE = {
 export default function news(state = INITIAL_STATE, action) {
   switch (action.type) {
     case CITY_LIST: {
-      console.log(action.payload, "！！action.payload！！")
+      // console.log(action.payload, "！！action.payload！！")
       return {
         ...state,
         cityList: action.payload

src/utils/login.js

@@ -32,7 +32,6 @@ export default function (payload, callback) {
         // 用户信息已授权获取成功
         if (miniAuthorized) {
    
-          console.log(data, "data=============")
           // 保存用户信息
           // dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
           callback && callback(data)

src/utils/rtLog.js

@@ -1,19 +1,7 @@
 
-let logger;
-
-function getLogger() {
-  if (wx.canIUse('getRealtimeLogManager')) {
-    return wx.getRealtimeLogManager()
-  }
-
-  return undefined;
-}
+let logger = wx.getRealtimeLogManager ? wx.getRealtimeLogManager() : null;
 
 function info(...args) {
-  if (!logger) {
-    logger = getLogger()
-  }
-
   // 本地打印
   console.info(...args)
 
@@ -24,10 +12,6 @@ function info(...args) {
 }
 
 function error(...args) {
-  if (!logger) {
-    logger = getLogger()
-  }
-
   console.error(...args)
 
   if (logger) {
@@ -36,10 +20,6 @@ function error(...args) {
 }
 
 function warn(...args) {
-  if (!logger) {
-    logger = getLogger()
-  }
-
   console.warn(...args)
 
   if (logger) {