bug fix

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/raiseMoney/index.js

@@ -444,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;
@@ -589,7 +603,6 @@ export default class raiseMoney extends Component {
 
   }
   toRaiseProfile(id) {
-
     Taro.navigateTo({
       url: `/onlineSelling/pages/raiseProfile/index?id=${id}`
     })