diff --git a/src/components/anchor-list/index.tsx b/src/components/anchor-list/index.tsx
index d459f41..085beca 100644
--- a/src/components/anchor-list/index.tsx
+++ b/src/components/anchor-list/index.tsx
@@ -9,9 +9,13 @@ import AnchorCard from '@/components/anchor-card';
import ListPlaceholder from '@/components/list-placeholder';
import { EventName } from '@/constants/app';
import { AnchorSortType } from '@/constants/material';
+import useUserInfo from '@/hooks/use-user-info';
import { AnchorInfo, GetAnchorListRequest, IAnchorFilters } from '@/types/material';
import { logWithPrefix } from '@/utils/common';
import { requestAnchorList as requestData } from '@/utils/material';
+import { getAgreementSigned, isNeedPhone, setAgreementSigned } from '@/utils/user';
+
+import { AgreementPopup } from '../agreement-popup';
import './index.less';
@@ -55,6 +59,10 @@ function AnchorList(props: IAnchorListProps) {
const requestProps = useRef
({});
const prevRequestProps = useRef({});
const onListEmptyRef = useRef(onListEmpty);
+ const [open, setOpen] = useState(false);
+ const successCallback = useRef<() => void>(() => {});
+ const userInfo = useUserInfo();
+ const needPhone = isNeedPhone(userInfo);
const handleRefresh = useCallback(async () => {
log('start pull refresh');
@@ -120,6 +128,27 @@ function AnchorList(props: IAnchorListProps) {
[dataList]
);
+ const handleCancel = useCallback(() => {
+ setOpen(false);
+ setAgreementSigned(false);
+ }, []);
+
+ const handleConfirm = useCallback(() => {
+ setOpen(false);
+ setAgreementSigned(true);
+ //TODO 没手机号要授权一下; 必须要开弹窗才可以，与需求不符
+ successCallback.current();
+ }, []);
+
+ const validator = (onSuccess: () => void) => {
+ if (getAgreementSigned()) {
+ onSuccess();
+ } else {
+ successCallback.current = onSuccess;
+ setOpen(true);
+ }
+ };
+
useEffect(() => {
onListEmptyRef.current = onListEmpty;
}, [onListEmpty]);
@@ -183,26 +212,29 @@ function AnchorList(props: IAnchorListProps) {
}, [jobId, ready, filters, cityCode, sortType]);
return (
-
-
+
- {dataList.map(item => (
-
- ))}
-
-
-
+
+ {dataList.map(item => (
+
+ ))}
+
+
+
+
+
);
}
diff --git a/src/constants/cache-key.ts b/src/constants/cache-key.ts
index 3a0563c..3b82f17 100644
--- a/src/constants/cache-key.ts
+++ b/src/constants/cache-key.ts
@@ -10,4 +10,5 @@ export enum CacheKey {
LAST_SELECT_MY_JOB = '__last_select_my_job__',
CLOSE_PARTNER_BANNER = '__close_partner_banner__',
INVITE_CODE = '__invite_code__',
+ AGREEMENT_SIGNED = '__agreement_signed__'
}
diff --git a/src/hooks/user-role-type.tsx b/src/hooks/user-role-type.tsx
index ab2785b..db4969c 100644
--- a/src/hooks/user-role-type.tsx
+++ b/src/hooks/user-role-type.tsx
@@ -1,9 +1,10 @@
import { useSelector } from 'react-redux';
import { selectRoleType } from '@/store/selector';
+import { RoleType } from '@/constants/app';
function useRoleType() {
- return useSelector(selectRoleType);
+ return useSelector(selectRoleType) || RoleType.Anchor;
}
export default useRoleType;
diff --git a/src/pages/job/index.tsx b/src/pages/job/index.tsx
index 384c54b..c6cb001 100644
--- a/src/pages/job/index.tsx
+++ b/src/pages/job/index.tsx
@@ -4,7 +4,6 @@ import { Tabs } from '@taroify/core';
import { useCallback, useEffect, useRef, useState } from 'react';
import HomePage from '@/components/home-page';
-import LocationDialog from '@/components/location-dialog';
import { LoginGuide } from '@/components/login-guide';
import MaterialGuide from '@/components/material-guide';
import { EventName, OpenSource, PageUrl } from '@/constants/app';
@@ -82,13 +81,6 @@ export default function Job() {
}
}, []);
- const handleCloseAuthorize = useCallback(() => setShowAuthorize(false), []);
-
- const handleClickAuthorize = useCallback(() => {
- requestLocation(true);
- setShowAuthorize(false);
- }, []);
-
useEffect(() => {
Taro.eventCenter.on(EventName.SELECT_CITY, handleCityChange);
return () => {
@@ -116,6 +108,7 @@ export default function Job() {
} else {
log('show authorize location dialog');
setShowAuthorize(true);
+ requestLocation(true);
}
});
@@ -154,7 +147,6 @@ export default function Job() {
))}
-
{showMaterialGuide && setShowMaterialGuide(false)} />}
diff --git a/src/pages/start/index.tsx b/src/pages/start/index.tsx
index 6fef234..9dc13e5 100644
--- a/src/pages/start/index.tsx
+++ b/src/pages/start/index.tsx
@@ -1,6 +1,9 @@
import { Image } from '@tarojs/components';
-
import { useLoad } from '@tarojs/taro';
+
+import { useState } from 'react';
+
+import { AgreementPopup } from '@/components/agreement-popup';
import Slogan from '@/components/slogan';
import { PageUrl, RoleType } from '@/constants/app';
import { ANCHOR_TAB_LIST, COMPANY_TAB_LIST } from '@/hooks/use-config';
@@ -8,12 +11,13 @@ import store from '@/store';
import { changeHomePage } from '@/store/actions';
import { getRoleType, switchDefaultTab, switchRoleType } from '@/utils/app';
import { switchTab } from '@/utils/route';
-
+import { getAgreementSigned, setAgreementSigned } from '@/utils/user';
import './index.less';
const PREFIX = 'page-start';
export default function Start() {
+ const [open, setOpen] = useState(typeof getAgreementSigned() !== 'boolean');
const mode = getRoleType();
useLoad(() => {
switchDefaultTab();
@@ -30,6 +34,15 @@ export default function Start() {
await switchTab(COMPANY_TAB_LIST[0].pagePath as PageUrl);
};
+ const handleCancel = () => {
+ setOpen(false);
+ setAgreementSigned(false);
+ };
+
+ const handleConfirm = () => {
+ setOpen(false);
+ setAgreementSigned(true);
+ };
return (
{mode && (
@@ -69,6 +82,7 @@ export default function Start() {