Authored by 张文文

ui fix

... ... @@ -27,11 +27,9 @@ export default class ContentFansListCell extends Component {
</TouchableOpacity>
<View style={styles.textView}>
<TouchableOpacity activeOpacity={1} onPress={()=> this.props.jumpToPersonalGrassPage && this.props.jumpToPersonalGrassPage(data)}>
<Text>
<Text style={styles.nicknameText}>{data.userName}</Text>
<Text style={styles.defaultReplyText} numberOfLines={1}> 关注了你</Text>
</Text>
<TouchableOpacity style={styles.toubleView} activeOpacity={1} onPress={()=> this.props.jumpToPersonalGrassPage && this.props.jumpToPersonalGrassPage(data)}>
<Text style={[styles.nicknameText, {maxWidth: width-220}]} numberOfLines={1}>{data.userName}</Text>
<Text style={styles.defaultReplyText}>关注了你</Text>
</TouchableOpacity>
<Text style={styles.startTimeText}>{data.createTime}</Text>
</View>
... ... @@ -70,6 +68,12 @@ let styles = StyleSheet.create({
alignItems: 'flex-start',
marginTop: 15,
marginBottom: 20,
width: width - 160,
},
toubleView: {
flexDirection: 'row',
overflow:'hidden',
width: width - 160,
},
startTimeText: {
fontFamily: 'PingFang-SC-Regular',
... ... @@ -81,7 +85,12 @@ let styles = StyleSheet.create({
fontSize: 14,
fontFamily: 'PingFang-SC-Medium',
color: 'black',
fontWeight: 'bold'
fontWeight: 'bold',
},
defaultReplyText :{
fontSize: 14,
fontFamily: 'PingFang-SC-Medium',
color: '#b0b0b0',
},
fanContainer: {
position: 'absolute',
... ...
... ... @@ -10,6 +10,7 @@ import LoadMoreIndicator from '../../../common/components/LoadMoreIndicator';
import ContentMessageTabView from "./ContentMessageTabView";
import ContentMessageCell from "./ContentMessageCell";
import ContentEmptyView from './ContentEmptyView'
import Prompt from '../../../common/components/Prompt';
export default class ContentMessageView extends Component {
... ... @@ -81,10 +82,17 @@ export default class ContentMessageView extends Component {
}
render() {
let commentList = this.props.commentList;
let isPullToRefresh = this.props.isPullToRefresh;
let tipMessage = this.props.tipMessage;
let {commentList, isPullToRefresh, shouldShowEmpty, tipMessage} = this.props;
if (shouldShowEmpty) {
return (
<View style={styles.container}>
<ContentEmptyView
listId={4}
/>
</View>
);
}
return (
<View style={styles.container}>
... ...
... ... @@ -24,6 +24,7 @@ function mapStateToProps(state) {
tabButtons: state.content.contentType.get('list').toJS(),
commentList: state.content.commentList.get('list').toJS(),
isPullToRefresh: state.content.commentList.get('isPullToRefresh'),
shouldShowEmpty: state.content.commentList.get('shouldShowEmpty'),
contentTipFlag: state.content.contentTipFlag,
tipMessage: state.content.tipMessage,
communityHost: state.app.communityHost,
... ... @@ -170,7 +171,8 @@ class ContentMessageContainer extends Component {
tipMessage,
tabButtons,
commentList,
isPullToRefresh
isPullToRefresh,
shouldShowEmpty
} = this.props
return (
... ... @@ -184,6 +186,7 @@ class ContentMessageContainer extends Component {
commentList={commentList}
isPullToRefresh={isPullToRefresh}
tipMessage={tipMessage}
shouldShowEmpty={shouldShowEmpty}
onRefresh={this._onRefresh}
onEndReached={this._onEndReached}
onHiddenTipMessage={this._onHiddenTipMessage}
... ...