diff --git a/src/pages/job/index.tsx b/src/pages/job/index.tsx
index 5b06223..4e40d20 100644
--- a/src/pages/job/index.tsx
+++ b/src/pages/job/index.tsx
@@ -3,6 +3,7 @@ import Taro, { useDidShow, useLoad, useShareAppMessage } from '@tarojs/taro';
import { Tabs } from '@taroify/core';
import { useCallback, useEffect, useRef, useState } from 'react';
+import { AgreementPopup } from '@/components/agreement-popup';
import HomePage from '@/components/home-page';
import { LoginGuide } from '@/components/login-guide';
import MaterialGuide from '@/components/material-guide';
@@ -21,8 +22,7 @@ import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
import { getJumpUrl, getPageQuery, navigateTo } from '@/utils/route';
import { getCommonShareMessage } from '@/utils/share';
import Toast from '@/utils/toast';
-import { isNeedCreateMaterial } from '@/utils/user';
-
+import { getAgreementSigned, isNeedCreateMaterial, setAgreementSigned } from '@/utils/user';
import './index.less';
const PREFIX = 'job';
@@ -42,6 +42,7 @@ export default function Job() {
const [showMaterialGuide, setShowMaterialGuide] = useState(false);
const [showAuthorize, setShowAuthorize] = useState(false);
const cityValuesChangedRef = useRef(false);
+ const [openAgreementPopup, setAgreementPopupOpen] = useState(typeof getAgreementSigned() !== 'boolean');
const handleTypeChange = useCallback(value => setTabType(value), []);
@@ -81,7 +82,15 @@ export default function Job() {
setShowMaterialGuide(true);
}
}, []);
+ const handleCancelAgreementPopup = () => {
+ setAgreementPopupOpen(false);
+ setAgreementSigned(false);
+ };
+ const handleConfirmAgreementPopup = () => {
+ setAgreementPopupOpen(false);
+ setAgreementSigned(true);
+ };
useEffect(() => {
Taro.eventCenter.on(EventName.SELECT_CITY, handleCityChange);
return () => {
@@ -151,6 +160,11 @@ export default function Job() {
{showMaterialGuide &&
setShowMaterialGuide(false)} />}
+
);
diff --git a/src/pages/start/index.tsx b/src/pages/start/index.tsx
index 9dc13e5..de11f9f 100644
--- a/src/pages/start/index.tsx
+++ b/src/pages/start/index.tsx
@@ -1,88 +1,94 @@
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';
-import store from '@/store';
-import { changeHomePage } from '@/store/actions';
+// import { useEffect, 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';
+// import store from '@/store';
+// import { changeHomePage } from '@/store/actions';
+import { RoleType } from '@/constants/app';
import { getRoleType, switchDefaultTab, switchRoleType } from '@/utils/app';
-import { switchTab } from '@/utils/route';
-import { getAgreementSigned, setAgreementSigned } from '@/utils/user';
+// 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 [open, setOpen] = useState(typeof getAgreementSigned() !== 'boolean');
const mode = getRoleType();
useLoad(() => {
- switchDefaultTab();
+ if (!mode) {
+ switchRoleType(RoleType.Anchor).then(() => {
+ switchDefaultTab();
+ });
+ } else {
+ switchDefaultTab();
+ }
});
- const handleAnchor = async () => {
- await switchRoleType(RoleType.Anchor);
- store.dispatch(changeHomePage(ANCHOR_TAB_LIST[0].type));
- await switchTab(ANCHOR_TAB_LIST[0].pagePath as PageUrl);
- };
+ // const handleAnchor = async () => {
+ // await switchRoleType(RoleType.Anchor);
+ // store.dispatch(changeHomePage(ANCHOR_TAB_LIST[0].type));
+ // await switchTab(ANCHOR_TAB_LIST[0].pagePath as PageUrl);
+ // };
- const handleCompany = async () => {
- await switchRoleType(RoleType.Company);
- store.dispatch(changeHomePage(COMPANY_TAB_LIST[0].type));
- await switchTab(COMPANY_TAB_LIST[0].pagePath as PageUrl);
- };
+ // const handleCompany = async () => {
+ // await switchRoleType(RoleType.Company);
+ // store.dispatch(changeHomePage(COMPANY_TAB_LIST[0].type));
+ // await switchTab(COMPANY_TAB_LIST[0].pagePath as PageUrl);
+ // };
- const handleCancel = () => {
- setOpen(false);
- setAgreementSigned(false);
- };
-
- const handleConfirm = () => {
- setOpen(false);
- setAgreementSigned(true);
- };
+ // const handleCancel = () => {
+ // setOpen(false);
+ // setAgreementSigned(false);
+ // };
+ //
+ // const handleConfirm = () => {
+ // setOpen(false);
+ // setAgreementSigned(true);
+ // };
return (
-
- {mode && (
-
- )}
+
+ {/*{mode && (*/}
+
+ {/*)}*/}
{!mode && (
<>
-
-
Hi,很高兴见到你
-
请选择您的身份
-
-
-
-
-
+ {/*
*/}
+ {/*
Hi,很高兴见到你
*/}
+ {/*
请选择您的身份
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
我是主播
*/}
+ {/*
我要找工作
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
我是企业
*/}
+ {/*
我要招主播
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
>
)}