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

src/onlineSelling/components/RaiseCard/index.js

@@ -23,6 +23,7 @@ export default function RaiseCard(props) {
     payStatus,
     houseId,
     taHousingResourcesList = [],
+    taRaise = {},
     buildingImgList = [],
   } = props.summary || {}
   const defHouse = taHousingResourcesList[0] || {}
@@ -59,11 +60,11 @@ export default function RaiseCard(props) {
           {!props.type && <View 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' && <View className="red-price">现价{Number(price) + 0}万</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">{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' && taRaise.displayHousePrice && <View className="price">现价<Text className="red">{Number(price) + 0}</Text>万</View>}
           {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&
             <Block>
               {buildingArea ? <View className="area">建筑面积约 <Text className="red">{buildingArea}m²</Text>

src/onlineSelling/components/RaiseCard/index.scss

@@ -1,6 +1,6 @@
 .housecard {
   width: 690px;
-  height: 250px;
+  min-height: 250px;
   background:#fff;
   display: flex;
   font-weight: 400;

src/onlineSelling/pages/detail/index.js

@@ -191,9 +191,10 @@ export default class Index extends Component {
               <View style="padding: 0 30rpx;">
                 <View className="name">{houseDetail.apartmentName || ''}</View>
                 <View className="btn" onClick={() => this.handleChat(houseDetail.buildingId)}>询问优惠</View>
-                <View className="price">
-                  现价：{houseDetail.price}万
-              </View>
+                {
+                  taRaise.displayHousePrice && <View className="price"> 现价：{houseDetail.price}万</View>
+                }
+
                 {houseDetail.apartmentName &&
                   <View className="area">
                     {houseDetail.buildingArea ? <Text>建筑面积约<Text style="color:#FE1C1C">{houseDetail.buildingArea}</Text>m² </Text> : '建筑面积待定'}

src/onlineSelling/pages/houseCart/index.scss

@@ -68,13 +68,14 @@
 
   .shoping-cart {
     position: absolute;
-    bottom: 135px;
+    bottom: 125px;
     font-size: 28px;
     line-height: 30px;
     color: #333;
     width: calc(100% - 70px);
     box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
     border-radius:44px 44px 0px 0px;
+    background-color: #fff;
 
     .title {
       text-align: center;

src/onlineSelling/pages/houseList/index.js

@@ -399,7 +399,7 @@ export default class HouseList extends Component {
   }
 
   renderHouses() {
-    const { houseList,dataType } = this.state
+    const { houseList, dataType } = this.state
 
     return (
       <ScrollView className="container" scrollY scrollWithAnimation>
@@ -436,7 +436,8 @@ export default class HouseList extends Component {
   }
 
   handleCondition(value) {
-    if (value == 2) {
+    const { salesBatchDetail: { displayHousePrice } } = this.state
+    if ((!displayHousePrice && value == 1) || value == 2) {
       this.setState({
         apartmentId: '',
         startPrice: '',
@@ -567,27 +568,29 @@ export default class HouseList extends Component {
             </View>
           ))}
         </View>
-          : <Blank tips="暂无户型图，请按价格筛选"></Blank>
+          : <Blank tips="暂无户型"></Blank>
         }
       </Block>
     )
   }
 
   renderCondition() {
-    const { current } = this.state
+    const { current, salesBatchDetail: { displayHousePrice } } = this.state
     const condition = [{ title: '按户型', value: 0 }, { title: '按价格', value: 1 }, { title: '不限条件', value: 2 }]
+    const condition2 = [{ title: '按户型', value: 0 }, { title: '不限条件', value: 2 }]
+    const conditionList = displayHousePrice ? condition : condition2
     return (
       <View className="screen-page">
         <View className="screen-top">
           筛选房源
-            {condition.map(item => (
+            {conditionList.map(item => (
             <View key={item.value} onClick={() => this.handleCondition(item.value)} className={current == item.value ? 'top-item active' : 'top-item'}>
               {item.title}
             </View>
           ))}
         </View>
         {current == 0 && this.renderApartment()}
-        {current == 1 && this.renderPrice()}
+        {current == 1 && displayHousePrice && this.renderPrice()}
 
 
       </View>
@@ -656,7 +659,7 @@ export default class HouseList extends Component {
                     </View>
                   ))}
                 </View>
-                
+
                 {houseList.length ? this.renderHouses() : this.renderBlank()}
                 {this.renderBottom()}
               </View>

src/onlineSelling/pages/raiseMoney/index.js

@@ -206,7 +206,7 @@ export default class raiseMoney extends Component {
         {
           raiseCart.map(item => (
             <View key={item.houseId} >
-              <RaiseCard type="raiseMoney" summary={item} onCancel={this.handleCancel} disableCancel={disabled} />
+              <RaiseCard type="raiseMoney" style="height:auto" summary={item} onCancel={this.handleCancel} disableCancel={disabled} />
             </View>
           ))
         }

src/onlineSelling/pages/records/index.js

@@ -13,7 +13,7 @@ import PickerComponent from '../../components/Picker'
 import './index.scss'
 import * as houseActions from '@/actions/house'
 
-function noop(){}
+function noop() { }
 
 @connect(
   ({ user, city, house }) => ({ ...user, ...city, house }),
@@ -57,7 +57,7 @@ export default class Records extends Component {
   componentDidShow() {
     ready.queue(() => {
 
-      const { id: salesBatchId } = this.$router.params
+      const { id: salesBatchId = '' } = this.$router.params
       const { userInfo: { person: { personId } }, house } = this.props
       const params = {
         personId,
@@ -200,7 +200,7 @@ export default class Records extends Component {
               {
                 raiseList.map(item => (
                   <View key={item.raiseRecordId} >
-                    <RaiseCard handleCard={()=>this.toRaiseProfile(item.raiseRecordId)} summary={item} />
+                    <RaiseCard handleCard={() => this.toRaiseProfile(item.raiseRecordId)} summary={item} />
                   </View>
                 )
                 )