Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/onlineSelling/pages/addHouse/index.js

@@ -84,6 +84,7 @@ export default class extends Component {
             {
               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} >

src/onlineSelling/pages/houseCart/index.js

@@ -113,6 +113,12 @@ export default class extends Component {
   // 添加到选择列表
   // 注意, 不是确认选择
   add2Cart = (room) => {
+    const locked = room.houseLockingStatus == 'locked'
+    if (locked) {
+      Taro.showToast({ title: '该房源已经被锁定', icon: 'none' })
+      return;
+    }
+
     const { chooseList } = this.state
     const checked = (chooseList || []).filter(x => x.houseId == room.houseId)[0]
 

src/onlineSelling/pages/houseList/index.js

@@ -260,8 +260,10 @@ export default class HouseList extends Component {
   }
 
   handleRecordBtn = e => {
-    this.goto('/onlineSelling/pages/records/index')
+    const { salesBatchDetail } = this.state
+    this.goto(`/onlineSelling/pages/records/index?id=${salesBatchDetail.salesBatchId}`)
   }
+
   currentPageAndParams() {
     const id = this.$router.params.id || this.state.id
     const {

src/onlineSelling/pages/records/index.js

@@ -11,11 +11,14 @@ import Statement from '../../components/Statement'
 import { transferImage } from '@/utils/tools'
 import PickerComponent from '../../components/Picker'
 import './index.scss'
+import * as houseActions from '@/actions/house'
+
+function noop(){}
 
 @connect(
-  ({ user, city }) => ({ ...user, ...city })
+  ({ user, city, house }) => ({ ...user, ...city, house }),
+  { ...houseActions }
 )
-
 export default class Records extends Component {
   config = {
     navigationBarTitleText: '选房记录'
@@ -48,26 +51,35 @@ export default class Records extends Component {
     lockCustomer: [{ value: '不限', code: '' }, { value: '我自己', code: 'mine' }, { value: '其他人', code: 'other' }],
     lockCustomerValue: '',
     customerLocked: '',
+
+    chooseList: [], // 选中的房源ID列表
   }
   componentDidShow() {
     ready.queue(() => {
 
-      const { userInfo: { person: { personId } } } = this.props
+      const { id: salesBatchId } = this.$router.params
+      const { userInfo: { person: { personId } }, house } = this.props
       const params = {
         personId,
+        salesBatchId,
         pageNumber: 1,
         pageSize: 999,
       }
       this.getPreselection(params)
       this.getRaise(params)
       querySalesList().then(res => {
-        res.unshift({ salesBatchName: '请选择', salesBatchId: '' })
+        res.unshift({ salesBatchName: '请选择', salesBatchId })
         this.setState({
           salesList: res || [],
-
         })
       })
       this.loadBuildingList()
+
+      if (house.raiseCart.length) {
+        this.setState({ chooseList: house.raiseCart.map(x => x.houseId) })
+      }
+
+      this.setState({ salesBatchId })
     })
   }
   getPreselection(params) {
@@ -111,12 +123,30 @@ export default class Records extends Component {
   }
 
   CheckboxChange = (e) => {
-    e.stopPropagation()
-    console.log('checkbox发生change事件，携带value值为：', e)
+    // 加了一个转整型的处理
+    // 因为所有的 houseId 都是整型
+    this.setState({ chooseList: e.detail.value.map(x => (x - 0)) })
+  }
+
+  handleSubmit = () => {
+    const { recordList, chooseList, salesBatchId } = this.state
+    if (!chooseList.length) {
+      Taro.showToast({ title: '请选择房源', icon: 'none' })
+      return;
+    }
+
+    debugger
+    const houseList = recordList.map(x => x.housingInfo).filter(x => chooseList.indexOf(x.houseId) > -1)
+    this.props.dispatchFlush2Cart(houseList);
+
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/raiseMoney/index?salesBatchId=${salesBatchId}`
+    })
   }
 
   renderPreselection() {
-    const { recordList, noRecord } = this.state
+    const { recordList, noRecord, chooseList } = this.state
+
     return (
       <Block>
         <ScrollView scrollY className="container">
@@ -126,12 +156,14 @@ export default class Records extends Component {
                 <View>
                   {
                     recordList.map((item) => {
+                      const checked = (chooseList || []).filter(x => x == item.houseId)[0]
+                      const disabled = item.housingInfo.houseLockingStatus == 'locked'
+
                       return (
                         <Label class="checkbox" >
-                          <Checkbox value={item.houseId} checked={item.checked} >
+                          <Checkbox value={item.houseId - 0} checked={checked} disabled={disabled}>
                             <View className="carditem" key={item.preselectionRecordId} >
-
-                              <HouseCard summary={item} />
+                              <HouseCard summary={item} onClick={noop} />
                             </View>
                           </Checkbox>
                         </Label>
@@ -144,7 +176,7 @@ export default class Records extends Component {
           <Statement />
         </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>
     )