xujing 5 年之前
父節點
當前提交
4582d9807a

+ 3
- 2
src/onlineSelling/components/RaiseCard/index.js 查看文件

23
     payStatus,
23
     payStatus,
24
     houseId,
24
     houseId,
25
     taHousingResourcesList = [],
25
     taHousingResourcesList = [],
26
+    taRaise = {},
26
     buildingImgList = [],
27
     buildingImgList = [],
27
   } = props.summary || {}
28
   } = props.summary || {}
28
   const defHouse = taHousingResourcesList[0] || {}
29
   const defHouse = taHousingResourcesList[0] || {}
59
           {!props.type && <View className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
60
           {!props.type && <View className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
60
           {(props.type == 'raiseProfile' || props.type == 'houseResource') && <View style="color:#FF3C3C" className='badge'>{mineLocked ? '已锁给我' : ' '}</View>}
61
           {(props.type == 'raiseProfile' || props.type == 'houseResource') && <View style="color:#FF3C3C" className='badge'>{mineLocked ? '已锁给我' : ' '}</View>}
61
           {(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>}
62
           {(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>}
62
-          {props.type == 'raiseMoney' && <View className="red-price">现价{Number(price) + 0}万</View>}
63
+          {props.type == 'raiseMoney' && taRaise.displayHousePrice && <View className="red-price">现价{Number(price) + 0}万</View>}
63
           {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 12rpx 0">{houseLockingStatus == 'locked' ? '已锁定' : '未锁定'}</View>}
64
           {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 12rpx 0">{houseLockingStatus == 'locked' ? '已锁定' : '未锁定'}</View>}
64
           <View className="title">{title}</View>
65
           <View className="title">{title}</View>
65
           {!props.type && <View className="meta">{showDT}</View>}
66
           {!props.type && <View className="meta">{showDT}</View>}
66
-          {props.type == 'raiseProfile' && <View className="price">现价<Text className="red">{Number(price) + 0}</Text>万</View>}
67
+          {props.type == 'raiseProfile' && taRaise.displayHousePrice && <View className="price">现价<Text className="red">{Number(price) + 0}</Text>万</View>}
67
           {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&
68
           {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&
68
             <Block>
69
             <Block>
69
               {buildingArea ? <View className="area">建筑面积约 <Text className="red">{buildingArea}m²</Text>
70
               {buildingArea ? <View className="area">建筑面积约 <Text className="red">{buildingArea}m²</Text>

+ 1
- 1
src/onlineSelling/components/RaiseCard/index.scss 查看文件

1
 .housecard {
1
 .housecard {
2
   width: 690px;
2
   width: 690px;
3
-  height: 250px;
3
+  min-height: 250px;
4
   background:#fff;
4
   background:#fff;
5
   display: flex;
5
   display: flex;
6
   font-weight: 400;
6
   font-weight: 400;

+ 4
- 3
src/onlineSelling/pages/detail/index.js 查看文件

191
               <View style="padding: 0 30rpx;">
191
               <View style="padding: 0 30rpx;">
192
                 <View className="name">{houseDetail.apartmentName || ''}</View>
192
                 <View className="name">{houseDetail.apartmentName || ''}</View>
193
                 <View className="btn" onClick={() => this.handleChat(houseDetail.buildingId)}>询问优惠</View>
193
                 <View className="btn" onClick={() => this.handleChat(houseDetail.buildingId)}>询问优惠</View>
194
-                <View className="price">
195
-                  现价:{houseDetail.price}万
196
-              </View>
194
+                {
195
+                  taRaise.displayHousePrice && <View className="price"> 现价:{houseDetail.price}万</View>
196
+                }
197
+
197
                 {houseDetail.apartmentName &&
198
                 {houseDetail.apartmentName &&
198
                   <View className="area">
199
                   <View className="area">
199
                     {houseDetail.buildingArea ? <Text>建筑面积约<Text style="color:#FE1C1C">{houseDetail.buildingArea}</Text>m² </Text> : '建筑面积待定'}
200
                     {houseDetail.buildingArea ? <Text>建筑面积约<Text style="color:#FE1C1C">{houseDetail.buildingArea}</Text>m² </Text> : '建筑面积待定'}

+ 2
- 1
src/onlineSelling/pages/houseCart/index.scss 查看文件

68
 
68
 
69
   .shoping-cart {
69
   .shoping-cart {
70
     position: absolute;
70
     position: absolute;
71
-    bottom: 135px;
71
+    bottom: 125px;
72
     font-size: 28px;
72
     font-size: 28px;
73
     line-height: 30px;
73
     line-height: 30px;
74
     color: #333;
74
     color: #333;
75
     width: calc(100% - 70px);
75
     width: calc(100% - 70px);
76
     box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
76
     box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
77
     border-radius:44px 44px 0px 0px;
77
     border-radius:44px 44px 0px 0px;
78
+    background-color: #fff;
78
 
79
 
79
     .title {
80
     .title {
80
       text-align: center;
81
       text-align: center;

+ 10
- 7
src/onlineSelling/pages/houseList/index.js 查看文件

395
   }
395
   }
396
 
396
 
397
   renderHouses() {
397
   renderHouses() {
398
-    const { houseList,dataType } = this.state
398
+    const { houseList, dataType } = this.state
399
 
399
 
400
     return (
400
     return (
401
       <ScrollView className="container" scrollY scrollWithAnimation>
401
       <ScrollView className="container" scrollY scrollWithAnimation>
432
   }
432
   }
433
 
433
 
434
   handleCondition(value) {
434
   handleCondition(value) {
435
-    if (value == 2) {
435
+    const { salesBatchDetail: { displayHousePrice } } = this.state
436
+    if ((!displayHousePrice && value == 1) || value == 2) {
436
       this.setState({
437
       this.setState({
437
         apartmentId: '',
438
         apartmentId: '',
438
         startPrice: '',
439
         startPrice: '',
563
             </View>
564
             </View>
564
           ))}
565
           ))}
565
         </View>
566
         </View>
566
-          : <Blank tips="暂无户型图,请按价格筛选"></Blank>
567
+          : <Blank tips="暂无户型"></Blank>
567
         }
568
         }
568
       </Block>
569
       </Block>
569
     )
570
     )
570
   }
571
   }
571
 
572
 
572
   renderCondition() {
573
   renderCondition() {
573
-    const { current } = this.state
574
+    const { current, salesBatchDetail: { displayHousePrice } } = this.state
574
     const condition = [{ title: '按户型', value: 0 }, { title: '按价格', value: 1 }, { title: '不限条件', value: 2 }]
575
     const condition = [{ title: '按户型', value: 0 }, { title: '按价格', value: 1 }, { title: '不限条件', value: 2 }]
576
+    const condition2 = [{ title: '按户型', value: 0 }, { title: '不限条件', value: 2 }]
577
+    const conditionList = displayHousePrice ? condition : condition2
575
     return (
578
     return (
576
       <View className="screen-page">
579
       <View className="screen-page">
577
         <View className="screen-top">
580
         <View className="screen-top">
578
           筛选房源
581
           筛选房源
579
-            {condition.map(item => (
582
+            {conditionList.map(item => (
580
             <View key={item.value} onClick={() => this.handleCondition(item.value)} className={current == item.value ? 'top-item active' : 'top-item'}>
583
             <View key={item.value} onClick={() => this.handleCondition(item.value)} className={current == item.value ? 'top-item active' : 'top-item'}>
581
               {item.title}
584
               {item.title}
582
             </View>
585
             </View>
583
           ))}
586
           ))}
584
         </View>
587
         </View>
585
         {current == 0 && this.renderApartment()}
588
         {current == 0 && this.renderApartment()}
586
-        {current == 1 && this.renderPrice()}
589
+        {current == 1 && displayHousePrice && this.renderPrice()}
587
 
590
 
588
 
591
 
589
       </View>
592
       </View>
652
                     </View>
655
                     </View>
653
                   ))}
656
                   ))}
654
                 </View>
657
                 </View>
655
-                
658
+
656
                 {houseList.length ? this.renderHouses() : this.renderBlank()}
659
                 {houseList.length ? this.renderHouses() : this.renderBlank()}
657
                 {this.renderBottom()}
660
                 {this.renderBottom()}
658
               </View>
661
               </View>

+ 2
- 2
src/onlineSelling/pages/raiseMoney/index.js 查看文件

48
     inputName: '',
48
     inputName: '',
49
     raiseProfile: undefined,
49
     raiseProfile: undefined,
50
     record: {},
50
     record: {},
51
-    protocolCountdown: 10, // 单位 s
51
+    protocolCountdown: 5, // 单位 s
52
     captchaCountdown: 60, // 单位 s
52
     captchaCountdown: 60, // 单位 s
53
     raiseIdRecord:'',
53
     raiseIdRecord:'',
54
   }
54
   }
168
         {
168
         {
169
           raiseCart.map(item => (
169
           raiseCart.map(item => (
170
             <View key={item.houseId} >
170
             <View key={item.houseId} >
171
-              <RaiseCard type="raiseMoney" summary={item} onCancel={this.handleCancel} disableCancel={disabled} />
171
+              <RaiseCard type="raiseMoney" style="height:auto" summary={item} onCancel={this.handleCancel} disableCancel={disabled} />
172
             </View>
172
             </View>
173
           ))
173
           ))
174
         }
174
         }

+ 3
- 3
src/onlineSelling/pages/records/index.js 查看文件

13
 import './index.scss'
13
 import './index.scss'
14
 import * as houseActions from '@/actions/house'
14
 import * as houseActions from '@/actions/house'
15
 
15
 
16
-function noop(){}
16
+function noop() { }
17
 
17
 
18
 @connect(
18
 @connect(
19
   ({ user, city, house }) => ({ ...user, ...city, house }),
19
   ({ user, city, house }) => ({ ...user, ...city, house }),
57
   componentDidShow() {
57
   componentDidShow() {
58
     ready.queue(() => {
58
     ready.queue(() => {
59
 
59
 
60
-      const { id: salesBatchId } = this.$router.params
60
+      const { id: salesBatchId = '' } = this.$router.params
61
       const { userInfo: { person: { personId } }, house } = this.props
61
       const { userInfo: { person: { personId } }, house } = this.props
62
       const params = {
62
       const params = {
63
         personId,
63
         personId,
197
               {
197
               {
198
                 raiseList.map(item => (
198
                 raiseList.map(item => (
199
                   <View key={item.raiseRecordId} >
199
                   <View key={item.raiseRecordId} >
200
-                    <RaiseCard handleCard={()=>this.toRaiseProfile(item.raiseRecordId)} summary={item} />
200
+                    <RaiseCard handleCard={() => this.toRaiseProfile(item.raiseRecordId)} summary={item} />
201
                   </View>
201
                   </View>
202
                 )
202
                 )
203
                 )
203
                 )