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

src/onlineSelling/pages/houseList/index.js

@@ -502,7 +502,7 @@ export default class HouseList extends Component {
                 <View className='construction__area'>
                   <Text>{apartmentItem.buildingArea ? '建筑面积约' + apartmentItem.buildingArea + 'm²' : '建筑面积待定'}</Text>
                   {
-                    apartmentItem.area2 ? <Text>使用面积约{apartmentItem.area2}m²</Text> : <Text>使用面积待定</Text>
+                    apartmentItem.insideArea ? <Text>使用面积约{apartmentItem.insideArea}m²</Text> : <Text>使用面积待定</Text>
                   }
                 </View>
               </View>

src/onlineSelling/pages/houseList/index.scss

@@ -186,7 +186,6 @@
         height: 80px;
         display: flex;
         flex-direction: column;
-        font-size: 28px;
         text-align: left;
 
       }

src/onlineSelling/pages/records/index.js

@@ -21,7 +21,7 @@ export default class Records extends Component {
   }
   componentWillMount() {
     ready.queue(() => {
-  
+
       const { userInfo: { person: { personId } } } = this.props
       const params = {
         personId,
@@ -29,12 +29,12 @@ export default class Records extends Component {
         pageSize: 999,
       }
       queryPreselectionRecord(params).then(res => {
+        const list = res.records
         this.setState({
-          recordList: res.records || []
+          recordList: list.filter(item => item.status == '1') || []
         })
       })
     })
-
   }
   toHouseDetail(item) {
     if (item.housingStatus == '0' || item.saleBatchStatus == '0') {
@@ -44,7 +44,6 @@ export default class Records extends Component {
         url: `/onlineSelling/pages/detail/index?id=${item.houseId}`
       })
     }
-
   }
 
   render() {

src/pages/activity/detail/poster.js

@@ -105,7 +105,7 @@ export default class Index extends Component {
         color: '#999',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 50,
+        width: 450,
         zIndex: 11
       },
       // {

src/pages/card/index.js

@@ -620,7 +620,7 @@ export default class Index extends Component {
 
               {buildingId && (
                 <View className="pro__info">
-                  <View className='project__title'>{person.personId != cardInfo.id?'为您推荐':'项目信息'}</View>
+                  <View className='project__title'>{isSelf?'项目信息':'为您推荐'}</View>
                   <ProjectItem data={projectDetail} onClick={this.toProjectDetail.bind(this)} />
                 </View>
               )}

src/pages/card/poster.js

@@ -113,7 +113,7 @@ export default class Index extends Component {
         color: '#999',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 50,
+        width: 450,
         zIndex: 100
       },
       // {

src/pages/news/detail/poster.js

@@ -105,7 +105,7 @@ export default class Index extends Component {
         color: '#999',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 50,
+        width: 450,
         zIndex: 11
       },
       // {

src/pages/person/myShare/index.js

@@ -122,12 +122,12 @@ export default class Person extends Taro.Component {
                 {item.eventType == 'project' && <View className="price"> {item.price || '暂无均价'} </View>}
 
                 {item.eventType == 'h5' && <View className="num"> {item.drainageShareNum || '0'}人查看了分享 </View>}
+                {item.eventType == 'house' && <View className="num"> {item.houseShareNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'project' && <View className="num"> {item.buildingNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'group' && <View className="num"> {item.groupActivityShareNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'help' && <View className="num"> {item.helpActivityShareNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'activity' && <View className="num"> {item.activityShareNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'news' && <View className="num"> {item.newsNum || '0'}人查看了分享 </View>}
-
                 {item.eventType == 'project' && <View className="address"> {item.address || ''} </View>}
               </View>
             ))

src/pages/project/detail/poster.js

@@ -132,7 +132,7 @@ export default class Index extends Component {
         color: '#999',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 50,
+        width: 450,
         zIndex: 11
       },
       // {