tabs

src/pages/agent/client/index.scss

@@ -36,7 +36,7 @@
 
     .client__list {
       width: 680px;
-      height:230px;
+      height:240px;
       margin:0 auto;
       position: relative;
       border-top: none;
@@ -124,7 +124,7 @@
 
 .phone{
   line-height:50px;
-  width: 480px;
+  width: 360px;
   @include text-ellipsis; 
 
 }

src/pages/project/detail/index.js

@@ -530,7 +530,7 @@ export default class Index extends Component {
 
   renderBuildingProjectTypeList() {
     const { statusOpts } = this.state
-    const { projectDetail: { buildingProjectType = [], status } } = this.props
+    const { projectDetail: { buildingProjectType = [], status,marketStatus } } = this.props
     return (
       <Block>
         {
@@ -545,7 +545,11 @@ export default class Index extends Component {
                     <View className='type-intro__item' key={item.buildingId} style={`background: url(${buildBg}) no-repeat center;background-size: 100% 100%;`}>
 
                       <View >
-                        <Text className='type-status'>{statusOpts[status]}</Text>
+
+                        {marketStatus &&
+                          <Text className='item__status' className={marketStatus == '在售' ? 'item__status sale' : marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{marketStatus}</Text>
+                        }
+                        {/* <Text className='type-status'>{statusOpts[status]}</Text> */}
                         {/* <Icon className="iconfont icon-jinrongxianxingge-" onClick={this.handleToolsClick}></Icon> */}
                         <View className='row' style="margin-top:0">
                           <Text className='row-label'>项目类型：</Text>

src/pages/project/detail/index.scss

@@ -476,16 +476,25 @@
           bottom: 8%;
         }
 
-        .type-status {
+        .item__status{
           position: absolute;
           right: 0;
           top: 0%;
-          color: #fff;
-          background: #F6B61D;
-          padding: 10px 36px;
+          background:rgba(246,182,29,1);
           border-radius: 0 16px 0 14px;
+          padding: 10px 36px;
+          color: #fff;
           font-size: 26px;
         }
+        .sale{
+          background:rgba(246,182,29,1);
+        }
+        .soldout{
+          background:rgba(0,0,0,0.7);
+        }
+        .waitsale{
+          background-color:$primary-color;
+        }
       }
     }
 

src/pages/shop/index.js

@@ -66,10 +66,11 @@ export default class Shop extends Component {
 
 
     Taro.showLoading()
+    let current = this.state.current
     const params = {
       pageNum: '1',
       pageSize: '9999',
-      buildingId: this.state.goodsBuilding[0].buildingId,
+      buildingId:this.state.goodsBuilding[current].buildingId|| this.state.goodsBuilding[0].buildingId,
       cityId: this.props.curCity.id
     }