feats

src/layout/useAuth.js

@@ -12,7 +12,7 @@ export default function useAuth(person) {
     if (current && current.auth && current.auth.length) {
       // 如果需要授权手机
       if (current.auth.indexOf('phone') > -1) {
-        if (person && !person.phone) {
+        if (person.inited && !person.phone) {
           setAuthPhone(true)
         } else {
           setAuthPhone(false)
@@ -21,7 +21,7 @@ export default function useAuth(person) {
 
       // 如果需要授权头像
       if (current.auth.indexOf('avatar') > -1) {
-        if (person && (!person.avatarurl || person.avatarurl.indexOf('default_avatar') > -1)) {
+        if (person.inited && (!person.avatarurl || person.avatarurl.indexOf('default_avatar') > -1)) {
           setAuthAvatar(true)
         } else {
           setAuthAvatar(false)

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

@@ -1,9 +1,10 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { useSelector } from 'react-redux'
 import { Image } from '@tarojs/components'
 import AuthRole from '@/components/auth/AuthRole'
 import Poster from '@/components/Poster'
+import { queryActivityList } from '@/services/activity'
 import { ROLE_CODE } from '@/constants/user'
 import './index.scss'
 
@@ -13,6 +14,7 @@ export default function DetailBottom (props) {
   // 当前推荐置业
   const { consultant } = useSelector(s => s.system)
   const [showPoster, setShowPoster] = useState(false)
+  const [actList, setActList] = useState([])
 
   const handleCall = () => {
     if (Info.tel) {
@@ -45,6 +47,25 @@ export default function DetailBottom (props) {
     })
   }
 
+  const handleTuanfang = () => {
+    const id = actList[0].dynamicId
+
+    Taro.navigateTo({
+      url: `/pages/index/activityDetail/index?id=${id}`
+    })
+  }
+  
+  useEffect(() => {
+    if (Info.buildingId) {
+      queryActivityList({ buildingId: Info.buildingId, pageSize: 1, type: 'house' }).then((res) => {
+        const { list } = res || {}
+        
+        // 只保留已发布的活动
+        setActList((list || []))
+      })
+    }
+  }, [Info.buildingId])
+
   return (
     <view>
       <view className='components DetailBottom flex-h'>
@@ -52,10 +73,14 @@ export default function DetailBottom (props) {
           <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>
-          <text>一键带看</text>
-        </view>
+        {
+          actList.length > 0 && (
+            <view className='Item' onClick={handleTuanfang}>
+              <Image mode='heightFix' src={require('@/assets/buildingDetail-icon1.png')}></Image>
+              <text>一键带看</text>
+            </view>
+          )
+        }
         <AuthRole role={ROLE_CODE.CONSULTANT}>
           <view className='Item' onClick={handleRecommender}>
             <Image mode='heightFix' src={require('@/assets/buildingDetail-icon2.png')}></Image>

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

@@ -17,9 +17,11 @@ export default function MarketingActivity (props) {
 
   useEffect(() => {
     if (buildingId) {
-      queryActivityList({ buildingId, pageSize: 3, type: 'house' }).then((res) => {
+      queryActivityList({ buildingId, pageSize: 500, type: 'house' }).then((res) => {
         const { list } = res || {}
-        setDataList(list || [])
+        
+        // 只保留3场在进行中的活动
+        setDataList((list || []).filter((x) => (x.activityStatus === 0)).slice(0, 3))
       })
     }
   }, [buildingId])

src/reducers/user.js

@@ -12,7 +12,7 @@ import {
 
 const INITIAL_STATE = {
   userInfo: {
-    person: {},
+    person: { inited: false },
     extraInfo: {},
     miniApp: {},
   },
@@ -40,7 +40,7 @@ export default function user(state = INITIAL_STATE, action) {
           userInfo: {
             ...state.userInfo,
             ...action.payload,
-            person: newPerson,
+            person: {...newPerson, inited: true},
             extraInfo: newExtraInfo,
             miniApp: newMiniApp,
           }
@@ -69,7 +69,7 @@ export default function user(state = INITIAL_STATE, action) {
         ...state,
         userInfo: {
           extraInfo,
-          person: newPerson,
+          person: {...newPerson, inited: true},
           miniApp,
         }
       }
@@ -81,6 +81,7 @@ export default function user(state = INITIAL_STATE, action) {
         userInfo: {
           person: {
             ...person,
+            inited: true,
             points: (person.points + 1)
           },
           extraInfo: {