23 changed files with 129 additions and 321 deletions
--- a/src/components/agreement-popup/index.less
+++ b/src/components/agreement-popup/index.less
@ -1,41 +0,0 @@
-@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);
-  }
-}
--- a/src/components/agreement-popup/index.tsx
+++ b/src/components/agreement-popup/index.tsx
@ -1,66 +0,0 @@
-import { Button, ITouchEvent } 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: (e: ITouchEvent) => void;
-  needPhone?: boolean;
-  needBindPhone?: boolean;
-}
-
-const PREFIX = 'agreement-popup';
-
-export function AgreementPopup({ open, onCancel, onConfirm, needPhone, needBindPhone }: IProps) {
-  const handleBindPhone = useCallback(
-    (status: BindPhoneStatus, e: ITouchEvent) => {
-      if (status === BindPhoneStatus.Success) {
-        onConfirm(e);
-      } 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>
-          {needBindPhone ? (
-            <PhoneButton className={`${PREFIX}__confirm-button`} needPhone={needPhone} onBindPhone={handleBindPhone}>
-              同意
-            </PhoneButton>
-          ) : (
-            <Button className={`${PREFIX}__confirm-button`} onClick={onConfirm}>
-              同意
-            </Button>
-          )}
-        </div>
-      </div>
-      <SafeBottomPadding />
-    </Popup>
-  );
-}
--- a/src/components/anchor-card/index.tsx
+++ b/src/components/anchor-card/index.tsx
@ -18,7 +18,6 @@ import './index.less';
 interface IProps {
  data: AnchorInfo;
  jobId?: string;
-  validator: (onSuccess: () => void) => void;
 }

 const PREFIX = 'anchor-card';
@ -35,17 +34,14 @@ const getSalary = (data: AnchorInfo) => {
 };

 function AnchorCard(props: IProps) {
-  const { data, jobId, validator } = props;
+  const { data, jobId } = props;
  const style = data.isRead ? ({ '--read-color': '#999999' } as React.CSSProperties) : {};
  const cover = (data.materialVideoInfoList.find(video => video.isDefault) || data.materialVideoInfoList[0])?.coverUrl;

-  const handleNavTo = useCallback(() => {
-    navigateTo(PageUrl.MaterialView, { jobId, resumeId: data.id, source: MaterialViewSource.AnchorList });
-  }, [data, jobId]);
-
-  const handleClick = useCallback(() => {
-    validator(handleNavTo);
-  }, [handleNavTo, validator]);
+  const handleClick = useCallback(
+    () => navigateTo(PageUrl.MaterialView, { jobId, resumeId: data.id, source: MaterialViewSource.AnchorList }),
+    [data, jobId]
+  );

  return (
    <div className={PREFIX} style={style} onClick={handleClick}>
--- a/src/components/anchor-list/index.tsx
+++ b/src/components/anchor-list/index.tsx
@ -7,16 +7,11 @@ import { useCallback, useEffect, useRef, useState } from 'react';

 import AnchorCard from '@/components/anchor-card';
 import ListPlaceholder from '@/components/list-placeholder';
-import LoginDialog from '@/components/login-dialog';
 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, isNeedLogin, setAgreementSigned } from '@/utils/user';
-
-import { AgreementPopup } from '../agreement-popup';

 import './index.less';

@ -60,11 +55,6 @@ function AnchorList(props: IAnchorListProps) {
  const requestProps = useRef<IRequestProps>({});
  const prevRequestProps = useRef<IRequestProps>({});
  const onListEmptyRef = useRef(onListEmpty);
-  const [openLogin, setLoginOpen] = useState(false);
-  const [openAssignment, setAssignmentOpen] = useState(false);
-  const successCallback = useRef<() => void>(() => {});
-  const userInfo = useUserInfo();
-  const needLogin = isNeedLogin(userInfo);

  const handleRefresh = useCallback(async () => {
    log('start pull refresh');
@ -130,37 +120,6 @@ function AnchorList(props: IAnchorListProps) {
    [dataList]
  );

-  const handleCancel = useCallback(() => {
-    setAssignmentOpen(false);
-    setAgreementSigned(false);
-  }, []);
-
-  const handleConfirm = useCallback(() => {
-    setAssignmentOpen(false);
-    setAgreementSigned(true);
-    successCallback.current();
-  }, []);
-
-  const handleLoginSuccess = useCallback(() => {
-    setLoginOpen(false);
-    successCallback.current();
-  }, []);
-
-  const handleLoginCancel = useCallback(() => {
-    setLoginOpen(false);
-  }, []);
-
-  const validator = (onSuccess: () => void) => {
-    successCallback.current = onSuccess;
-    if (!getAgreementSigned()) {
-      setAssignmentOpen(true);
-    } else if (needLogin) {
-      setLoginOpen(true);
-    } else {
-      onSuccess();
-    }
-  };
-
  useEffect(() => {
    onListEmptyRef.current = onListEmpty;
  }, [onListEmpty]);
@ -224,7 +183,6 @@ function AnchorList(props: IAnchorListProps) {
  }, [jobId, ready, filters, cityCode, sortType]);

  return (
-    <>
    <PullRefresh
      className={classNames(`${PREFIX}__pull-refresh`, className)}
      loading={refreshing}
@ -240,19 +198,11 @@ function AnchorList(props: IAnchorListProps) {
        style={listHeight ? { height: `${listHeight}px` } : undefined}
      >
        {dataList.map(item => (
-            <AnchorCard data={item} jobId={jobId} key={item.id} validator={validator} />
+          <AnchorCard data={item} jobId={jobId} key={item.id} />
        ))}
        <ListPlaceholder hasMore={hasMore} loadingMore={loadingMore} loadMoreError={loadMoreError} />
      </List>
    </PullRefresh>
-      <AgreementPopup
-        open={openAssignment}
-        onCancel={handleCancel}
-        onConfirm={handleConfirm}
-        needBindPhone={needLogin}
-      />
-      {openLogin && <LoginDialog onCancel={handleLoginCancel} onSuccess={handleLoginSuccess} />}
-    </>
  );
 }

--- a/src/components/login-button/index.tsx
+++ b/src/components/login-button/index.tsx
@ -1,12 +1,11 @@
-import { Button, ButtonProps, ITouchEvent } from '@tarojs/components';
+import { Button, ButtonProps } from '@tarojs/components';

 import classNames from 'classnames';
 import { useCallback, useState } from 'react';

-import { AgreementPopup } from '@/components/agreement-popup';
 import LoginDialog from '@/components/login-dialog';
 import useUserInfo from '@/hooks/use-user-info';
-import { getAgreementSigned, isNeedLogin, setAgreementSigned } from '@/utils/user';
+import { isNeedLogin } from '@/utils/user';

 import './index.less';

@ -18,7 +17,6 @@ export enum BindPhoneStatus {

 export interface ILoginButtonProps extends ButtonProps {
  needPhone?: boolean;
-  needAssignment?: boolean;
 }

 const PREFIX = 'login-button';
@ -26,50 +24,12 @@ const PREFIX = 'login-button';
 function LoginButton(props: ILoginButtonProps) {
  const { className, children, needPhone, onClick, ...otherProps } = props;
  const userInfo = useUserInfo();
-  const [loginVisible, setLoginVisible] = useState(false);
-  const [assignVisible, setAssignVisible] = useState(false);
+  const [visible, setVisible] = useState(false);
  const needLogin = isNeedLogin(userInfo);
-  // 点击按钮时，协议同意也手机也授权了 -> 下一步
-  //
-  // 点击按钮时，协议同意但是手机授权没给 ->  弹登录
-  //   -> 如果授权了手机号就进行下一步
-  //   -> 不给授权没下一步
-  //
-  // 点击按钮时，协议不同意 ->  弹协议窗口
-  //   -> 如果同意就进行下一步
-  //   -> 不同意没下一步
-  const handleClick = useCallback(
-    (e: ITouchEvent) => {
-      if (!getAgreementSigned()) {
-        setAssignVisible(true);
-      } else if (needLogin) {
-        setLoginVisible(true);
-      } else if (onClick) {
-        onClick(e);
-      }
-    },
-    [needLogin, onClick]
-  );

-  const handleConfirm = useCallback(
-    (e: ITouchEvent) => {
-      setAssignVisible(false);
-      setAgreementSigned(true);
-      if (onClick) {
-        onClick(e);
-      }
-    },
-    [onClick]
-  );
-
-  const handleCancel = useCallback(() => {
-    setAgreementSigned(false);
-    setAssignVisible(false);
-  }, []);
-
-  const handleLoginSuccess = useCallback(
+  const onSuccess = useCallback(
    e => {
-      setLoginVisible(false);
+      setVisible(false);
      onClick?.(e);
    },
    [onClick]
@ -77,18 +37,14 @@ function LoginButton(props: ILoginButtonProps) {

  return (
    <>
-      <Button {...otherProps} className={classNames(PREFIX, className)} onClick={handleClick}>
+      <Button
+        {...otherProps}
+        className={classNames(PREFIX, className)}
+        onClick={needLogin ? () => setVisible(true) : onClick}
+      >
        {children}
      </Button>
-      <AgreementPopup
-        open={assignVisible}
-        onCancel={handleCancel}
-        onConfirm={handleConfirm}
-        needBindPhone={needLogin}
-      />
-      {loginVisible && (
-        <LoginDialog onCancel={() => setLoginVisible(false)} onSuccess={handleLoginSuccess} needPhone={needPhone} />
-      )}
+      {visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={onSuccess} needPhone={needPhone} />}
    </>
  );
 }
--- a/src/components/login-dialog/index.less
+++ b/src/components/login-dialog/index.less
@ -17,4 +17,22 @@
    .button(@width: 360px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 44px);
    margin-top: 40px;
  }
+
+  &__cancel-button {
+    min-width: fit-content;
+    font-size: 28px;
+    line-height: 32px;
+    color: @blHighlightColor;
+    background: transparent;
+    border: none;
+    margin-top: 40px;
+
+    &::after {
+      border-color: transparent
+    }
+  }
+
+  &__checkbox {
+    margin-top: 40px;
+  }
 }
--- a/src/components/login-dialog/index.tsx
+++ b/src/components/login-dialog/index.tsx
@ -1,6 +1,11 @@
+import { Button } from '@tarojs/components';
+
 import { Dialog } from '@taroify/core';
+import { useCallback, useState } from 'react';

 import PhoneButton, { IPhoneButtonProps } from '@/components/phone-button';
+import { ProtocolPrivacyCheckbox } from '@/components/protocol-privacy';
+import Toast from '@/utils/toast';

 import './index.less';

@ -16,12 +21,23 @@ const PREFIX = 'login-dialog';

 export default function LoginDialog(props: IProps) {
  const { title = '使用播络服务前，请先登录', needPhone, onSuccess, onCancel, onBindPhone } = props;
+  const [checked, setChecked] = useState(false);
+
+  const handleTipCheck = useCallback(() => {
+    Toast.info('请先阅读并同意协议');
+  }, []);

  return (
    <Dialog open onClose={onCancel}>
      <Dialog.Content>
        <div className={`${PREFIX}__container`}>
          <div className={`${PREFIX}__title`}>{title}</div>
+          {!checked && (
+            <Button className={`${PREFIX}__confirm-button`} onClick={handleTipCheck}>
+              登录
+            </Button>
+          )}
+          {checked && (
            <PhoneButton
              className={`${PREFIX}__confirm-button`}
              onSuccess={onSuccess}
@ -30,6 +46,11 @@ export default function LoginDialog(props: IProps) {
            >
              登录
            </PhoneButton>
+          )}
+          <Button className={`${PREFIX}__cancel-button`} onClick={onCancel}>
+            跳过，暂不登录
+          </Button>
+          <ProtocolPrivacyCheckbox checked={checked} onChange={setChecked} className={`${PREFIX}__checkbox`} />
        </div>
      </Dialog.Content>
    </Dialog>
--- a/src/components/partner-banner/index.tsx
+++ b/src/components/partner-banner/index.tsx
@ -60,9 +60,7 @@ export default function PartnerBanner() {
        )}
        <div className={`${PREFIX}__close`} onClick={handlePartnerBannerClose} />
      </div>
-      {visible && (
-        <LoginDialog disableCheck onCancel={() => setVisible(false)} onSuccess={handleBind} needPhone={needPhone} />
-      )}
+      {visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={handleBind} needPhone={needPhone} />}
    </>
  );
 }
--- a/src/components/partner-entry/index.tsx
+++ b/src/components/partner-entry/index.tsx
@ -39,9 +39,7 @@ function JoinEntry({ onBindSuccess }: JoinEntryProps) {
          </Button>
        )}
      </div>
-      {visible && (
-        <LoginDialog disableCheck onCancel={() => setVisible(false)} onSuccess={onBindSuccess} needPhone={needPhone} />
-      )}
+      {visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={onBindSuccess} needPhone={needPhone} />}
    </>
  );
 }
--- a/src/components/partner-kanban/index.tsx
+++ b/src/components/partner-kanban/index.tsx
@ -74,7 +74,7 @@ function WithdrawDialog(props: { open: boolean; onClose: () => void; count: numb
            {+props.count}
            <div className="yuan">元</div>
          </div>
-          <div className={`${PREFIX}-withdraw-dialog__hint`}>单日提现最大200元</div>
+          <div className={`${PREFIX}-withdraw-dialog__hint`}>单笔最大500元</div>
          <Button className={`${PREFIX}-withdraw-dialog__confirm-button`} onClick={handleWithdraw}>
            提现
          </Button>
@ -193,7 +193,7 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
      {!simple && <TipDialog open={tipOpen} onClose={handleTipClose} />}
      {!simple && (
        <WithdrawDialog
-          count={Math.min(Number(formatMoney(stats.availableBalance)), 200)}
+          count={Math.min(Number(formatMoney(stats.availableBalance)), 500)}
          open={withdrawOpen}
          onClose={handleWithdrawClose}
        />
--- a/src/components/phone-button/index.tsx
+++ b/src/components/phone-button/index.tsx
@ -19,7 +19,7 @@ export interface IPhoneButtonProps extends ButtonProps {
  message?: string;
  // 绑定后是否需要刷新接口获取手机号
  needPhone?: boolean;
-  onBindPhone?: (status: BindPhoneStatus, e: ITouchEvent) => void;
+  onBindPhone?: (status: BindPhoneStatus) => void;
  onSuccess?: (e: ITouchEvent) => void;
 }

@ -44,17 +44,17 @@ export default function PhoneButton(props: IPhoneButtonProps) {
      const encryptedData = e.detail.encryptedData;
      const iv = e.detail.iv;
      if (!encryptedData || !iv) {
-        onBindPhone?.(BindPhoneStatus.Cancel, e as ITouchEvent);
+        onBindPhone?.(BindPhoneStatus.Cancel);
        return Toast.error('取消授权');
      }
      try {
        await setPhoneNumber({ encryptedData, iv });
        needPhone && (await requestUserInfo());
        Toast.success(message);
-        onBindPhone?.(BindPhoneStatus.Success, e as ITouchEvent);
+        onBindPhone?.(BindPhoneStatus.Success);
        onSuccess?.(e as ITouchEvent);
      } catch (err) {
-        onBindPhone?.(BindPhoneStatus.Error, e as ITouchEvent);
+        onBindPhone?.(BindPhoneStatus.Error);
        Toast.error('绑定失败');
        log('bind phone fail', err);
      }
--- a/src/constants/cache-key.ts
+++ b/src/constants/cache-key.ts
@ -10,6 +10,4 @@ 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__',
-  CITY_CODES = '__city_codes__',
 }
--- a/src/fragments/profile/intention/index.tsx
+++ b/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));
--- a/src/pages/anchor/index.tsx
+++ b/src/pages/anchor/index.tsx
@ -186,7 +186,7 @@ export default function AnchorPage() {
  });

  useShareAppMessage(() => {
-    return getCommonShareMessage(true, inviteCode, '数万名优质主播等你来挑');
+    return getCommonShareMessage(true, inviteCode);
  });

  useDidShow(() => requestUnreadMessageCount());
--- a/src/pages/group-v2/index.tsx
+++ b/src/pages/group-v2/index.tsx
@ -11,7 +11,6 @@ import { getCurrentCityCode } from '@/utils/location';
 import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
 import { getPageQuery } from '@/utils/route';
 import { getCommonShareMessage } from '@/utils/share';
-import { checkCityCode } from '@/utils/user';
 import './index.less';

 const PREFIX = 'group-v2-page';
@ -27,9 +26,6 @@ export default function GroupV2() {
  useShareAppMessage(() => getCommonShareMessage(true, inviteCode));

  const handleSelectCity = useCallback(cityCode => {
-    if (!checkCityCode(cityCode)) {
-      return;
-    }
    const group = GROUPS.find(g => String(g.cityCode) === cityCode);
    if (group) {
      openCustomerServiceChat(group.serviceUrl);
--- a/src/pages/job-detail/index.tsx
+++ b/src/pages/job-detail/index.tsx
@ -112,6 +112,7 @@ const AnchorFooter = (props: { data: JobDetails }) => {
  }, [data]);

  const handleDialogHidden = useCallback(() => setDialogVisible(false), []);
+
  return (
    <>
      <div className={`${PREFIX}__footer`}>
--- a/src/pages/job/index.tsx
+++ b/src/pages/job/index.tsx
@ -4,6 +4,7 @@ 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';
@ -81,6 +82,13 @@ 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 () => {
@ -108,7 +116,6 @@ export default function Job() {
    } else {
      log('show authorize location dialog');
      setShowAuthorize(true);
-      requestLocation(true);
    }
  });

@ -147,6 +154,7 @@ export default function Job() {
        ))}
      </Tabs>
      <div>
+        <LocationDialog open={showAuthorize} onClose={handleCloseAuthorize} onClick={handleClickAuthorize} />
        <LoginGuide disabled={showAuthorize} onAfterBind={handleAfterBindPhone} />
        {showMaterialGuide && <MaterialGuide onClose={() => setShowMaterialGuide(false)} />}
      </div>
--- a/src/pages/message-chat/index.tsx
+++ b/src/pages/message-chat/index.tsx
@ -31,7 +31,7 @@ import {
  PostMessageRequest,
 } from '@/types/message';
 import { isAnchorMode } from '@/utils/app';
-import { getScrollItemId, last, logWithPrefix } from '@/utils/common';
+import { getScrollItemId, last, logWithPrefix, safeJsonParse } from '@/utils/common';
 import { collectEvent } from '@/utils/event';
 import {
  isExchangeMessage,
@ -55,6 +55,7 @@ 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`;
@ -85,8 +86,19 @@ 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);
@ -95,8 +107,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);
@ -253,6 +265,14 @@ export default function MessageChat() {
  //   };
  // }, []);

+  useEffect(() => {
+    if (resumeId) {
+      return;
+    }
+
+    setResumeId(getResumeId(messages, userId));
+  }, [messages, resumeId, userId]);
+
  useEffect(() => {
    if (!chat) {
      return;
@ -299,7 +319,6 @@ 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));
--- a/src/pages/start/index.tsx
+++ b/src/pages/start/index.tsx
@ -1,9 +1,6 @@
 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';
@ -11,13 +8,12 @@ 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();
@ -34,15 +30,6 @@ 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 && (
@ -82,7 +69,6 @@ export default function Start() {
            </div>
          </div>
          <Slogan />
-          <AgreementPopup open={open} onCancel={handleCancel} onConfirm={handleConfirm} />
        </>
      )}
    </div>
--- a/src/pages/user-batch-publish/index.tsx
+++ b/src/pages/user-batch-publish/index.tsx
@ -11,7 +11,6 @@ import useInviteCode from '@/hooks/use-invite-code';
 import { openCustomerServiceChat } from '@/utils/common';
 import { getCurrentCityCode } from '@/utils/location';
 import { getCommonShareMessage } from '@/utils/share';
-import { checkCityCode } from '@/utils/user';
 import './index.less';

 const PREFIX = 'page-biz-service';
@ -23,9 +22,6 @@ export default function BizService() {
    openCustomerServiceChat('https://work.weixin.qq.com/kfid/kfcd60708731367168d');
  }, []);
  const handleSelectCity = useCallback(cityCode => {
-    if (!checkCityCode(cityCode)) {
-      return;
-    }
    const group = GROUPS.find(g => String(g.cityCode) === cityCode);
    if (group) {
      openCustomerServiceChat(group.serviceUrl);
--- a/src/types/message.ts
+++ b/src/types/message.ts
@ -43,9 +43,7 @@ export interface ILocationMessage {
  longitude: number;
 }

-export interface IChatUser extends Pick<UserInfo, 'userId' | 'nickName'> {
-  resumeId: string;
-}
+export interface IChatUser extends Pick<UserInfo, 'userId' | 'nickName'> {}

 export interface IChatMessage {
  msgId: string;
--- a/src/utils/share.ts
+++ b/src/utils/share.ts
@ -15,14 +15,10 @@ const getRandomCount = () => {
  return (seed % 300) + 500;
 };

-export const getCommonShareMessage = (
-  useCapture: boolean = true,
-  inviteCode?: string,
-  title?: string
-): ShareAppMessageReturn => {
+export const getCommonShareMessage = (useCapture: boolean = true, inviteCode?: string): ShareAppMessageReturn => {
  console.log('share share message', getJumpUrl(PageUrl.Job, inviteCode ? { c: inviteCode } : undefined));
  return {
-    title: title || `昨天新增了${getRandomCount()}条主播通告，宝子快来看看`,
+    title: `昨天新增了${getRandomCount()}条主播通告，宝子快来看看`,
    path: getJumpUrl(PageUrl.Job, inviteCode ? { c: inviteCode } : undefined),
    imageUrl: useCapture ? undefined : imageUrl,
  };
--- a/src/utils/user.ts
+++ b/src/utils/user.ts
@ -148,23 +148,3 @@ 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);
-export const getCityCodes = (): string[] => {
-  const cachedValue = Taro.getStorageSync(CacheKey.CITY_CODES);
-  return !cachedValue || !Array.isArray(cachedValue) ? [] : cachedValue;
-};
-export const setCityCodes = (cityCode: string[]) => Taro.setStorageSync(CacheKey.CITY_CODES, cityCode);
-export const checkCityCode = (cityCode: string): boolean => {
-  const cachedCityCodes = getCityCodes();
-  const isNewCityCode = cachedCityCodes.indexOf(cityCode) === -1;
-  if (cachedCityCodes.length === 2 && isNewCityCode) {
-    Toast.info('最多只能进入2个城市');
-    return false;
-  }
-  if (isNewCityCode) {
-    setCityCodes([...cachedCityCodes, cityCode]);
-  }
-  return true;
-};