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

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.2.52:8080"',
-    // WSS_HOST: '"ws://192.168.2.52:8080"',
+    // HOST: '"http://192.168.2.51:8080"',
+    // WSS_HOST: '"ws://192.168.2.51:8080"',
     Version: 'V3.5.5'
   },
   weapp: {},

src/pages/card/list/index.js

@@ -19,7 +19,7 @@ export default class Index extends Component {
     hasMore: true,
     isEmpty: false,
     recordId: null,
-    pageIndex:1
+    pageIndex: 1
   }
   componentWillMount() {
     savePoint({
@@ -61,27 +61,27 @@ export default class Index extends Component {
   }
 
   handleChatClick(item, e) {
-    console.log(item,"item")
-    console.log(e,"eeeeeeeeeeeeeeeeeeeeeeeeeee")
+    console.log(item, "item")
+    console.log(e, "eeeeeeeeeeeeeeeeeeeeeeeeeee")
     e && e.stopPropagation()
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     const { userInfo: { miniApp: { tpls } } } = this.props
-    const tplId=(tpls.filter(x => x.tplType == noticeType.TPL_NOTICE&&x.isSubscribe == true))[0].tplId
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true))[0].tplId
     wx.requestSubscribeMessage({
       tmplIds: [tplId],
-      success (res) {
+      success(res) {
 
       },
-      fail(res){
+      fail(res) {
 
       },
-      complete(){
+      complete() {
         // App.zhuge.track('查看置业顾问列表')
         Taro.navigateTo({
           url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.id}&receiverName=${encodeURIComponent(item.name)}`
         })
       }
-    })   
+    })
 
   }
 
@@ -102,7 +102,7 @@ export default class Index extends Component {
   }
 
   loadList(pageNumber) {
- 
+
     const { buildingId } = this.$router.params
     const payload = { pageSize: 10, pageNumber, buildingId: '' }
     if (buildingId) {
@@ -117,7 +117,7 @@ export default class Index extends Component {
       list,
       isEmpty: total == 0,
       hasMore: list.length >= total ? false : true,
-      pageIndex:1
+      pageIndex: 1
     })
     rest && rest()
   }
@@ -125,12 +125,12 @@ export default class Index extends Component {
   onScrollToLower = async (fn) => {
     const { list } = this.state;
     pageIndex++
-    const { records, total } = await this.loadList(this.state.pageIndex+1);
+    const { records, total } = await this.loadList(this.state.pageIndex + 1);
     const newList = list.concat(records)
     this.setState({
       list: newList,
       hasMore: newList.length >= total ? false : true,
-      pageIndex:this.state.pageIndex+1
+      pageIndex: this.state.pageIndex + 1
     });
     fn && fn();
   }
@@ -157,7 +157,7 @@ export default class Index extends Component {
               <View className='item-main' key={item.id} onClick={this.handleConsuItemClick.bind(this, item)}>
                 <View className="item">
                   <View className="flex">
-                  <Image className="avatar" mode="aspectFill" src={item.photo || item.avatar}></Image>
+                    <Image className="avatar" mode="aspectFill" src={item.photo || item.avatar}></Image>
 
                     <View className='info'>
                       <View className='name-info'>
@@ -186,7 +186,7 @@ export default class Index extends Component {
                   </View>
 
                 </View>
-                <View className='item-txt'>{item.description || ''}</View>
+                {item.description && <View className='item-txt'>{item.description}</View>}
               </View>
 
             ))

src/pages/person/customerAnalysis/followUpCustomer/index.js

@@ -309,7 +309,7 @@ export default class transactionCustomer extends Taro.Component {
                     <View className="phone" >{item.phone}</View>
                     <Image className="phone-icon" onClick={this.handleTelClick.bind(this, item)} src={phoneImg} />
                     <Image className="goutong-icon" onClick={this.handleChatClick.bind(this, item)} src={communicateImg}></Image>
-                    <View className="status">{item.status == 1 ? '报备' : item.status == 2 ? '到访' : item.status == 3 ? '认筹' : '签约'}</View>
+                    {/* <View className="status">{item.status == 1 ? '报备' : item.status == 2 ? '到访' : item.status == 3 ? '认筹' : '签约'}</View> */}
                   </View>
                 ))
               }

src/pages/person/myShare/index.js

@@ -6,7 +6,7 @@ import { getSharePersonList } from '@services/person'
 import { savePoint, updatePoint } from '@services/common'
 import { transferImage } from '@utils/tools'
 
-
+const emptyImg = require('@assets/empty.png')
 @connect(state => state.user)
 
 export default class Person extends Taro.Component {
@@ -93,69 +93,6 @@ export default class Person extends Taro.Component {
     })
   }
 
-  renderBuilding(item) {
-    return (
-      <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
-        <Image className="img" src={transferImage(item.drainageImg)}></Image>
-        <View className="building">{item.buildingName}</View>
-        <View className="price"> 均价{item.price ? item.price : ''}元/m² </View>
-        <View className="num"> {item.buildingNum ? item.buildingNum : '0'}人查看了分享 </View>
-        <View className="address"> {item.address} </View>
-      </View>
-    )
-  }
-
-  renderH5(item) {
-    return (
-      <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
-        <Image className="img" src={transferImage(item.drainageImg)}></Image>
-        <View className="name">{item.drainageName}</View>
-        <View className="num"> {item.drainageShareNum ? item.drainageShareNum : '0'}人查看了分享 </View>
-      </View>
-    )
-  }
-
-  renderGroup(item) {
-    return (
-      <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
-        <Image className="img" src={transferImage(item.groupActivityImg)}></Image>
-        <View className="name">{item.groupActivityName}</View>
-        <View className="num"> {item.groupActivityShareNum ? item.groupActivityShareNum : '0'}人查看了分享 </View>
-      </View>
-    )
-  }
-
-  renderHelp(item) {
-    return (
-      <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
-        <Image className="img" src={transferImage(item.helpActivityImg)}></Image>
-        <View className="name">{item.helpActivityName}</View>
-        <View className="num"> {item.helpActivityShareNum ? item.helpActivityShareNum : '0'}人查看了分享 </View>
-      </View>
-    )
-  }
-
-  renderNews(item) {
-    return (
-      <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
-        <Image className="img" src={transferImage(item.newsImg)}></Image>
-        <View className="name">{item.newsName}</View>
-        <View className="num"> {item.newsNum ? item.newsNum : '0'}人查看了分享 </View>
-      </View>
-    )
-  }
-
-  renderActivity(item) {
-    return (
-      <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
-        <Image className="img" src={transferImage(item.activityImg)}></Image>
-        <View className="name">{item.activityName}</View>
-        <View className="num"> {item.activityShareNum ? item.activityShareNum : '0'}人查看了分享 </View>
-      </View>
-    )
-  }
-
-
   render() {
     const { isEmpty, hasMore, recordList } = this.state
     return (
@@ -168,16 +105,15 @@ export default class Person extends Taro.Component {
         onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
         onScrollToLower={fn => this.onScrollToLower(fn)}
       >
-        <View className="list" >
+        <View className='share-page'>
           {
             recordList.map(item => (
-              <View key={item.targetId + 'share'} className='share-page'>
-                {item.shareType == 'building' && this.renderBuilding(item)}
-                {item.shareType == 'h5' && this.renderH5(item)}
-                {item.shareType == 'group' && this.renderGroup(item)}
-                {item.shareType == 'help' && this.renderHelp(item)}
-                {item.shareType == 'news' && this.renderNews(item)}
-                {item.shareType == 'activity' && this.renderActivity(item)}
+              <View className="share-item" key={item.targetId + 'share'} onClick={this.handleItemClick.bind(this, item.targetId)}>
+                <Image className="img" src={transferImage(item.activityImg || emptyImg)}></Image>
+                <View className={item.eventType == 'building' ? 'building' : 'name'}>{item.activityName || ''}</View>
+                {item.eventType == 'building' && <View className="price"> {item.price ? '均价' + item.price + '元/m²' : '暂无'} </View>}
+                <View className="num"> {item.newsNum || '0'}人查看了分享 </View>
+                {item.eventType == 'building' && <View className="address"> {item.address || ''} </View>}
               </View>
             ))
           }

src/pages/project/detail/index.js

@@ -194,7 +194,7 @@ export default class Index extends Component {
     }, () => {
       this.loadDetail()
       this.loadNewsData()
-      this.loadActivityData()
+      // this.loadActivityData()
       this.loadHelpGroupList()
 
       addItemUv(id)
@@ -239,19 +239,22 @@ export default class Index extends Component {
       console.log(res, "buildingId")
       const helpList = []
       const groupList = []
+      const activityList = []
       res.map(item => {
         if (item.type == 'help') {
           helpList.push(item)
-        } else {
+        } else if (item.type == 'group') {
           groupList.push(item)
+        } else {
+          activityList.push(item)
         }
       })
       this.setState({
         helpList,
-        groupList
+        groupList,
+        activityList
       })
-    }
-    )
+    })
   }
 
   loadDetail() {
@@ -282,16 +285,16 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityData() {
-    const { buildingId } = this.state
-    const payload = { pageSize: 999, pageNumber: 1, buildingId }
-    queryActivityList(payload).then(res => {
-      console.log(res, 'Activity')
-      this.setState({
-        activityList: res.list || []
-      })
-    })
-  }
+  // loadActivityData() {
+  //   const { buildingId } = this.state
+  //   const payload = { pageSize: 999, pageNumber: 1, buildingId }
+  //   queryActivityList(payload).then(res => {
+  //     console.log(res, 'Activity')
+  //     this.setState({
+  //       activityList: res.list || []
+  //     })
+  //   })
+  // }
 
   loadNewsData() {
     const { buildingId } = this.state
@@ -403,7 +406,6 @@ export default class Index extends Component {
         resolve(posterData)
         return
       }
-      con
       const {
         userInfo: { person: { avatarurl, nickname, personId, personType, userId }, miniApp },
         projectDetail: { posters, buildingId, poster, price, buildingRestaurant, createDate, buildingName, tel, buildingTag, uvList = {} }
@@ -437,6 +439,7 @@ export default class Index extends Component {
 
   // 开始生成海报
   togglePosterStatus = (flag) => {
+    console.log(flag, "flag")
     if (flag) {
       // App.zhuge.track('生成海报')
 
@@ -462,22 +465,38 @@ export default class Index extends Component {
     }
   }
 
-  makePhoneCall = () => {
-    const { tel: phoneNumber } = this.props.projectDetail
-    Taro.makePhoneCall({
-      phoneNumber
-    })
+  callPhone = () => {
+    console.log(this.props, "this.props")
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant
+    if (consultant) {
+      this.handleTelClick(this.state.consultData)
+    } else {
+      const { tel } = this.props.projectDetail
+      if (tel) {
+        Taro.makePhoneCall({
+          phoneNumber: tel
+        })
+      } else {
+        Taro.showToast({
+          title: '暂无联系电话',
+          icon: 'none'
+        })
+      }
+
+    }
+
   }
 
   handleTelClick(item, e) {
-    e.stopPropagation()
+    // e.stopPropagation()
     Taro.makePhoneCall({
-      phoneNumber: item.phone
+      phoneNumber: item.phone || item.tel
     })
   }
 
   handleChatClick(item, e) {
-    e.stopPropagation()
+    // e.stopPropagation()
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     const { userInfo: { miniApp: { tpls } } } = this.props
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true))[0].tplId
@@ -506,11 +525,20 @@ export default class Index extends Component {
   }
 
   handleMoreClick() {
-    const { userInfo: { miniApp: { tpls } } } = this.props
+
     Taro.navigateTo({
       url: `/pages/card/list/index?buildingId=${this.state.buildingId}`
     })
   }
+  ChatOnlineClick() {
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant
+    if (consultant) {
+      this.handleChatClick(this.state.consultData)
+    } else {
+      this.handleMoreClick()
+    }
+  }
 
   handleStopPropagation(e) {
     e.stopPropagation()
@@ -564,7 +592,7 @@ export default class Index extends Component {
 
   handActivityItemClick(item) {
     Taro.navigateTo({
-      url: '/pages/activity/detail/index?id=' + item.dynamicId
+      url: '/pages/activity/detail/index?id=' + item.activityId
     })
   }
 
@@ -652,10 +680,10 @@ export default class Index extends Component {
           }
 
         </View>
-        <Button className='bt-nav__item  bt-nav__right' onClick={this.handleMoreClick}>
+        <Button className='bt-nav__item  bt-nav__right' onClick={this.ChatOnlineClick}>
           <Text className="text">在线聊</Text>
         </Button>
-        <Button className='bt-nav__item  bt-nav__right bt-nav__right2' onClick={this.makePhoneCall}>
+        <Button className='bt-nav__item  bt-nav__right bt-nav__right2' onClick={this.callPhone}>
           <Text className="iconfont icon-tel"></Text>
           <Text className="text">打电话</Text>
         </Button>
@@ -812,7 +840,7 @@ export default class Index extends Component {
             <Text className="section-head__title">位置及周边配套</Text>
           </View> */}
         </View>
-        <Around building={building}  buildingId={this.state.buildingId} ></Around>
+        <Around building={building} buildingId={this.state.buildingId} ></Around>
       </View>
     )
   }
@@ -935,7 +963,6 @@ export default class Index extends Component {
       <Block>
         {groupList.length > 0 &&
           <View className="activity">
-            {console.log(groupList, '----groupList-----')}
             <View className="title">拼团活动</View>
             <View
               style={{ position: 'relative' }}>