This commit is contained in:
saplf
2019-09-08 13:03:43 +08:00
parent b004908af9
commit 5351afaae3
25 changed files with 263 additions and 14 deletions

View File

@@ -1,6 +1,6 @@
import React, { useEffect } from 'react';
import { connect, DispatchProp, routerRedux } from 'dva';
import { Spin, Icon } from 'antd';
import _ from 'lodash';
import { formatMessage } from 'umi-plugin-locale';
import FittedImage from 'react-fitted-image';
import { HomeCommunityModelState } from './model';
@@ -10,6 +10,7 @@ import List from '@/components/List';
import { dispatch } from '@/utils/utils';
import styles from './style.less';
import { displayPhone } from '@/utils/transform';
const CommunityPage: React.FC<HomeCommunityModelState & DispatchProp> = ({
dispatch,
@@ -79,10 +80,10 @@ const CommunityPage: React.FC<HomeCommunityModelState & DispatchProp> = ({
{it.avatar ? <FittedImage
src={it.avatar}
fit="cover"
/> : <div className="fake">{(it.nickname && it.nickname[0]) || 'F'}</div>}
/> : <div className="fake">{(it.nickname && it.nickname[0]) || _.last(it.phone) || 'F'}</div>}
</div>
<div className="line">
<span>{it.nickname || it.phone}</span>
<span>{it.nickname || displayPhone(it.phone)}</span>
<span className="time">{formatMessage({ id: 'home.community.time' })}{it.createdAt}</span>
</div>
</div>

View File

@@ -1,6 +1,7 @@
import React from 'react';
import FittedImage from 'react-fitted-image';
import { connect, DispatchProp, routerRedux } from 'dva';
import _ from 'lodash';
import { UserModelState } from '@/models/user';
import SettingItem from '@/components/SettingItem';
import logoAccount from '@/assets/p_account.png';
@@ -24,7 +25,7 @@ const ProfilePage: React.FC<UserModelState & DispatchProp> = ({
<div className="avatar">
{user.avatar ?
<FittedImage src={user.avatar} fit="cover" /> :
<span>{user.nickname ? user.nickname[0] : user.phone[0]}</span>
<span>{user.nickname ? user.nickname[0] : _.last(user.phone)}</span>
}
</div>
<span className="name">{user.nickname || user.phone}</span>