聊天

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

src/components/consultant/index.js

@@ -2,6 +2,7 @@ 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 {
     state = {
@@ -66,9 +67,23 @@ export default class Index extends Component {
     handleChatClick(data, e) {
         e.stopPropagation()
         const { personId, name } = this.props
-        Taro.navigateTo({
-            url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name)}&receiverId=${data.id}&receiverName=${encodeURIComponent(data.name)}`
+        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) {
+          },
+          fail(res){
+            
+          },
+          complete(){
+            Taro.navigateTo({
+                url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name)}&receiverId=${data.id}&receiverName=${encodeURIComponent(data.name)}`
+            })
+          }
         })
+
     }
     render() {
         const { show } = this.state

src/pages/activity/detail/assemble.js

@@ -26,6 +26,7 @@ import { connect } from '@tarojs/redux'
 import { getCardDetail } from '@services/card'
 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
+import * as noticeType from '@constants/common.js'
 
 const waitImg = require('@assets/helpgroup/wait.png')
 const memberImg = require('@assets/helpgroup/group/member.png')
@@ -369,57 +370,73 @@ export default class Detail extends Component {
 
   // 立即参团
   joinGroup = () => {
-    const { submitting, detail, recordDetail, memberList = [] } = this.state
-    const person = this.props.userInfo.person
-    if (submitting) return
-
-    Taro.showModal({
-      content: `是否扣除 ${detail.integral} 积分参与拼团?`,
-      success: (res) => {
-        if (res.confirm) {
-          Taro.showLoading()
-          this.setState({ submitting: true }, () => {
-            joinGroupBuy({
-              recordId: recordDetail.recordId,
-              groupActivityId: detail.groupActivityId,
-              personId: person.personId,
-              nickname: person.name || person.nickname,
-              phone: person.tel || person.phone,
-              avatarurl: person.avatarurl,
-            }).then((res) => {
-              Taro.hideLoading()
-              memberList.push(res.taShareChildRecord)
-
-              this.setState({
-                submitting: false,
-                memberList,
-                recordDetail: res.taShareRecord,
-                recordId: res.taShareRecord.recordId,
-                groupState: res.taShareRecord.status,
+    const { userInfo: { miniApp: { tpls } } } = this.props
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_GROUP && x.isSubscribe == true))[0].tplId
+    const that=this
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success(res) {
+
+      },
+      fail(res) {
+
+      },
+      complete() {
+        const { submitting, detail, recordDetail, memberList = [] } = this.state
+        const person = this.props.userInfo.person
+        if (submitting) return
+
+        Taro.showModal({
+          content: `是否扣除 ${detail.integral} 积分参与拼团?`,
+          success: (res) => {
+            if (res.confirm) {
+              Taro.showLoading()
+              that.setState({ submitting: true }, () => {
+                joinGroupBuy({
+                  recordId: recordDetail.recordId,
+                  groupActivityId: detail.groupActivityId,
+                  personId: person.personId,
+                  nickname: person.name || person.nickname,
+                  phone: person.tel || person.phone,
+                  avatarurl: person.avatarurl,
+                }).then((res) => {
+                  Taro.hideLoading()
+                  memberList.push(res.taShareChildRecord)
+
+                  that.setState({
+                    submitting: false,
+                    memberList,
+                    recordDetail: res.taShareRecord,
+                    recordId: res.taShareRecord.recordId,
+                    groupState: res.taShareRecord.status,
+                  })
+
+                  Taro.showToast({
+                    title: '参团成功',
+                    icon: 'success'
+                  })
+                }).catch(err => {
+                  console.log('err:', err)
+                  Taro.hideLoading()
+
+                  Taro.showToast({
+                    title: '失败: ' + err.message,
+                    icon: 'none'
+                  })
+                  // setTimeout(() => {
+                  //   this.loadDetail()
+                  // }, 500)
+
+                  that.setState({ submitting: false })
+                })
               })
+            } // if (res.confirm)
+          }
+        }) // Taro.showModal
+      }
+    })
 
-              Taro.showToast({
-                title: '参团成功',
-                icon: 'success'
-              })
-            }).catch(err => {
-              console.log('err:', err)
-              Taro.hideLoading()
-
-              Taro.showToast({
-                title: '失败: ' + err.message,
-                icon: 'none'
-              })
-              // setTimeout(() => {
-              //   this.loadDetail()
-              // }, 500)
 
-              this.setState({ submitting: false })
-            })
-          })
-        } // if (res.confirm)
-      }
-    }) // Taro.showModal
   }
 
   // 发起我的拼团
@@ -465,18 +482,33 @@ export default class Detail extends Component {
 
   // 请求好友参团
   groupBuyInvite = () => {
-    // 必须授权头像
-    if (this.toggleGrantAvatar()) {
-      const recordDetail = this.state.recordDetail
-      if (!recordDetail.recordId) {
-        // 如果是未发起的拼团, 先以当前人身份发起
-        this.startMine(() => {
-          this.toggleActionVisible()
-        })
-      } else {
-        this.toggleActionVisible()
+    const { userInfo: { miniApp: { tpls } } } = this.props
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_GROUP && x.isSubscribe == true))[0].tplId
+    const that=this
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success(res) {
+
+      },
+      fail(res) {
+
+      },
+      complete() {
+        // 必须授权头像
+        if (that.toggleGrantAvatar()) {
+          const recordDetail = that.state.recordDetail
+          if (!recordDetail.recordId) {
+            // 如果是未发起的拼团, 先以当前人身份发起
+            that.startMine(() => {
+              that.toggleActionVisible()
+            })
+          } else {
+            that.toggleActionVisible()
+          }
+        }
       }
-    }
+    })
+
   }
 
   getQRCode() {

src/pages/activity/detail/assistance.js

@@ -26,6 +26,7 @@ import { connect } from '@tarojs/redux'
 import { getCardDetail } from '@services/card'
 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
+import * as noticeType from '@constants/common.js'
 
 const successImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success2.png'
 const failImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/help%20failure.png'
@@ -370,53 +371,68 @@ export default class Detail extends Component {
 
   // 助力好友
   handleHelp = () => {
-    if (this.state.submitting) return
-
-    Taro.showLoading()
-    this.setState({ submitting: true }, () => {
-      const { detail, initiateDetail } = this.state
-      const person = this.props.userInfo.person
-
-      giveFriendHelp({
-        buildingId: detail.buildingId,
-        helpActivityId: detail.helpActivityId,
-        personId: person.personId,
-        name: person.name || person.nickname,
-        phone: person.tel || person.phone,
-        avatarurl: person.avatarurl,
-        helpRecordInitiateId: initiateDetail.helpRecordInitiateId,
-      }).then((res) => {
-        Taro.hideLoading()
-        const helpList = this.state.helpList || []
-        helpList.push(res.helpRecord)
-
-        this.setState({
-          submitting: false,
-          helpList,
-          initiateDetail: res.helpInitiateRecord,
-          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'
+    const { userInfo: { miniApp: { tpls } } } = this.props
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HELP && x.isSubscribe == true))[0].tplId
+    const that=this
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success(res) {
+
+      },
+      fail(res) {
+
+      },
+      complete() {
+        if (that.state.submitting) return
+
+        Taro.showLoading()
+        that.setState({ submitting: true }, () => {
+          const { detail, initiateDetail } = that.state
+          const person = that.props.userInfo.person
+    
+          giveFriendHelp({
+            buildingId: detail.buildingId,
+            helpActivityId: detail.helpActivityId,
+            personId: person.personId,
+            name: person.name || person.nickname,
+            phone: person.tel || person.phone,
+            avatarurl: person.avatarurl,
+            helpRecordInitiateId: initiateDetail.helpRecordInitiateId,
+          }).then((res) => {
+            Taro.hideLoading()
+            const helpList = that.state.helpList || []
+            helpList.push(res.helpRecord)
+    
+            that.setState({
+              submitting: false,
+              helpList,
+              initiateDetail: res.helpInitiateRecord,
+              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'
+            })
+            // setTimeout(() => {
+            //   this.loadDetail()
+            // }, 500)
+            that.setState({ submitting: false })
+          })
         })
-        // setTimeout(() => {
-        //   this.loadDetail()
-        // }, 500)
-        this.setState({ submitting: false })
-      })
+      }
     })
+   
   }
 
   // 发起我的助力
@@ -456,20 +472,37 @@ export default class Detail extends Component {
     return Promise.reject()
   }
 
+
+
   // 请求好友助力
   askForHelp = () => {
-    // 必须授权头像
-    if (this.toggleGrantAvatar()) {
-      const initiateDetail = this.state.initiateDetail
-      if (!initiateDetail.helpRecordInitiateId) {
-        // 如果是未发起的助力, 先以当前人身份发起
-        this.startMine().then(() => {
-          this.toggleActionVisible()
-        })
-      } else {
-        this.toggleActionVisible()
+    const { userInfo: { miniApp: { tpls } } } = this.props
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HELP && x.isSubscribe == true))[0].tplId
+    const that=this
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success(res) {
+
+      },
+      fail(res) {
+
+      },
+      complete() {
+        // 必须授权头像
+        if (that.toggleGrantAvatar()) {
+          const initiateDetail = that.state.initiateDetail
+          if (!initiateDetail.helpRecordInitiateId) {
+            // 如果是未发起的助力, 先以当前人身份发起
+            that.startMine().then(() => {
+              that.toggleActionVisible()
+            })
+          } else {
+            that.toggleActionVisible()
+          }
+        }
       }
-    }
+    })
+
   }
 
   getQRCode() {

src/pages/card/list/index.js

@@ -64,10 +64,23 @@ export default class Index extends Component {
     console.log(e,"eeeeeeeeeeeeeeeeeeeeeeeeeee")
     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.id}&receiverName=${encodeURIComponent(item.name)}`
-    })
+    const tplId=(tpls.filter(x => x.tplType == noticeType.TPL_NOTICE&&x.isSubscribe == true))[0].tplId
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success (res) {
+
+      },
+      fail(res){
+
+      },
+      complete(){
+        // App.zhuge.track('查看置业顾问列表')
+        Taro.navigateTo({
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.id}&receiverName=${encodeURIComponent(item.name)}`
+        })
+      }
+    })   
+
   }
 
   handleConsuItemClick(item) {

src/pages/im/list/index.js

@@ -9,6 +9,7 @@ import ready from '@utils/ready'
 
 import { DECREASE_UNREADNUM } from '@constants/user'
 import { getStore, connect } from '@tarojs/redux'
+import * as noticeType from '@constants/common.js'
 
 @connect(state => state.user)
 export default class Index extends Component {
@@ -51,7 +52,7 @@ export default class Index extends Component {
         const totalUnRead = (records || []).reduce((acc, item) => (acc + item.unReadNum), 0)
         if (!totalUnRead) {
           // 如果未读为 0, 那么更新 提示组件也为 0
-          
+
           const { dispatch } = getStore()
           dispatch({ type: DECREASE_UNREADNUM })
         }
@@ -73,13 +74,26 @@ export default class Index extends Component {
   }
 
   handleItemClick = ({ unReadNum }) => person => {
+    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) {
 
-    if (unReadNum > 0) {
-      const { dispatch } = getStore()
-      dispatch({ type: DECREASE_UNREADNUM, payload: unReadNum })
-    }
+      },
+      fail(res) {
+
+      },
+      complete() {
+        if (unReadNum > 0) {
+          const { dispatch } = getStore()
+          dispatch({ type: DECREASE_UNREADNUM, payload: unReadNum })
+        }
+
+        return this.toChat(person);
+      }
+    })
 
-    return this.toChat(person);
   }
 
   render() {

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

@@ -7,6 +7,7 @@ import { connect } from '@tarojs/redux'
 import { View, Text, Picker } from '@tarojs/components';
 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')
@@ -250,9 +251,23 @@ export default class transactionCustomer extends Taro.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: {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) {
+
+      },
+      fail(res){
+
+      },
+      complete(){
+        Taro.navigateTo({
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
+        })
+      }
     })
   }
   render() {

src/pages/person/customerAnalysis/myCustomer.js

@@ -10,6 +10,8 @@ import ActivityItem from './item'
 import dayjs from 'dayjs'
 import { transferImage } from '@utils/tools'
 import emptyImg from '@assets/empty.png'
+import * as noticeType from '@constants/common.js'
+
 const maleImg = require('@assets/person/male.png')
 const femaleImg = require('@assets/person/female.png')
 const phoneImg = require('@assets/person/phone.png')
@@ -366,10 +368,25 @@ export default class myCustomer extends Taro.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: {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) {
+
+      },
+      fail(res){
+
+      },
+      complete(){
+        Taro.navigateTo({
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
+        })
+      }
     })
+
   }
   renderBaseBox() {
     const { baseInfo, desc, selector, sexSelector } = this.state

src/pages/person/myShare/accessRecord.js

@@ -4,7 +4,7 @@ import { connect } from '@tarojs/redux'
 import './index.scss'
 import { getSharePersonInfoList } from '@services/person'
 import { savePoint, updatePoint } from '@services/common'
-import '@constants/common.js'
+import * as noticeType from '@constants/common.js'
 import dayjs from 'dayjs';
 
 @connect(state => state.user)
@@ -88,7 +88,7 @@ export default class Person extends Component {
     e.stopPropagation()
     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
+    const tplId=(tpls.filter(x => x.tplType == noticeType.TPL_NOTICE&&x.isSubscribe == true))[0].tplId
     wx.requestSubscribeMessage({
       tmplIds: [tplId],
       success (res) {

src/pages/project/detail/index.js

@@ -29,6 +29,8 @@ import getUserPhone from '@utils/getUserPhone'
 import { ROLE_CODE } from '@constants/user'
 import { getCardDetail } from '@services/card'
 import Consultant from '@components/consultant'
+import * as noticeType from '@constants/common.js'
+
 const buildBg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/buildbg.png'
 const dotImg = require('@assets/dot.png')
 
@@ -322,9 +324,23 @@ export default class Index extends Component {
   getPhoneNumber(e, item) {
     getUserPhone(e, (phoneNumber) => {
       const { userInfo: { person: { personId, nickname, name } } } = this.props
-      Taro.navigateTo({
-        url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.id}&receiverName=${encodeURIComponent(item.userName)}`
+      const tplId=(tpls.filter(x => x.tplType == noticeType.TPL_NOTICE&&x.isSubscribe == true))[0].tplId
+      wx.requestSubscribeMessage({
+        tmplIds: [tplId],
+        success (res) {
+  
+        },
+        fail(res){
+  
+        },
+        complete(){
+          // App.zhuge.track('查看置业顾问列表')
+          Taro.navigateTo({
+            url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.id}&receiverName=${encodeURIComponent(item.userName)}`
+          })
+        }
       })
+      
     })
   }
 
@@ -413,9 +429,23 @@ export default class Index 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.id}&receiverName=${encodeURIComponent(item.userName)}`
-    })
+    const tplId=(tpls.filter(x => x.tplType == noticeType.TPL_NOTICE&&x.isSubscribe == true))[0].tplId
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success (res) {
+
+      },
+      fail(res){
+
+      },
+      complete(){
+        // App.zhuge.track('查看置业顾问列表')
+        Taro.navigateTo({
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.id}&receiverName=${encodeURIComponent(item.userName)}`
+        })    
+      }
+    })   
+    
   }
 
   handleConsuItemClick(item) {
@@ -425,7 +455,7 @@ export default class Index extends Component {
   }
 
   handleMoreClick() {
-    // App.zhuge.track('查看置业顾问列表')
+    const { userInfo: {miniApp:{tpls}}} = this.props
     Taro.navigateTo({
       url: `/pages/card/list/index?buildingId=${this.state.buildingId}`
     })

src/pages/project/index.js

@@ -115,21 +115,8 @@ export default class Index extends Component {
   toChatList() {
     // const { dispatch } = getStore()
     // dispatch({ type: DECREASE_UNREADNUM })
-    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'
-        })
-      }
+    Taro.navigateTo({
+      url: '/pages/im/list/index'
     })
   }
   componentDidShow() {