diff --git a/src/assets/a_web.png b/src/assets/a_web.png new file mode 100644 index 0000000..5a80e05 Binary files /dev/null and b/src/assets/a_web.png differ diff --git a/src/components/Tab/style.less b/src/components/Tab/style.less index 0d4b7a1..7f6f0c7 100644 --- a/src/components/Tab/style.less +++ b/src/components/Tab/style.less @@ -15,7 +15,7 @@ justify-content: center; align-items: center; - font-size: 0.6rem; + font-size: 0.8rem; color: @hint-color; :global { diff --git a/src/config.ts b/src/config.ts index e9552c5..1a05106 100644 --- a/src/config.ts +++ b/src/config.ts @@ -11,6 +11,7 @@ export default { // baseURL: 'http://yapi.faronear.org/mock/20/v1', linkAndroid: 'https://fivhome.github.io/app/fiv.apk', linkIOS: 'https://fivapp.github.io', + linkWeb: 'https://fivapp.github.io', linkTelegram: 'https://t.me/fivhome', linkEmail: 'team-fiv@outlook.com', }; diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 6e34ac3..297ab62 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -65,6 +65,7 @@ export default { 'home.mine.status0': 'Pending', 'home.mine.status1': 'Mining', 'home.mine.status2': 'Exhausted', + 'home.mine.none': '还没有收益,快去获取矿晶吧', 'home.fund.total': 'Total', 'home.fund.totalVIC': 'VIC Balance: ', @@ -114,6 +115,7 @@ export default { 'draw.draw': 'Withdraw', 'draw.qrPrompt': 'Please install App to scan QR code', 'draw.qrError': 'Scanning QR code fails', + 'draw.coin': '请选择提币币种', 'draw.targetPrompt': 'Please input destination address', 'draw.amountLt': 'Withdrawal amount can\'t be less than 10000', 'draw.amountGt': 'Withdrawal amount exceeds your balance', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index d7132a8..ff0776c 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -65,6 +65,7 @@ export default { 'home.mine.status0': '等待确认', 'home.mine.status1': '正在挖矿', 'home.mine.status2': '已耗尽能源', + 'home.mine.none': '还没有收益,快去获取矿晶吧', 'home.fund.total': '总资金', 'home.fund.totalVIC': '当前VIC余额:', @@ -114,6 +115,7 @@ export default { 'draw.draw': '提币', 'draw.qrPrompt': '请安装 App 扫描二维码', 'draw.qrError': '扫描二维码错误', + 'draw.coin': '请选择提币币种', 'draw.targetPrompt': '请填写目标地址', 'draw.amountLt': '提币金额最低1000起', 'draw.amountGt': '提币金额超出余额', diff --git a/src/pages/about/index.tsx b/src/pages/about/index.tsx index afce216..f1e1646 100644 --- a/src/pages/about/index.tsx +++ b/src/pages/about/index.tsx @@ -13,17 +13,19 @@ import config from '@/config'; import logo from '@/assets/bg_login.png'; import pAndroid from '@/assets/a_android.png'; import pIOS from '@/assets/a_ios.png'; +import pWeb from '@/assets/a_web.png'; import pTelegram from '@/assets/a_telegram.png'; import styles from './style.less'; const AboutPage: React.FC = () => { 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);