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

src/onlineSelling/pages/detail/index.js

@@ -140,6 +140,17 @@ export default class Index extends Component {
 
   toRaiseMoney() {
     const detail = this.state.houseDetail || {}
+
+    if (detail.status != 1 || detail.houseLockingStatus == 'locked') {
+      Taro.showToast({
+        url: '当前房源被锁定或未发布, 不能认筹',
+        icon: 'none',
+      })
+
+      return;
+    }
+
+
     this.props.dispatchAddCart(detail)
     Taro.navigateTo({ url: `/onlineSelling/pages/raiseMoney/index?houseId=${detail.houseId}&salesBatchId=${detail.salesBatchId}` })
   }

src/onlineSelling/pages/houseCart/index.js

@@ -45,6 +45,7 @@ export default class extends Component {
       const { id: salesBatchId, multi } = this.$router.params
 
       const params = {
+        source: 'raiseChoose',
         salesBatchId,
         pageNum: 1,
         pageSize: 9999,

src/onlineSelling/pages/raiseMoney/index.js

@@ -5,6 +5,7 @@ import RaiseCard from '../../components/RaiseCard'
 import Statement from '../../components/Statement'
 import ConsultantItem from '../../components/ConsultantItem/index'
 import ready from '@/utils/ready'
+import dayjs from 'dayjs'
 import { connect } from '@tarojs/redux'
 import * as houseActions from '@/actions/house'
 import NextStep from './NextStep'
@@ -35,7 +36,6 @@ const saveRaiseRecord = (record, raise) => {
     buildingId: raise.buildingId,
   }
 
-
   return fetch({ url: `${apis.API_SAVE_RAISE_RECORD}`, method: 'POST', payload })
 }
 
@@ -102,6 +102,16 @@ export default class raiseMoney extends Component {
 
       this.setState({ raiseProfile: res, payType, record: res.record || defaultRecord })
 
+      // 销售批次已被取消发布
+      if (res.status != 1) {
+        this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '销售批次已被取消发布' } })  
+      }
+
+      // 不在认筹时间内
+      if (!dayjs().isBefore(res.raiseEndTime) || !dayjs().isAfter(res.raiseStartTime)) {
+        this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '不在认筹时间内' } })  
+      }
+
       // 请求置业顾问列表
       if (!house.consultantList || !house.consultantList.length) {
         this.props.dispatchGetConsultants({
@@ -119,7 +129,7 @@ export default class raiseMoney extends Component {
       }).then((res2) => {
         // 如果认筹必须预选
         if (res.needPreselection && res2.length < 1) {
-          this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '请先预选房源' } })  
+          this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '需要先预选才能认筹' } })
         }
       })
     })
@@ -162,7 +172,7 @@ export default class raiseMoney extends Component {
     const isMulti = raiseProfile.houseLockingType != 'auto'
 
     const url = pageType == 'all' ?
-      `/onlineSelling/pages/houseCart/index?id=${raiseProfile.salesBatchId}&multi={isMulti}` :
+      `/onlineSelling/pages/houseCart/index?id=${raiseProfile.salesBatchId}&multi=${isMulti}` :
       `/onlineSelling/pages/addHouse/index?id=${raiseProfile.salesBatchId}`
 
     Taro.navigateTo({ url })
@@ -434,19 +444,33 @@ export default class raiseMoney extends Component {
   }
 
   checkRaise = () => {
-    const { record } = this.state
+    const { record, raiseProfile, preselectList } = this.state
     const { house } = this.props
 
-    if (!house.raiseCart.length) {
+    // 当前选中房源
+    const houseList = house.raiseCart || []
+
+    if (!houseList.length) {
       Taro.showToast({ title: '请选择房源', icon: 'none' })
       return Promise.reject()
     }
 
+    // 如果要求预选, 预先房源跟当前列表必须一致
+    if (raiseProfile.needPreselection) {
+      for (let i in houseList) {
+        const exists = preselectList.filter(x => x.houseId === houseList[i].houseId)[0]
+        if (!exists) {
+          Taro.showToast({ title: '需要先预选才能认筹', icon: 'none' })
+          return Promise.reject()
+        }
+      }
+    }
+
     if (record.raiseRecordId) {
       // 如果认筹单跟预选的房源不一致, 说明是新的认筹
       let found = true
-      for (let inx in house.raiseCart) {
-        const has = (record.taHousingResourcesList || []).filter(x => x.houseId == house.raiseCart[inx].houseId)[0]
+      for (let inx in houseList) {
+        const has = (record.taHousingResourcesList || []).filter(x => x.houseId == houseList[inx].houseId)[0]
 
         if (!has) {
           found = false;
@@ -497,6 +521,8 @@ export default class raiseMoney extends Component {
         title: '手机号格式不正确',
         icon: 'none',
       })
+
+      return Promise.reject()
     }
 
     // 验证码
@@ -528,6 +554,8 @@ export default class raiseMoney extends Component {
       }, raiseProfile).then((res) => {
         this.setState({ record: res })
         resolve(res)
+      }).catch((err) => {
+        this.setState({ current: 4, failInfo: { title: '认筹失败', desc: err.message || err } }) 
       })
     })
   }
@@ -579,7 +607,6 @@ export default class raiseMoney extends Component {
 
   }
   toRaiseProfile(id) {
-
     Taro.navigateTo({
       url: `/onlineSelling/pages/raiseProfile/index?id=${id}`
     })
@@ -611,8 +638,10 @@ export default class raiseMoney extends Component {
         }
 
         <ContactConsultant buildingId={raiseProfile.buildingId} style=" position: absolute;bottom: 11vh;" />
-
-        <View className="look-btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>查看认筹单</View>
+        {
+          record.raiseRecordId &&
+          (<View className="look-btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>查看认筹单</View>)
+        }        
       </View>
 
     );

src/onlineSelling/pages/records/index.js

@@ -62,7 +62,7 @@ export default class Records extends Component {
       const { userInfo: { person: { personId } }, house } = this.props
       const params = {
         personId,
-        salesBatchId,
+        // salesBatchId,
         pageNumber: 1,
         pageSize: 999,
       }
@@ -139,8 +139,17 @@ export default class Records extends Component {
       return;
     }
 
-    debugger
     const houseList = recordList.map(x => x.housingInfo).filter(x => chooseList.indexOf(x.houseId) > -1)
+
+    // 选择房源必须同一批次
+    const checkHouse = houseList[0]
+    for (let inx in houseList) {
+      if (houseList[inx].salesBatchId != checkHouse.salesBatchId) {
+        Taro.showToast({ title: '所选房源不属于同一销售批次, 请筛选后重选', icon: 'none' })
+        return;
+      }
+    }
+
     this.props.dispatchFlush2Cart(houseList);
 
     Taro.navigateTo({
@@ -256,6 +265,7 @@ export default class Records extends Component {
       }
     })
   }
+
   loadAparamentType(salesBatchId) {
     queryApartmentType({ salesBatchId: salesBatchId }).then(res => {
       res.unshift({ apartmentName: '请选择', apartmentId: '' })
@@ -264,8 +274,8 @@ export default class Records extends Component {
       })
     })
   }
-  handleApartmentChange = e => {
 
+  handleApartmentChange = e => {
     const { apartmentList } = this.state
 
     this.setState({
@@ -343,8 +353,8 @@ export default class Records extends Component {
         buildingId,
         salesBatchId,
         houseLockingStatus,
-
       }
+
       this.getRaise(params)
     }