feats

src/actions/house.js

@@ -1,6 +1,12 @@
 import { createAction, createActionNormal } from '@/utils/redux'
 import { API_CARDS_LIST } from '@/constants/api'
-import { ADD_CART, SUB_CART, ADD_CONSULTANT, CHOOSE_CONSULTANT } from '@/constants/house'
+import {
+  ADD_CART,
+  SUB_CART,
+  ADD_CONSULTANT,
+  CHOOSE_CONSULTANT,
+  MY_PRESELECT_RECORD,
+} from '@/constants/house'
 
 // 加入临时车
 export const dispatchAddCart = payload => createActionNormal({ type: ADD_CART, payload })
@@ -15,3 +21,10 @@ export const dispatchGetConsultants = payload => createAction({
 
 // 临时选择置业
 export const dispatchChooseConsultant = payload => createActionNormal({ type: CHOOSE_CONSULTANT, payload })
+
+// 获取预选记录
+export const dispatchGetMySelection = payload = createAction({
+  type: MY_PRESELECT_RECORD,
+  url: API_PRESELECTION_RECORD,
+  payload,
+})

src/constants/house.js

@@ -10,3 +10,6 @@ export const ADD_CONSULTANT = 'ADD_CONSULTANT'
 
 // 临时选择置业
 export const CHOOSE_CONSULTANT = 'CHOOSE_CONSULTANT'
+
+// 获取预选记录
+export const MY_PRESELECT_RECORD = 'MY_PRESELECT_RECORD'

src/onlineSelling/pages/addHouse/index.js

@@ -3,83 +3,61 @@ import { View, ScrollView, Block } from '@tarojs/components'
 import './index.scss'
 import Blank from '../../components/Blank'
 import HouseCard from '../../components/HouseCard'
+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: '添加其他房源',
+    navigationBarTitleText: '添加预选房源',
   }
 
-  state = {
+  state = {}
 
-    houseList: [
-      {
-        apartmentName: 'A户型',
-        blockName: "1栋",
-        buildingId: "9f021a59b2a714822894c23ccca8c2db",
-        buildingImgList: null,
-        buildingName: "万科安平园舍",
-        createDate: "2020-02-27T16:31:56",
-        floorName: "1楼",
-        houseId: "820",
-        preselectionRecordId: 205,
-        price: "111.00000000",
-        roomName: "1户",
-        saleBatchStatus: "1",
-        status: 1,
-        termname: "1期",
-        unitName: "2单元",
-        area1: '290',
-        area2: '270',
-        code: '2-09876545456'
-      }, {
-        apartmentName: 'B户型',
-        blockName: "1栋",
-        buildingId: "9f021a59b2a714822894c23ccca8c2db",
-        buildingImgList: null,
-        buildingName: "凤翔新城",
-        createDate: "2020-02-27T16:31:56",
-        floorName: "1楼",
-        houseId: "820",
-        preselectionRecordId: 206,
-        price: "111.00000000",
-        roomName: "1户",
-        saleBatchStatus: "1",
-        status: 1,
-        termname: "1期",
-        unitName: "2单元",
-        area1: '290',
-        area2: '270',
-        code: '2-09876545333'
-      },
-    ],
-  }
+  componentWillMount() {
+    ready.queue(() => {
+      const { userInfo, house } = this.props
+      const { salesBatchId } = this.$router.params
 
-  componentWillMount() { }
+      if (!house.mySelectHouses || !house.mySelectHouses.length) {
+        this.props.dispatchGetMySelection({
+          salesBatchId,
+          personId: userInfo.person.personId,
+        })
+      }
+    })
+  }
 
+  handleCheckboxChange = (e) => {
+    console.log('------------->', e)
+  }
 
   renderHead() {
-
     return (
       <View className="head">仅展示符合认筹条件的已预选房源,左侧勾选</View>
-
-
     );
   }
 
   renderHouses() {
-    const { houseList } = this.state
-    const hasData = houseList && houseList.length
+    const { house } = this.props
+    const hasData = house.mySelectHouses && house.mySelectHouses.length
 
     return hasData && (
       <Block>
         <ScrollView scrollY className="container">
-          <CheckboxGroup onChange={this.CheckboxChange}>
+          <CheckboxGroup onChange={this.handleCheckboxChange}>
             {
-              houseList.map((item) => {
+              house.mySelectHouses.map((item) => {
+                const checked = !!house.raiseCart.filter(x => x.houseId === item.houseId)[0]
+
                 return (
-                  <Label class="checkbox" >
-                    <Checkbox value={item.houseId} checked={item.checked} >
-                      <View className="carditem" key={item.preselectionRecordId} >
+                  <Label class="checkbox" key={item.houseId}>
+                    <Checkbox value={item.houseId} checked={checked} >
+                      <View className="carditem" >
                         <HouseCard summary={item} />
                       </View>
                     </Checkbox>
@@ -96,9 +74,10 @@ export default class extends Component {
 
 
   renderBlank() {
-    const { houseList } = this.state
+    const { house } = this.props
+    const hasData = house.mySelectHouses && house.mySelectHouses.length
 
-    return !(houseList && houseList.length) && (
+    return !hasData && (
       <Blank tips="没有符合认筹条件的预选房源" />
     )
   }

src/onlineSelling/pages/raiseMoney/index.js

@@ -42,10 +42,12 @@ export default class raiseMoney extends Component {
     navigationBarTitleText: '认筹确认'
   }
   state = {
-    current: 2,
+    current: 0,
     inputName: '',
     raiseProfile: undefined,
     record: {},
+    protocolCountdown: 10, // 单位 s
+    captchaCountdown: 60, // 单位 s
   }
 
   captchaLock = false
@@ -59,15 +61,7 @@ export default class raiseMoney extends Component {
         raiseRecordId,  // 认筹单ID, // 从认筹列表进入
       } = this.$router.params
 
-      if (houseId) {
-        this.loadHouseInfo(houseId, salesBatchId)
-      }
-
-      if (raiseRecordId) {
-        this.loadRaiseRecord(raiseRecordId)
-      }
-
-      if (!houseId && !raiseRecordId) {
+      if (!salesBatchId && !raiseRecordId) {
         Taro.showToast({
           title: '错误, 请返回上一步',
           icon: 'none',
@@ -75,18 +69,20 @@ export default class raiseMoney extends Component {
         return;
       }
 
+      this.loadInfo(houseId, salesBatchId, raiseRecordId)
+
       if (this.$router.params.type == 'pay') {
         this.setState({ current: 3 })
       }
     })
   }
 
-  loadHouseInfo = (houseId, salesBatchId) => {
+  loadInfo = (houseId, salesBatchId, raiseRecordId) => {
     const { userInfo, house } = this.props
     const { personId, nickname, idcard, tel, phone } = userInfo.person
 
     // 请求认筹信息
-    getRaiseProfile({ salesBatchId, personId }).then(res => {
+    getRaiseProfile({ salesBatchId, raiseRecordId, personId }).then(res => {
       this.setState({ raiseProfile: res, record: res.record || { personId, name: nickname, idcard, tel: tel || phone } })
 
       // 请求置业顾问列表
@@ -100,10 +96,6 @@ export default class raiseMoney extends Component {
     })
   }
 
-  loadRaiseRecord = (raiseRecordId) => {
-
-  }
-
   handleCancel = (house) => {
     Taro.showModal({
       title: '提示',
@@ -116,6 +108,14 @@ export default class raiseMoney extends Component {
     })
   }
 
+  gotoHouseSelect = (pageType) => {
+    const url = pageType == 'all' ?
+      `/onlineSelling/pages/houseCart/index` :
+      `/onlineSelling/pages/addHouse/index`
+
+    Taro.navigateTo({ url })
+  }
+
   renderTop() {
     const tabList = [
       { title: '确认房源', value: 0 },
@@ -157,8 +157,8 @@ export default class raiseMoney extends Component {
           )
           )
         }
-        <View className="addhouse">从<Text style="color:#BB9C79">预选记录</Text>中添加其他房源</View>
-        <View className="addhouse">从<Text style="color:#F3B82E">房源列表</Text>中添加其他房源</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>
         <Statement style="margin-top:80rpx" />
       </ScrollView>
     )
@@ -244,7 +244,6 @@ export default class raiseMoney extends Component {
   }
 
   tochooseConsultant() {
-    console.log('--------------------------------------')
     Taro.navigateTo({
       url: '/onlineSelling/pages/chooseConsultant/index'
     })
@@ -256,7 +255,7 @@ export default class raiseMoney extends Component {
   }
 
   renderProfile() {
-    const { record } = this.state
+    const { record, captchaCountdown } = this.state
     const consultant = this.getConsultant()
     const disabled = !!record.raiseRecordId
 
@@ -292,7 +291,7 @@ export default class raiseMoney extends Component {
               验证码
             </View>
             <Input className='inputCode' placeholder-style="color:#999" type='text' disabled={disabled}  onInput={this.handleInput.bind(this, 'captcha')} placeholder='请填写验证码' />
-            <Captcha countdown={5} require={this.prepareGetCaptcha.bind(this)} onClick={this.handleCaptcha} />
+            <Captcha countdown={captchaCountdown} require={this.prepareGetCaptcha.bind(this)} onClick={this.handleCaptcha} />
           </View>
           <View className="profile-flex" style="margin-top:20rpx">
             <View className="title">我的置业顾问信息</View>
@@ -454,13 +453,13 @@ export default class raiseMoney extends Component {
   }
 
   renderBottomBtn() {
-    const { current } = this.state
+    const { current, protocolCountdown } = this.state
     return (
       <View className="bottom-btn">
         {current == 1 && <View style="font-size:24rpx;color:#999;line-height:70rpx">请仔细阅读选房协议直到结尾才能进入下一步</View>}
         {current != 4 &&
           <NextStep
-            countdown={current == 1 ? 2 : 0}
+            countdown={current == 1 ? protocolCountdown : 0}
             onClick={() => this.nextStep(current)}
             text={current == 3 ? '现在缴费' : '下一步'}
           />

src/reducers/house.js

@@ -7,6 +7,7 @@
    SUB_CART,
    ADD_CONSULTANT,
    CHOOSE_CONSULTANT,
+   MY_PRESELECT_RECORD,
  } from '@/constants/house'
 
 const INITIAL_STATE = {
@@ -16,7 +17,11 @@ const INITIAL_STATE = {
   // 置业顾问列表
   consultantList: [],
 
+  // 认筹选中置业
   chooseConsultant: undefined,
+
+  // 预选房源列表
+  mySelectHouses: [],
 }
 
 export default function(state = INITIAL_STATE, action) {
@@ -49,6 +54,11 @@ export default function(state = INITIAL_STATE, action) {
         chooseConsultant: payload,
       };
 
+    case MY_PRESELECT_RECORD:
+      return {
+        ...state,
+        mySelectHouses: payload,
+      };
     default:
       return state;
   }