Merge branch 'master' of http://gogs.efunbox.cn/Rorschach/efunbox-mobile-8

pages/components/Comment.js

@@ -86,10 +86,14 @@ export default class Comment extends Component {
       <View style={[ styles.padding ]} key={ index }>
         <View style={[ styles.title ]}>
           <View style={[ styles.center ]}>
-              <Image style={[styles.headImg ]}></Image>
+              <Image
+              source={item.user ? {
+                uri: item.user.avatar
+              } : require('../images/userInfo/default_photo.png')}               
+               style={[styles.headImg ]}></Image>
               <View>
-                <Text style={{ fontSize: 16, color: '#373737' }}>{item.posts.columnNames}</Text>
-                <Text style={{ fontSize: 14, color: '#7F7F7F' } }>2019-07-05</Text>
+                <Text style={{ fontSize: 16, color: '#373737' }}>{item.user ? item.user.nickName : '游客'}</Text>
+                <Text style={{ fontSize: 14, color: '#7F7F7F' } }>{ new Date(item.posts.gmtCreated).toLocaleDateString() }</Text>
               </View>
           </View>
           <TouchableOpacity onPress={() => this.comments(item.posts.id)}>
@@ -113,7 +117,7 @@ export default class Comment extends Component {
   repliesList (items, indexs) {
     return (
       <View style={[ styles.padding, styles.column ]}  key={ indexs }>
-        <Text style={ styles.color }>卡通小熊</Text>
+        <Text style={ styles.color }>{items.user ? items.user.nickName : '游客'}</Text>
         <Text>{ items.content }</Text>
       </View>
     )