bug fix

src/onlineSelling/components/RaiseCard/index.js

@@ -1,4 +1,4 @@
-import { View, Image, Text } from "@tarojs/components";
+import { View, Image, Text, Block } from "@tarojs/components";
 import { transferImage } from '@/utils/tools'
 import dayjs from 'dayjs'
 import copyImg from '../../assets/copy.png'
@@ -21,7 +21,7 @@ export default function RaiseCard(props) {
     buildingArea,
     insideArea,
     payStatus,
-    code,
+    houseId,
     buildingImgList = [],
   } = props.summary || {}
 
@@ -34,7 +34,7 @@ export default function RaiseCard(props) {
   const copyData = (e) => {
     e.stopPropagation()
     Taro.setClipboardData({
-      data: code,
+      data: houseId,
       onSuccess: (() => { }),
     })
   }
@@ -55,17 +55,29 @@ export default function RaiseCard(props) {
         {props.type == 'raiseMoney' && <Image src={closeImg} onClick={handleCancel} className="close-img"></Image>}
         <View onClick={props.handleCard}>
           {!props.type && <View className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
-          {(props.type == 'raiseProfile' || props.type == 'houseResource') && houseLockingStatus == 'locked' && <View style="color:#FF3C3C" className='raised badge'>{mineLocked ? '已锁给我' : ''}</View>}
-          {props.type == 'raiseProfile' || props.type == 'raiseMoney' && <View style={props.type == 'raiseMoney' ? 'color:#BB9C79;font-size:30rpx' : 'color:#BB9C79;font-size:30rpx;margin-top:-20rpx'}>{apartmentName || '　'}</View>}
+          {(props.type == 'raiseProfile' || props.type == 'houseResource') && <View style="color:#FF3C3C" className='badge'>{mineLocked ? '已锁给我' : '　'}</View>}
+          {(props.type == 'raiseProfile' || props.type == 'raiseMoney') && <View style={props.type == 'raiseMoney' ? 'color:#BB9C79;font-size:30rpx' : 'color:#BB9C79;font-size:30rpx;margin-top:-20rpx'}>{apartmentName || '　'}</View>}
           {props.type == 'raiseMoney' && <View className="red-price">现价{Number(price) + 0}万</View>}
-          {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 26rpx 0">{houseLockingStatus == 'locked' ? '已锁定' : '未锁定'}</View>}
+          {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 12rpx 0">{houseLockingStatus == 'locked' ? '已锁定' : '未锁定'}</View>}
           <View className="title">{title}</View>
           {!props.type && <View className="meta">{showDT}</View>}
           {props.type == 'raiseProfile' && <View className="price">现价<Text className="red">{Number(price) + 0}</Text>万</View>}
-          {props.type == 'raiseProfile' || props.type == 'raiseMoney' && buildingArea && <View className="area">建筑面积约<Text className="red">{buildingArea}m²</Text></View>}
-          {props.type == 'raiseProfile' || props.type == 'raiseMoney' && insideArea && <View className="area">使用面积约<Text className="red">{insideArea}m²</Text></View>}
+          {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&
+            <Block>
+              {buildingArea ? <View className="area">建筑面积约 <Text className="red">{buildingArea}m²</Text>
+              </View> : <View className="area">建筑面积待定
+            </View>}
+            </Block>
+          }
+          {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&
+            <Block>
+              {insideArea ? <View className="area">使用面积约 <Text className="red">{insideArea}m²</Text>
+              </View> : <View className="area">使用面积待定
+            </View>}
+            </Block>
+          }
         </View>
-        {props.type == 'houseResource' && <View className="house-code" style="margin-top:26rpx">房源编号：{code}
+        {props.type == 'houseResource' && <View className="house-code" style="margin-top:14rpx">房源编号：{houseId}
           <Image src={copyImg} className="copy-img" onClick={copyData}></Image>
         </View>}
       </View>

src/onlineSelling/pages/detail/index.js

@@ -15,7 +15,7 @@ import * as houseActions from '@/actions/house'
 
 @connect(
   ({ user, house }) => ({ ...user, house }),
-  {...houseActions}
+  { ...houseActions }
 )
 
 export default class Index extends Component {
@@ -148,6 +148,7 @@ export default class Index extends Component {
 
   render() {
     const { grantPhoneVisible, grantAvatarVisible, houseDetail, buildingImgList = [], popVisiable } = this.state
+    const { taRaise } = this.state.houseDetail
     const { userInfo } = this.props
     const address = `${houseDetail.buildingName || ''}${houseDetail.termName || ''}${houseDetail.blockName || ''}${houseDetail.unitName || ''}${houseDetail.floorName || ''}${houseDetail.roomName || ''}`
 
@@ -205,7 +206,9 @@ export default class Index extends Component {
                 <View className="date">
                   预选时间：{dayjs(houseDetail.preselectionStartTime).format('MM/DD HH:mm:ss')}--{dayjs(houseDetail.preselectionEndTime).format('MM/DD HH:mm:ss')}
                 </View>
-                <View className="date">认筹时间：2/12 12:23:33--2/13 12:23:34</View>
+                {taRaise && <View className="date">认筹时间：{dayjs(taRaise.raiseStartTime).format('MM/DD HH:mm:ss')}--{dayjs(taRaise.raiseEndTime).format('MM/DD HH:mm:ss')}
+                </View>}
+
               </View>
               <View className="num">
                 已有{houseDetail.realHeat + houseDetail.heat + 0}人预选此房源，快快预选认筹~

src/onlineSelling/pages/raiseMoney/index.js

@@ -15,13 +15,12 @@ import { getCodeMessage } from '@/services/getCode'
 import { checkIDCard, isEmpty } from '@/utils/tools'
 import ContactConsultant from '../../components/ContactConsultant'
 
-const getRaiseProfile = ({ salesBatchId, raiseRecordId, personId}) => {
+const getRaiseProfile = ({ salesBatchId, raiseRecordId, personId }) => {
   const queryString = [
     `${raiseRecordId ? 'raiseRecordId=' + raiseRecordId : ''}`,
     `${salesBatchId ? 'salesBatchId=' + salesBatchId : ''}`,
     `${personId ? 'personId=' + personId : ''}`,
   ].filter(Boolean).join('&')
-  console.log('----------queryString-------------->', queryString)
 
   return fetch({ url: `${apis.API_RAISE_PROFILE}?${queryString}` })
 }
@@ -81,11 +80,10 @@ export default class raiseMoney extends Component {
   }
 
   loadInfo(salesBatchId, raiseRecordId) {
-    const { house } = this.props
+    const { userInfo, house } = this.props
+    const { personId } = userInfo.person
     const defaultRecord = this.initRecord()
 
-    console.log('----------this.props------------->', getRaiseProfile)
-
     // 请求认筹信息
     getRaiseProfile({ salesBatchId, raiseRecordId, personId }).then(res => {
       this.setState({ raiseProfile: res, record: res.record || defaultRecord })
@@ -320,15 +318,44 @@ export default class raiseMoney extends Component {
       </ScrollView >
     )
   }
-
+  toDecimal2 = (x) => {
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+      return false;
+    }
+    var f = Math.round(x * 100) / 100;
+    var s = f.toString();
+    var rs = s.indexOf('.');
+    if (rs < 0) {
+      rs = s.length;
+      s += '.';
+    }
+    while (s.length <= rs + 2) {
+      s += '0';
+    }
+    return s;
+  }
+  regFenToYuan = (fen) => {
+    var num = fen;
+    num = fen * 0.01;
+    num += '';
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
+    num = num.replace(reg, '$1');
+    num = this.toDecimal2(num)
+    return num
+  };
   renderMoney() {
+    const { raiseProfile = {} } = this.state
+
+
     return (
       <ScrollView scrollY className="container2" style="padding:0 30rpx">
         <View className="profile-flex">
           <View className="title">认筹金额</View>
-          <View className="price">1 元</View>
+          <View className="price">{this.regFenToYuan(raiseProfile.raisePrice)}元</View>
         </View>
-        <View className="center-title">线上选房协议</View>
+        <View className="center-title">线上缴费说明</View>
+        <RichText nodes={raiseProfile.payDescriptionOnline || ''} />
       </ScrollView >
     )
   }
@@ -344,17 +371,17 @@ export default class raiseMoney extends Component {
 
     if (record.raiseRecordId) {
       // 如果认筹单跟预选的房源不一致, 说明是新的认筹
-      let found = false
+      let found = true
       for (let inx in house.raiseCart) {
-        const has = (record.taHousingResourcesList || []).filter(x => houseId == house.raiseCart[inx].houseId)[0]
+        const has = (record.taHousingResourcesList || []).filter(x => x.houseId == house.raiseCart[inx].houseId)[0]
 
-        if (has) {
-          found = true;
+        if (!has) {
+          found = false;
           break;
         }
       }
 
-      if (found) {
+      if (!found) {
         const defaultRecord = this.initRecord()
         this.setState({ record: defaultRecord })
       }
@@ -462,13 +489,14 @@ export default class raiseMoney extends Component {
     })
 
   }
-  toRaiseProfile() {
-    const id = this.$router.params.raiseRecordId
+  toRaiseProfile(id) {
+
     Taro.navigateTo({
       url: `/onlineSelling/pages/raiseProfile/index?raiseRecordId=${id}`
     })
   }
   renderResult() {
+    const { raiseProfile = {} } = this.state
     return (
       <View className="result">
         <Image className="result-img" src={require('../../assets/success2.png')}></Image>
@@ -477,9 +505,9 @@ export default class raiseMoney extends Component {
 
         <View className="tip" style="margin-bottom:10rpx">详情请查看认筹单</View>
         <View className="tip">支付结果请留意微信支付通知</View>
-        {/* <ContactConsultant buildingId={buildingId} style=" position: absolute;bottom: 8vh;" /> */}
-        <ContactConsultant style=" position: absolute;bottom: 11vh;" />
-        <View className="look-btn" onClick={() => this.toRaiseProfile()}>查看认筹单</View>
+        <ContactConsultant buildingId={raiseProfile.buildingId} style=" position: absolute;bottom: 11vh;" />
+
+        <View className="look-btn" onClick={() => this.toRaiseProfile(raiseProfile.raiseId)}>查看认筹单</View>
       </View>
 
     );

src/onlineSelling/pages/raiseMoney/index.scss

@@ -60,6 +60,7 @@
     font-size: 24px;
     color: #333;
     text-align: center;
+    line-height: 2;
   }
   .profile-box{
     padding: 0 30px;
@@ -106,6 +107,11 @@
       font-size: 24px;
       color: #BB9C79;
     }
+    .title{
+      font-size: 36px;
+      color: #333;
+      font-weight: 700;
+    }
     .price{
       color: #FF3C3C;
       font-size: 44px;

src/onlineSelling/pages/raiseProfile/houseResource.js

@@ -2,59 +2,31 @@ import Taro, { Component } from '@tarojs/taro'
 import { View } from '@tarojs/components'
 import './index.scss'
 import RaiseCard from '../../components/RaiseCard'
+import { queryRaiseDetail } from '@/services/project'
 
 export default class HouseResource extends Component {
   config = {
     navigationBarTitleText: '房源清单'
   }
+  state = {
+    houseList: [],
+  }
 
-  render() {
-    const list = [
-      {
-        apartmentName: 'A户型',
-        blockName: "1栋",
-        buildingId: "9f021a59b2a714822894c23ccca8c2db",
-        buildingImgList: null,
-        buildingName: "万科安平园舍",
-        createDate: "2020-02-27T16:31:56",
-        floorName: "1楼",
-        houseId: "820",
-        preselectionRecordId: 205,
-        price: "111.00000000",
-        roomName: "1户",
-        saleBatchStatus: "1",
-        status: 1,
-        termname: "1期",
-        unitName: "2单元",
-        area1: '290',
-        area2: '270',
-        code: '2-09876545456'
-      }, {
-        apartmentName: 'B户型',
-        blockName: "1栋",
-        buildingId: "9f021a59b2a714822894c23ccca8c2db",
-        buildingImgList: null,
-        buildingName: "凤翔新城",
-        createDate: "2020-02-27T16:31:56",
-        floorName: "1楼",
-        houseId: "820",
-        preselectionRecordId: 206,
-        price: "111.00000000",
-        roomName: "1户",
-        saleBatchStatus: "1",
-        status: 1,
-        termname: "1期",
-        unitName: "2单元",
-        area1: '290',
-        area2: '270',
-        code: '2-09876545333'
-      },
-    ]
+  componentWillMount() {
+    const { raiseRecordId } = this.$router.params
+    queryRaiseDetail(raiseRecordId).then(res => {
+      this.setState({
+        houseList: res.houseList || [],
 
+      })
+    })
+  }
+  render() {
+    const { houseList } = this.state
     return (
       <View style="padding-top:30rpx">
         {
-          list.map(item => (
+          houseList.map(item => (
             <View key={item.raiseRecordId} >
               <RaiseCard type="houseResource" summary={item} />
             </View>

src/onlineSelling/pages/raiseProfile/index.js

@@ -54,8 +54,9 @@ export default class Raise extends Component {
 
   // 查看所有认筹房源
   viewAllHouses = () => {
+    const { raiseRecordId } = this.$router.params
     Taro.navigateTo({
-      url: '/onlineSelling/pages/raiseProfile/houseResource'
+      url: `/onlineSelling/pages/raiseProfile/houseResource?raiseRecordId=${raiseRecordId}`
     })
   }
 
@@ -182,7 +183,7 @@ export default class Raise extends Component {
     // 缴费信息
     const payInfo = [
       { head: '缴费方式', body: `${raiseDeatil.payType == 'onLine' ? '线上缴费' : '线下缴费'}` },
-      { head: '实际支付费用', body: this.regFenToYuan(orderDetail.totalFee) },
+      { head: '实际支付费用', body: this.regFenToYuan(orderDetail.totalFee)+'元' },
       { head: '缴费成功时间', body: dayjs(orderDetail.payTime).format('YYYY/MM/DD HH:mm:ss') },
     ]
 
@@ -191,7 +192,7 @@ export default class Raise extends Component {
       { head: '退费状态', body: refundOrder.payStatus == 'refunded' ? '退费完成' : '退费中' },
       { head: '退费结果', body: refundOrder.payStatus == 'refunded' ? '成功' : '失败' },
       { head: '退费发起时间', body: dayjs(refundOrder.createDate).format('YYYY/MM/DD HH:mm:ss') },
-      { head: '实退费用', body: this.regFenToYuan(refundOrder.totalFee) },
+      { head: '实退费用', body: this.regFenToYuan(refundOrder.totalFee)+'元' },
       { head: '退费到账时间', body: dayjs(refundOrder.payTime).format('YYYY/MM/DD HH:mm:ss') },
       { head: '退费原因', desc: raiseDeatil.refundReason },
     ]

src/onlineSelling/pages/screenHouse/index.js

@@ -18,11 +18,7 @@ export default class Index extends Component {
     priceCurrent: 0,
     startPrice: '100',
     endPrice: null,
-    apartmentList: [
-      // { apartmentName: 'A 户型', buildingArea: '149', area2: '131' },
-      // { apartmentName: 'B 户型', buildingArea: '95', area2: '84.7' },
-      // { apartmentName: 'C 户型', buildingArea: '95', area2: '84.7' },
-    ]
+    apartmentList: []
   }
 
   componentWillMount() {
@@ -118,7 +114,7 @@ export default class Index extends Component {
               <View className='construction__area'>
                 <Text>{apartmentItem.buildingArea ? '建筑面积约' + apartmentItem.buildingArea + 'm²' : '建筑面积待定'}</Text>
                 {
-                  apartmentItem.area2 ? <Text>使用面积约{apartmentItem.area2}m²</Text> : <Text>使用面积待定</Text>
+                  apartmentItem.insideArea ? <Text>使用面积约{apartmentItem.insideArea}m²</Text> : <Text>使用面积待定</Text>
                 }
               </View>
             </View>