lf

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://127.0.0.1:8080"',
-    // WSS_HOST: '"ws://127.0.0.1:8080"',
+    HOST: '"http://192.168.2.51:8080"',
+    WSS_HOST: '"http://192.168.2.51:8080"',
     Version: 'V3.5.3'
   },
   weapp: {},

src/constants/api.js

@@ -184,6 +184,7 @@ export const API_ECHERTS_MONTH = resolvePath('customerStatisticMonthly')
 export const API_BUILDING_TYPE = resolvePath('getByBuildingIdSelectBuildingProjectType')
 export const API_CONSULTANT_VISIT_RECORD = resolvePath('visitRecord')
 export const API_MORE_ACTIVITY = resolvePath('visitRecord/activity')
-
+export const API_SHARE_LIST = resolvePath('shareRecords')
+export const API_SHARE_INFOLIST = resolvePath('sharePersonInfoList')
 // 消息模板
 export const API_TEMPLATE_TYPE = resolvePath('template/of/')

src/pages/person/myShare/accessRecord.js

@@ -2,8 +2,9 @@ import Taro, { Component } from '@tarojs/taro';
 import ListView from '@components/ListView'
 import { connect } from '@tarojs/redux'
 import './index.scss'
-import { getConsulantVisitRecord } from '@services/person'
+import { getSharePersonInfoList } from '@services/person'
 import { savePoint, updatePoint } from '@services/common'
+import '@constants/common.js'
 import dayjs from 'dayjs';
 
 @connect(state => state.user)
@@ -22,7 +23,6 @@ export default class Person extends Component {
   }
 
   componentWillMount() {
-
     savePoint({
       event: 'list',
       eventType: 'activity',
@@ -40,32 +40,28 @@ export default class Person extends Component {
     recordId && updatePoint(recordId)
   }
   componentDidShow() {
+
     Taro.showLoading()
     this.loadList(1)
   }
   loadList(pageNumber) {
     console.log(this.props, "this.props")
+    const { targetId } = this.$router.params
     const { userInfo: { person } } = this.props
-
-    let payload
-    if(person.userId){
-      payload = {
-        userId: person.userId,
-        pageNumber,
-        pageSize: 5
-      }
-    }else{
-     payload = {
-       userId: Taro.getStorageSync('userId'),
-       pageNumber,
-       pageSize: 5
-     }
+    console.log(targetId)
+    const payload = {
+      userId: person.userId,
+      targetId: targetId,
+      pageNumber,
+      pageSize: 5
     }
-    getConsulantVisitRecord(payload).then(res => {
+
+    getSharePersonInfoList(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,
@@ -90,9 +86,21 @@ export default class Person extends Component {
   }
   handleChatClick(item, e) {
     e.stopPropagation()
-    const { userInfo: { person: { personId, nickname, name } } } = this.props
-    Taro.navigateTo({
-      url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
+    const { userInfo: { person: { personId, nickname, name }}} = this.props
+    const { userInfo: {miniApp:{tpls}}} = this.props
+    const tplId=(tpls.filter(x => x.tplType == TPL_NOTICE&&isSubscribe == true))[0].tplId
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      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){
+        Taro.navigateTo({
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
+        })
+      }
     })
   }
 
@@ -113,7 +121,7 @@ export default class Person extends Component {
           <View className='access-page'>
             {
               recordList.map(item => (
-                <View className='item' key={item + 'more'}>
+                <View className='item' key={String(item + 'more')}>
                   {item.myCustomer == 1 && <View className="tag">我的客户</View>}
                   <Image className="touxiang" src={item.avatarurl || require('@assets/default-avatar.png')}></Image>
                   <View className="info-top">

src/pages/person/myShare/index.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 { getConsulantVisitRecord} from '@services/person'
+import { getSharePersonList } from '@services/person'
 import { savePoint, updatePoint } from '@services/common'
 import dayjs from 'dayjs';
 
@@ -41,61 +41,126 @@ export default class Person extends Component {
   }
 
   componentDidShow() {
-    // Taro.showLoading()
-    // this.loadList(1)
-  }
-  // loadList(pageNumber) {
-  //   console.log(this.props, "this.props")
-  //   const { userInfo: { person } } = this.props
-
-  //   let payload
-  //   if(person.userId){
-  //     payload = {
-  //       userId: person.userId,
-  //       pageNumber,
-  //       pageSize: 5
-  //     }
-  //   }else{
-  //    payload = {
-  //      userId: Taro.getStorageSync('userId'),
-  //      pageNumber,
-  //      pageSize: 5
-  //    }
-  //   }
-  //   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)
-  //     this.setState({
-  //       recordList: newList,
-  //       isEmpty: total == 0 || !res,
-  //       hasMore: current < pages,
-  //       pageIndex: current >= pages ? pages : current
-  //     })
-  //     Taro.hideLoading()
-  //   })
-  // }
-  // onScrollToLower = async (fn) => {
-  //   const { pageIndex } = this.state;
-  //   this.loadList(pageIndex + 1)
-  //   fn && fn();
-  // }
-  // onPullDownRefresh = (rest) => {
-  //   // debugger
-  //   if (this.refreshing) return
-  //   this.refreshing = true
-  //   this.loadList(1)
-  //   rest && rest()
-  //   this.refreshing = false
-  // }
-
-  handleItemClick() {
+    Taro.showLoading()
+    this.loadList(1)
+  }
+  loadList(pageNumber) {
+    console.log(this.props, "this.props")
+    const { userInfo: { person } } = this.props
+
+    let payload
+    if (person.userId) {
+      payload = {
+        userId: person.userId,
+        pageNumber,
+        pageSize: 5
+      }
+    } else {
+      payload = {
+        userId: Taro.getStorageSync('userId'),
+        pageNumber,
+        pageSize: 5
+      }
+    }
+    getSharePersonList(payload).then(res => {
+
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.recordList.concat(_list)
+
+      this.setState({
+        recordList: newList,
+        isEmpty: total == 0 || !res,
+        hasMore: current < pages,
+        pageIndex: current >= pages ? pages : current
+      })
+      Taro.hideLoading()
+    })
+  }
+  onScrollToLower = async (fn) => {
+    const { pageIndex } = this.state;
+    this.loadList(pageIndex + 1)
+    fn && fn();
+  }
+  onPullDownRefresh = (rest) => {
+    // debugger
+    if (this.refreshing) return
+    this.refreshing = true
+    this.loadList(1)
+    rest && rest()
+    this.refreshing = false
+  }
+
+  handleItemClick(targetId) {
     Taro.navigateTo({
-      url: `/pages/person/myShare/accessRecord`
+      url: `/pages/person/myShare/accessRecord?targetId=` + targetId
     })
   }
 
+
+  renderBuilding(item) {
+    return (
+      <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
+        <Image className="img" src={item.drainageImg}></Image>
+        <View className="name">{item.buildingName}</View>
+        <View className="price"> {item.price ? item.price : ''} </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={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={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={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={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={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 (
@@ -108,17 +173,19 @@ export default class Person extends Component {
         onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
         onScrollToLower={fn => this.onScrollToLower(fn)}
       >
-        <View className='share-page'>
-          <View className="share-item" onClick={this.handleItemClick}>
-            <Image className="img" src={require('@assets/default-avatar.png')}></Image>
-            <View className="name">鱼嘴润府</View>
-            <View className="price"> 均价35000元/m² </View>
-            <View className="num"> 5人查看了分享 </View>
-            <View className="address"> 南京市锦创广场水西门大街2号 </View>
-          </View>
-        </View>
+        {
+          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>
+          ))
+        }
       </ListView>
-
     )
   }
 }

src/pages/person/myShare/index.scss

@@ -91,10 +91,10 @@
           margin: 0 10px;
         }
         .goutong{
-          font-size: 38px;
+          font-size: 34px;
           color: $primary-color;
           border-bottom: 4px solid #EDCA73;
-          line-height: 28px;
+          line-height: 34px;
         }
   
       }

src/pages/project/index.js

@@ -20,6 +20,7 @@ import * as actions from '@actions/project'
 import { transferImage } from '@utils/tools'
 import Notice from '@components/Notice'
 import Authorize from '@components/authorize'
+import * as noticeType from '@constants/common.js'
 
 
 const { miniProgram: { appId } } = wx.getAccountInfoSync();
@@ -114,8 +115,21 @@ export default class Index extends Component {
   toChatList() {
     // const { dispatch } = getStore()
     // dispatch({ type: DECREASE_UNREADNUM })
-    Taro.navigateTo({
-      url: '/pages/im/list/index'
+    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) {
+        Taro.navigateTo({
+          url: '/pages/im/list/index'
+        })
+      },
+      fail(res){
+        Taro.navigateTo({
+          url: '/pages/im/list/index'
+        })
+      }
     })
   }
   componentDidShow() {

src/services/person.js

@@ -11,7 +11,9 @@ import {
   API_ECHERTS_MONTH,
   API_BUILDING_TYPE,
   API_CONSULTANT_VISIT_RECORD,
-  API_MORE_ACTIVITY
+  API_MORE_ACTIVITY,
+  API_SHARE_LIST,
+  API_SHARE_INFOLIST
 } from '@constants/api'
 
 
@@ -88,7 +90,16 @@ export const getConsulantVisitRecord = (payload) => fetch({ url: API_CONSULTANT_
  * @param {*} payload  
  */
 export const getMoreVisitRecord = (payload) => fetch({ url: API_MORE_ACTIVITY, payload })
-
+/**
+ * 获取分享记录
+ * @param {*} payload  
+ */
+export const getSharePersonList = (payload) => fetch({ url: API_SHARE_LIST, payload })
+/**
+ * 获取访问人列表
+ * @param {*} payload  
+ */
+export const getSharePersonInfoList = (payload) => fetch({ url: API_SHARE_INFOLIST, payload })