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 { @@ -73,11 +73,13 @@ export default class Home extends React.Component {
73 hot: ImmutablePropTypes.contains({ 73 hot: ImmutablePropTypes.contains({
74 postId: React.PropTypes.number, 74 postId: React.PropTypes.number,
75 avatar: React.PropTypes.string, 75 avatar: React.PropTypes.string,
  76 + title: React.PropTypes.string,
76 content: React.PropTypes.string.isRequired, 77 content: React.PropTypes.string.isRequired,
77 }), 78 }),
78 new: ImmutablePropTypes.contains({ 79 new: ImmutablePropTypes.contains({
79 postId: React.PropTypes.number, 80 postId: React.PropTypes.number,
80 avatar: React.PropTypes.string, 81 avatar: React.PropTypes.string,
  82 + title: React.PropTypes.string,
81 content: React.PropTypes.string.isRequired, 83 content: React.PropTypes.string.isRequired,
82 }), 84 }),
83 num: ImmutablePropTypes.contains({ 85 num: ImmutablePropTypes.contains({
@@ -43,10 +43,12 @@ SectionView.propTypes = { @@ -43,10 +43,12 @@ SectionView.propTypes = {
43 }), 43 }),
44 hot: React.PropTypes.shape({ 44 hot: React.PropTypes.shape({
45 avatar: React.PropTypes.string, 45 avatar: React.PropTypes.string,
  46 + title: React.PropTypes.string,
46 content: React.PropTypes.string.isRequired, 47 content: React.PropTypes.string.isRequired,
47 }), 48 }),
48 new: React.PropTypes.shape({ 49 new: React.PropTypes.shape({
49 avatar: React.PropTypes.string, 50 avatar: React.PropTypes.string,
  51 + title: React.PropTypes.string,
50 content: React.PropTypes.string.isRequired, 52 content: React.PropTypes.string.isRequired,
51 }), 53 }),
52 num: React.PropTypes.shape({ 54 num: React.PropTypes.shape({
@@ -92,19 +92,19 @@ let styles = StyleSheet.create({ @@ -92,19 +92,19 @@ let styles = StyleSheet.create({
92 }, 92 },
93 topLine: { 93 topLine: {
94 position: 'absolute', 94 position: 'absolute',
95 - left: 15, 95 + left: 0,
96 top: 0, 96 top: 0,
97 - width: lineWidth, 97 + width: width,
98 height: 0.5, 98 height: 0.5,
99 - backgroundColor: '#a0a0a0', 99 + backgroundColor: '#f2f2f2',
100 }, 100 },
101 bottomLine: { 101 bottomLine: {
102 position: 'absolute', 102 position: 'absolute',
103 - left: 15, 103 + left:0,
104 bottom: 0, 104 bottom: 0,
105 - width: lineWidth, 105 + width: width,
106 height: 0.5, 106 height: 0.5,
107 - backgroundColor: '#a0a0a0', 107 + backgroundColor: '#f2f2f2',
108 }, 108 },
109 leftLikeContainer: { 109 leftLikeContainer: {
110 flex: 1, 110 flex: 1,
@@ -247,14 +247,14 @@ function parseBNS(json) { @@ -247,14 +247,14 @@ function parseBNS(json) {
247 content: hotPost && hotPost.contentData ? hotPost.contentData : '', 247 content: hotPost && hotPost.contentData ? hotPost.contentData : '',
248 hasImg: hotPost && hotPost.hasImgFlg ? hotPost.hasImgFlg : '', 248 hasImg: hotPost && hotPost.hasImgFlg ? hotPost.hasImgFlg : '',
249 postId: hotPost && hotPost.postId ? hotPost.postId : 0, 249 postId: hotPost && hotPost.postId ? hotPost.postId : 0,
250 - postTitle: hotPost && hotPost.postsTitle ? hotPost.postsTitle : '', 250 + title: hotPost && hotPost.postsTitle ? hotPost.postsTitle : '',
251 }, 251 },
252 new: { 252 new: {
253 avatar: newAvatar, 253 avatar: newAvatar,
254 content: newPost && newPost.contentData ? newPost.contentData : '', 254 content: newPost && newPost.contentData ? newPost.contentData : '',
255 hasImg: newPost && newPost.hasImgFlg ? newPost.hasImgFlg : '', 255 hasImg: newPost && newPost.hasImgFlg ? newPost.hasImgFlg : '',
256 postId: newPost && newPost.postId ? newPost.postId : 0, 256 postId: newPost && newPost.postId ? newPost.postId : 0,
257 - postTitle: newPost && newPost.postsTitle ? newPost.postsTitle : '', 257 + title: newPost && newPost.postsTitle ? newPost.postsTitle : '',
258 }, 258 },
259 num: { 259 num: {
260 onedayAddNum: item.oneDayAddNum, 260 onedayAddNum: item.oneDayAddNum,