静态页面

config/dev.js

@@ -3,9 +3,9 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"http://127.0.0.1:8081"',
-    WSS_HOST: '"wss://xlk.njyz.tech"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"http://127.0.0.1:8081"',
+    WSS_HOST: '"ws://127.0.0.1:8081"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',

config/prod.js

@@ -3,10 +3,10 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    // HOST: '"https://xlj.newlandsh.com"', //正式
-    // WSS_HOST: '"wss://xlj.newlandsh.com"',
-    HOST: '"https://xlk.njyz.tech"', //正式
-    WSS_HOST: '"wss://xlk.njyz.tech"',
+    HOST: '"https://xlj.newlandsh.com"', //正式
+    WSS_HOST: '"wss://xlj.newlandsh.com"',
+    // HOST: '"https://xlk.njyz.tech"', //正式
+    // WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',

src/components/FixedConsultant/index.jsx

@@ -17,7 +17,7 @@ export default function FixedCard (props) {
 
   const handleChat = () => {
     Taro.navigateTo({
-      url: `/pages/chat/chatDetail/index?targetPerson=${consultantId}}`
+      url: `/pages/chat/chatDetail/index?friend=${consultantId}`
     })
   }
   

src/components/Loading/index.jsx

@@ -3,7 +3,7 @@ import logo from '@/assets/logo.png'
 import './style.scss'
 
 export default (props) => {
-  const { width = '80px', logoVisible } = props
+  const { width = '64px', logoVisible } = props
   const height = width
 
   return (

src/components/Loading/style.scss

@@ -4,6 +4,8 @@
   position: relative;
 
   &-logo {
+    box-sizing: border-box;
+    padding: 12px;
     position: absolute;
     left: 0;
     transform: scale(.75, .75);

src/components/ProjectListItem/index.jsx

@@ -3,6 +3,7 @@ import './index.scss'
 import '@/assets/css/iconfont.css'
 import Taro from '@tarojs/taro'
 import { Image } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
 
 export default function ProjectListItem (props) {
   const { Data = {} } = props
@@ -11,7 +12,7 @@ export default function ProjectListItem (props) {
     <view className='components ProjectListItem flex-h' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.buildingId}` })}}>
       <view className='Img'>
         <view>
-          <Image mode='aspectFill' className='centerLabel' src={Data.buildingListImg?.length ? Data.buildingListImg[0].url : null} />
+          <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.buildingListImg?.length ? Data.buildingListImg[0].url : null)} />
         </view>
       </view>
       <view className='flex-item'>

src/constants/api.js

@@ -276,4 +276,7 @@ export const API_BUILDINGSPECIALROOM_LIST = resolvePath('buildingSpecialRoom')
 export const API_BUILDINGSPECIALROOM_BUILDING_LIST = resolvePath('buildingSpecialRoom/building')
 
 // video
-export const API_VIDEO_DETAIL = resolvePath('detail')
+export const API_VIDEO_DETAIL = resolvePath('detail')
+
+// 客服热线
+export const API_FEEDBACK_SETTING = resolvePath('/searchHouse/setting')

src/pages/chat/chatDetail/Card.jsx

@@ -0,0 +1,30 @@
+import React from 'react'
+import Taro from '@tarojs/taro'
+import './index.scss'
+
+export default (props) => {
+  const { person, onLeavePhone } = props
+
+  const callPhone = () => {
+    if (person.tel || person.phone) {
+      Taro.makePhoneCall({
+        phoneNumber: person.tel || person.phone
+      })
+    }
+  }
+
+  return (
+    <view className='SystemModel'>
+      <text className='Msg'>{`您好，我是${person.name || person.nickname}，有什么可以帮您吗？您可以在这里跟我实时沟通哦~`}</text>
+      <text className='Tips'>您还可以通过以下方式快速联系我：</text>
+      <view onClick={callPhone}>
+        <text className='iconfont icon-dianhua'></text>
+        <text>拨打我的电话</text>
+      </view>
+      <view onClick={onLeavePhone}>
+        <text className='iconfont icon-shouji'></text>
+        <text>留下您的电话</text>
+      </view>
+    </view>
+  )
+}

src/pages/chat/chatDetail/index.jsx

@@ -1,100 +1,205 @@
-import { useState } from 'react'
-import { ScrollView, Input, Image } from '@tarojs/components'
+import { useEffect, useState } from 'react'
+import Taro from '@tarojs/taro'
+import { ScrollView, Input, Image, Button } from '@tarojs/components'
+import withLayout from '@/layout'
+import { API_QUERY_USERINFO_BYID } from '@/constants/api'
+import { ROLE_CODE } from '@/constants/user'
+import { uploadFiles, fetch } from '@/utils/request'
+import { queryChatHistory } from '@/services/chat'
+import im from '@/utils/im'
+import { getDateForHumans } from '@/utils/chatDate'
 import '@/assets/css/iconfont.css'
+import Card from './Card'
+import useScrollTop from './useScrollTop'
 import './index.scss'
 
-export default function MyCollectForActivity () {
-
-  const [PageList, setPageList] = useState([{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}])
+export default withLayout((props) => {
+  const { router, person } = props;
+  const { friend } = router.params
+
+  const [submitting, setSubmitting] = useState(false)
+  const [text, setText] = useState()
+  const [receiver, setReceiver] = useState({})
+  const [PageList, setPageList] = useState([])
+  const [scrollTop, scroll] = useScrollTop('#chat-scroll')
+
+  const sendMessage = (msg, type = im.MESSAGETYPE.TEXT) => {
+    const message = msg
+    const messageType = type
+
+    // 用来回调写入消息列表
+    const newMessage = {
+      chatId: Math.random().toString(36).substring(2),
+      message,
+      messageType,
+      receivePerson: friend,
+      sendPerson: person.personId,
+      createDate: new Date(),
+    }
+
+    // 发送消息
+    setSubmitting(true)
+    im.sendMessage(message, messageType).then(() => {
+      // 发送成功
+      setText()
+      // 立刻回显刚刚发送内容
+      setPageList(PageList.concat(newMessage))
+      // 滚动到底部
+      scroll()
+      //
+      setSubmitting(false)
+    }).catch(() => {
+      setSubmitting(false)
+      Taro.showToast({
+        title: '发送失败, 请重试',
+        icon: 'none',
+      })
+    })
+  }
+
+  const submitText = () => {
+    sendMessage(text)
+  }
+
+  const submitImage = () => {
+    Taro.chooseImage({
+      count: 1,
+      sizeType: ['original', 'compressed'],
+      sourceType: ['album', 'camera'],
+      success: res => {
+        uploadFiles(res.tempFilePaths).then(data => {
+          sendMessage(data[0], im.MESSAGETYPE.IMAGE)
+        })
+      }
+    })
+  }
+
+  const getChatHistory = (params) => {
+    Taro.showLoading()
+    queryChatHistory({
+      chatWith: friend,
+      pageSize: 20,
+      ...params || {},
+    }).then((res) => {
+      const { records } = res;
+      Taro.hideLoading()
+
+      const lst = (records || []).reverse()
+
+      // 如果聊天对象是有身份的
+      if (receiver.personType !== ROLE_CODE.DRIFT && receiver.personType !== ROLE_CODE.CUSTOMER) {
+        const mockMessage = {
+          chatId: Math.random().toString(36).substring(2),
+          message: '',
+          messageType: im.MESSAGETYPE.CARD,
+          receivePerson: person.personId,
+          sendPerson: friend,
+          createDate: new Date(),
+        }
+        lst.push(mockMessage)
+      }
+
+      setPageList(lst)
+      scroll()
+    })
+  }
+
+  // 留电话
+  // 实际上是发送一条文本记录
+  const leavePhone = () => {
+    sendMessage(person.phone)
+  }
+
+  useEffect(() => {
+    if (friend) {
+      im.bindReceiver(friend)
+      fetch({ url: `${API_QUERY_USERINFO_BYID}/${friend}`, spin: true }).then((res) => {
+        setReceiver(res)
+        getChatHistory({ pageNumber: 1 })
+      })
+    } else {
+      Taro.showToast({
+        title: '无聊天对象，请退出重试',
+        icon: 'none',
+      })
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [friend])
 
   return (
     <view className='chatDetail flex-v'>
       <view className='flex-item'>
         <view>
-          <ScrollView scroll-y>
+          <ScrollView id='chat-scroll' scrollY enhanced scrollTop={scrollTop}>
             <view className='PageContent'>
               {
-                PageList.map((item, index) => (
-                  <view key={`ChatItem-${index}`} className='ChatItem'>
+                PageList.map((item) => (
+                  <view key={item.chatId} className='ChatItem'>
 
                     <view className='Time'>
-                      <text>今天 17:50</text>
+                      <text>{getDateForHumans(item.createDate, true)}</text>
                     </view>
 
                     <view className='flex-h'>
-
-                      {/* 对方头像 */}
                       {
-                        index % 2 === 0 &&
-                        <view className='Icon'>
-                          <Image mode='scaleToFill' src={null}></Image>
-                        </view>
-                      }
-
-                      <view className='flex-item'>
-
-                        {/* 系统模板消息（对方消息） */}
-                        {
-                          index === 0 &&
-                          <view className='SystemModel'>
-                            <text className='Msg'>您好，我是陆毅，有什么可以帮您吗？您可以在这里跟我实时沟通哦~</text>
-                            <text className='Tips'>您还可以通过以下方式快速联系我：</text>
-                            <view>
-                              <text className='iconfont icon-dianhua'></text>
-                              <text>拨打我的电话</text>
+                        item.sendPerson === friend ? (
+                          <>
+                            <view className='Icon'>
+                              <Image mode='scaleToFill' src={receiver.avatarurl}></Image>
                             </view>
-                            <view>
-                              <text className='iconfont icon-shouji'></text>
-                              <text>留下您的电话</text>
+
+                            <view className='flex-item'>
+                              { /* 如果是文本 */
+                                item.messageType === im.MESSAGETYPE.TEXT && (
+                                  <view className='Message Left'>
+                                    <text>{item.message}</text>
+                                  </view>
+
+                                  // 图片消息
+                                  // <view className='Message Left Img'>
+                                  //   <view>
+                                  //     <Image mode='scaleToFill' src={receiver.avatarurl}></Image>
+                                  //   </view>
+                                  // </view>
+                                )
+                              }
+                              { /* 如果是卡片 */
+                                item.messageType === im.MESSAGETYPE.CARD && (
+                                  <Card person={receiver} onLeavePhone={leavePhone} />
+                                )
+                              }
                             </view>
-                          </view>
-                        }
-
-                        {/* 对方消息（文本） */}
-                        {
-                          index % 2 === 0 && index > 2 &&
-                          <view className='Message Left'>
-                            <text>知道了</text>
-                          </view>
-                        }
-
-                        {/* 对方消息（图片） */}
-                        {
-                          index === 2 &&
-                          <view className='Message Left Img'>
-                            <view>
-                              <Image mode='scaleToFill' src={null}></Image>
+                          </>
+                        ) : (
+                          <>
+                            <view className='flex-item'>
+                              { /* 如果是文本 */
+                                item.messageType === im.MESSAGETYPE.TEXT && (
+                                  <view className='Message Right'>
+                                    <text>{item.message}</text>
+                                  </view>
+
+                                  // 图片消息
+                                  // <view className='Message Right Img'>
+                                  //   <view>
+                                  //     <Image mode='scaleToFill' src={receiver.avatarurl}></Image>
+                                  //   </view>
+                                  // </view>
+                                )
+                              }
                             </view>
-                          </view>
-                        }
-
-                        {/* 我方消息（文本） */}
-                        {
-                          index % 2 === 1 && index !== 1 &&
-                          <view className='Message Right'>
-                            <text>知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了知道了</text>
-                          </view>
-                        }
-
-                        {/* 我方消息（图片） */}
-                        {
-                          index === 1 &&
-                          <view className='Message Right Img'>
-                            <view>
-                              <Image mode='scaleToFill' src={null}></Image>
+                            <view className='Icon'>
+                              <Image mode='scaleToFill' src={person.avatarurl}></Image>
                             </view>
-                          </view>
-                        }
+                          </>
+                        )
+                      }
 
-                      </view>
 
-                      {/* 我方头像 */}
-                      {
-                        index % 2 === 1 &&
-                        <view className='Icon'>
-                          <Image mode='scaleToFill' src={null}></Image>
-                        </view>
-                      }
+                      {/* 系统模板消息（对方消息） */}
+                      {/* {
+                          index === 0 &&
+                        } */}
 
                     </view>
 
@@ -107,11 +212,11 @@ export default function MyCollectForActivity () {
       </view>
       <view className='SendContent flex-h'>
         <view className='flex-item'>
-          <Input placeholder='发送消息' />
+          <Input placeholder='发送消息' value={text} onInput={(e) => setText(e.detail.value)} />
         </view>
-        <text className='iconfont icon-tianjia'></text>
-        <text className='Send'>发送</text>
+        <text className='iconfont icon-tianjia' onClick={submitImage}></text>
+        <Button loading={submitting} className='Send' onClick={submitText}>发送</Button>
       </view>
     </view>
   )
-}
+})

src/pages/chat/chatDetail/useScrollTop.js

@@ -0,0 +1,21 @@
+
+import { useEffect, useState, useRef } from 'react';
+import Taro from '@tarojs/taro'
+
+export default function useScrollTop() {
+  // 设置一个初始高度
+  const [scrollTop, setScrollTop] = useState(1000)
+
+  const scroll = () => {
+    // Taro.createSelectorQuery()
+    //     .select(selector)
+    //     .boundingClientRect((rect) => {
+    //       console.log('-------rect------->', rect)
+    //   }).exec();
+    Taro.nextTick(() => {
+      setScrollTop(scrollTop + 500)
+    })
+  }
+
+  return [scrollTop, scroll]
+}

src/pages/chat/index.jsx

@@ -1,16 +1,44 @@
 import { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
 import { ScrollView, Image } from '@tarojs/components'
 import withLayout from '@/layout'
+import { queryChatFriends } from '@/services/chat'
+import { formatDate } from '@/utils/chatDate'
 import './index.scss'
 
 const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon18.jpg'
 
-export default withLayout(() => {
+export default withLayout((props) => {
 
   // const [PageProps] = useState(props)
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', ''])
+  const [PageList, setPageList] = useState([])
+
+  const getList = (params) => {
+    Taro.showLoading()
+    queryChatFriends({
+      pageSize: 20,
+      ...params || {},
+    }).then((res) => {
+      Taro.hideLoading()
+      const { records } =  res
+      setPageList(records || [])
+    }).catch((err) => {
+      console.error(err)
+      Taro.hideLoading()
+    })
+  }
+
+  const handleChat = (item) => {
+    Taro.navigateTo({
+      url: `/pages/chat/chatDetail/index?friend=${item.friendId}`
+    })
+  }
+
+  useEffect(() => {
+    getList({ pageNumber: 1 })
+  }, [])
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
@@ -28,24 +56,24 @@ export default withLayout(() => {
   return (
     <view className='Page Chat'>
 
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scrollY refresherEnabled refresherTriggered={IsPull} onRefresherrefresh={PageRefresh} refresherBackground='#fff'>
         <view className='PageContent'>
           {
             PageList.map((item, index) => (
-              <view className='ListItem flex-h' key={`ListItem-${index}`}>
+              <view className='ListItem flex-h' key={item.friendId} onClick={() => handleChat(item)}>
                 <view className='Icon'>
                   <view>
-                    <Image mode='aspectFill' className='centerLabel' src={item.img || defaultRuleImage} />
+                    <Image mode='aspectFill' className='centerLabel' src={item.avatar || defaultRuleImage} />
                   </view>
-                  <text className='Num'>99</text>
+                  {!!item.unReadNum && <text className='Num'>{item.unReadNum}</text>}
                 </view>
                 <view className='flex-item'>
                   <view className='flex-h'>
-                    <text className='flex-item'>张三</text>
-                    <text>刚刚</text>
+                    <text className='flex-item'>{item.name}</text>
+                    <text>{formatDate(item.createDate, 'yyyy/M/d')}</text>
                   </view>
                   <view className='Msg'>
-                    <text>户型很好，很满意</text>
+                    <text>{item.messageType === 'text' ? item.message : '[图片]'}</text>
                   </view>
                 </view>
               </view>

src/pages/index/activityDetail/index.jsx

@@ -18,7 +18,7 @@ import {
   queryActivityDetail,
 } from "@/services/activity";
 import { getImgURL } from "@/utils/image";
-import getDateFormat from "@/utils/chatDate";
+import { formatDate } from "@/utils/chatDate";
 import useParams from "@/utils/hooks/useParams";
 import useShare from "@/utils/hooks/useShare";
 import useFavor from "@/utils/hooks/useFavor";
@@ -213,11 +213,7 @@ export default withLayout((props) => {
         </view>
         <text className='Time'>
           报名截止时间：
-          {getDateFormat(
-            new Date(detail.enlistEnd).valueOf(),
-            true,
-            'yyyy/M/d'
-          )}
+          {formatDate(detail.enlistEnd, 'yyyy/M/d')}
         </text>
         <text className='Name'>{detail.title}</text>
         <view className='flex-h Address'>
@@ -230,17 +226,7 @@ export default withLayout((props) => {
           <text>时间：</text>
           <view className='flex-item'>
             <text>
-              {getDateFormat(
-                new Date(detail.startDate).valueOf(),
-                true,
-                'yyyy/M/d'
-              )}{' '}
-              -{' '}
-              {getDateFormat(
-                new Date(detail.endDate).valueOf(),
-                true,
-                'yyyy/M/d'
-              )}
+              {`${formatDate(detail.startDate, 'yyyy/M/d')} - ${formatDate(detail.endDate, 'yyyy/M/d')}`}
             </text>
           </view>
         </view>
@@ -267,7 +253,7 @@ export default withLayout((props) => {
             </view>
             <text className='Price'>价格待定</text>
           </view>
-          <text className='Time'>时间：{getDateFormat(new Date(detail.startDate).valueOf(), true, 'yyyy/M/d')} - {getDateFormat(new Date(detail.endDate).valueOf(), true, 'yyyy/M/d')}</text>
+          <text className='Time'>时间：{formatDate(detail.startDate, 'yyyy/M/d')} - {formatDate(detail.endDate, 'yyyy/M/d')}</text>
         </view>
         <view className='Option'>
           <view>
@@ -326,7 +312,7 @@ export default withLayout((props) => {
                   </view>
 
                   {detail.type == "dymic" && dymic()}
-                  {detail.type == "house" && house()}
+                  {detail.type !== "dymic" && house()}
                   <view className='ActivityIntro'>
                     <view className='Title'>
                       <text>活动介绍</text>

src/pages/index/activityDetail/index.scss

@@ -333,6 +333,8 @@
               overflow: hidden;
               text-align: center;
               font-size: 0;
+              margin-bottom: 30rpx;
+
               &::after {
                 content: '';
                 display: block;

src/pages/index/buildingAround/index.jsx

@@ -1,21 +1,24 @@
-import { useState } from 'react'
+import { useState, useEffect, useRef } from 'react'
+import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
-import { ScrollView } from '@tarojs/components'
+import { ScrollView, Map } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import { API_ITEMS_DETAIL } from '@/constants/api'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const { router, city } = props
+  const { id } = router.params
 
-  const [NavList] = useState([
-    { name: '交通', id: 1 },
-    { name: '商业', id: 2 },
-    { name: '医院', id: 3 },
-    { name: '学校', id: 4 },
-    { name: '银行', id: 5 }
-  ])
+  const [DetailInfo, setDetailInfo] = useState({})
+  const [loc, setLoc] = useState([])
+  const [NavList, setNavList] = useState([])
   const [CurrentNavId, setCurrentNavId] = useState(1)
   const [List, setList] = useState([{}, {}, {}, {}, {}, {}, {}, {}, {}])
   const [OtherList, setOtherList] = useState([{}, {}, {}, {}, {}, {}, {}, {}, {}])
+  const [markers, setMarkers] = useState([])
+  const mapCtx = useRef()
 
   const CutNav = (id) => {
     return () => {
@@ -23,12 +26,108 @@ export default withLayout(() => {
     }
   }
 
+  const locationTo = () => {
+    if (loc.length) {
+      Taro.openLocation({
+        longitude: loc[0],
+        latitude: loc[1],
+        name: DetailInfo.buildingName,
+        address: DetailInfo.address,
+      })
+    }
+  }
+
+  const handlePoi = (poi) => {
+    const [longitude, latitude] = poi.location.split(',').map(x => x ? x - 0 : undefined)
+
+    const marker = {
+      id: 1,
+      longitude,
+      latitude,
+      // iconPath: '',
+      width: 18,
+      height: 27,
+      callout: {
+        content: poi.name,
+        color: '#333333',
+        padding: 6,
+        display: 'ALWAYS',
+      }
+    }
+
+    const center = markers[0]
+    setMarkers([center, marker])
+
+    if (mapCtx.current) {
+      // 缩放地图，显示所有 marker
+      const points = [
+        {longitude: center.longitude, latitude: center.latitude},
+        {longitude: marker.longitude, latitude: marker.latitude}
+      ]
+      mapCtx.current.includePoints({ points, padding: [32] })
+    }
+  }
+
+  // 获取地图 Context
+  useEffect(() => {
+    Taro.nextTick(() => {
+      mapCtx.current = Taro.createMapContext('around-map')
+    })
+  }, [])
+
+  useEffect(() => {
+    // 获取楼盘信息
+    fetch({ url: `${API_ITEMS_DETAIL}/${id}`, spin: true }).then((res) => {
+      if (res?.coordinate) {
+        // 地图中心
+        const [longitude, latitude] = res.coordinate.split(',')
+        setLoc([longitude - 0, latitude - 0])
+        // 中心点标记
+        setMarkers([{
+          id: -1,
+          longitude,
+          latitude,
+          width: 18,
+          height: 27,
+          callout: {
+            content: res.buildingName,
+            color: '#333333',
+            padding: 6,
+            display: 'ALWAYS',
+          }
+        }])
+        setDetailInfo(res || {})
+        if (res.mapJson) {
+          const pois = JSON.parse(res.mapJson).map(poi => ({...poi, data: JSON.parse(poi.data)}))
+          setNavList(pois)
+          setCurrentNavId(pois[0].key)
+          setList(pois[0].data)
+        }
+        
+      } else {
+        Taro.showToast({
+          title: '当前楼盘未设置位置信息',
+          icon: 'none',
+        })
+      }
+    }).catch((err) => {
+      console.error(err)
+    })
+
+  }, [id])
+
   return (
     <view className='Page buildingAround'>
 
       <view className='MapContainer'>
         <view>
-          
+          <Map
+            id='around-map'
+            showLocation
+            longitude={loc[0]}
+            latitude={loc[1]}
+            markers={markers}
+          />
         </view>
       </view>
 
@@ -37,9 +136,9 @@ export default withLayout(() => {
 
           <view className='Title flex-h'>
             <view className='flex-item'>
-              <text>香颂·蔚澜半岛</text>
+              <text>{DetailInfo.buildingName}</text>
             </view>
-            <view className='Go'>
+            <view className='Go' onClick={locationTo}>
               <text>前往</text>
               <text className='iconfont icon-qianwang'></text>
             </view>
@@ -48,15 +147,15 @@ export default withLayout(() => {
           <view className='Address flex-h'>
             <text className='iconfont icon-dingwei'></text>
             <view className='flex-item'>
-              <text>建邺区高庙路与保双街交叉路口</text>
+              <text>{DetailInfo.address}</text>
             </view>
           </view>
 
           <view className='Nav flex-h'>
             {
               NavList.map((item, index) => (
-                <view className={item.id === CurrentNavId ? 'flex-item active' : 'flex-item'} key={`NavItem-${index}`}>
-                  <text onClick={CutNav(item.id)}>{item.name}(12)</text>
+                <view className={item.key === CurrentNavId ? 'flex-item active' : 'flex-item'} key={item.key}>
+                  <text onClick={CutNav(item.key)}>{`${item.label}(${item.data.length})`}</text>
                 </view>
               ))
             }
@@ -70,13 +169,13 @@ export default withLayout(() => {
                 <view className='List'>
                   {
                     List.map((item, index) => (
-                      <view className='flex-h' key={`ListItem-${index}`}>
+                      <view className='flex-h' key={`ListItem-${index}`} onClick={() => handlePoi(item)}>
                         <text>{index + 1}、</text>
                         <view className='flex-item'>
-                          <text>南京地铁1号线</text>
+                          <text>{item.name}</text>
                         </view>
                         <text className='iconfont icon-dingwei'></text>
-                        <text className='distance'>200m</text>
+                        <text className='distance'>{`${item.distance}m`}</text>
                       </view>
                     ))
                   }

src/pages/index/buildingAround/index.scss

@@ -15,6 +15,11 @@
       height: calc(100vh - 600px);
       position: relative;
       overflow: hidden;
+
+      map {
+        width: 100%;
+        height: 100%;
+      }
     }
   }
   >.TabContainer {

src/pages/index/buildingDetail/components/DetailBottom/index.jsx

@@ -29,7 +29,7 @@ export default function DetailBottom (props) {
 
     if (consultant?.id) {
       Taro.navigateTo({
-        url: `/pages/chat/chatDetail/index?targetPerson=${consultant.id}}`
+        url: `/pages/chat/chatDetail/index?friend=${consultant.id}}`
       })
     } else {
       Taro.navigateTo({
@@ -66,10 +66,10 @@ export default function DetailBottom (props) {
     if (Info.buildingId) {
       // 请求看房活动
       queryActivityList({ buildingId: Info.buildingId, pageSize: 1, type: 'look' }).then((res) => {
-        const { list } = res || {}
+        const { records } = res || {}
 
         // 只保留已发布的活动
-        setActList((list || []))
+        setActList((records || []))
       })
     }
   }, [Info.buildingId])

src/pages/index/buildingDetail/components/MarketingActivity/index.jsx

@@ -18,10 +18,10 @@ export default function MarketingActivity (props) {
   useEffect(() => {
     if (buildingId) {
       queryActivityList({ buildingId, pageSize: 500, type: 'house' }).then((res) => {
-        const { list } = res || {}
+        const { records } = res || {}
         
         // 只保留3场在进行中的活动
-        setDataList((list || []).filter((x) => (x.activityStatus === 0)).slice(0, 3))
+        setDataList((records || []).filter((x) => (x.activityStatus < 2)).slice(0, 3))
       })
     }
   }, [buildingId])
@@ -44,7 +44,7 @@ export default function MarketingActivity (props) {
               dataList.map((item, index) => (
                 <SwiperItem key={`Banner-${index}`}>
                   <view className='swiper-item' onClick={() => goDetail(item.dynamicId)}>
-                    <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || item.detailImg)} />
+                    <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.imgUrl || item.image || item.url || item.img || item.imgUrl || item.detailImg)} />
                   </view>
                 </SwiperItem>
               ))

src/pages/index/buildingDetail/components/Periphery/index.jsx

@@ -30,10 +30,8 @@ export default function Periphery (props) {
     return tagLen + poiLen
   }, [Info, pois])
 
-  const CutTab = () => {
-    return () => {
-      Taro.navigateTo({url: `/pages/index/buildingAround/index?id=${Info.buildingId}`})
-    }
+  const handleClick = () => {
+    Taro.navigateTo({url: `/pages/index/buildingAround/index?id=${Info.buildingId}`})
   }
 
   useEffect(() => {
@@ -46,11 +44,12 @@ export default function Periphery (props) {
         longitude: loc[0],
         latitude: loc[1],
         iconPath: '',
-        width: 24,
-        height: 36,
-        customCallout: {
-          anchorY: 0,
-          anchorX: 0,
+        width: 18,
+        height: 27,
+        callout: {
+          content: Info.buildingName,
+          color: '#333333',
+          padding: 6,
           display: 'ALWAYS',
         }
       })
@@ -81,25 +80,21 @@ export default function Periphery (props) {
         <view>
           <Map
             id='poi-around'
-            show-location
+            // show-location
             scale={12}
             markers={markers}
             longitude={loc[0]}
             latitude={loc[1]}
             // enable-enableScroll
             // enable-zoom
-          >
-            <CoverView slot='callout' className='marker-callout'>
-              <CoverView markerId={-1} className='marker-project'>{Info.buildingName}</CoverView>
-            </CoverView>
-          </Map>
+          />
         </view>
       </view>
 
-      <view className='List flex-h'>
+      <view className='List flex-h' onClick={handleClick}>
         {
           poiTypes.map((item) => (
-            <view className='flex-item' key={item.value} onClick={CutTab(item.value)}>
+            <view className='flex-item' key={item.value}>
               <text className={item.class}></text>
               <text>{item.label}</text>
               <text>({countLen(item.value)})</text>

src/pages/index/buildingDetail/components/PropertyConsultant/index.jsx

@@ -27,7 +27,7 @@ export default function PropertyConsultant (props) {
 
   const handleChat = (item) => {
     Taro.navigateTo({
-      url: `/pages/chat/chatDetail/index?targetPerson=${item.id}}`
+      url: `/pages/chat/chatDetail/index?friend=${item.id}`
     })
   }
   

src/pages/index/buildingDetail/index.jsx

@@ -62,7 +62,7 @@ export default withLayout((props) => {
       console.error(err)
     })
 
-  }, [id, router.path])
+  }, [id])
 
   // 户型图
   const houseTypeImages = (DetailInfo?.buildingApartment || []).filter(x => x.apartmentType === 'apart')

src/pages/index/buildingPropertyConsultant/index.jsx

@@ -15,7 +15,7 @@ export default withLayout((props) => {
 
   const handleChat = (item) => {
     Taro.navigateTo({
-      url: `/pages/chat/chatDetail/index?targetPerson=${item.id}}`
+      url: `/pages/chat/chatDetail/index?friend=${item.id}`
     })
   }
 

src/pages/index/components/ActivityListItem/index.jsx

@@ -3,7 +3,7 @@ import './index.scss'
 import { Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import { getImgURL } from '@/utils/image'
-import getDateFormat from '@/utils/chatDate'
+import { formatDate } from '@/utils/chatDate'
 
 const activityStatusDict={
   0:{
@@ -38,7 +38,7 @@ export default function ActivityListItem (props) {
           <text className={activityStatusDict[data.activityStatus]?.className}>{activityStatusDict[data.activityStatus]?.text}</text>
         </view>
         <view className='Time'>
-          <text>活动时间：{getDateFormat(new Date(data.startDate).valueOf(),true,'yyyy/M/d')} - {getDateFormat(new Date(data.endDate).valueOf(),true,'yyyy/M/d')}</text>
+          <text>活动时间：{formatDate(data.startDate, 'yyyy/M/d')} - {formatDate(data.endDate, 'yyyy/M/d')}</text>
         </view>
       </view>
     </view>

src/pages/index/components/NewsListItem/index.jsx

@@ -3,7 +3,7 @@ import './index.scss'
 import { Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import { getImgURL } from "@/utils/image";
-import getDateFormat from "@/utils/chatDate";
+import { formatDate } from "@/utils/chatDate";
 
 export default function NewsListItem (props) {
   const { data = {} } = props
@@ -15,7 +15,7 @@ export default function NewsListItem (props) {
       </view>
       <view className='flex-item'>
         <text>{data.newsName}</text>
-        <text>于{getDateFormat(new Date(data.createDate).valueOf(), true,"yyyy-M-d")}发布</text>
+        <text>于{formatDate(data.createDate, "yyyy-M-d")}发布</text>
       </view>
     </view>
   )

src/pages/index/encyDetail/index.jsx

@@ -6,7 +6,7 @@ import { ScrollView } from "@tarojs/components";
 import "@/assets/css/iconfont.css";
 import { Image, RichText } from "@tarojs/components";
 import { queryPolicyDetail } from "@/services/policy";
-import getDateFormat from "@/utils/chatDate";
+import { formatDate } from "@/utils/chatDate";
 
 export default withLayout((props) => {
   const { router, shareContent, trackData, person, page } = props;
@@ -44,13 +44,8 @@ export default withLayout((props) => {
                   <view>
                   <text>阅读：{data.pvNum}</text>
                     <text className="Time">
-                      {getDateFormat(
-                        new Date(data.createDate).valueOf(),
-                        true,
-                        "yyyy-M-d"
-                      )}
+                      {formatDate(data.createDate, "yyyy-M-d")}
                     </text>
-                   
                   </view>
                 </view>
               </view>

src/pages/index/findHouseFromMap/index.jsx

@@ -1,81 +1,189 @@
-import { useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
+import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
-import { Image } from '@tarojs/components'
+import { Image, Map } from '@tarojs/components'
+import { getItemList } from '@/services/item'
+import { getImgURL } from '@/utils/image'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const { city } = props
 
   const [ShowInfo, setShowInfo] = useState(false)
+  const [list, setList] = useState([])
+  const [markers, setMarkers] = useState([])
+  const mapCtx = useRef()
+  const [current, setCurrent] = useState({})
 
-  const CutInfo = (status) => {
-    return () => {
-      setShowInfo(!!status)
+  const changeCity = () => {
+    Taro.navigateTo({ url: '/pages/index/location/index' })
+  }
+
+  const handleMarker = (e) => {
+    const { markerId } = e
+    const building = list[markerId - 1];
+    setCurrent(building||{});
+    setShowInfo(true)
+  }
+
+  const gotoDetail = () => {
+    if (current.buildingId) {
+      Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${current.buildingId}` })
+    }
+  }
+
+  const locationTo = () => {
+    if (current.buildingId) {
+      const loc = current.coordinate.split(',')
+      Taro.openLocation({
+        longitude: loc[0] - 0,
+        latitude: loc[1] - 0,
+        name: current.buildingName,
+        address: current.address,
+        scale: 12,
+      })
     }
   }
 
+  useEffect(() => {
+    Taro.nextTick(() => {
+      mapCtx.current = Taro.createMapContext('map-buildings')
+    })
+  }, [])
+
+  useEffect(() => {
+    if (city?.id) {
+      // 先移除页面的 markers
+      if (mapCtx.current && markers.length) {
+        mapCtx.current.removeMarkers({ markerIds: markers.map(x => x.id) })
+        setMarkers([])
+      }
+
+      getItemList({
+        cityId: city.id,
+        pageSize: 100,
+      }).then((res) => {
+        const { records } = res
+        setList((records || []).filter(x => x.coordinate))
+      })
+    }
+  }, [city?.id])
+
+  useEffect(() => {
+    if (!list.length) return;
+
+    const mks = list.map((item, index) => {
+      const loc = item.coordinate.split(',')
+
+      return {
+        id: index + 1,
+        longitude: loc[0] - 0,
+        latitude: loc[1] - 0,
+        iconPath: '',
+        width: 18,
+        height: 27,
+        callout: {
+          content: item.buildingName,
+          color: '#333333',
+          fontSize: 14,
+          display: 'ALWAYS',
+          padding: 6,
+          borderRadius: 2,
+          borderColor: 'rgba(0,0,0, .1)',
+        }
+        // customCallout: {
+        //   anchorY: 0,
+        //   anchorX: 0,
+        //   display: 'ALWAYS',
+        // }
+      }
+    })
+
+    const points = mks.map(it => ({ longitude: it.longitude, latitude: it.latitude }))
+    setMarkers(mks)
+
+    const t = setInterval(() => {
+      if (mapCtx.current) {
+        mapCtx.current.includePoints({ points, padding: [32] })
+        clearInterval(t)
+      }
+    }, 300)
+
+    return () => clearInterval(t)
+  }, [list])
+
   return (
     <view className='Page findHouseFromMap'>
 
       {/* 地图 */}
       <view className='MapContainer'>
-
+        <Map
+          id='map-buildings'
+          show-location
+          scale={12}
+          longitude={city?.lng}
+          latitude={city?.lat}
+          markers={markers}
+          onMarkertap={handleMarker}
+          onTap={() => setShowInfo(false)}
+        />
       </view>
 
       {/* 定位 */}
-      <view className='Location'>
+      <view className='Location' onClick={changeCity}>
         <text className='iconfont icon-dingwei'></text>
-        <text>南京市</text>
+        <text>{city.name}</text>
       </view>
 
       {/* 分享 */}
-      <view className='Share'>
+      <button className='Share' openType='share'>
         <text className='iconfont icon-fenxiang'></text>
-        <text>分享</text>
-      </view>
+        <text>分 享</text>
+      </button>
 
       {/* 附近楼盘 */}
       <view className={ShowInfo ? 'AroundBuilding active' : 'AroundBuilding'}>
-        <view className='Go'>
+        <view className='Go' onClick={locationTo}>
           <text>立即</text>
           <text>前往</text>
         </view>
         <view className='InfoContainer'>
-          <text className='Title' onClick={CutInfo(true)}>附近楼盘</text>
+          {/* <text className='Title' onClick={CutInfo(true)}>附近楼盘</text> */}
           <view className='InfoContent'>
-            <view className='Img'>
-              <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
+            <view className='Img' onClick={gotoDetail}>
+              <Image mode='scaleToFill' src={getImgURL(current.buildingListImg?.length ? current.buildingListImg[0].url : null)} className='centerLabel'></Image>
             </view>
             <view className='Name flex-h'>
               <view className='flex-item'>
-                <text>奥园金基天著尚居</text>
+                <text>{current.buildingName}</text>
               </view>
-              <text>约</text>
-              <text>20000/㎡</text>
+              <text></text>
+              <text>{current.price}</text>
             </view>
-            <text className='Address'>江宁禄口云熙99路号（诚信大道）</text>
+            <text className='Address'>{current.address}</text>
             <view className='Tag'>
-              <text>纯新盘</text>
-              <text>纯新盘</text>
-              <text>纯新盘</text>
+            {
+              (current.buildingTag || []).map((item, index) => (
+                <text key={`Tags-${index}`}>{item.tagName}</text>
+              ))
+            }
             </view>
             <view className='Views flex-h'>
               <view className='flex-item'>
                 <text className='iconfont icon-fenxiang'></text>
-                <text>3次分享</text>
+                <text>{`${current.shareNum||0}次分享`}</text>
               </view>
               <view className='Icons'>
-                <view>
-                  <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
-                </view>
-                <view>
-                  <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
-                </view>
-                <view>
-                  <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
-                </view>
+                {
+                  (current.uvList?.records || []).slice(0, 3).map((item, index) => (
+                    <view key={`uv-${index}`}>
+                      <Image mode='scaleToFill' className='centerLabel' src={item.photoOravatar} />
+                    </view>
+                  ))
+                }
               </view>
-              <text>...9人围观</text>
+              <text>{`...${current.pvNum}人围观`}</text>
             </view>
           </view>
         </view>

src/pages/index/findHouseFromMap/index.scss

@@ -10,6 +10,11 @@
     overflow: hidden;
     z-index: 1;
     background: #eee;
+
+    map {
+      width: 100%;
+      height: 100%;
+    }
   }
   > .Location,
   > .Share {
@@ -22,6 +27,8 @@
     top: 30px;
     right: 30px;
     border-radius: 12px;
+    padding: 0;
+
     > text {
       display: block;
       text-align: center;

src/pages/index/helpToFindHouse/components/SubmitBuyHouseResult/index.jsx

@@ -1,12 +1,27 @@
 
-import '@/assets/css/iconfont.css'
+import { useState } from 'react'
+import Taro from '@tarojs/taro'
 import { Image, Block } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
-import Taro from '@tarojs/taro'
+import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default function SubmitBuyHouseResult (props) {
-  const { List = [] } = props
+  const { List = [], setting } = props
+
+  const handlePhone = () => {
+    if (!setting?.phone) {
+      Taro.showToast({
+        title: '暂不提供相关服务',
+        icon: 'none',
+      })
+    }
+
+    Taro.makePhoneCall({
+      phoneNumber: setting.phone,
+    })
+  }
+
   return (
     <view className='components SubmitBuyHouseResult'>
       <view className='centerLabel'>
@@ -25,8 +40,8 @@ export default function SubmitBuyHouseResult (props) {
             </view>
 
             <view className='Btn flex-h'>
-              <text className='flex-item'>一键咨询</text>
-              <text className='flex-item active'>一键电话</text>
+              <button className='flex-item' openType='contact'>一键咨询</button>
+              <text className='flex-item active' onClick={handlePhone}>一键电话</text>
             </view>
 
             {/* 匹配楼盘 */}

src/pages/index/helpToFindHouse/components/SubmitBuyHouseResult/index.scss

@@ -58,7 +58,8 @@
           margin-top: 40px;
           align-items: center;
           margin-bottom: 60px;
-          >text {
+          >text, button {
+            padding: 0;
             font-size: 30px;
             line-height: 78px;
             border-radius: 78px;

src/pages/index/helpToFindHouse/index.jsx

@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import withLayout from '@/layout'
 import { ScrollView, Image } from '@tarojs/components'
 import { fetch } from '@/utils/request'
@@ -6,6 +6,7 @@ import { API_HELP_FIND_HOUSE_SUBMIT } from '@/constants/api'
 import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
 import AreaPickerView from '@/components/AreaPickerView/index'
+import { getFeedbackSetting } from '@/services/common'
 import './index.scss'
 import BuyHouse from './components/BuyHouse/index'
 import RentingHouse from './components/RentingHouse/index'
@@ -26,6 +27,7 @@ export default withLayout(() => {
   const [ShowPopup, setShowPopup] = useState(false)
   const [ShowCitysPopup, setShowCitysPopup] = useState(false)
   const [AreaInfo, setAreaInfo] = useState({})
+  const [setting, setSetting] = useState({})
 
   const CutDemandId = (id) => {
     return () => {
@@ -69,6 +71,10 @@ export default withLayout(() => {
     })
   }
 
+  useEffect(() => {
+    getFeedbackSetting().then((res) => setSetting(res))
+  }, [])
+
   return (
     <view className='Page helpToFindHouse'>
 
@@ -76,7 +82,7 @@ export default withLayout(() => {
 
       {
         ShowPopup &&
-        <SubmitBuyHouseResult List={ResultList}></SubmitBuyHouseResult>
+        <SubmitBuyHouseResult setting={setting} List={ResultList}></SubmitBuyHouseResult>
       }
 
       <ScrollView scroll-y refresher-enabled={false}>

src/pages/index/newsDetail/index.jsx

@@ -11,7 +11,7 @@ import {
   queryNewsDetail,
   cancelFavorNews,
 } from "@/services/news";
-import getDateFormat from "@/utils/chatDate";
+import { formatDate } from "@/utils/chatDate";
 
 export default withLayout((props) => {
   const { id } = props.router.params;
@@ -74,12 +74,7 @@ export default withLayout((props) => {
                       <text>收藏{data.saveNum || 0}</text>
                     </view>
                     <text className="Time">
-                      时间：
-                      {getDateFormat(
-                        new Date(data.createDate).valueOf(),
-                        true,
-                        "yyyy-M-d"
-                      )}{" "}
+                      {`时间：${formatDate(data.createDate, "yyyy-M-d")} `}
                     </text>
                     <text className="Share">分享好友</text>
                   </view>

src/pages/index/specialPriceHouse/index.jsx

@@ -13,26 +13,17 @@ import './index.scss'
 
 const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const { city } = props
   
-  const user = useSelector(state => state.user)
   const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PersonId, setPersonId] = useState(null)
   const [pageNumber, setPageNumber] = useState(1)
   const [HasNextPage, setHasNextPage] = useState(true)
 
   useEffect(() => {
-    if(user?.userInfo?.person?.personId) {
-      setPersonId(user.userInfo.person.personId)
-    }
-  }, [user])
-
-  useEffect(() => {
-    if(PersonId) {
-      GetPageList()
-    }
-  }, [pageNumber, PersonId])
+    GetPageList()
+  }, [pageNumber])
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
@@ -40,7 +31,7 @@ export default withLayout(() => {
 
   const GetPageList = () => {
     setHasNextPage(false)
-    fetch({ url: API_SPECIAL_ROOM_LIST, method: 'get', payload: { pageNumber, pageSize: 10 } }).then((res) => {
+    fetch({ url: API_SPECIAL_ROOM_LIST, method: 'get', payload: { pageNumber, pageSize: 10, cityId: city?.id } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)

src/pages/mine/components/UserDetailFollowRecord/index.jsx

@@ -2,11 +2,9 @@ import { useState, useEffect } from 'react'
 import { ScrollView } from '@tarojs/components'
 import { fetch } from '@/utils/request'
 import { API_FOLLOW_LIST } from '@/constants/api'
-import getDateFormat from "@/utils/chatDate";
+import { formatDate } from "@/utils/chatDate";
 import './index.scss'
 
-const formatDate = (dtStr, formatStr) => getDateFormat((new Date(dtStr)).valueOf(), true, formatStr)
-
 export default function UserDetailFollowRecord (props) {
   const { CustomerId = null, AddFollow = () => {}, AddFollowCounts = 0 } = props
   const [PageList, setPageList] = useState([])

src/pages/video/videoDetail/index.jsx

@@ -5,7 +5,7 @@ import "@/assets/css/iconfont.css";
 import "./index.scss";
 import { fetch } from "@/utils/request";
 import { API_VIDEO_DETAIL } from "@/constants/api";
-import getDateFormat from "@/utils/chatDate";
+import { formatDate } from "@/utils/chatDate";
 
 export default withLayout((props) => {
   const { id } = props.router.params;
@@ -49,11 +49,9 @@ export default withLayout((props) => {
           {/* 视频信息 */}
           <view className="Info">
             <text className="Name">{data.name}</text>
-            <text className="Time">时间：{getDateFormat(
-            new Date(data.createdTime).valueOf(),
-            true,
-            'yyyy年M月d日'
-          )}</text>
+            <text className="Time">
+              {`时间：${formatDate(data.createdTime, 'yyyy年M月d日')}`}
+            </text>
           </view>
 
           {/* 详情 */}

src/services/common.js

@@ -9,7 +9,8 @@ import {
   API_TEMPLATE_TYPE,
   API_BRAND_LIST,
   API_BRAND_INFO,
-  API_INDEX_ICONS
+  API_INDEX_ICONS,
+  API_FEEDBACK_SETTING,
 } from "@/constants/api";
 
 /**
@@ -102,4 +103,6 @@ export const queryBrandList = (params) => fetch({ url: API_BRAND_LIST, params })
  * 获取品牌房企列表
  * @param {*}
  */
- export const queryBrandInfo = (id) => fetch({ url: `${API_BRAND_INFO}/${id}`});
+export const queryBrandInfo = (id) => fetch({ url: `${API_BRAND_INFO}/${id}`});
+
+export const getFeedbackSetting = () => fetch({ url: API_FEEDBACK_SETTING });

src/utils/chatDate.js

@@ -12,7 +12,9 @@
 */
 
 //例子 getDateFormat(new Date().valueOf(),true,'yyyy/M/d')
-var _formatDate = function (date, fmt) {
+export function formatDate(dt, fmt) {
+  const date = new Date(dt)
+
   var o = {
     "M+": date.getMonth() + 1, //月份
     "d+": date.getDate(), //日
@@ -28,102 +30,100 @@ var _formatDate = function (date, fmt) {
   return fmt;
 };
 
+
 /**
 * 仿照微信中的消息时间显示逻辑，将时间戳（单位：毫秒）转换为友好的显示格式.
 *
 * 1）7天之内的日期显示逻辑是：今天、昨天(-1d)、前天(-2d)、星期？（只显示总计7天之内的星期数，即<=-4d）；
 * 2）7天之外（即>7天）的逻辑：直接显示完整日期时间。
 *
-* @param  {[long]} timestamp 时间戳（单位：毫秒），形如：1550789954260
+* @param  {[string|date]} dt 时间
 * @param {boolean} mustIncludeTime true表示输出的格式里一定会包含“时间:分钟”
 * ，否则不包含（参考微信，不包含时分的情况，用于首页“消息”中显示时）
 *
 * @return {string} 输出格式形如：“刚刚”、“10:30”、“昨天 12:04”、“前天 20:51”、“星期二”、“2019/2/21 12:09”等形式
 * @since 1.1
 */
-export default function getDateFormat(timestamp, mustIncludeTime,format='yyyy-M-d') {
+export function getDateForHumans(dt, mustIncludeTime, format='yyyy-M-d') {
 
   // 当前时间
-  // var currentDate = new Date();
+  var currentDate = new Date();
   // 目标判断时间
-  var srcDate = new Date(parseInt(timestamp));
+  var srcDate = new Date(dt);
 
-  // var currentYear = currentDate.getFullYear();
-  // var currentMonth = (currentDate.getMonth() + 1);
-  // var currentDateD = currentDate.getDate();
+  var currentYear = currentDate.getFullYear();
+  var currentMonth = (currentDate.getMonth() + 1);
+  var currentDateD = currentDate.getDate();
 
-  // var srcYear = srcDate.getFullYear();
-  // var srcMonth = (srcDate.getMonth() + 1);
-  // var srcDateD = srcDate.getDate();
+  var srcYear = srcDate.getFullYear();
+  var srcMonth = (srcDate.getMonth() + 1);
+  var srcDateD = srcDate.getDate();
 
   var ret = "";
 
   // 要额外显示的时间分钟
-  var timeExtraStr = (mustIncludeTime ? " " + _formatDate(srcDate, "hh:mm") : "");
+  var timeExtraStr = (mustIncludeTime ? " " + formatDate(srcDate, "hh:mm") : "");
 
-  // // 当年
-  // if (currentYear == srcYear) {
-  //   var currentTimestamp = currentDate.getTime();
-  //   var srcTimestamp = timestamp;
-  //   // 相差时间（单位：毫秒）
-  //   var deltaTime = (currentTimestamp - srcTimestamp);
+  // 当年
+  if (currentYear == srcYear) {
+    // 相差时间（单位：毫秒）
+    var deltaTime = (currentDate - srcDate);
 
-  //   // 当天（月份和日期一致才是）
-  //   if (currentMonth == srcMonth && currentDateD == srcDateD) {
-  //     // 时间相差60秒以内
-  //     if (deltaTime < 60 * 1000)
-  //       ret = "刚刚";
-  //     // 否则当天其它时间段的，直接显示“时:分”的形式
-  //     else
-  //       ret = _formatDate(srcDate, "hh:mm");
-  //   }
-  //   // 当年 && 当天之外的时间（即昨天及以前的时间）
-  //   else {
-  //     // 昨天（以“现在”的时候为基准-1天）
-  //     var yesterdayDate = new Date();
-  //     yesterdayDate.setDate(yesterdayDate.getDate() - 1);
+    // 当天（月份和日期一致才是）
+    if (currentMonth == srcMonth && currentDateD == srcDateD) {
+      // 时间相差60秒以内
+      if (deltaTime < 60 * 1000)
+        ret = "刚刚";
+      // 否则当天其它时间段的，直接显示“时:分”的形式
+      else
+        ret = formatDate(srcDate, "hh:mm");
+    }
+    // 当年 && 当天之外的时间（即昨天及以前的时间）
+    else {
+      // 昨天（以“现在”的时候为基准-1天）
+      var yesterdayDate = new Date();
+      yesterdayDate.setDate(yesterdayDate.getDate() - 1);
 
-  //     // 前天（以“现在”的时候为基准-2天）
-  //     var beforeYesterdayDate = new Date();
-  //     beforeYesterdayDate.setDate(beforeYesterdayDate.getDate() - 2);
+      // 前天（以“现在”的时候为基准-2天）
+      var beforeYesterdayDate = new Date();
+      beforeYesterdayDate.setDate(beforeYesterdayDate.getDate() - 2);
 
-  //     // 用目标日期的“月”和“天”跟上方计算出来的“昨天”进行比较，是最为准确的（如果用时间戳差值
-  //     // 的形式，是不准确的，比如：现在时刻是2019年02月22日1:00、而srcDate是2019年02月21日23:00，
-  //     // 这两者间只相差2小时，直接用“deltaTime/(3600 * 1000)” > 24小时来判断是否昨天，就完全是扯蛋的逻辑了）
-  //     if (srcMonth == (yesterdayDate.getMonth() + 1) && srcDateD == yesterdayDate.getDate())
-  //       ret = "昨天" + timeExtraStr;// -1d
-  //     // “前天”判断逻辑同上
-  //     else if (srcMonth == (beforeYesterdayDate.getMonth() + 1) && srcDateD == beforeYesterdayDate.getDate())
-  //       ret = "前天" + timeExtraStr;// -2d
-  //     else {
-  //       // 跟当前时间相差的小时数
-  //       var deltaHour = (deltaTime / (3600 * 1000));
+      // 用目标日期的“月”和“天”跟上方计算出来的“昨天”进行比较，是最为准确的（如果用时间戳差值
+      // 的形式，是不准确的，比如：现在时刻是2019年02月22日1:00、而srcDate是2019年02月21日23:00，
+      // 这两者间只相差2小时，直接用“deltaTime/(3600 * 1000)” > 24小时来判断是否昨天，就完全是扯蛋的逻辑了）
+      if (srcMonth == (yesterdayDate.getMonth() + 1) && srcDateD == yesterdayDate.getDate())
+        ret = "昨天" + timeExtraStr;// -1d
+      // “前天”判断逻辑同上
+      else if (srcMonth == (beforeYesterdayDate.getMonth() + 1) && srcDateD == beforeYesterdayDate.getDate())
+        ret = "前天" + timeExtraStr;// -2d
+      else {
+        // 跟当前时间相差的小时数
+        var deltaHour = (deltaTime / (3600 * 1000));
 
-  //       // 如果小于或等 7*24小时就显示星期几
-  //       if (deltaHour <= 7 * 24) {
-  //         var weekday = new Array(7);
-  //         weekday[0] = "星期日";
-  //         weekday[1] = "星期一";
-  //         weekday[2] = "星期二";
-  //         weekday[3] = "星期三";
-  //         weekday[4] = "星期四";
-  //         weekday[5] = "星期五";
-  //         weekday[6] = "星期六";
+        // 如果小于或等 7*24小时就显示星期几
+        if (deltaHour <= 7 * 24) {
+          var weekday = new Array(7);
+          weekday[0] = "星期日";
+          weekday[1] = "星期一";
+          weekday[2] = "星期二";
+          weekday[3] = "星期三";
+          weekday[4] = "星期四";
+          weekday[5] = "星期五";
+          weekday[6] = "星期六";
 
-  //         // 取出当前是星期几
-  //         var weedayDesc = weekday[srcDate.getDay()];
-  //         ret = weedayDesc + timeExtraStr;
-  //       }
-  //       // 否则直接显示完整日期时间
-  //       else
-  //         ret = _formatDate(srcDate, format) + timeExtraStr;
-  //     }
-  //   }
-  // }
-  // // 往年
-  // else {
-  //   ret = _formatDate(srcDate, format) + timeExtraStr;
-  // }
-  ret = _formatDate(srcDate, format) + timeExtraStr;
+          // 取出当前是星期几
+          var weedayDesc = weekday[srcDate.getDay()];
+          ret = weedayDesc + timeExtraStr;
+        }
+        // 否则直接显示完整日期时间
+        else
+          ret = formatDate(srcDate, format) + timeExtraStr;
+      }
+    }
+  }
+  // 往年
+  else {
+    ret = formatDate(srcDate, format) + timeExtraStr;
+  }
   return ret;
 };

src/utils/im/index.js

@@ -13,6 +13,7 @@ function IM() {
   const listeners = initListeners()
 
   let sendPerson;
+  let receivePerson;
   let timer;
 
   sdk.listen('onMessage', listeners.getListeners)
@@ -21,32 +22,24 @@ function IM() {
     MESSAGETYPE,
     init,
     listen: listeners.append,
+    bindReceiver,
     connect: sdk.connect,
-    send,
     sendMessage,
   }
 
-  function bindPerson(person) {
-    sendPerson = person
+  function bindReceiver(receiver) {
+    receivePerson = receiver
   }
 
-  function send(to) {
-    return function(type = MESSAGETYPE.TEXT) {
-      return function(message) {
-        return sendMessage(to, message, type)
-      }
-    }
-  }
-
-  function sendMessage(to, message, type = MESSAGETYPE.TEXT) {
-    return sdk.send(wrapData(to, message, type))
+  function sendMessage(message, type = MESSAGETYPE.TEXT) {
+    return sdk.send(wrapData(message, type))
   }
 
-  function wrapData(to, data, messageType) {
+  function wrapData(message, messageType) {
     return JSON.stringify({
       sendPerson,
-      receivePerson: to,
-      message: data,
+      receivePerson,
+      message,
       messageType,
       createDate: new Date().valueOf(),
     })
@@ -56,7 +49,7 @@ function IM() {
     // eslint-disable-next-line no-undef
     const url = `${WSS_HOST}/wx/chat/${personId}`  
 
-    bindPerson(personId)
+    sendPerson = personId
 
     if (timer) {
       clearInterval(timer)