mobile / YH_RNComponent · Commits

Go to a project

Authored by 王钱钧
Commit 9c1c4b75f4a5093993d5c6161ffe2bc37bcb4627 2 parents d2b43ed1 a9d01698

Merge branch 'develop' of http://git.yoho.cn/mobile/YH_RNComponent into develop

Inline Side-by-side
Showing 4 changed files with 12 additions and 8 deletions
... ... @@ -73,11 +73,13 @@ export default class Home extends React.Component {
hot: ImmutablePropTypes.contains({
postId: React.PropTypes.number,
avatar: React.PropTypes.string,
title: React.PropTypes.string,
content: React.PropTypes.string.isRequired,
}),
new: ImmutablePropTypes.contains({
postId: React.PropTypes.number,
avatar: React.PropTypes.string,
title: React.PropTypes.string,
content: React.PropTypes.string.isRequired,
}),
num: ImmutablePropTypes.contains({
... ...
... ... @@ -43,10 +43,12 @@ SectionView.propTypes = {
}),
hot: React.PropTypes.shape({
avatar: React.PropTypes.string,
title: React.PropTypes.string,
content: React.PropTypes.string.isRequired,
}),
new: React.PropTypes.shape({
avatar: React.PropTypes.string,
title: React.PropTypes.string,
content: React.PropTypes.string.isRequired,
}),
num: React.PropTypes.shape({
... ...
... ... @@ -92,19 +92,19 @@ let styles = StyleSheet.create({
},
topLine: {
position: 'absolute',
left: 15,
left: 0,
top: 0,
width: lineWidth,
width: width,
height: 0.5,
backgroundColor: '#a0a0a0',
backgroundColor: '#f2f2f2',
},
bottomLine: {
position: 'absolute',
left: 15,
left:0,
bottom: 0,
width: lineWidth,
width: width,
height: 0.5,
backgroundColor: '#a0a0a0',
backgroundColor: '#f2f2f2',
},
leftLikeContainer: {
flex: 1,
... ...
... ... @@ -247,14 +247,14 @@ function parseBNS(json) {
content: hotPost && hotPost.contentData ? hotPost.contentData : '',
hasImg: hotPost && hotPost.hasImgFlg ? hotPost.hasImgFlg : '',
postId: hotPost && hotPost.postId ? hotPost.postId : 0,
postTitle: hotPost && hotPost.postsTitle ? hotPost.postsTitle : '',
title: hotPost && hotPost.postsTitle ? hotPost.postsTitle : '',
},
new: {
avatar: newAvatar,
content: newPost && newPost.contentData ? newPost.contentData : '',
hasImg: newPost && newPost.hasImgFlg ? newPost.hasImgFlg : '',
postId: newPost && newPost.postId ? newPost.postId : 0,
postTitle: newPost && newPost.postsTitle ? newPost.postsTitle : '',
title: newPost && newPost.postsTitle ? newPost.postsTitle : '',
},
num: {
onedayAddNum: item.oneDayAddNum,
... ...