bug fix"

src/onlineSelling/pages/houseList/index.js

@@ -23,8 +23,9 @@ import { getCardDetail } from '@/services/card'
 import Consultant from '@/components/consultant'
 import './index.scss'
 import { Loading } from '@/components/Loading'
+import * as houseActions from '@/actions/house'
 
-@connect(s => s.user)
+@connect(s => s.user, { ...houseActions })
 @withDetail({
   track: {
     event: 'house_list',
@@ -70,6 +71,9 @@ export default class HouseList extends Component {
       this.setState({ showShareMenu: false })
       this.initPageData()
     })
+
+    // 清空认筹选择
+    this.props.dispatchFlush2Cart([])
   }
 
 

src/onlineSelling/pages/raiseMoney/RadioList/index.js

@@ -0,0 +1,32 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Label, Radio } from "@tarojs/components";
+import './index.scss'
+
+export default class extends Component {
+
+  render() {
+    const { value, color, size, dataset = [], onChange } = this.props
+
+    return (
+      <RadioGroup onChange={onChange}>
+        {
+          dataset.map((item) => {
+            const checked = item.value === value
+            const checkedColor = color && checked ? `border-color: ${color}` : ''
+            const btnSize = size ? `width: ${size}; height: ${size}` : ''
+            const btnStyle = `${checkedColor};${btnSize}`
+
+            return (
+              <Label key={item.value} className="radio-btn">
+                <Radio hidden value={item.value} checked={checked}></Radio>
+                <View className={`icon ${checked ? 'checked' : ''}`} style={btnStyle}></View>
+                <View className="label">{item.label}</View>
+              </Label>
+            )
+          })
+        }
+      </RadioGroup>
+    )
+  }
+
+}

src/onlineSelling/pages/raiseMoney/RadioList/index.scss

@@ -0,0 +1,28 @@
+.radio-btn {
+  display: inline-block;
+
+  .icon {
+    width: 20px;
+    height: 20px;
+    display: inline-block;
+    border:2px solid #999;
+    border-radius:50%;
+    position: relative;
+    margin-right: 10px;
+    vertical-align: middle;
+
+    &.checked {
+      border-width: 6px;
+      border-style: solid;
+      border-color: #f00;
+    }
+  }
+
+  .label {
+    display: inline-block;
+  }
+
+  & + .radio-btn {
+    margin-left: 40px;
+  }
+}

src/onlineSelling/pages/raiseMoney/index.js

@@ -14,6 +14,7 @@ import { raiseOrder, cancelOrder } from '@/services/project'
 import { getCodeMessage } from '@/services/getCode'
 import { checkIDCard, isEmpty } from '@/utils/tools'
 import ContactConsultant from '../../components/ContactConsultant'
+import RadioList from './RadioList'
 
 const getRaiseProfile = ({ salesBatchId, raiseRecordId, personId }) => {
   const queryString = [
@@ -44,13 +45,18 @@ export default class raiseMoney extends Component {
     navigationBarTitleText: '认筹确认'
   }
   state = {
-    current: 0,
+    current: 3,
     inputName: '',
     raiseProfile: undefined,
     record: {},
     protocolCountdown: 10, // 单位 s
     captchaCountdown: 60, // 单位 s
     raiseIdRecord:'',
+    payType: '', // 缴费方式
+    payTypeList: [
+      { label: '线上缴费', value: 'onLine' },
+      { label: '线下缴费', value: 'offLine' },
+    ],
   }
 
   captchaLock = false
@@ -87,7 +93,13 @@ export default class raiseMoney extends Component {
 
     // 请求认筹信息
     getRaiseProfile({ salesBatchId, raiseRecordId, personId }).then(res => {
-      this.setState({ raiseProfile: res, record: res.record || defaultRecord })
+      let payType = ''
+      const payTypeSettings = (res.payType || '').split(',')
+      if (payTypeSettings.length === 1) {
+        payType = payTypeSettings[0]
+      }
+
+      this.setState({ raiseProfile: res, payType, record: res.record || defaultRecord })
 
       // 请求置业顾问列表
       if (!house.consultantList || !house.consultantList.length) {
@@ -354,10 +366,19 @@ export default class raiseMoney extends Component {
     num = num.replace(reg, '$1');
     num = this.toDecimal2(num)
     return num
-  };
-  renderMoney() {
-    const { raiseProfile = {} } = this.state
+  }
+
+  handleChangeType = (e) => {
+    console.log('----------------->', e)
+    this.setState({ payType: e.detail.value })
+  }
 
+  renderMoney() {
+    const { raiseProfile = {}, payTypeList, payType } = this.state
+    const payTypeSettings = (raiseProfile.payType || '').split(',')
+    const showTypes = payTypeList.filter(x => (payTypeSettings.indexOf(x.value) > -1))
+    const showProtocal = payType === 'onLine' ? raiseProfile.payDescriptionOnline : raiseProfile.payDescriptionOffline
+    const payTip = payType === 'onLine' ? '线上缴费说明' : '线下缴费说明'
 
     return (
       <ScrollView scrollY className="container2" style="padding:0 30rpx">
@@ -365,8 +386,19 @@ export default class raiseMoney extends Component {
           <View className="title">认筹金额</View>
           <View className="price">{this.regFenToYuan(raiseProfile.raisePrice)}元</View>
         </View>
-        <View className="center-title">线上缴费说明</View>
-        <RichText nodes={raiseProfile.payDescriptionOnline || ''} />
+        {
+          (payTypeSettings.length > 1) &&
+          (
+            <View className="pay-type">
+              <View className="head">请选择缴费方式：</View>
+              <View className="body">
+                <RadioList dataset={showTypes} value={payType} onChange={this.handleChangeType} />
+              </View>
+            </View>
+          )
+        }
+        <View className="center-title">{payTip}</View>
+        <RichText nodes={showProtocal || ''} />
       </ScrollView >
     )
   }
@@ -427,8 +459,10 @@ export default class raiseMoney extends Component {
       return Promise.reject()
     }
 
+    debugger
+
     // 校验手机号
-    if (isEmpty(record.tel) || record.tel < 11) {
+    if (isEmpty(record.tel) || record.tel.length < 11) {
       Taro.showToast({
         title: '手机号格式不正确',
         icon: 'none',
@@ -468,6 +502,19 @@ export default class raiseMoney extends Component {
   }
 
   makePay = () => {
+    const { payType } = this.state
+    if (!payType) {
+      Taro.showToast({
+        title: '请确定支付方式',
+        icon: 'none'
+      })
+      return Promise.reject()
+    }
+
+    if (payType === 'offLine') {
+      return Promise.resolve()
+    }
+
     const params = {
       targetId: this.$router.params.raiseRecordId || this.state.raiseIdRecord,
       targetType: 'house'

src/onlineSelling/pages/raiseMoney/index.scss

@@ -44,6 +44,26 @@
   }
   .container2 {
     height: calc(100vh - 382px);
+
+    .pay-type {
+      display: flex;
+      margin: 30px 0 40px;
+      font-size:28px;
+      color: #333;
+
+      .head {
+        width: 240px;
+        flex: none;
+      }
+
+      .body {
+        flex: auto;
+
+        .item {
+          display: inline-block;
+        }
+      }
+    }
   }
   .container3 {
     height: calc(100vh - 452px);

src/onlineSelling/pages/raiseProfile/index.scss

@@ -129,6 +129,7 @@
   }
 }
 .raise-flex{
+  margin-top: 40px;
   display: flex;
   align-items: center;
   justify-content: space-between;

src/onlineSelling/pages/records/index.js

@@ -80,6 +80,9 @@ export default class Records extends Component {
       }
 
       this.setState({ salesBatchId })
+
+      // 清空认筹选择
+      this.props.dispatchFlush2Cart([])
     })
   }
   getPreselection(params) {