From 9aa5d0d5bf7c7ef5ef168971f0d9235ef9bd0eea Mon Sep 17 00:00:00 2001 From: saplf Date: Sun, 8 Sep 2019 21:48:48 +0800 Subject: [PATCH] Bug fix --- src/assets/a_web.png | Bin 0 -> 11536 bytes src/components/Tab/style.less | 2 +- src/config.ts | 1 + src/locales/en-US.ts | 2 ++ src/locales/zh-CN.ts | 2 ++ src/pages/about/index.tsx | 58 ++++++++++++++++++++++++++------ src/pages/check/model.ts | 2 +- src/pages/draw/model.ts | 7 ++-- src/pages/home/estate/index.tsx | 25 +++++++++++--- src/pages/home/fund/index.tsx | 6 ++-- src/pages/home/model.ts | 12 +++---- src/pages/lgpwd/model.ts | 3 +- 12 files changed, 88 insertions(+), 32 deletions(-) create mode 100644 src/assets/a_web.png diff --git a/src/assets/a_web.png b/src/assets/a_web.png new file mode 100644 index 0000000000000000000000000000000000000000..5a80e05b17e06270c934a256f9a7f2f497c4e6d8 GIT binary patch literal 11536 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 trTtw*`)~EP|Am7t= { const [info, setInfo] = useState(''); + const [title, setTitle] = useState(''); const showInfo = ( setInfo('')} > @@ -49,19 +51,47 @@ const AboutPage: React.FC = () => { {formatMessage({ id: 'about.desc' })}
- {(config.linkAndroid || config.linkIOS) && ( + {(config.linkAndroid || config.linkIOS || config.linkWeb) && (
{formatMessage({ id: 'about.appTitle' })} {formatMessage({ id: 'about.appDesc' })}
- {config.linkAndroid &&
setInfo(config.linkAndroid)}> -
- Android -
} - {config.linkIOS &&
setInfo(config.linkIOS)}> -
- iOS -
} + {config.linkAndroid && ( +
{ + setInfo(config.linkAndroid); + setTitle('Android'); + }} + > +
+ Android +
+ )} + {config.linkIOS && ( +
{ + setInfo(config.linkIOS); + setTitle('iOS'); + }} + > +
+ iOS +
+ )} + {config.linkWeb && ( +
{ + setInfo(config.linkWeb); + setTitle('Web'); + }} + > +
+ Web +
+ )}
)} @@ -70,7 +100,13 @@ const AboutPage: React.FC = () => { {formatMessage({ id: 'about.comTitle' })} {formatMessage({ id: 'about.comDesc' })}
-
setInfo(config.linkTelegram)}> +
{ + setInfo(config.linkTelegram); + setTitle('Telegram'); + }} + >
Telegram
diff --git a/src/pages/check/model.ts b/src/pages/check/model.ts index 173b598..c7107e7 100644 --- a/src/pages/check/model.ts +++ b/src/pages/check/model.ts @@ -157,7 +157,7 @@ const model: Model = { if (!verifyCode) return message.warn(formatMessage({ id: 'check.msgCode' })); if (!validPwd(password)) return message.warn(formatMessage({ id: 'check.msgPwd' })); if (password !== pwdConfirm) return message.warn(formatMessage({ id: 'check.msgConfirm' })); - // if (!inviter) return message.warn(formatMessage({ id: 'check.msgInviter' })); + if (!inviter) return message.warn(formatMessage({ id: 'check.msgInviter' })); yield put({ type: 'onUpdateState', submitting: true }); try { diff --git a/src/pages/draw/model.ts b/src/pages/draw/model.ts index 06ed216..058ef65 100644 --- a/src/pages/draw/model.ts +++ b/src/pages/draw/model.ts @@ -113,17 +113,16 @@ const model: Model = { address, balance, } = (yield select((state: any) => state.draw)) as DrawModelState; - if (!coin || !balance) return; + if (!coin) return message.warn(formatMessage({ id: 'draw.coin' })); if (!address) return message.warn(formatMessage({ id: 'draw.targetPrompt' })); const inputAmount = new BigNumber(amount || 0); - if (inputAmount.lt(1000)) return message.warn(formatMessage({ id: 'draw.amountLt' })); - if (inputAmount.gt(balance)) return message.warn(formatMessage({ id: 'draw.amountGt' })); + if (inputAmount.gt(balance || 0)) return message.warn(formatMessage({ id: 'draw.amountGt' })); yield put({ type: 'onUpdateState', confirmVisible: true, confirmLoading: false, password: '', - }) + }); }, *draw(_, { put, select, call }) { diff --git a/src/pages/home/estate/index.tsx b/src/pages/home/estate/index.tsx index 85023ef..15525c7 100644 --- a/src/pages/home/estate/index.tsx +++ b/src/pages/home/estate/index.tsx @@ -75,6 +75,25 @@ const MinePage: React.FC = ({
); + let body; + if (data) { + if (data.length) { + body = data.map(renderItem); + } else { + body = ( +
+ {formatMessage({ id: 'home.mine.none' })} +
+ ); + } + } else { + body = ( +
+ {formatMessage({ id: errorList ? 'common.loadError' : 'common.loading' })} +
+ ); + } + return (
{renderBanner} @@ -87,11 +106,7 @@ const MinePage: React.FC = ({
- {!data ? ( -
- {formatMessage({ id: errorList ? 'common.loadError' : 'common.loading' })} -
- ) : data.map(renderItem)} + {body}
); diff --git a/src/pages/home/fund/index.tsx b/src/pages/home/fund/index.tsx index 0bc5363..73bd83b 100644 --- a/src/pages/home/fund/index.tsx +++ b/src/pages/home/fund/index.tsx @@ -43,18 +43,18 @@ const FundPage: React.FC = ({
{formatMessage({ id: 'home.fund.total' })} - {info ? info.sum : 0} + {info ? (info.sum || 0) : 0} VIC
{formatMessage({ id: 'home.fund.totalVIC' })} - +{info ? info.vic : 0} VIC + +{info ? (info.vic || 0) : 0} VIC {formatMessage({ id: 'home.fund.totalUSDT' })} - +{info ? info.usdt : 0} USDT + +{info ? (info.usdt || 0) : 0} USDT
diff --git a/src/pages/home/model.ts b/src/pages/home/model.ts index 4532a4d..c6ab887 100644 --- a/src/pages/home/model.ts +++ b/src/pages/home/model.ts @@ -30,18 +30,18 @@ const tabItems: TabItemModels = [ icon: estateIcon, iconSelected: estateIconS, }, - { - key: '/home/fund', - name: 'home.tabFund', - icon: fundIcon, - iconSelected: fundIconS, - }, { key: '/home/market', name: 'home.tabMarket', icon: marketIcon, iconSelected: marketIconS, }, + { + key: '/home/fund', + name: 'home.tabFund', + icon: fundIcon, + iconSelected: fundIconS, + }, { key: '/home/profile', name: 'home.tabProfile', diff --git a/src/pages/lgpwd/model.ts b/src/pages/lgpwd/model.ts index 0bbb4bb..8d2d7a2 100644 --- a/src/pages/lgpwd/model.ts +++ b/src/pages/lgpwd/model.ts @@ -44,12 +44,13 @@ const model: Model = { submitting, } = (yield select((state: any) => state.lgpwd)) as LgpwdModelState; if (submitting) return; + if (!origin) return message.warn(formatMessage({ id: 'lgpwd.originPrompt' })) if (!validPwd(newPwd)) return message.warn(formatMessage({ id: 'check.msgPwd' })); if (confirm !== newPwd) return message.warn(formatMessage({ id: 'check.msgConfirm' })); yield put({ type: 'onUpdateState', submitting: true }); try { yield call(changeLgpwd, newPwd, origin); - yield put(routerRedux.goBack()); + yield put({ type: 'user/logout' }); message.success(formatMessage({ id: 'lgpwd.success' })); } catch (e) { message.error(e.message);