raisecard

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/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}`
     })
   }
 
@@ -68,7 +69,7 @@ export default class Raise extends Component {
             <View className="title">认筹房源</View>
           </View>
           <View className="flexSpace-fixed">
-            {houseList.length > 1 && <View className="gray" onClick={this.viewAllHouses}>
+            {houseList.length > 0 && <View className="gray" onClick={this.viewAllHouses}>
               <Text>查看全部（{houseList.length}）</Text>
               <Text className='at-icon at-icon-chevron-right'></Text>
             </View>}
@@ -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>