许静 5 years ago
parent
commit
0bc8ec4791

+ 2
- 2
src/pages/agent/client/index.scss View File

36
 
36
 
37
     .client__list {
37
     .client__list {
38
       width: 680px;
38
       width: 680px;
39
-      height:230px;
39
+      height:240px;
40
       margin:0 auto;
40
       margin:0 auto;
41
       position: relative;
41
       position: relative;
42
       border-top: none;
42
       border-top: none;
124
 
124
 
125
 .phone{
125
 .phone{
126
   line-height:50px;
126
   line-height:50px;
127
-  width: 480px;
127
+  width: 360px;
128
   @include text-ellipsis; 
128
   @include text-ellipsis; 
129
 
129
 
130
 }
130
 }

+ 6
- 2
src/pages/project/detail/index.js View File

530
 
530
 
531
   renderBuildingProjectTypeList() {
531
   renderBuildingProjectTypeList() {
532
     const { statusOpts } = this.state
532
     const { statusOpts } = this.state
533
-    const { projectDetail: { buildingProjectType = [], status } } = this.props
533
+    const { projectDetail: { buildingProjectType = [], status,marketStatus } } = this.props
534
     return (
534
     return (
535
       <Block>
535
       <Block>
536
         {
536
         {
545
                     <View className='type-intro__item' key={item.buildingId} style={`background: url(${buildBg}) no-repeat center;background-size: 100% 100%;`}>
545
                     <View className='type-intro__item' key={item.buildingId} style={`background: url(${buildBg}) no-repeat center;background-size: 100% 100%;`}>
546
 
546
 
547
                       <View >
547
                       <View >
548
-                        <Text className='type-status'>{statusOpts[status]}</Text>
548
+
549
+                        {marketStatus &&
550
+                          <Text className='item__status' className={marketStatus == '在售' ? 'item__status sale' : marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{marketStatus}</Text>
551
+                        }
552
+                        {/* <Text className='type-status'>{statusOpts[status]}</Text> */}
549
                         {/* <Icon className="iconfont icon-jinrongxianxingge-" onClick={this.handleToolsClick}></Icon> */}
553
                         {/* <Icon className="iconfont icon-jinrongxianxingge-" onClick={this.handleToolsClick}></Icon> */}
550
                         <View className='row' style="margin-top:0">
554
                         <View className='row' style="margin-top:0">
551
                           <Text className='row-label'>项目类型:</Text>
555
                           <Text className='row-label'>项目类型:</Text>

+ 13
- 4
src/pages/project/detail/index.scss View File

476
           bottom: 8%;
476
           bottom: 8%;
477
         }
477
         }
478
 
478
 
479
-        .type-status {
479
+        .item__status{
480
           position: absolute;
480
           position: absolute;
481
           right: 0;
481
           right: 0;
482
           top: 0%;
482
           top: 0%;
483
-          color: #fff;
484
-          background: #F6B61D;
485
-          padding: 10px 36px;
483
+          background:rgba(246,182,29,1);
486
           border-radius: 0 16px 0 14px;
484
           border-radius: 0 16px 0 14px;
485
+          padding: 10px 36px;
486
+          color: #fff;
487
           font-size: 26px;
487
           font-size: 26px;
488
         }
488
         }
489
+        .sale{
490
+          background:rgba(246,182,29,1);
491
+        }
492
+        .soldout{
493
+          background:rgba(0,0,0,0.7);
494
+        }
495
+        .waitsale{
496
+          background-color:$primary-color;
497
+        }
489
       }
498
       }
490
     }
499
     }
491
 
500
 

+ 2
- 1
src/pages/shop/index.js View File

66
 
66
 
67
 
67
 
68
     Taro.showLoading()
68
     Taro.showLoading()
69
+    let current = this.state.current
69
     const params = {
70
     const params = {
70
       pageNum: '1',
71
       pageNum: '1',
71
       pageSize: '9999',
72
       pageSize: '9999',
72
-      buildingId: this.state.goodsBuilding[0].buildingId,
73
+      buildingId:this.state.goodsBuilding[current].buildingId|| this.state.goodsBuilding[0].buildingId,
73
       cityId: this.props.curCity.id
74
       cityId: this.props.curCity.id
74
     }
75
     }
75
 
76