diff --git a/h5pack/manifest.json b/h5pack/manifest.json index f44c7ff..b5ecf14 100644 --- a/h5pack/manifest.json +++ b/h5pack/manifest.json @@ -111,7 +111,7 @@ "frameworks" : [] /*调用Native.js调用原生Objective-c API需要引用的FrameWork,如需调用GameCenter,则添加"GameKit.framework"*/ }, "google" : { - "packagename" : "org.tacever.vic", /*Android应用包名,如io.dcloud.HelloH5*/ + "packagename" : "net.yuanjin.vic", /*Android应用包名,如io.dcloud.HelloH5*/ "keystore" : "unpackage/key/vic.keystore", /*Android应用打包使用的密钥库文件*/ "password" : "vic@2019", /*Android应用打包使用密钥库中证书的密码*/ "aliasname" : "vic", /*Android应用打包使用密钥库中证书的别名*/ diff --git a/src/assets/a_wechat.png b/src/assets/a_wechat.png new file mode 100644 index 0000000..5508d55 Binary files /dev/null and b/src/assets/a_wechat.png differ diff --git a/src/assets/bg_login.png b/src/assets/bg_login.png index 8e6e780..eeab925 100644 Binary files a/src/assets/bg_login.png and b/src/assets/bg_login.png differ diff --git a/src/config.ts b/src/config.ts index 2009823..7607527 100644 --- a/src/config.ts +++ b/src/config.ts @@ -13,5 +13,6 @@ export default { linkIOS: 'https://vic.yuanjin.net/webapp', linkWeb: 'https://vic.yuanjin.net/webapp', linkTelegram: 'https://t.me/vichome', + linkWechat: 'vichome', linkEmail: 'team-vic@outlook.com', }; diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 769c832..37cb375 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1,9 +1,9 @@ export default { - 'app.name': 'The 5th Dimension', + 'app.name': 'VIC', 'app.error': 'Loading failed, click to reload', 'index.start': 'Splash Screen', - 'index.start1': 'Cryptocurrencies', - 'index.start2': 'Wealth Management Platform', + 'index.start1': 'Activating Value of Individual', + 'index.start2': 'Initial Mining Offering', 'network.error': 'Network error', 'common.phoneHolder': 'Phone number', @@ -111,7 +111,7 @@ export default { 'draw.avaliable': 'Available balance:{num} {coin}', 'draw.fee': 'Transfer fee {num} {coin}', 'draw.actual': 'Estimated amount of arrival {num} {coin}', - 'draw.drawHint': 'at least 1000 VIC, or once per week for USDT', + 'draw.drawHint': 'at least 1000 to withdraw', 'draw.draw': 'Withdraw', 'draw.qrPrompt': 'Please install App to scan QR code', 'draw.qrError': 'Scanning QR code fails', @@ -158,7 +158,7 @@ export default { 'profile.identity': 'KYC', 'profile.share': 'Promotion', 'profile.msg': 'Message Center', - 'profile.about': 'About', + 'profile.about': 'About VIC', 'account.title': 'My Account', 'account.nickname': 'Nickname', @@ -175,12 +175,12 @@ export default { 'system.currency': 'Currency', 'system.chooseLang': 'Choose Language', - 'about.title': 'About FIV', - 'about.desc': 'Cryptocurrencies Wealth Management Platform', + 'about.title': 'About VIC', + 'about.desc': 'Activating Value of Individual', 'about.appTitle': 'Download APP', - 'about.appDesc': '(Click to get app link)', - 'about.comTitle': 'Join in Community', - 'about.comDesc': '(Click to get community link)', + 'about.appDesc': '', + 'about.comTitle': 'Join Community', + 'about.comDesc': '', 'about.contact': 'Contact Us', - 'about.copyright': 'Copyright ©2019 FIV', + 'about.copyright': 'Copyright ©2019 VIC', } diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index b1a6cd7..098416a 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1,9 +1,9 @@ export default { - 'app.name': '五维星球', + 'app.name': 'Value of Invididual', 'app.error': '加载失败,点击重新加载', 'index.start': '启动页', - 'index.start1': '加密货币', - 'index.start2': '财富管理平台', + 'index.start1': '激活个性价值', + 'index.start2': '首次挖矿发行', 'network.error': '网络错误', 'common.phoneHolder': '请输入手机号', @@ -59,7 +59,7 @@ export default { 'home.mine.valid': '当前有效矿晶', 'home.mine.retrieve': '获取矿晶', 'home.mine.refresh': '刷新', - 'home.mine.validTime': '获赠日期:', + 'home.mine.validTime': '获得日期:', 'home.mine.invalidTime': '有效期至:', 'home.mine.status': '状态:', 'home.mine.status0': '等待确认', @@ -101,7 +101,7 @@ export default { 'mine.calc': '汇率计算器:', 'mine.mine': '矿晶', 'mine.addressTitle': '充值 {label} 到您的专属地址。扫描二维码或点击地址复制:', - 'mine.info': '充值到达目标账户后,请回到上一页矿场,点击刷新,平台查账确认后,您即可获赠矿晶。', + 'mine.info': '充值到达目标账户后,请回到上一页矿场点击刷新,平台查账确认后,您即可获得矿晶。', 'draw.title': '提币转账', 'draw.selection': '请选择提取币种', @@ -111,7 +111,7 @@ export default { 'draw.avaliable': '可用余额:{num} {coin}', 'draw.fee': '转账费用 {num} {coin}', 'draw.actual': '预计到账 {num} {coin}', - 'draw.drawHint': 'VIC最低1000起; USDT每周仅限一次', + 'draw.drawHint': '最低数额1000起', 'draw.draw': '提币', 'draw.qrPrompt': '请安装 App 以扫描二维码', 'draw.qrError': '扫描二维码错误', @@ -158,7 +158,7 @@ export default { 'profile.identity': '实名认证', 'profile.share': '社区推广', 'profile.msg': '消息中心', - 'profile.about': '关于五维星球', + 'profile.about': '关于 VIC', 'account.title': '我的账户', 'account.nickname': '昵称', @@ -175,12 +175,12 @@ export default { 'system.currency': '法币偏好', 'system.chooseLang': '请选择语言', - 'about.title': '关于五维星球', - 'about.desc': '加密货币财富管理平台', + 'about.title': '关于 VIC', + 'about.desc': '激活个性价值,首次挖矿发行', 'about.appTitle': '下载 APP', - 'about.appDesc': '(点击相应图标获取 APP 下载地址)', + 'about.appDesc': '', 'about.comTitle': '加入社区', - 'about.comDesc': '(点击相应图标获取社区地址)', + 'about.comDesc': '', 'about.contact': '联系我们', - 'about.copyright': 'Copyright ©2019 五维星球', + 'about.copyright': 'Copyright ©2019 VIC', } diff --git a/src/pages/about/index.tsx b/src/pages/about/index.tsx index f1e1646..3e9c166 100644 --- a/src/pages/about/index.tsx +++ b/src/pages/about/index.tsx @@ -15,6 +15,7 @@ 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 pWechat from '@/assets/a_wechat.png'; import styles from './style.less'; @@ -95,28 +96,38 @@ const AboutPage: React.FC = () => { )} - {config.linkTelegram && ( + {(config.linkTelegram || config.linkWechat) && (
{formatMessage({ id: 'about.comTitle' })} {formatMessage({ id: 'about.comDesc' })}
-
{ - setInfo(config.linkTelegram); - setTitle('Telegram'); - }} - > -
- Telegram -
+ {config.linkAndroid && ( +
{ + setInfo(config.linkTelegram); + setTitle('Telegram'); + }} + > +
+ Telegram +
+ )} + {config.linkWechat && ( +
{ + setInfo(config.linkWechat); + setTitle('Web'); + }} + > +
+ Wechat +
+ )}
)} -
- {formatMessage({ id: 'about.contact' })} - {config.linkEmail} -
{formatMessage({ id: 'about.copyright' })}
@@ -126,4 +137,9 @@ const AboutPage: React.FC = () => { ); } +//
+// {formatMessage({ id: 'about.contact' })} +// {config.linkEmail} +//
+ export default AboutPage; diff --git a/src/pages/home/estate/index.tsx b/src/pages/home/estate/index.tsx index 670e4fe..5e981be 100644 --- a/src/pages/home/estate/index.tsx +++ b/src/pages/home/estate/index.tsx @@ -36,7 +36,7 @@ const MinePage: React.FC = ({ {formatMessage({ id: 'home.mine.valid' })} {info ? info.activeFund : 0} - KG + [VIC]
@@ -64,7 +64,7 @@ const MinePage: React.FC = ({
{formatMessage({ id: 'home.mine.validTime' })}{displayTime(it.createdAt)}
-
+{it.amount} KG
+
+{it.amount} [VIC]
diff --git a/src/pages/home/fund/index.tsx b/src/pages/home/fund/index.tsx index f0bbf2a..e21c9eb 100644 --- a/src/pages/home/fund/index.tsx +++ b/src/pages/home/fund/index.tsx @@ -45,10 +45,10 @@ const FundPage: React.FC = ({ {formatMessage({ id: 'home.fund.total' })} - {info ? (info.vic || 0) : 0} VIC + {info ? (info.vic || 0) : 0} VIC(可提取) - {info ? (info.usdt || 0) : 0} USDT + {info ? (info.usdt || 0) : 0} VIC(总量)
diff --git a/src/pages/home/market/index.tsx b/src/pages/home/market/index.tsx index 726cc0e..49ac599 100644 --- a/src/pages/home/market/index.tsx +++ b/src/pages/home/market/index.tsx @@ -45,7 +45,7 @@ const CommunityPage: React.FC = ({
{formatMessage({ id: 'home.community.total' })} - +{info ? info.reward : 0} USDT + +{info ? info.reward : 0} VIC
diff --git a/tslint.yml b/tslint.yml index d1ac5c4..c9e8737 100644 --- a/tslint.yml +++ b/tslint.yml @@ -12,3 +12,5 @@ rules: jsx-no-lambda: false jsx-no-multiline-js: false jsx-alignment: false + jsx-wrap-multiline: false + \ No newline at end of file