feat: resume

src/components/agreement-popup/index.less

@@ -0,0 +1,41 @@
+@import '@/styles/common.less';
+@import '@/styles/variables.less';
+
+.agreement-popup {
+  &__content {
+    .flex-column();
+    padding: 40px 32px;
+  }
+
+  &__title {
+    font-size: 32px;
+    font-weight: 500;
+    line-height: 48px;
+    color: @blColor;;
+    margin-bottom: 24px;
+  }
+
+  &__body {
+    font-weight: 400;
+    font-size: 28px;
+    line-height: 40px;
+    color: @blColor;
+    margin-bottom: 24px;
+    align-self: flex-start;
+  };
+
+  &__btn-group {
+    margin-top: 32px;
+    .flex-row();
+    gap: 30px;
+  }
+
+  &__confirm-button {
+    .button(@width: 230px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 44px);
+
+  }
+
+  &__cancel-button {
+    .button(@width: 230px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 44px, @highlight: 0);
+  }
+}

src/components/agreement-popup/index.tsx

@@ -0,0 +1,65 @@
+import { Button } from '@tarojs/components';
+
+import { Popup } from '@taroify/core';
+import { useCallback } from 'react';
+
+import { BindPhoneStatus } from '@/components/login-button';
+import PhoneButton from '@/components/phone-button';
+import { ProtocolPrivacy } from '@/components/protocol-privacy';
+import SafeBottomPadding from '@/components/safe-bottom-padding';
+
+import './index.less';
+
+interface IProps {
+  open: boolean;
+  onCancel: () => void;
+  onConfirm: () => void;
+  needPhone?: boolean;
+}
+
+const PREFIX = 'agreement-popup';
+
+export function AgreementPopup({ open, onCancel, onConfirm, needPhone }: IProps) {
+  const handleBindPhone = useCallback(
+    status => {
+      if (status === BindPhoneStatus.Success) {
+        onConfirm();
+      } else {
+        onCancel();
+      }
+    },
+    [onCancel, onConfirm]
+  );
+
+  if (!open) {
+    return null;
+  }
+
+  return (
+    <Popup rounded className={PREFIX} placement="bottom" open={open} onClose={onCancel}>
+      <div className={`${PREFIX}__content`}>
+        <div className={`${PREFIX}__title`}>提示</div>
+        <div className={`${PREFIX}__body`}>
+          <div>你好，以下是播络隐私协议与用户协议</div>
+          <div>同意后可使用全部功能，不同意你也可以浏览</div>
+        </div>
+        <ProtocolPrivacy divider />
+        <div className={`${PREFIX}__btn-group`}>
+          <Button className={`${PREFIX}__cancel-button`} onClick={onCancel}>
+            拒绝
+          </Button>
+          {needPhone ? (
+            <PhoneButton className={`${PREFIX}__confirm-button`} needPhone onBindPhone={handleBindPhone}>
+              同意
+            </PhoneButton>
+          ) : (
+            <Button className={`${PREFIX}__confirm-button`} onClick={onConfirm}>
+              同意
+            </Button>
+          )}
+        </div>
+      </div>
+      <SafeBottomPadding />
+    </Popup>
+  );
+}

src/components/anchor-card/index.tsx

@@ -18,6 +18,7 @@ import './index.less';
 interface IProps {
   data: AnchorInfo;
   jobId?: string;
+  validator: (onSuccess: () => void) => void;
 }
 
 const PREFIX = 'anchor-card';
@@ -34,14 +35,17 @@ const getSalary = (data: AnchorInfo) => {
 };
 
 function AnchorCard(props: IProps) {
-  const { data, jobId } = props;
+  const { data, jobId, validator } = props;
   const style = data.isRead ? ({ '--read-color': '#999999' } as React.CSSProperties) : {};
   const cover = (data.materialVideoInfoList.find(video => video.isDefault) || data.materialVideoInfoList[0])?.coverUrl;
 
-  const handleClick = useCallback(
-    () => navigateTo(PageUrl.MaterialView, { jobId, resumeId: data.id, source: MaterialViewSource.AnchorList }),
-    [data, jobId]
-  );
+  const handleNavTo = useCallback(() => {
+    navigateTo(PageUrl.MaterialView, { jobId, resumeId: data.id, source: MaterialViewSource.AnchorList });
+  }, [data, jobId]);
+
+  const handleClick = useCallback(() => {
+    validator(handleNavTo);
+  }, [handleNavTo, validator]);
 
   return (
     <div className={PREFIX} style={style} onClick={handleClick}>

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<IRequestProps>({});
   const prevRequestProps = useRef<IRequestProps>({});
   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 (
-    <PullRefresh
-      className={classNames(`${PREFIX}__pull-refresh`, className)}
-      loading={refreshing}
-      onRefresh={handleRefresh}
-      disabled={refreshDisabled || !ready}
-    >
-      <List
-        hasMore={hasMore}
-        onLoad={handleLoadMore}
-        loading={loadingMore || refreshing}
-        disabled={loadMoreError || !ready}
-        fixedHeight={typeof listHeight !== 'undefined'}
-        style={listHeight ? { height: `${listHeight}px` } : undefined}
+    <>
+      <PullRefresh
+        className={classNames(`${PREFIX}__pull-refresh`, className)}
+        loading={refreshing}
+        onRefresh={handleRefresh}
+        disabled={refreshDisabled || !ready}
       >
-        {dataList.map(item => (
-          <AnchorCard data={item} jobId={jobId} key={item.id} />
-        ))}
-        <ListPlaceholder hasMore={hasMore} loadingMore={loadingMore} loadMoreError={loadMoreError} />
-      </List>
-    </PullRefresh>
+        <List
+          hasMore={hasMore}
+          onLoad={handleLoadMore}
+          loading={loadingMore || refreshing}
+          disabled={loadMoreError || !ready}
+          fixedHeight={typeof listHeight !== 'undefined'}
+          style={listHeight ? { height: `${listHeight}px` } : undefined}
+        >
+          {dataList.map(item => (
+            <AnchorCard data={item} jobId={jobId} key={item.id} validator={validator} />
+          ))}
+          <ListPlaceholder hasMore={hasMore} loadingMore={loadingMore} loadMoreError={loadMoreError} />
+        </List>
+      </PullRefresh>
+      <AgreementPopup open={open} onCancel={handleCancel} onConfirm={handleConfirm} needPhone={needPhone} />
+    </>
   );
 }
 

src/components/login-button/index.tsx

@@ -5,7 +5,7 @@ import { useCallback, useState } from 'react';
 
 import LoginDialog from '@/components/login-dialog';
 import useUserInfo from '@/hooks/use-user-info';
-import { isNeedLogin } from '@/utils/user';
+import { getAgreementSigned, isNeedLogin } from '@/utils/user';
 
 import './index.less';
 
@@ -26,6 +26,7 @@ function LoginButton(props: ILoginButtonProps) {
   const userInfo = useUserInfo();
   const [visible, setVisible] = useState(false);
   const needLogin = isNeedLogin(userInfo);
+  const needSign = !getAgreementSigned();
 
   const onSuccess = useCallback(
     e => {
@@ -40,11 +41,13 @@ function LoginButton(props: ILoginButtonProps) {
       <Button
         {...otherProps}
         className={classNames(PREFIX, className)}
-        onClick={needLogin ? () => setVisible(true) : onClick}
+        onClick={needLogin || needSign ? () => setVisible(true) : onClick}
       >
         {children}
       </Button>
-      {visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={onSuccess} needPhone={needPhone} />}
+      {visible && (
+        <LoginDialog disableCheck onCancel={() => setVisible(false)} onSuccess={onSuccess} needPhone={needPhone} />
+      )}
     </>
   );
 }

src/components/login-dialog/index.tsx

@@ -12,6 +12,7 @@ import './index.less';
 interface IProps {
   title?: string;
   onCancel: () => void;
+  disableCheck?: boolean;
   needPhone?: IPhoneButtonProps['needPhone'];
   onSuccess?: IPhoneButtonProps['onSuccess'];
   onBindPhone?: IPhoneButtonProps['onBindPhone'];
@@ -20,8 +21,15 @@ interface IProps {
 const PREFIX = 'login-dialog';
 
 export default function LoginDialog(props: IProps) {
-  const { title = '使用播络服务前，请先登录', needPhone, onSuccess, onCancel, onBindPhone } = props;
-  const [checked, setChecked] = useState(false);
+  const {
+    title = '使用播络服务前，请先登录',
+    disableCheck = false,
+    needPhone,
+    onSuccess,
+    onCancel,
+    onBindPhone,
+  } = props;
+  const [checked, setChecked] = useState(disableCheck);
 
   const handleTipCheck = useCallback(() => {
     Toast.info('请先阅读并同意协议');
@@ -50,7 +58,9 @@ export default function LoginDialog(props: IProps) {
           <Button className={`${PREFIX}__cancel-button`} onClick={onCancel}>
             跳过，暂不登录
           </Button>
-          <ProtocolPrivacyCheckbox checked={checked} onChange={setChecked} className={`${PREFIX}__checkbox`} />
+          {!disableCheck && (
+            <ProtocolPrivacyCheckbox checked={checked} onChange={setChecked} className={`${PREFIX}__checkbox`} />
+          )}
         </div>
       </Dialog.Content>
     </Dialog>

src/components/partner-banner/index.tsx

@@ -60,7 +60,9 @@ export default function PartnerBanner() {
         )}
         <div className={`${PREFIX}__close`} onClick={handlePartnerBannerClose} />
       </div>
-      {visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={handleBind} needPhone={needPhone} />}
+      {visible && (
+        <LoginDialog disableCheck onCancel={() => setVisible(false)} onSuccess={handleBind} needPhone={needPhone} />
+      )}
     </>
   );
 }

src/components/partner-entry/index.tsx

@@ -39,7 +39,9 @@ function JoinEntry({ onBindSuccess }: JoinEntryProps) {
           </Button>
         )}
       </div>
-      {visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={onBindSuccess} needPhone={needPhone} />}
+      {visible && (
+        <LoginDialog disableCheck onCancel={() => setVisible(false)} onSuccess={onBindSuccess} needPhone={needPhone} />
+      )}
     </>
   );
 }

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__'
 }

src/fragments/profile/intention/index.tsx

@@ -62,7 +62,7 @@ const getSalaryPrice = (fullSalary?: SalaryRange, partSalary?: SalaryRange) => {
 
 function ProfileIntentionFragment(props: IProps, ref) {
   const { profile } = props;
-  const [cityCodes, setCityCodes] = useState(calcInitCityCodes(profile.cityCodes));
+  const [cityCodes, setCityCodes] = useState(calcInitCityCodes(profile.cityCodes || ''));
   const [employType, setEmployType] = useState(profile.employType);
   const [fullSalary, setFullSalary] = useState(calcSalarySelect(profile, true));
   const [partSalary, setPartSalary] = useState(calcSalarySelect(profile, false));

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() {
         ))}
       </Tabs>
       <div>
-        <LocationDialog open={showAuthorize} onClose={handleCloseAuthorize} onClick={handleClickAuthorize} />
         <LoginGuide disabled={showAuthorize} onAfterBind={handleAfterBindPhone} />
         {showMaterialGuide && <MaterialGuide onClose={() => setShowMaterialGuide(false)} />}
       </div>

src/pages/message-chat/index.tsx

@@ -31,7 +31,7 @@ import {
   PostMessageRequest,
 } from '@/types/message';
 import { isAnchorMode } from '@/utils/app';
-import { getScrollItemId, last, logWithPrefix, safeJsonParse } from '@/utils/common';
+import { getScrollItemId, last, logWithPrefix } from '@/utils/common';
 import { collectEvent } from '@/utils/event';
 import {
   isExchangeMessage,
@@ -55,7 +55,6 @@ import Toast from '@/utils/toast';
 import { getUserId } from '@/utils/user';
 
 import './index.less';
-import useUserInfo from '@/hooks/use-user-info';
 
 const PREFIX = 'page-message-chat';
 const LIST_CONTAINER_CLASS = `${PREFIX}__chat-list`;
@@ -86,19 +85,8 @@ const getHeaderLeftButtonText = (job?: IJobMessage, material?: IMaterialMessage)
   return isAnchorMode() ? '不感兴趣' : '标记为不合适';
 };
 
-const getResumeId = (messages: IChatMessage[], userId?: string) => {
-  const resumeStr = messages.find(it => it.type === MessageType.Material && it.senderUserId !== userId)?.actionObject;
-  if (resumeStr) {
-    const { id } = safeJsonParse(resumeStr);
-    log('resumeId', id);
-    return id;
-  }
-  return undefined;
-};
-
 export default function MessageChat() {
   const listHeight = useListHeight(CALC_LIST_PROPS);
-  const { userId } = useUserInfo();
   const [input, setInput] = useState('');
   const [showMore, setShowMore] = useState(false);
   const [chat, setChat] = useState<IChatInfo | null>(null);
@@ -107,8 +95,8 @@ export default function MessageChat() {
   const [messages, setMessages] = useState<IChatMessage[]>([]);
   const [messageStatusList, setMessageStatusList] = useState<IMessageStatus[]>([]);
   const [jobId, setJobId] = useState<string>();
+  const [resumeId, setResumeId] = useState<string>();
   const [job, setJob] = useState<IJobMessage>();
-  const [resumeId, setResumeId] = useState<string | undefined>();
   const [material, setMaterial] = useState<IMaterialMessage>();
   const [scrollItemId, setScrollItemId] = useState<string>();
   const scrollToLowerRef = useRef(false);
@@ -265,14 +253,6 @@ export default function MessageChat() {
   //   };
   // }, []);
 
-  useEffect(() => {
-    if (resumeId) {
-      return;
-    }
-
-    setResumeId(getResumeId(messages, userId));
-  }, [messages, resumeId, userId]);
-
   useEffect(() => {
     if (!chat) {
       return;
@@ -319,6 +299,7 @@ export default function MessageChat() {
       const parseMaterial = query.material ? parseQuery<IMaterialMessage>(query.material) : null;
       // log('requestChatDetail', chatDetail, parseJob, parseMaterial);
       setChat(chatDetail);
+      setResumeId(chatDetail.participants.find(u => u.userId !== currentUserId)?.resumeId);
       setJobId(query.jobId);
       setMessages(chatDetail.messages);
       setScrollItemId(getScrollItemId(last(chatDetail.messages)?.msgId));

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 (
     <div className={`${PREFIX} ${mode ? '' : 'color-bg'}`}>
       {mode && (
@@ -69,6 +82,7 @@ export default function Start() {
             </div>
           </div>
           <Slogan />
+          <AgreementPopup open={open} onCancel={handleCancel} onConfirm={handleConfirm} />
         </>
       )}
     </div>

src/types/message.ts

@@ -43,7 +43,9 @@ export interface ILocationMessage {
   longitude: number;
 }
 
-export interface IChatUser extends Pick<UserInfo, 'userId' | 'nickName'> {}
+export interface IChatUser extends Pick<UserInfo, 'userId' | 'nickName'> {
+  resumeId: string;
+}
 
 export interface IChatMessage {
   msgId: string;

src/utils/user.ts

@@ -148,3 +148,6 @@ export async function followGroup(blGroupId: FollowGroupRequest['blGroupId']) {
     return false;
   }
 }
+
+export const getAgreementSigned = (): boolean | '' => Taro.getStorageSync(CacheKey.AGREEMENT_SIGNED);
+export const setAgreementSigned = (signed: boolean) => Taro.setStorageSync(CacheKey.AGREEMENT_SIGNED, signed);