feats

src/components/Disclaimer/index.jsx

@@ -0,0 +1,28 @@
+import React from 'react'
+import Taro from '@tarojs/taro'
+import { View, Text } from '@tarojs/components'
+
+import './style.scss'
+
+export default (props) => {
+  const gotoFeedback = () => {
+    Taro.navigateTo({ url: '/pages/mine/feedBack/index' })
+  }
+
+  return (
+    <View className='disclaimer-card' style={props.style}>
+      <View>
+        <View>
+          <Text className='iconfont icon-shengming'></Text>
+          <Text>免责声明</Text>
+        </View>
+        <View>&emsp;&emsp;本平台上所示图片、价格、房屋相关等文字信息，仅供您参考使用，不作为您决策交易的依据。
+          实际交易行为、权利义务、房屋信息均以您与开发商签订的商品房买卖合同为准。
+          若您对平台上所示图片、价格、房屋相关等文字信息有异议，请点击
+          <Text className='active' onClick={gotoFeedback}>意见反馈</Text>
+          窗口，平台核实后将会做出相应调整
+        </View>
+      </View>
+    </View>
+  )
+}

src/components/Disclaimer/style.scss

@@ -0,0 +1,30 @@
+.disclaimer-card {
+  padding: 30rpx 40rpx;
+  background: #fff;
+  color: #999;
+  line-height: 34rpx;
+  letter-spacing: 2rpx;
+  position: relative;
+  overflow: hidden;
+  font-size: 20rpx;
+  box-sizing: border-box;  
+
+  & > view {
+    padding: 30rpx 36rpx;
+    background: #F8F8F8;
+    border-radius: 8rpx;
+    box-sizing: border-box;  
+  }
+
+  .iconfont, text {
+    color: #999;
+  }
+
+  .iconfont {
+    font-size: 1.1em;
+  }
+
+  .active {
+    color: #193C83;
+  }
+}

src/pages/index/activityDetail/index.jsx

@@ -2,16 +2,12 @@ import { useState, useEffect } from "react";
 import Taro, { useDidShow, useReady } from "@tarojs/taro";
 import withLayout from "@/layout";
 import {
-  Text,
-  View,
-  Picker,
-  Input,
   ScrollView,
   Image,
   RichText,
 } from "@tarojs/components";
-import "@/assets/css/iconfont.css";
-import "./index.scss";
+import Disclaimer from '@/components/Disclaimer'
+
 import {
   // addActivityShareNum,
   signupActivity,
@@ -22,6 +18,8 @@ import {
 import { getImgURL } from "@/utils/image";
 import getDateFormat from "@/utils/chatDate";
 
+import "./index.scss";
+
 const activityStatusDict = {
   0: {
     text: "立即参与",
@@ -237,21 +235,7 @@ export default withLayout((props) => {
               {/* <richText nodes={detail.desc} ></richText> */}
             </view>
 
-            <view className="Bottom">
-              <view>
-                <view>
-                  <text className="iconfont icon-shengming"></text>
-                  <text>免责声明</text>
-                </view>
-                <view>
-                  <text>
-                    &emsp;&emsp;以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1
-                    意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读
-                  </text>
-                  <text className="active">《新联家使用免责条款》</text>
-                </view>
-              </view>
-            </view>
+            <Disclaimer />
           </view>
         </ScrollView>
       </view>

src/pages/index/activityList/index.jsx

@@ -1,11 +1,14 @@
 import { useState, useEffect } from 'react'
+import { useSelector } from 'react-redux'
 import { useDidShow,useRouter } from '@tarojs/taro'
 import { ScrollView } from '@tarojs/components'
-import { useSelector } from 'react-redux'
 import { queryActivityList, getActNewList } from '@/services/activity'
-import './index.scss'
+import Disclaimer from '@/components/Disclaimer'
+
 import ActivityListItem from '../components/ActivityListItem/index'
 
+import './index.scss'
+
 export default function MyCollectForActivity (props) {
  const router=useRouter()
 
@@ -65,6 +68,8 @@ export default function MyCollectForActivity (props) {
             <text>已经到底了~</text>
           </view>
         </view>
+
+        <Disclaimer />
       </ScrollView>
     </view>
   )

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

@@ -1,21 +1,16 @@
 import React from 'react'
 import Taro from '@tarojs/taro'
+import { useSelector } from 'react-redux'
 import { Image } from '@tarojs/components'
-import useConsultant from '@/utils/hooks/useConsultant'
 import './index.scss'
 
 export default function DetailBottom (props) {
   const { Info = {} } = props
 
   // 当前推荐置业
-  const { consultant } = useConsultant(Info?.buildingId)
+  const { consultant } = useSelector(s => s.system)
 
   const handleCall = () => {
-    if (consultant) {
-      Taro.makePhoneCall({ phoneNumber: consultant.phone })
-      return
-    }
-
     if (Info.tel) {
       Taro.makePhoneCall({ phoneNumber: Info.tel })
       return
@@ -25,7 +20,17 @@ export default function DetailBottom (props) {
   }
 
   const handleChat = () => {
-    
+    // TODO 订阅消息
+
+    if (consultant?.id) {
+      Taro.navigateTo({
+        url: `/pages/chat/detail?targetPerson=${consultant.id}}`
+      })
+    } else {
+      Taro.navigateTo({
+        url: `/pages/index/buildingPropertyConsultant/index?buldingId=${Info?.buildingId}`
+      })
+    }
   }
 
   return (

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

@@ -44,20 +44,6 @@ export default function Pictures (props) {
           }
         </ScrollView>
       </view>
-
-      <view className='Bottom'>
-        <view>
-          <view>
-            <text className='iconfont icon-shengming'></text>
-            <text>免责声明</text>
-          </view>
-          <view>
-            <text>&emsp;&emsp;以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1 意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读</text>
-            <text className='active'>《新联家使用免责条款》</text>
-          </view>
-        </view>
-      </view>
-
     </view>
   )
 }

src/pages/index/buildingDetail/index.jsx

@@ -1,10 +1,9 @@
 import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
 import { ScrollView } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-import Spin from '@/components/Spin/Spin2'
+import Disclaimer from '@/components/Disclaimer'
 import { fetch } from '@/utils/request'
-import { API_ITEMS_DETAIL, API_PROJECT_TREND_LIST, API_ACTIVITY_GROUP, API_LIVE_LIST, API_NEWS_LIST } from '@/constants/api'
+import { API_ITEMS_DETAIL, API_NEWS_LIST } from '@/constants/api'
 import DetailBottom from './components/DetailBottom/index'
 import Banner from './components/Banner/index'
 import BasicInfo from './components/BasicInfo/index'
@@ -131,6 +130,8 @@ export default withLayout((props) => {
                   <Pictures List={PictureList}></Pictures>
                 </view>
 
+                {/* 免责声明 */}
+                <Disclaimer />
               </view>
 
             </view>

src/pages/index/buildingInfo/index.jsx

@@ -1,9 +1,10 @@
 import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
 import { ScrollView } from '@tarojs/components'
+import Disclaimer from '@/components/Disclaimer'
 import { fetch } from '@/utils/request'
 import { API_ITEMS_DETAIL } from '@/constants/api'
-import '@/assets/css/iconfont.css'
+
 import './index.scss'
 
 const formateDate = dt => dt ? dt.substring(0, 10) : undefined
@@ -72,6 +73,8 @@ export default withLayout((props) => {
             ))
           }
         </view>
+
+        <Disclaimer />
       </ScrollView>
     </view>
   )

src/pages/index/index.jsx

@@ -1,18 +1,20 @@
 import { useState, useEffect } from 'react'
-import withLayout from '@/layout'
-import { ScrollView } from '@tarojs/components'
-import Taro from '@tarojs/taro'
 import { useSelector } from 'react-redux'
+import Taro from '@tarojs/taro'
+import { ScrollView } from '@tarojs/components'
+import withLayout from '@/layout'
+import ProjectListItem from '@/components/ProjectListItem/index'
 import { fetch } from '@/utils/request'
 import { API_BANNER_LIST, API_INDEX_PROJECTS } from '@/constants/api'
-import './index.scss'
+
 import Location from './components/Location/index'
 import Banner from './components/Banner/index'
 import Menu from './components/Menu/index'
 import HotRecommend from './components/HotRecommend/index'
 import LiveSale from './components/LiveSale/index'
 import ColumnTitle from './components/ColumnTitle/index'
-import ProjectListItem from '../../components/ProjectListItem/index'
+
+import './index.scss'
 
 export default withLayout(() => {
 
@@ -108,19 +110,6 @@ export default withLayout(() => {
             <text>已经到底了~</text>
           </view>
 
-          <view className='Bottom'>
-            <view>
-              <view>
-                <text className='iconfont icon-shengming'></text>
-                <text>免责声明</text>
-              </view>
-              <view>
-                <text>&emsp;&emsp;以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1 意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读</text>
-                <text className='active'>《新联家使用免责条款》</text>
-              </view>
-            </view>
-          </view>
-
         </view>
       </ScrollView>
 

src/utils/hooks/useConsultant.js

@@ -1,18 +0,0 @@
-import { useSelector } from 'react-redux'
-
-/**
- * 获取当前推荐置业
- * @param {*} buildingId 
- * @returns 
- */
-export default function useConsultant(buildingId) {
-  const { consultant } = useSelector(s => s.system)
-
-  if (consultant?.id) {
-    if (consultant.projects && consultant.projects.indexOf(buildingId) > -1) {
-      return { consultant }
-    }
-  }
-
-  return {}
-}