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

src/pages/card/index.js

@@ -472,7 +472,7 @@ export default class Index extends Component {
                 <View className='mycard__work'>
                   <View className='row mycard__work-department'>{cardInfo.department}<Text className='txt'>部门</Text></View>
                   <View className='row mycard__work-position'>{cardInfo.post}<Text className='txt'>职位</Text></View>
-                  <View className='row mycard__work-company'>{cardInfo.company}<Text className='txt'>楼盘</Text></View>
+                  <View className='row mycard__work-company'>{projectDetail.buildingName}<Text className='txt'>楼盘</Text></View>
                 </View>
 
                 {/* 人气 */}
@@ -549,4 +549,4 @@ export default class Index extends Component {
       </Block>
     )
   }
-}
+}

src/pages/project/floor/index.js

@@ -39,7 +39,7 @@ export default class Index extends Component {
           </View>
           <View className='item'>
             <Text className='txt left-txt'>销售状态</Text>
-            <Text className='txt right-txt'>{this.state.statusOpts[projectDetail.status - 1]}</Text>
+            <Text className='txt right-txt'>{projectDetail.marketStatus ? projectDetail.marketStatus :'待定'}</Text>
           </View>
           <View className='item'>
             <Text className='txt left-txt'>开盘日期</Text>
@@ -89,4 +89,4 @@ export default class Index extends Component {
       </View >
     );
   }
-}
+}