feat:

project.config.json

@@ -44,4 +44,4 @@
   },
   "appid": "wxf0724a83f8e377d2",
   "simulatorPluginLibVersion": {}
-}
+}

src/components/agreement-popup/index.tsx

@@ -1,4 +1,4 @@
-import { Button } from '@tarojs/components';
+import { Button, ITouchEvent } from '@tarojs/components';
 
 import { Popup } from '@taroify/core';
 import { useCallback } from 'react';
@@ -13,17 +13,18 @@ import './index.less';
 interface IProps {
   open: boolean;
   onCancel: () => void;
-  onConfirm: () => void;
+  onConfirm: (e: ITouchEvent) => void;
   needPhone?: boolean;
+  needBindPhone?: boolean;
 }
 
 const PREFIX = 'agreement-popup';
 
-export function AgreementPopup({ open, onCancel, onConfirm, needPhone }: IProps) {
+export function AgreementPopup({ open, onCancel, onConfirm, needPhone, needBindPhone }: IProps) {
   const handleBindPhone = useCallback(
-    status => {
+    (status: BindPhoneStatus, e: ITouchEvent) => {
       if (status === BindPhoneStatus.Success) {
-        onConfirm();
+        onConfirm(e);
       } else {
         onCancel();
       }
@@ -48,8 +49,8 @@ export function AgreementPopup({ open, onCancel, onConfirm, needPhone }: IProps)
           <Button className={`${PREFIX}__cancel-button`} onClick={onCancel}>
             拒绝
           </Button>
-          {needPhone ? (
-            <PhoneButton className={`${PREFIX}__confirm-button`} needPhone onBindPhone={handleBindPhone}>
+          {needBindPhone ? (
+            <PhoneButton className={`${PREFIX}__confirm-button`} needPhone={needPhone} onBindPhone={handleBindPhone}>
               同意
             </PhoneButton>
           ) : (

src/components/anchor-list/index.tsx

@@ -7,13 +7,14 @@ 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, isNeedPhone, setAgreementSigned } from '@/utils/user';
+import { getAgreementSigned, isNeedLogin, setAgreementSigned } from '@/utils/user';
 
 import { AgreementPopup } from '../agreement-popup';
 
@@ -59,10 +60,11 @@ function AnchorList(props: IAnchorListProps) {
   const requestProps = useRef<IRequestProps>({});
   const prevRequestProps = useRef<IRequestProps>({});
   const onListEmptyRef = useRef(onListEmpty);
-  const [open, setOpen] = useState(false);
+  const [openLogin, setLoginOpen] = useState(false);
+  const [openAssignment, setAssignmentOpen] = useState(false);
   const successCallback = useRef<() => void>(() => {});
   const userInfo = useUserInfo();
-  const needPhone = isNeedPhone(userInfo);
+  const needLogin = isNeedLogin(userInfo);
 
   const handleRefresh = useCallback(async () => {
     log('start pull refresh');
@@ -129,23 +131,33 @@ function AnchorList(props: IAnchorListProps) {
   );
 
   const handleCancel = useCallback(() => {
-    setOpen(false);
+    setAssignmentOpen(false);
     setAgreementSigned(false);
   }, []);
 
   const handleConfirm = useCallback(() => {
-    setOpen(false);
+    setAssignmentOpen(false);
     setAgreementSigned(true);
-    //TODO 没手机号要授权一下; 必须要开弹窗才可以，与需求不符
     successCallback.current();
   }, []);
 
+  const handleLoginSuccess = useCallback(() => {
+    setLoginOpen(false);
+    successCallback.current();
+  }, []);
+
+  const handleLoginCancel = useCallback(() => {
+    setLoginOpen(false);
+  }, []);
+
   const validator = (onSuccess: () => void) => {
-    if (getAgreementSigned()) {
-      onSuccess();
+    successCallback.current = onSuccess;
+    if (!getAgreementSigned()) {
+      setAssignmentOpen(true);
+    } else if (needLogin) {
+      setLoginOpen(true);
     } else {
-      successCallback.current = onSuccess;
-      setOpen(true);
+      onSuccess();
     }
   };
 
@@ -233,7 +245,13 @@ function AnchorList(props: IAnchorListProps) {
           <ListPlaceholder hasMore={hasMore} loadingMore={loadingMore} loadMoreError={loadMoreError} />
         </List>
       </PullRefresh>
-      <AgreementPopup open={open} onCancel={handleCancel} onConfirm={handleConfirm} needPhone={needPhone} />
+      <AgreementPopup
+        open={openAssignment}
+        onCancel={handleCancel}
+        onConfirm={handleConfirm}
+        needBindPhone={needLogin}
+      />
+      {openLogin && <LoginDialog onCancel={handleLoginCancel} onSuccess={handleLoginSuccess} />}
     </>
   );
 }

src/components/job-recommend-list/index.tsx

@@ -46,8 +46,8 @@ function JobRecommendList(props: IJobListProps) {
         setDataList([]);
         setLoading(true);
         setLoadError(false);
-        const { jobResults = [] } = await requestMyRecommendJobList({ ...requestProps.current });
-        setDataList(jobResults);
+        const { jobResults } = await requestMyRecommendJobList({ ...requestProps.current });
+        setDataList(jobResults || []);
       } catch (e) {
         setDataList([]);
         setLoadError(true);

src/components/login-button/index.tsx

@@ -1,11 +1,12 @@
-import { Button, ButtonProps } from '@tarojs/components';
+import { Button, ButtonProps, ITouchEvent } 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 } from '@/utils/user';
+import { getAgreementSigned, isNeedLogin, setAgreementSigned } from '@/utils/user';
 
 import './index.less';
 
@@ -17,6 +18,7 @@ export enum BindPhoneStatus {
 
 export interface ILoginButtonProps extends ButtonProps {
   needPhone?: boolean;
+  needAssignment?: boolean;
 }
 
 const PREFIX = 'login-button';
@@ -24,13 +26,50 @@ const PREFIX = 'login-button';
 function LoginButton(props: ILoginButtonProps) {
   const { className, children, needPhone, onClick, ...otherProps } = props;
   const userInfo = useUserInfo();
-  const [visible, setVisible] = useState(false);
+  const [loginVisible, setLoginVisible] = useState(false);
+  const [assignVisible, setAssignVisible] = useState(false);
   const needLogin = isNeedLogin(userInfo);
-  const needSign = !getAgreementSigned();
+  // 点击按钮时，协议同意也手机也授权了 -> 下一步
+  //
+  // 点击按钮时，协议同意但是手机授权没给 ->  弹登录
+  //   -> 如果授权了手机号就进行下一步
+  //   -> 不给授权没下一步
+  //
+  // 点击按钮时，协议不同意 ->  弹协议窗口
+  //   -> 如果同意就进行下一步
+  //   -> 不同意没下一步
+  const handleClick = useCallback(
+    (e: ITouchEvent) => {
+      if (!getAgreementSigned()) {
+        setAssignVisible(true);
+      } else if (needLogin) {
+        setLoginVisible(true);
+      } else if (onClick) {
+        onClick(e);
+      }
+    },
+    [needLogin, onClick]
+  );
 
-  const onSuccess = useCallback(
+  const handleConfirm = useCallback(
+    (e: ITouchEvent) => {
+      setAssignVisible(false);
+      setAgreementSigned(true);
+      if (onClick) {
+        onClick(e);
+      }
+    },
+    [onClick]
+  );
+
+  const handleCancel = useCallback(() => {
+    setAgreementSigned(false);
+    setAssignVisible(false);
+  }, []);
+
+  const handleLoginSuccess = useCallback(
     e => {
-      setVisible(false);
+      setLoginVisible(false);
       onClick?.(e);
     },
     [onClick]
@@ -38,15 +77,17 @@ function LoginButton(props: ILoginButtonProps) {
 
   return (
     <>
-      <Button
-        {...otherProps}
-        className={classNames(PREFIX, className)}
-        onClick={needLogin || needSign ? () => setVisible(true) : onClick}
-      >
+      <Button {...otherProps} className={classNames(PREFIX, className)} onClick={handleClick}>
         {children}
       </Button>
-      {visible && (
-        <LoginDialog disableCheck onCancel={() => setVisible(false)} onSuccess={onSuccess} needPhone={needPhone} />
+      <AgreementPopup
+        open={assignVisible}
+        onCancel={handleCancel}
+        onConfirm={handleConfirm}
+        needBindPhone={needLogin}
+      />
+      {loginVisible && (
+        <LoginDialog onCancel={() => setLoginVisible(false)} onSuccess={handleLoginSuccess} needPhone={needPhone} />
       )}
     </>
   );

src/components/login-dialog/index.less

@@ -17,22 +17,4 @@
     .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;
-  }
 }

src/components/login-dialog/index.tsx

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

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`}>单笔最大500元</div>
+          <div className={`${PREFIX}-withdraw-dialog__hint`}>单日提现最大200元</div>
           <Button className={`${PREFIX}-withdraw-dialog__confirm-button`} onClick={handleWithdraw}>
             提现
           </Button>
@@ -124,10 +124,14 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
     setStats(data);
   }, []);
   const handleViewWithdraw = useCallback(() => {
-    if (stats.availableBalance < 10 * 1000) {
-      Toast.error('提现金额需大于等于10元');
+    if (stats.availableBalance < 0) {
+      Toast.info('提现金额需大于等于0元');
       return;
     }
+    // if (stats.availableBalance < 10 * 1000) {
+    //   Toast.error('提现金额需大于等于10元');
+    //   return;
+    // }
     setWithdrawOpen(true);
   }, [stats.availableBalance]);
   const handleWithdrawClose = useCallback(() => {
@@ -193,7 +197,7 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
       {!simple && <TipDialog open={tipOpen} onClose={handleTipClose} />}
       {!simple && (
         <WithdrawDialog
-          count={Math.min(Number(formatMoney(stats.availableBalance)), 500)}
+          count={Math.min(Number(formatMoney(stats.availableBalance)), 200)}
           open={withdrawOpen}
           onClose={handleWithdrawClose}
         />

src/components/phone-button/index.tsx

@@ -19,7 +19,7 @@ export interface IPhoneButtonProps extends ButtonProps {
   message?: string;
   // 绑定后是否需要刷新接口获取手机号
   needPhone?: boolean;
-  onBindPhone?: (status: BindPhoneStatus) => void;
+  onBindPhone?: (status: BindPhoneStatus, e: ITouchEvent) => 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);
+        onBindPhone?.(BindPhoneStatus.Cancel, e as ITouchEvent);
         return Toast.error('取消授权');
       }
       try {
         await setPhoneNumber({ encryptedData, iv });
         needPhone && (await requestUserInfo());
         Toast.success(message);
-        onBindPhone?.(BindPhoneStatus.Success);
+        onBindPhone?.(BindPhoneStatus.Success, e as ITouchEvent);
         onSuccess?.(e as ITouchEvent);
       } catch (err) {
-        onBindPhone?.(BindPhoneStatus.Error);
+        onBindPhone?.(BindPhoneStatus.Error, e as ITouchEvent);
         Toast.error('绑定失败');
         log('bind phone fail', err);
       }

src/constants/cache-key.ts

@@ -10,5 +10,6 @@ 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__'
+  AGREEMENT_SIGNED = '__agreement_signed__',
+  CITY_CODES = '__city_codes__',
 }

src/constants/city.ts

@@ -5861,6 +5861,16 @@ export const CITY_INDEXES_LIST = [
 ];
 
 export const GROUP_CITY_INDEXES_LIST = [
+  {
+    letter: 'B',
+    data: [
+      {
+        cityCode: '110100',
+        cityName: '北京',
+        keyword: 'BEIJING北京',
+      },
+    ],
+  },
   {
     letter: 'C',
     data: [
@@ -5874,6 +5884,11 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '成都',
         keyword: 'CHENGDOU成都',
       },
+      {
+        cityCode: '430100',
+        cityName: '长沙',
+        keyword: 'CHANGSHA长沙',
+      },
     ],
   },
   {
@@ -5914,6 +5929,11 @@ export const GROUP_CITY_INDEXES_LIST = [
   {
     letter: 'H',
     data: [
+      {
+        cityCode: '330100',
+        cityName: '杭州',
+        keyword: 'HANGZHOU杭州',
+      },
       {
         cityCode: '340100',
         cityName: '合肥',
@@ -5921,6 +5941,16 @@ export const GROUP_CITY_INDEXES_LIST = [
       },
     ],
   },
+  {
+    letter: 'K',
+    data: [
+      {
+        cityCode: '530100',
+        cityName: '昆明',
+        keyword: 'KUNMING昆明',
+      },
+    ],
+  },
   {
     letter: 'N',
     data: [
@@ -5939,6 +5969,11 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '青岛',
         keyword: 'QINGDAO青岛',
       },
+      {
+        cityCode: '350500',
+        cityName: '泉州',
+        keyword: 'QUANZHOU泉州',
+      },
     ],
   },
   {
@@ -5959,11 +5994,6 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '苏州',
         keyword: 'SUZHOU苏州',
       },
-      {
-        cityCode: '330300',
-        cityName: '温州',
-        keyword: 'WENZHOU温州',
-      },
     ],
   },
   {
@@ -5979,6 +6009,11 @@ export const GROUP_CITY_INDEXES_LIST = [
   {
     letter: 'W',
     data: [
+      {
+        cityCode: '330300',
+        cityName: '温州',
+        keyword: 'WENZHOU温州',
+      },
       {
         cityCode: '420100',
         cityName: '武汉',
@@ -5994,6 +6029,11 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '西安',
         keyword: 'XIAN西安',
       },
+      {
+        cityCode: '350200',
+        cityName: '厦门',
+        keyword: 'XIAMEN厦门',
+      },
     ],
   },
   {

src/pages/anchor/index.tsx

@@ -186,7 +186,7 @@ export default function AnchorPage() {
   });
 
   useShareAppMessage(() => {
-    return getCommonShareMessage(true, inviteCode);
+    return getCommonShareMessage(true, inviteCode, '数万名优质主播等你来挑');
   });
 
   useDidShow(() => requestUnreadMessageCount());

src/pages/group-v2/index.tsx

@@ -11,6 +11,7 @@ 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';
@@ -26,6 +27,9 @@ 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);

src/pages/job-detail/index.tsx

@@ -112,7 +112,6 @@ const AnchorFooter = (props: { data: JobDetails }) => {
   }, [data]);
 
   const handleDialogHidden = useCallback(() => setDialogVisible(false), []);
-
   return (
     <>
       <div className={`${PREFIX}__footer`}>

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/user-batch-publish/index.tsx

@@ -11,6 +11,7 @@ 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';
@@ -22,6 +23,9 @@ 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);

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/app.ts

@@ -41,6 +41,8 @@ export const switchRoleType = async (appMode?: RoleType) => {
     const curMode = getRoleType();
     appMode = curMode === RoleType.Anchor ? RoleType.Company : RoleType.Anchor;
   }
+
+  console.log('switchRoleType', appMode);
   try {
     await postSwitchRoleType(appMode);
     store.dispatch(changeRoleType(appMode));

src/utils/share.ts

@@ -15,10 +15,14 @@ const getRandomCount = () => {
   return (seed % 300) + 500;
 };
 
-export const getCommonShareMessage = (useCapture: boolean = true, inviteCode?: string): ShareAppMessageReturn => {
+export const getCommonShareMessage = (
+  useCapture: boolean = true,
+  inviteCode?: string,
+  title?: string
+): ShareAppMessageReturn => {
   console.log('share share message', getJumpUrl(PageUrl.Job, inviteCode ? { c: inviteCode } : undefined));
   return {
-    title: `昨天新增了${getRandomCount()}条主播通告，宝子快来看看`,
+    title: title || `昨天新增了${getRandomCount()}条主播通告，宝子快来看看`,
     path: getJumpUrl(PageUrl.Job, inviteCode ? { c: inviteCode } : undefined),
     imageUrl: useCapture ? undefined : imageUrl,
   };

src/utils/user.ts

@@ -151,3 +151,20 @@ export async function followGroup(blGroupId: FollowGroupRequest['blGroupId']) {
 
 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;
+};