feats

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"http://127.0.0.1:8088"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"http://127.0.0.1:8088"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',

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

@@ -1,27 +1,51 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+import React from 'react'
+import Taro from '@tarojs/taro'
 import { Image } from '@tarojs/components'
+import useConsultant from '@/utils/hooks/useConsultant'
+import './index.scss'
 
 export default function DetailBottom (props) {
-  const { Data = {} } = props
+  const { Info = {} } = props
+
+  // 当前推荐置业
+  const { consultant } = useConsultant(Info?.buildingId)
+
+  const handleCall = () => {
+    if (consultant) {
+      Taro.makePhoneCall({ phoneNumber: consultant.phone })
+      return
+    }
+
+    if (Info.tel) {
+      Taro.makePhoneCall({ phoneNumber: Info.tel })
+      return
+    }
+
+    Taro.showToast({ title: '暂无联系电话', icon: 'none' })
+  }
+
+  const handleChat = () => {
+    
+  }
+
   return (
     <view className='components DetailBottom flex-h'>
       <view className='Item'>
-        <Image mode="heightFix" src={require('../../../../../assets/buildingDetail-icon3.png')}></Image>
+        <Image mode='heightFix' src={require('@/assets/buildingDetail-icon3.png')}></Image>
         <text>一键海报</text>
       </view>
       <view className='Item'>
-        <Image mode="heightFix" src={require('../../../../../assets/buildingDetail-icon1.png')}></Image>
+        <Image mode='heightFix' src={require('@/assets/buildingDetail-icon1.png')}></Image>
         <text>一键带看</text>
       </view>
       <view className='Item'>
-        <Image mode="heightFix" src={require('../../../../../assets/buildingDetail-icon2.png')}></Image>
+        <Image mode='heightFix' src={require('@/assets/buildingDetail-icon2.png')}></Image>
         <text>一键推荐</text>
       </view>
       <view className='flex-item'></view>
       <view className='Btn'>
-        <text>一键咨询</text>
-        <text className='active'>一键电话</text>
+        <text onClick={handleChat}>一键咨询</text>
+        <text className='active' onClick={handleCall}>一键电话</text>
       </view>
     </view>
   )

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

@@ -13,16 +13,17 @@ export default function MarketingActivity (props) {
   const [dataList, setDataList] = useState([])
 
   const goMore = () => Taro.navigateTo({ url: `/pages/index/activityList/index?type=house&buildingId=${buildingId}` })
+  const goDetail = (id) => Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${id}` })
 
   useEffect(() => {
-    queryActivityList({ buildingId, pageSize: 3 }).then((res) => {
-      const { list } = res || {}
-      setDataList(list || [])
-    })
+    if (buildingId) {
+      queryActivityList({ buildingId, pageSize: 3, type: 'house' }).then((res) => {
+        const { list } = res || {}
+        setDataList(list || [])
+      })
+    }
   }, [buildingId])
 
-  console.log('----------->', dataList)
-
   return dataList.length > 0 && (
     <view className='components MarketingActivity'>
 
@@ -40,7 +41,7 @@ export default function MarketingActivity (props) {
             {
               dataList.map((item, index) => (
                 <SwiperItem key={`Banner-${index}`}>
-                  <view className='swiper-item'>
+                  <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)} />
                   </view>
                 </SwiperItem>

src/pages/index/buildingDetail/index.jsx

@@ -139,7 +139,7 @@ export default withLayout((props) => {
       </view>
 
       <view className='PageBottom'>
-        <DetailBottom></DetailBottom>
+        <DetailBottom Info={DetailInfo}></DetailBottom>
       </view>
 
     </view>

src/reducers/system.js

@@ -8,6 +8,11 @@ const INITIAL_STATE = {
   userInfo: {},
   settings: [],
   systemInfo: {},
+
+  // 当前推荐人信息
+  recommender: {},
+  // 当前推荐置业顾问信息
+  consultant: {},
 };
 
 export default function(state = INITIAL_STATE, action) {
@@ -24,6 +29,18 @@ export default function(state = INITIAL_STATE, action) {
         systemInfo: action.payload
       };
     }
+    case 'SYNC_RECOMMENDER': {
+      return {
+        ...state,
+        recommender: action.payload
+      };
+    }
+    case 'SYNC_CONSULTANT': {
+      return {
+        ...state,
+        consultant: action.payload
+      };
+    }
 
     default:
       return state;

src/utils/hooks/useConsultant.js

@@ -0,0 +1,18 @@
+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 {}
+}

src/utils/im/sdk.js

@@ -22,6 +22,8 @@ export default function IMSDK() {
     current: {}
   }
 
+  let connected = false
+
   return {
     STATE,
     getState,
@@ -47,7 +49,7 @@ export default function IMSDK() {
   function connect(options) {
     Object.assign(paramsRef.current, options || {})
     
-    if (instanceRef.current && instanceRef.current.readyState === STATE.OPEN) {
+    if (instanceRef.current && instanceRef.current.readyState <= STATE.CLOSING) {
       return Promise.resolve()
     }
 

src/utils/login.js

@@ -1,9 +1,10 @@
 import Taro from '@tarojs/taro';
 import store from "@/store";
 import { dispatchCitySelected } from '@/actions/city'
-import { USER_INFO, ASSIGN_UNREADNUM } from '@/constants/user'
+import { USER_INFO, ASSIGN_UNREADNUM, ROLE_CODE } from '@/constants/user'
 import { ifNull } from '@/utils/tools'
 import { wxLogin } from '@/services/login'
+import { getCardDetail } from '@/services/card'
 import { queryUserInfo } from '@/services/user'
 
 export default (payload) => {
@@ -46,6 +47,17 @@ export default (payload) => {
             dispatch({ type: ASSIGN_UNREADNUM, payload: true });
             resolve(data)
           }).catch(reject)
+
+          // 如果有推荐人信息
+          if (loginParams.recommender && loginParams.recommender !== person.personId) {
+            getCardDetail(loginParams.recommender).then((res) => {
+              dispatch({ type: 'SYNC_RECOMMENDER', payload: res });
+              if (res.personType === ROLE_CODE.CONSULTANT) {
+                dispatch({ type: 'SYNC_CONSULTANT', payload: res });
+              }
+            })
+          }
+
         }).catch(reject)
       }
     })