This commit is contained in:
saplf
2019-09-08 23:35:10 +08:00
parent 7fae21f7ca
commit 51fdb7cc24
6 changed files with 20 additions and 8 deletions

View File

@@ -7,6 +7,7 @@ import { MineStatus, Mine } from '@/types/common';
import { dispatch } from '@/utils/utils';
import styles from './style.less';
import { displayTime } from '@/utils/transform';
const MinePage: React.FC<HomeMineModelState & DispatchProp> = ({
dispatch,
@@ -62,7 +63,7 @@ const MinePage: React.FC<HomeMineModelState & DispatchProp> = ({
const renderItem = (it: Mine) => (
<div className={styles.item} key={it.id}>
<div className="line">
<div>{formatMessage({ id: 'home.mine.validTime' })}{it.createdAt}</div>
<div>{formatMessage({ id: 'home.mine.validTime' })}{displayTime(it.createdAt)}</div>
<div className="amount">+{it.amount} KG</div>
</div>
<div className="line">
@@ -70,7 +71,7 @@ const MinePage: React.FC<HomeMineModelState & DispatchProp> = ({
{formatMessage({ id: 'home.mine.status' })}
{formatMessage({ id: `home.mine.status${it.status}` })}
</div>
<div className="small">{formatMessage({ id: 'home.mine.invalidTime' })}{it.expiresAt}</div>
<div className="small">{formatMessage({ id: 'home.mine.invalidTime' })}{displayTime(it.expiresAt)}</div>
</div>
</div>
);

View File

@@ -9,6 +9,7 @@ import List from '@/components/List';
import styles from './style.less';
import { isApp } from '@/utils/h5plus';
import { displayTime } from '@/utils/transform';
const FundPage: React.FC<HomeFundModelState & DispatchProp> = ({
dispatch,
@@ -67,14 +68,14 @@ const FundPage: React.FC<HomeFundModelState & DispatchProp> = ({
<div>{formatMessage({ id: `home.fund.type${it.type}` })}</div>
<div className={`amount ${it.op === JournalOp.Income ? 'active' : ''}`}>
{it.op === JournalOp.Income ? '+' : '-'}{it.amount}&nbsp;
{it.coinType.toUpperCase()}
{(it.tokenType || '').toUpperCase()}
</div>
</div>
<div className="line">
<div className="detail">
{it.detail}
</div>
<div className="small">{it.createdAt}</div>
<div className="small">{displayTime(it.createdAt)}</div>
</div>
</div>
);

View File

@@ -10,7 +10,7 @@ import List from '@/components/List';
import { dispatch } from '@/utils/utils';
import styles from './style.less';
import { displayPhone } from '@/utils/transform';
import { displayPhone, displayTime } from '@/utils/transform';
import { isApp } from '@/utils/h5plus';
const CommunityPage: React.FC<HomeCommunityModelState & DispatchProp> = ({
@@ -85,7 +85,7 @@ const CommunityPage: React.FC<HomeCommunityModelState & DispatchProp> = ({
</div>
<div className="line">
<span>{it.nickname || displayPhone(it.phone)}</span>
<span className="time">{formatMessage({ id: 'home.community.time' })}{it.createdAt}</span>
<span className="time">{formatMessage({ id: 'home.community.time' })}{displayTime(it.createdAt)}</span>
</div>
</div>
);

View File

@@ -222,7 +222,7 @@ export interface Journal {
amount: string;
coinType: string;
tokenType: string;
op: JournalOp;

View File

@@ -2,6 +2,7 @@ import BigNumber from 'bignumber.js';
import _ from 'lodash';
import md5 from 'md5';
import { AreaCode, Estate } from '@/types/common';
import moment, { Moment } from 'moment';
export function encodePhone(code: AreaCode, phone: string): string {
if (code && code.areacode) return `+${code.areacode}-${phone || ''}`;
@@ -50,3 +51,7 @@ export function encryptPwd(pwd: string): string {
export function displayPhone(phone: string): string {
return `1******${_.takeRight(phone, 4).join('')}`;
}
export function displayTime(time: string | Moment): string {
return moment(time).format('YYYY-MM-DD HH:mm');
}