bug fix

src/onlineSelling/components/RaiseCard/index.js

@@ -12,6 +12,7 @@ export default function RaiseCard(props) {
     termName,
     blockName,
     unitName,
+    floorName,
     roomName,
     price,
     houseLockingStatus,
@@ -22,6 +23,7 @@ export default function RaiseCard(props) {
     insideArea,
     payStatus,
     houseId,
+    status,
     taHousingResourcesList = [],
     apartmentImgList = [],
     taRaise = {},
@@ -33,7 +35,8 @@ export default function RaiseCard(props) {
   }
 
   const defHouse = taHousingResourcesList[0] || {}
-  const title = `${buildingName || defHouse.buildingName || ''} ${termName || defHouse.termName || ''} ${blockName || defHouse.blockName || ''} ${unitName || defHouse.unitName || ''} ${roomName || defHouse.roomName || '　'}`
+  const ellipsis = taHousingResourcesList.length > 1 ? `等${taHousingResourcesList.length}套房源` : ''
+  const title = `${buildingName || defHouse.buildingName || ''} ${termName || defHouse.termName || ''} ${blockName || defHouse.blockName || ''} ${unitName || defHouse.unitName || ''} ${floorName || defHouse.floorName || ''} ${roomName || defHouse.roomName || '　'}${ellipsis}`
   const thumb = (buildingImgList || []).length
   const thumb2 = (apartmentImgList || []).length
   const showDT = dayjs(createDate).format('YYYY/MM/DD')
@@ -67,14 +70,15 @@ export default function RaiseCard(props) {
       <View className="body">
         {props.type == 'raiseMoney' && !props.disableCancel && <Image src={closeImg} onClick={handleCancel} className="close-img"></Image>}
         <View onClick={() => (props.handleCard && props.handleCard())}>
-          {!props.type && <View className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
+          {!props.type && <View style={status == '0' ? 'color:#999' : ''} className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</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' && taRaise.displayHousePrice && <View className="red-price">现价{Number(price) + 0}万</View>}
           {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 12rpx 0">{houseLockingStatus == 'locked' ? '已锁定' : '未锁定'}</View>}
-          <View className="title" style={props.type == 'raiseMoney' && !props.disableCancel ? 'max-width:340rpx' : ''}>{title}</View>
+          <View className={props.type == 'raiseMoney' && !props.disableCancel ? 'title max' : 'title'} style={status == '0' ? 'color:#999' : ''}>{title}</View>
           {!props.type && <View className="meta">{showDT}</View>}
           {props.type == 'raiseProfile' && taRaise.displayHousePrice && <View className="price">现价<Text className="red">{Number(price) + 0}</Text>万</View>}
+          {status == '0' && <View style="color:#999;font-size:30rpx">已作废</View>}
           {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&
             <Block>
               {buildingArea ? <View className="area">建筑面积约 <Text className="red">{buildingArea}m²</Text>

src/onlineSelling/components/RaiseCard/index.scss

@@ -54,11 +54,14 @@
       color:#333;
       line-height: 1.6;
     }
+    .max{
+      max-width:340px
+    }
 
     .meta {
       font-size: 24px;
       color:#999;
-      text-align: right;
+      float: right;
     }
     .price{
       font-size: 28px;

src/onlineSelling/pages/raiseMoney/index.js

@@ -46,7 +46,7 @@ export default class raiseMoney extends Component {
     navigationBarTitleText: '认筹确认'
   }
   state = {
-    current: 2,
+    current: 0,
     inputName: '',
     raiseProfile: undefined,  // 认筹主记录
     record: {},               // 认筹单

src/onlineSelling/pages/raiseProfile/index.js

@@ -52,9 +52,9 @@ export default class Raise extends Component {
 
   // 查看所有认筹房源
   viewAllHouses = () => {
-    const { raiseRecordId } = this.$router.params
+    const { id} = this.$router.params
     Taro.navigateTo({
-      url: `/onlineSelling/pages/raiseProfile/houseResource?raiseRecordId=${raiseRecordId}`
+      url: `/onlineSelling/pages/raiseProfile/houseResource?raiseRecordId=${id}`
     })
   }
 

src/onlineSelling/pages/raiseProfile/index.scss

@@ -79,6 +79,7 @@
 
   &-item {
     flex: auto;
+    font-size: 22px;
   }
 }
 

src/onlineSelling/pages/records/index.js

@@ -14,7 +14,6 @@ import './index.scss'
 import * as houseActions from '@/actions/house'
 import * as noticeType from '@/constants/common.js'
 
-function noop() { }
 
 @connect(
   ({ user, city, house }) => ({ ...user, ...city, house }),
@@ -156,7 +155,15 @@ export default class Records extends Component {
       url: `/onlineSelling/pages/raiseMoney/index?salesBatchId=${checkHouse.salesBatchId}`
     })
   }
-
+  toHouseDetail(item) {
+    if (item.housingStatus == '0' || item.saleBatchStatus == '0') {
+      Taro.showToast({ title: '当前销售批次或该房源已被取消发布', icon: 'none', duration: 2000 })
+    } else {
+      Taro.navigateTo({
+        url: `/onlineSelling/pages/detail/index?id=${item.houseId}`
+      })
+    }
+  }
   renderPreselection() {
     const { recordList, noRecord, chooseList } = this.state
 
@@ -169,16 +176,16 @@ export default class Records extends Component {
                 <View>
                   {
                     recordList.map((item) => {
-                      const checked = (chooseList || []).filter(x => x == item.houseId)[0]
-                      const disabled = item.housingInfo.houseLockingStatus == 'locked'
+                      // const checked = (chooseList || []).filter(x => x == item.houseId)[0]
+                      // const disabled = item.housingInfo.houseLockingStatus == 'locked'
 
                       return (
                         <Label class="checkbox" >
-                          <Checkbox value={item.houseId - 0} checked={checked} disabled={disabled}>
+                          {/* <Checkbox value={item.houseId - 0} checked={checked} disabled={disabled}> */}
                             <View className="carditem" key={item.preselectionRecordId} >
-                              <HouseCard summary={item} onClick={noop} />
+                              <HouseCard summary={item} onClick={()=>this.toHouseDetail(item)} />
                             </View>
-                          </Checkbox>
+                          {/* </Checkbox> */}
                         </Label>
                       )
                     })
@@ -189,7 +196,7 @@ export default class Records extends Component {
           <Statement />
         </ScrollView >
 
-        <View className="raise-box"> <View className="raise-btn" onClick={this.handleSubmit}>认筹房源</View></View>
+        {/* <View className="raise-box"> <View className="raise-btn" onClick={this.handleSubmit}>认筹房源</View></View> */}
 
       </Block>
     )
@@ -221,7 +228,7 @@ export default class Records extends Component {
 
         {
           noRaiseRecord ? <Blank style="margin:10vh 0 22vh 0" tips="暂无认筹记录" /> :
-            <ScrollView scrollY>
+            <ScrollView scrollY className="container">
               {
                 raiseList.map(item => (
                   <View key={item.raiseRecordId} >

src/onlineSelling/pages/records/index.scss

@@ -45,7 +45,7 @@
     margin-bottom: 20px;
   }
   .container {
-    height: calc(100vh - 254px);
+    height: calc(100vh - 100px);
   }
   .raise-box{
     position: fixed;

src/services/getCode.js

@@ -2,7 +2,8 @@ import { fetch } from '@/utils/request'
 import {
   API_GET_CODE,
   API_PUT_REGISTER,
-  API_PUT_REGISTERCONSULTANT
+  API_PUT_REGISTERCONSULTANT,
+  API_CHECK_CODE
 } from '@/constants/api'
 
 /**