diff --git a/src/pages/fundpwd/model.ts b/src/pages/fundpwd/model.ts index a413c1c..dd13d49 100644 --- a/src/pages/fundpwd/model.ts +++ b/src/pages/fundpwd/model.ts @@ -68,7 +68,7 @@ const model: Model = { if (confirm !== newPwd) return message.warn(formatMessage({ id: 'check.msgConfirm' })); yield put({ type: 'onUpdateState', submitting: true }); try { - yield call(changeFundPwd, newPwd, originVisible ? undefined : origin); + yield call(changeFundPwd, newPwd, originVisible ? origin : undefined); yield put(routerRedux.goBack()); message.success(formatMessage({ id: 'fundpwd.success' })); } catch (e) { diff --git a/src/pages/home/market/index.tsx b/src/pages/home/market/index.tsx index 18be6c1..1795ac1 100644 --- a/src/pages/home/market/index.tsx +++ b/src/pages/home/market/index.tsx @@ -43,7 +43,7 @@ const CommunityPage: React.FC = ({
{formatMessage({ id: 'home.community.total' })} - +{info ? info.rewardAll : 0} USDT + +{info ? info.reward : 0} USDT
@@ -51,14 +51,14 @@ const CommunityPage: React.FC = ({ {formatMessage({ id: 'home.community.totalInvited', }, { - num: info ? info.followerNumber : 0, + num: info ? info.follower : 0, })} {formatMessage({ id: 'home.community.totalAll', }, { - num: info ? info.communeNumber : 0, + num: info ? info.groupScale : 0, })}
diff --git a/src/pages/home/market/service.ts b/src/pages/home/market/service.ts index dc73f33..8aab9b2 100644 --- a/src/pages/home/market/service.ts +++ b/src/pages/home/market/service.ts @@ -6,7 +6,7 @@ export async function getCommunityBasic(): Promise { ok, data, msg, - } = await http.get('/commune/basic'); + } = await http.get('/community/basic'); if (ok && data) { return data; } @@ -18,7 +18,7 @@ export async function getCommunityList(pageIndex: number, pageSize: number): Pro ok, data, msg, - } = await http.get('/commune/list', { + } = await http.get('/community/list', { pageIndex, pageSize, }); diff --git a/src/pages/invite/index.tsx b/src/pages/invite/index.tsx index 04e5da7..7a41beb 100644 --- a/src/pages/invite/index.tsx +++ b/src/pages/invite/index.tsx @@ -15,6 +15,7 @@ import Header from '@/components/Header'; import styles from './style.less'; import { UserModelState } from '@/models/user'; import { generateInviteHref } from './service'; +import { isApp, share } from '@/utils/h5plus'; const InvitePage: React.FC = ({ dispatch, @@ -59,9 +60,14 @@ const InvitePage: React.FC = (
- + {isApp() && ( + + )}
diff --git a/src/types/common.ts b/src/types/common.ts index e59f4ab..780e7cb 100644 --- a/src/types/common.ts +++ b/src/types/common.ts @@ -232,17 +232,17 @@ export interface CommunityBasic { /** * 累计奖励总额的数字 */ - rewardAll: string; + reward: string; /** * 直接邀请人数 */ - followerNumber: string; + follower: string; /** * 社区总人数 */ - communeNumber: string; + groupScale: string; } export interface Inviter { diff --git a/src/types/global.d.ts b/src/types/global.d.ts index 2719eed..3c32276 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -362,7 +362,7 @@ interface ShareWrapper { /** * 使用系统组件发送分享 */ - sendWithSystem: (message: ShareMessage, successCB: () => any, errorCB: (err: DOMException) => any) => any; + sendWithSystem: (message: ShareMessage, successCB: () => any, errorCB?: (err: DOMException) => any) => any; } type AppKeyType = diff --git a/src/utils/h5plus.ts b/src/utils/h5plus.ts index accc895..91d5317 100644 --- a/src/utils/h5plus.ts +++ b/src/utils/h5plus.ts @@ -28,7 +28,7 @@ const scan = () => { webview.currentWebview().append(bc); bc.start(); }); -} +}; const firstPaths = [ '/check', @@ -53,17 +53,26 @@ const backButtonHandler = () => { const init = () => { if (!isApp()) return; plus.key.addEventListener('backbutton', backButtonHandler); -} +}; const destory = () => { if (!isApp()) return; plus.key.removeEventListener('backbutton', backButtonHandler); -} +}; + +const share = (content: string) => { + if (!isApp()) return; + plus.share.sendWithSystem({ + type: 'text', + content, + }, () => { }); +}; export { init, isApp, scan, + share, destory, }; @@ -71,5 +80,6 @@ export default { init, isApp, scan, + share, destory, };