feats

src/actions/house.js

@@ -3,6 +3,7 @@ import { API_CARDS_LIST, API_PRESELECTION_RECORD } from '@/constants/api'
 import {
   ADD_CART,
   SUB_CART,
+  FLUSH_TO_CART,
   ADD_CONSULTANT,
   CHOOSE_CONSULTANT,
   MY_PRESELECT_RECORD,
@@ -12,6 +13,8 @@ import {
 export const dispatchAddCart = payload => createActionNormal({ type: ADD_CART, payload })
 // 删减临时车
 export const dispatchSubCart = payload => createActionNormal({ type: SUB_CART, payload })
+// 全部进入临时车
+export const dispatchFlush2Cart = payload => createActionNormal({ type: FLUSH_TO_CART, payload })
 // 获取置业顾问
 export const dispatchGetConsultants = payload => createAction({
   type: ADD_CONSULTANT,

src/constants/house.js

@@ -5,6 +5,9 @@ export const ADD_CART = 'ADD_CART'
 // 取消选择-暂存
 export const SUB_CART = 'SUB_CART'
 
+// 所有进入-暂存
+export const FLUSH_TO_CART = 'FLUSH_TO_CART'
+
 // 置业顾问列表
 export const ADD_CONSULTANT = 'ADD_CONSULTANT'
 

src/onlineSelling/components/HouseGrid/Floor.js

@@ -12,7 +12,13 @@ export default function Floor(props) {
         {roomList.map((room) => {
           return (
             <View className="item" key={room.houseId} >
-              <Room dataset={room} onClick={props.onRoomClick} onActionClick={props.onActionClick}/>
+              <Room
+                dataset={room}
+                showDataType={props.showDataType}
+                onClick={props.onRoomClick}
+                showAction={props.showAction}
+                onActionClick={props.onActionClick}
+              />
             </View>
           )
         })}

src/onlineSelling/components/HouseGrid/Room.js

@@ -1,54 +1,71 @@
+import Taro, { Component } from '@tarojs/taro'
 import { View } from "@tarojs/components";
 import HotBlock from "../HotBlock";
 import './room.scss'
 import lockImg from '../../assets/lock.png'
 import preselectionImg from '../../assets/preselection.png'
 import chipsImg from '../../assets/chips.png'
+import { connect } from '@tarojs/redux'
 
-export default function Room(props) {
-  const { roomName, heat, realHeat, status, raiseHeat, raiseRealHeat, showAction, ownerd, houseLockingStatus, mineLocked, minePreselection, mineRaise } = props.dataset || {}
-  // const personNum = `(${realHeat + heat + 0}人)`
-  const { currentHot = 0 } = props
-  const personNum = realHeat + heat + 0
-  const raisePersonNum = raiseHeat + raiseRealHeat + 0
-
-  const handleClick = () => {
-    if (props.onClick) {
-      props.onClick(props.dataset || {})
+@connect(({ house }) => { house })
+export default class Room extends Component {
+  handleClick = () => {
+    const { onClick, dataset } = this.props
+    if (onClick) {
+      onClick(dataset || {})
     }
   }
 
-  const actionIcon = ownerd ? 'subtract-circle' : 'add-circle'
+  handleActionClick = () => {
+    const { onActionClick, showAction, dataset } = this.props
 
-  const handleActionClick = () => {
-    if (showAction && props.onActionClick) {
-      props.onActionClick(props.dataset || {})
+    if (showAction && onActionClick) {
+      onActionClick(dataset || {})
     }
   }
 
-  return (
-    <HotBlock number={currentHot == '0' ? personNum : raisePersonNum}>
-      {
-        status == '1' &&
-        (<View className="room">
+  render() {
+    const { dataset, showAction, house, showDataType = 1 } = this.props
+
+    const {
+      houseId,
+      roomName,
+      heat,
+      realHeat,
+      raiseHeat,
+      raiseRealHeat,
+      houseLockingStatus,
+      mineLocked,
+      minePreselection,
+      mineRaise
+    } = dataset || {}
+
+    // const personNum = `(${realHeat + heat + 0}人)`
+    const personNum = realHeat + heat + 0
+    const raisePersonNum = raiseHeat + raiseRealHeat + 0
+    
+    const actionIcon = (house.raiseCart || []).filter(x => x.houseId == houseId)[0] ? 'subtract-circle' : 'add-circle'
+    
+    return (
+      <HotBlock number={showDataType === 1 ? personNum : raisePersonNum}>
+        <View className="room">
           <View onClick={handleClick}>
             <View className="roomname">{roomName || ''}</View>
             <View className="yuxuan">{personNum}预选</View>
             <View className="yuxuan">{raisePersonNum}认筹</View>
-            {minePreselection && <Image src={preselectionImg} className="preselection-img"></Image>}
-            {mineRaise && <Image src={chipsImg} className="chips-img"></Image>}
-            {houseLockingStatus == 'locked' && <Image src={lockImg} style={mineLocked ? 'position: absolute; right: 2px;bottom: 3px;' : ''} className="lock-img"></Image>}
+            {!showAction && minePreselection && <Image src={preselectionImg} className="preselection-img"></Image>}
+            {!showAction && mineRaise && <Image src={chipsImg} className="chips-img"></Image>}
+            {!showAction && houseLockingStatus == 'locked' && <Image src={lockImg} style={mineLocked ? 'position: absolute; right: 2px;bottom: 3px;' : ''} className="lock-img"></Image>}
           </View>
           {
-            !showAction && (
-              <View className="action" onClick="handleActionClick">
+            showAction && (
+              <View className="action" onClick={this.handleActionClick.bind(this)}>
                 <View className={`at-icon at-icon-${actionIcon}`}></View>
               </View>
             )
           }
-        </View>)
-      }
-
-    </HotBlock>
-  )
+        </View>
+      </HotBlock>
+    )
+  }
 }

src/onlineSelling/components/HouseGrid/Unit.js

@@ -29,7 +29,15 @@ export default class Unit extends Component {
         </View>
         <View className="body" >
           {!noshow && floorList.map((floor) => {
-            return <Floor key={floor.floorId} dataset={floor} onRoomClick={this.props.onRoomClick} onActionClick={this.props.onActionClick} />
+            return (
+              <Floor
+                key={floor.floorId}
+                dataset={floor}
+                showDataType={this.props.showDataType}
+                onRoomClick={this.props.onRoomClick}
+                showAction={this.props.showAction}
+                onActionClick={this.props.onActionClick}                
+              />)
           })}
         </View>
       </View>

src/onlineSelling/components/HouseGrid/index.js

@@ -9,9 +9,17 @@ export default (props) => {
   return (
     <Block>
       {
-        unitList.map((unit) => (<Unit key={unit.unitId} dataset={unit} onRoomClick={handleRoomClick} onActionClick={handleActionClick} />))
+        unitList.map((unit) => (
+          <Unit
+            key={unit.unitId}
+            dataset={unit}
+            showDataType={props.showDataType}
+            onRoomClick={handleRoomClick}
+            showAction={props.showAction}
+            onActionClick={handleActionClick}
+          />
+        ))
       }
     </Block>
   )
-
-}
+}

src/onlineSelling/pages/addHouse/index.js

@@ -18,24 +18,37 @@ export default class extends Component {
     navigationBarTitleText: '添加预选房源',
   }
 
-  state = {}
+  state = {
+    chooseList: [],
+  }
 
   componentWillMount() {
     ready.queue(() => {
       const { userInfo, house } = this.props
-      const { salesBatchId } = this.$router.params
+      const { id: salesBatchId } = this.$router.params
+
+      this.props.dispatchGetMySelection({
+        salesBatchId,
+        personId: userInfo.person.personId,
+      })
 
-      if (!house.mySelectHouses || !house.mySelectHouses.length) {
-        this.props.dispatchGetMySelection({
-          salesBatchId,
-          personId: userInfo.person.personId,
-        })
+      if (house.raiseCart && house.raiseCart.length) {
+        this.setState({ chooseList: house.raiseCart })
       }
     })
   }
 
   handleCheckboxChange = (e) => {
-    console.log('------------->', e)
+    const { house } = this.props
+    const houseIdList = e.detail.value
+    const chooseList = (house.mySelectHouses || []).filter(x => houseIdList.indexOf(x.houseId) > -1).map(x => x.housingInfo)
+
+    this.setState({ chooseList })
+  }
+
+  handleSubmit = () => {
+    this.props.dispatchFlush2Cart(this.state.chooseList)
+    Taro.navigateBack({ delta: 1 })
   }
 
   renderHead() {
@@ -45,16 +58,19 @@ export default class extends Component {
   }
 
   renderHouses() {
+    const { chooseList } = this.state
     const { house } = this.props
-    const hasData = house.mySelectHouses && house.mySelectHouses.length
+    
+    // 从预选记录中过滤出来, 状态正常且未锁定的房源
+    const houseList = (house.mySelectHouses || []).map(x => x.housingInfo).filter(x => x.status == 1 && x.houseLockingStatus != 'locked')
 
-    return hasData && (
+    return houseList.length && (
       <Block>
         <ScrollView scrollY className="container">
           <CheckboxGroup onChange={this.handleCheckboxChange}>
             {
-              house.mySelectHouses.map((item) => {
-                const checked = !!house.raiseCart.filter(x => x.houseId == item.houseId)[0]
+              houseList.map((item) => {
+                const checked = !!chooseList.filter(x => x.houseId == item.houseId)[0]
                 return (
                   <Label class="checkbox" key={item.houseId}>
                     <Checkbox value={item.houseId} checked={checked} >
@@ -68,7 +84,9 @@ export default class extends Component {
             }
           </CheckboxGroup>
         </ScrollView >
-        <View className="raise-box"> <View className="raise-btn">确认以上选择</View></View>
+        <View className="raise-box">
+          <View className="raise-btn" onClick={this.handleSubmit}>确认以上选择</View>
+        </View>
       </Block>
     )
   }

src/onlineSelling/pages/houseCart/index.js

@@ -4,20 +4,105 @@ import { View, ScrollView } from '@tarojs/components'
 import './index.scss'
 import Blank from '../../components/Blank'
 import HouseGrid from '../../components/HouseGrid'
+import { queryHouseList } from '@/services/project'
 
+import ready from '@/utils/ready'
+import { connect } from '@tarojs/redux'
+import * as houseActions from '@/actions/house'
+
+@connect(
+  ({ user, house }) => ({ ...user, house }),
+  {...houseActions}
+)
 export default class extends Component {
   config = {
     navigationBarTitleText: '添加其他房源',
   }
 
   state = {
+    loading: true,
     dataType: 1, // maybe need change  1 预选, 2 认筹
     houseList: [ { name: '1期1栋1单元1楼101户' } ],
     chooseList: [ { name: '1期1栋1单元1楼101户' }, { name: '1期1栋1单元1楼102户' } ], // 已经选择的房源列表
     collapsed: true, // 已选列表默认关闭, true 关闭, false 开启 
   }
 
-  componentWillMount () {}
+  componentWillMount () {
+    ready.queue(() => {
+      const { userInfo, house } = this.props
+      const { id: salesBatchId } = this.$router.params
+
+      const params = {
+        salesBatchId,
+        pageNum: 1,
+        pageSize: 9999,
+      }
+      queryHouseList(params).then(res => {
+        this.setState({
+          houseList: this.groupHouseList(res) || [],
+          loading: false,
+        })
+      })
+
+      if (house.raiseCart && house.raiseCart.length) {
+        this.setState({ chooseList: house.raiseCart })
+      }
+    })
+  }
+  
+  groupHouseList(houseList = []) {
+    // 先按照楼层分组
+    const floorList = houseList.reduce((list, room) => {
+      let found = false
+
+      list.forEach((floor) => {
+        if (floor.floorId === room.floorId) {
+          found = true
+          floor.roomList.push(room)
+        }
+      })
+
+      if (!found) {
+        list.push({ ...room, roomList: [room] })
+      }
+
+      return list
+    }, [])
+
+    // 再按照单元分组
+    const unitList = floorList.reduce((list, floor) => {
+      let found = false
+      list.forEach((unit) => {
+        if (unit.unitId === floor.unitId) {
+          found = true
+          unit.floorList.push(floor)
+        }
+      })
+
+      if (!found) {
+        list.push({ ...floor, floorList: [floor] })
+      }
+
+      return list
+    }, [])
+
+    // 最后按照楼栋分组
+    return unitList.reduce((list, unit) => {
+      let found = false
+      list.forEach((block) => {
+        if (block.blockId === unit.blockId) {
+          found = true
+          block.unitList.push(unit)
+        }
+      })
+
+      if (!found) {
+        list.push({ ...unit, unitList: [unit] })
+      }
+
+      return list
+    }, [])
+  }
 
   changeShowData = (dataType) => {
     // 此处需要按照 dataType 去切换数据
@@ -75,14 +160,14 @@ export default class extends Component {
   }
 
   renderHouses() {
-    const { houseList } = this.state
+    const { houseList, dataType } = this.state
     const hasData = houseList && houseList.length
 
     return hasData && (
       <ScrollView className="body" scrollY>
       {
         houseList.map((item) => {
-          return <HouseGrid key={item.unitId} dataset={item} onRoomClick={this.handleRoomClick} onActionClick={this.add2Cart} />
+          return <HouseGrid showAction showDataType={dataType} key={item.unitId} dataset={item} onRoomClick={this.handleRoomClick} onActionClick={this.add2Cart} />
         })
       }
       </ScrollView>

src/onlineSelling/pages/houseList/index.js

@@ -61,7 +61,7 @@ export default class HouseList extends Component {
     consultShow: false,  // 置业顾问悬浮框显示隐藏
     noRecord: false,
     loading: true,
-    currentHot: 0,
+    dataType: 1,
   }
 
 
@@ -127,7 +127,7 @@ export default class HouseList extends Component {
       endPrice,
       apartmentId,
       pageNum: 1,
-      pageSize: 999,
+      pageSize: 9999,
     }
     queryHouseList(params).then(res => {
       this.setState({
@@ -393,13 +393,13 @@ export default class HouseList extends Component {
   }
 
   renderHouses() {
-    const { houseList,currentHot } = this.state
+    const { houseList,dataType } = this.state
 
     return (
       <ScrollView className="container" scrollY scrollWithAnimation>
         {
           houseList.map((item) => {
-            return <HouseGrid key={item.unitId} currentHot={currentHot} dataset={item} onRoomClick={this.handleRoomClick} />
+            return <HouseGrid key={item.unitId} showDataType={dataType} dataset={item} onRoomClick={this.handleRoomClick} />
           })
         }
       </ScrollView>
@@ -593,10 +593,7 @@ export default class HouseList extends Component {
     this.goto(`/pages/project/detail/index?id=${buildingId}`)
   }
   handleScreen(value) {
-    console.log(value,"valueffffffffffffffffffffffffffff")
-    this.setState({
-      currentHot: value,
-    })
+    this.setState({ dataType: value })
   }
 
   render() {
@@ -612,7 +609,7 @@ export default class HouseList extends Component {
       noRecord,
       loading,
       salesBatchDetail,
-      currentHot
+      dataType
     } = this.state
 
     if (loading) {
@@ -624,7 +621,7 @@ export default class HouseList extends Component {
     const showCircleBtn = posterData && posterData.qrcode
     console.log('==============>', posterData, showPoster, posterConfig)
 
-    const screenList = [{ title: '预选热度图', value: 0 }, { title: '认筹热度图', value: 1 }]
+    const screenList = [{ title: '预选热度图', value: 1 }, { title: '认筹热度图', value: 2 }]
     return (
       <Block>
         {conditionVisible && this.renderCondition()}
@@ -648,7 +645,7 @@ export default class HouseList extends Component {
 
                 <View className="screen-flex" >
                   {screenList.map(item => (
-                    <View key={item.value} onClick={() => this.handleScreen(item.value)} className={currentHot == item.value ? 'top-item active' : 'top-item'}>
+                    <View key={item.value} onClick={() => this.handleScreen(item.value)} className={dataType == item.value ? 'top-item active' : 'top-item'}>
                       {item.title}
                     </View>
                   ))}

src/onlineSelling/pages/raiseMoney/index.js

@@ -111,9 +111,11 @@ export default class raiseMoney extends Component {
   }
 
   gotoHouseSelect = (pageType) => {
+    const { raiseProfile } = this.state
+
     const url = pageType == 'all' ?
-      `/onlineSelling/pages/houseCart/index` :
-      `/onlineSelling/pages/addHouse/index`
+      `/onlineSelling/pages/houseCart/index?id=${raiseProfile.id}` :
+      `/onlineSelling/pages/addHouse/index?id=${raiseProfile.salesBatchId}`
 
     Taro.navigateTo({ url })
   }
@@ -156,8 +158,7 @@ export default class raiseMoney extends Component {
             <View key={item.houseId} >
               <RaiseCard type="raiseMoney" summary={item} onCancel={this.handleCancel} />
             </View>
-          )
-          )
+          ))
         }
         <View className="addhouse">从 <Text style="color:#F3B82E" onClick={this.gotoHouseSelect.bind(this, 'all')}>房源列表</Text> 中添加其他房源</View>
         <View className="addhouse">从 <Text style="color:#BB9C79" onClick={this.gotoHouseSelect.bind(this, 'select')}>预选记录</Text> 中添加其他房源</View>

src/reducers/house.js

@@ -5,6 +5,7 @@
  import {
    ADD_CART,
    SUB_CART,
+   FLUSH_TO_CART,
    ADD_CONSULTANT,
    CHOOSE_CONSULTANT,
    MY_PRESELECT_RECORD,
@@ -32,14 +33,21 @@ export default function(state = INITIAL_STATE, action) {
     case ADD_CART:
       return {
         ...state,
-        raiseCart: state.raiseCart.filter(x => x.houseId !== payload.houseId).concat(payload),
+        raiseCart: state.raiseCart.filter(x => x.houseId != payload.houseId).concat(payload),
       };
 
     // 取消临时选择
     case SUB_CART:
       return {
         ...state,
-        raiseCart: state.raiseCart.filter(x => x.houseId !== payload.houseId),
+        raiseCart: state.raiseCart.filter(x => x.houseId != payload.houseId),
+      };
+
+    //
+    case FLUSH_TO_CART:
+      return {
+        ...state,
+        raiseCart: payload,
       };
 
     case ADD_CONSULTANT: