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

src/onlineSelling/pages/raiseMoney/index.js

@@ -10,7 +10,7 @@ import * as houseActions from '@/actions/house'
 import NextStep from './NextStep'
 import { fetch, apis } from '@/utils/request'
 import Captcha from './Captcha'
-import { raiseOrder, cancelOrder } from '@/services/project'
+import { raiseOrder, cancelOrder, queryPreselectionRecord } from '@/services/project'
 import { getCodeMessage } from '@/services/getCode'
 import { checkIDCard, isEmpty } from '@/utils/tools'
 import ContactConsultant from '../../components/ContactConsultant'
@@ -45,14 +45,15 @@ export default class raiseMoney extends Component {
     navigationBarTitleText: '认筹确认'
   }
   state = {
-    current: 3,
+    current: 0,
     inputName: '',
-    raiseProfile: undefined,
-    record: {},
-    protocolCountdown: 5, // 单位 s
-    captchaCountdown: 60, // 单位 s
-    raiseIdRecord:'',
-    payType: '', // 缴费方式
+    raiseProfile: undefined,  // 认筹主记录
+    record: {},               // 认筹单
+    preselectList: [],        // 我的预选 - 当前批次
+    protocolCountdown: 10,    // 单位 s
+    captchaCountdown: 60,     // 单位 s
+    payType: '',              // 缴费方式
+    failInfo: undefined,      // 操作失败 - 对象 { title, desc }
     payTypeList: [
       { label: '线上缴费', value: 'onLine' },
       { label: '线下缴费', value: 'offLine' },
@@ -109,6 +110,31 @@ export default class raiseMoney extends Component {
           pageNumber: 1,
         })
       }
+
+      this.getMyPreselection({
+        personId,
+        pageNumber: 1,
+        pageSize: 999,
+        salesBatchId: res.salesBatchId,
+      }).then((res2) => {
+        // 如果认筹必须预选
+        if (res.needPreselection && res2.length < 1) {
+          this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '请先预选房源' } })  
+        }
+      })
+    })
+  }
+
+  // 我的预选
+  getMyPreselection = (params) => {
+    return new Promise((resolve, reject) => {
+      queryPreselectionRecord(params).then((res) => {
+        this.setState({ preselectList: res.records })
+        resolve(res.records)        
+      }).catch(() => {
+        resolve([])
+        // reject()
+      })
     })
   }
 
@@ -172,7 +198,7 @@ export default class raiseMoney extends Component {
   }
   renderHouse() {
     const { house: { raiseCart } } = this.props
-    const { raiseProfile } = this.state
+    const { raiseProfile = {} } = this.state
     const disabled = raiseProfile.houseLockingType === 'auto'
 
     return (
@@ -502,7 +528,7 @@ export default class raiseMoney extends Component {
   }
 
   makePay = () => {
-    const { payType } = this.state
+    const { payType, record = {} } = this.state
     if (!payType) {
       Taro.showToast({
         title: '请确定支付方式',
@@ -516,7 +542,7 @@ export default class raiseMoney extends Component {
     }
 
     const params = {
-      targetId: this.$router.params.raiseRecordId || this.state.raiseIdRecord,
+      targetId: this.$router.params.raiseRecordId || record.raiseRecordId,
       targetType: 'house'
     }
 
@@ -554,15 +580,31 @@ export default class raiseMoney extends Component {
     })
   }
   renderResult() {
-    const { raiseProfile = {} } = this.state
+    const { raiseProfile = {}, failInfo } = this.state
+    const isOk = !failInfo
+    const showIcon = isOk ? require('../../assets/success2.png') : require('../../assets/fail2.png')
+    const showTitle = isOk ? '提交成功' : failInfo.title
+
     return (
       <View className="result">
-        <Image className="result-img" src={require('../../assets/success2.png')}></Image>
+        <Image className="result-img" src={showIcon}></Image>
 
-        <View className="status">提交成功</View>
+        <View className="status">{showTitle}</View>
+
+        {
+          isOk &&
+          (
+            <Block>
+              <View className="tip" style="margin-bottom:10rpx">详情请查看认筹单</View>
+              <View className="tip">支付结果请留意微信支付通知</View>
+            </Block>
+          )
+        }
+
+        {
+          !isOk && (<View className="tip">{(failInfo || {}).desc}</View>)
+        }
 
-        <View className="tip" style="margin-bottom:10rpx">详情请查看认筹单</View>
-        <View className="tip">支付结果请留意微信支付通知</View>
         <ContactConsultant buildingId={raiseProfile.buildingId} style=" position: absolute;bottom: 11vh;" />
 
         <View className="look-btn" onClick={() => this.toRaiseProfile(raiseProfile.raiseId)}>查看认筹单</View>
@@ -587,9 +629,7 @@ export default class raiseMoney extends Component {
         this.makeRaiseRecord().then((res) => {
           console.log(res, "res")
           this.setState({
-            current: current + 1,
-            raiseIdRecord: res.raiseRecordId
-
+            current: current + 1
           })
         })
         return;