share、chat

config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST: '"https://dev.jinchengjiaye.com"',//测试
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST: '"https://dev.jinchengjiaye.com"',//测试
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.2.51:8080"',
-    // WSS_HOST: '"ws://192.168.2.51:8080"',
+    HOST: '"http://192.168.2.52:8080"',
+    WSS_HOST: '"ws://192.168.2.52:8080"',
     Version: 'V3.5.5'
   },
   weapp: {},

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

@@ -4,6 +4,7 @@ import './index.scss'
 import { connect } from '@tarojs/redux'
 import { queryCustomerList, addFollowRecord } from '@services/person'
 import { transferImage } from '@utils/tools'
+import * as noticeType from '@constants/common.js'
 
 const maleImg = require('@assets/person/male.png')
 const femaleImg = require('@assets/person/female.png')

src/pages/person/myShare/accessRecord.js

@@ -2,7 +2,7 @@ import Taro, { Component } from '@tarojs/taro';
 import ListView from '@components/ListView'
 import { connect } from '@tarojs/redux'
 import './index.scss'
-import { getSharePersonInfoList,judgeBindCustomer } from '@services/person'
+import { getSharePersonInfoList, judgeBindCustomer, getConsulantVisitRecord } from '@services/person'
 import { savePoint, updatePoint } from '@services/common'
 import * as noticeType from '@constants/common.js'
 import dayjs from 'dayjs';
@@ -53,15 +53,12 @@ export default class Person extends Component {
       userId: person.userId,
       targetId: targetId,
       pageNumber,
-      pageSize: 5
+      pageSize: 10
     }
-
-    getSharePersonInfoList(payload).then(res => {
-
+    getConsulantVisitRecord(payload).then(res => {
       const { records, list, total, current, pages } = res || {}
       const _list = records || list || []
       const newList = current <= 1 ? _list : this.state.recordList.concat(_list)
-      console.log(newList)
       this.setState({
         recordList: newList,
         isEmpty: total == 0 || !res,
@@ -69,7 +66,9 @@ export default class Person extends Component {
         pageIndex: current >= pages ? pages : current
       })
       Taro.hideLoading()
+
     })
+
   }
   onScrollToLower = async (fn) => {
     const { pageIndex } = this.state;
@@ -86,17 +85,17 @@ export default class Person extends Component {
   }
   handleChatClick(item, 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 { 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
     wx.requestSubscribeMessage({
       tmplIds: [tplId],
-      success (res) {
+      success(res) {
         Taro.navigateTo({
           url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
         })
       },
-      fail(res){
+      fail(res) {
         Taro.navigateTo({
           url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
         })
@@ -104,34 +103,27 @@ export default class Person extends Component {
     })
   }
 
-  goCustomerDetail(customerId,e){
-    e.stopPropagation()
-    const { userInfo: { person: { personId }}} = this.props
-    const payload = {
-      personId: personId,
-      customerId: customerId
+  goCustomerDetail(item) {
+    console.log(item, "item")
+
+    if (item.myCustomer == 1) {
+      Taro.navigateTo({
+        url: `/pages/person/customerAnalysis/myCustomer?
+          =` + item.customerId
+      })
+    } else {
+      Taro.showToast({
+        title: 'TA不是你的客户，无法查看详细信息',
+        duration: 2000,
+        icon: 'none',
+      })
     }
-    judgeBindCustomer(payload).then(res=>{
-      if(res.data){
-        Taro.navigateTo({
-          url: `/pages/person/customerAnalysis/myCustomer?
-          =` + customerId
-        })
-      }else{
-        Taro.showToast({
-          title: 'TA不是你的客户，无法查看详细信息',
-          duration: 3000,
-          icon: 'none',
-        })
-      }
-    })
-    
+
   }
 
   render() {
     const { isEmpty, hasMore, recordList } = this.state
     return (
-
       <Block>
         <ListView
           className="wrap"
@@ -145,16 +137,16 @@ export default class Person extends Component {
           <View className='access-page'>
             {
               recordList.map(item => (
-                <View className='item' key={String(item + 'more')}>
+                <View className='item' key={String(item + 'more')} onClick={this.goCustomerDetail.bind(this, item)} >
                   {item.myCustomer == 1 && <View className="tag">我的客户</View>}
                   <Image className="touxiang" src={item.avatarurl || require('@assets/default-avatar.png')}></Image>
                   <View className="info-top">
-                    <View onClick={this.goCustomerDetail.bind(this,item.customerId)} className="name">{item.userName || item.nickname || '　'}</View>
+                    <View className="name">{item.userName || item.nickname || '　'}</View>
                     <View style="display: flex;align-items: center;" onClick={this.handleChatClick.bind(this, item)}><Image className="goutong-icon" src={require('@assets/person/zixun.png')}></Image><Text className="goutong">在线沟通</Text></View>
                   </View>
                   <View className="activity-time">
                     {`${dayjs(item.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}
-                  </View> 
+                  </View>
                 </View>
               ))
             }

src/pages/person/myShare/index.js

@@ -5,11 +5,11 @@ import './index.scss'
 import { getSharePersonList } from '@services/person'
 import { savePoint, updatePoint } from '@services/common'
 import { transferImage } from '@utils/tools'
-import dayjs from 'dayjs';
+
 
 @connect(state => state.user)
 
-export default class Person extends Component {
+export default class Person extends Taro.Component {
   config = {
     navigationBarTitleText: '我的分享'
   }
@@ -41,12 +41,7 @@ export default class Person extends Component {
     recordId && updatePoint(recordId)
   }
 
-  componentDidShow() {
-    Taro.showLoading()
-    this.loadList(1)
-  }
   loadList(pageNumber) {
-    console.log(this.props, "this.props")
     const { userInfo: { person } } = this.props
 
     let payload
@@ -54,13 +49,13 @@ export default class Person extends Component {
       payload = {
         userId: person.userId,
         pageNumber,
-        pageSize: 5
+        pageSize: 10
       }
     } else {
       payload = {
         userId: Taro.getStorageSync('userId'),
         pageNumber,
-        pageSize: 5
+        pageSize: 10
       }
     }
     getSharePersonList(payload).then(res => {
@@ -71,7 +66,7 @@ export default class Person extends Component {
 
       this.setState({
         recordList: newList,
-        isEmpty: total == 0 || !res,
+        isEmpty: total == 0,
         hasMore: current < pages,
         pageIndex: current >= pages ? pages : current
       })
@@ -98,7 +93,6 @@ export default class Person extends Component {
     })
   }
 
-
   renderBuilding(item) {
     return (
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
@@ -174,18 +168,20 @@ export default class Person extends Component {
         onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
         onScrollToLower={fn => this.onScrollToLower(fn)}
       >
-        {
-          recordList.map(item => (
-            <View taroKey={String(item.targetId)} 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>
-          ))
-        }
+        <View className="list" >
+          {
+            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>
+            ))
+          }
+        </View>
       </ListView>
     )
   }

src/pages/person/myShare/index.scss

@@ -1,4 +1,8 @@
 @import "@styles/theme.scss";
+.wrap{
+  height: 100vh;
+  width: 100%;
+}
 .share-page{
   padding: 10px 30px;
   .share-item{

src/pages/project/detail/index.js

@@ -750,7 +750,7 @@ export default class Index extends Component {
               <ScrollView scrollX>
                 <View className='photos__type__content' >
 
-                  <View className="around-tab">
+                  <View className="around-tab" style="display:flex">
                     {listimg.map((item, index) => {
                       const { apartmentName } = item
                       const buildingImgList = item.buildingImgList

src/services/person.js

@@ -82,7 +82,7 @@ export const getFollowRecord = (payload) => fetch({ url: API_FOLLOW_LIST, payloa
  */
 export const addFollowRecord = (payload) => fetch({ url: API_FOLLOW_LIST, payload, method: 'POST' })
 /**
- * 获取访问记录
+ * 获取访客信息
  * @param {*} payload  
  */
 export const getConsulantVisitRecord = (payload) => fetch({ url: API_CONSULTANT_VISIT_RECORD, payload })