feat:

package.json

@@ -109,5 +109,6 @@
 		"ignoredBuiltDependencies": [
 			"@tarojs/binding"
 		]
-	}
+	},
+	"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

project.config.json

@@ -16,7 +16,19 @@
     "coverView": false,
     "showShadowRootInWxmlPanel": false,
     "packNpmRelationList": [],
-    "ignoreUploadUnusedFiles": true
+    "ignoreUploadUnusedFiles": true,
+    "compileWorklet": false,
+    "uglifyFileName": false,
+    "uploadWithSourceMap": true,
+    "packNpmManually": false,
+    "minifyWXSS": true,
+    "minifyWXML": true,
+    "localPlugins": false,
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "condition": false,
+    "swc": false,
+    "disableSWC": true
   },
   "compileType": "miniprogram",
   "srcMiniprogramRoot": "dist/",
@@ -30,5 +42,6 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wxf0724a83f8e377d2"
+  "appid": "wxf0724a83f8e377d2",
-}
+  "simulatorPluginLibVersion": {}
+}

src/app.tsx

@@ -7,16 +7,16 @@ import { REFRESH_UNREAD_COUNT_TIME } from '@/constants/message';
 import http from '@/http';
 import store from '@/store';
 import { requestUnreadMessageCount } from '@/utils/message';
-import { getInviteCode } from '@/utils/partner';
+import { getInviteCode, getInviteCodeFromQuery } from '@/utils/partner';
 import qiniuUpload from '@/utils/qiniu-upload';
 import { requestUserInfo, updateLastLoginTime } from '@/utils/user';
 
 import './app.less';
 
 function App({ children }: PropsWithChildren<BL.Anything>) {
-  useLaunch(async () => {
+  useLaunch(async ({ query }) => {
     console.log('App launched.');
-    await http.init();
+    await http.init(getInviteCodeFromQuery(query));
     requestUserInfo().then(userInfo => {
       if (userInfo.isPartner) {
         getInviteCode();

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,66 @@
+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>
+  );
+}

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(
+  const handleNavTo = useCallback(() => {
-    () => navigateTo(PageUrl.MaterialView, { jobId, resumeId: data.id, source: MaterialViewSource.AnchorList }),
+    navigateTo(PageUrl.MaterialView, { jobId, resumeId: data.id, source: MaterialViewSource.AnchorList });
-    [data, jobId]
+  }, [data, jobId]);
-  );
+
+  const handleClick = useCallback(() => {
+    validator(handleNavTo);
+  }, [handleNavTo, validator]);
 
   return (
     <div className={PREFIX} style={style} onClick={handleClick}>

src/components/anchor-list/index.tsx

@@ -7,11 +7,16 @@ 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';
 
@@ -55,6 +60,11 @@ 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');
@@ -120,6 +130,37 @@ 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]);
@@ -183,26 +224,35 @@ function AnchorList(props: IAnchorListProps) {
   }, [jobId, ready, filters, cityCode, sortType]);
 
   return (
-    <PullRefresh
+    <>
-      className={classNames(`${PREFIX}__pull-refresh`, className)}
+      <PullRefresh
-      loading={refreshing}
+        className={classNames(`${PREFIX}__pull-refresh`, className)}
-      onRefresh={handleRefresh}
+        loading={refreshing}
-      disabled={refreshDisabled || !ready}
+        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}
       >
-        {dataList.map(item => (
+        <List
-          <AnchorCard data={item} jobId={jobId} key={item.id} />
+          hasMore={hasMore}
-        ))}
+          onLoad={handleLoadMore}
-        <ListPlaceholder hasMore={hasMore} loadingMore={loadingMore} loadMoreError={loadMoreError} />
+          loading={loadingMore || refreshing}
-      </List>
+          disabled={loadMoreError || !ready}
-    </PullRefresh>
+          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={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 });
+        const { jobResults } = await requestMyRecommendJobList({ ...requestProps.current });
-        setDataList(jobResults);
+        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 { 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,12 +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 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]
@@ -37,14 +77,18 @@ function LoginButton(props: ILoginButtonProps) {
 
   return (
     <>
-      <Button
+      <Button {...otherProps} className={classNames(PREFIX, className)} onClick={handleClick}>
-        {...otherProps}
-        className={classNames(PREFIX, className)}
-        onClick={needLogin ? () => setVisible(true) : onClick}
-      >
         {children}
       </Button>
-      {visible && <LoginDialog 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,11 +1,6 @@
-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';
 
@@ -21,36 +16,20 @@ 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 && (
+          <PhoneButton
-            <Button className={`${PREFIX}__confirm-button`} onClick={handleTipCheck}>
+            className={`${PREFIX}__confirm-button`}
-              登录
+            onSuccess={onSuccess}
-            </Button>
+            onBindPhone={onBindPhone}
-          )}
+            needPhone={needPhone}
-          {checked && (
+          >
-            <PhoneButton
+            登录
-              className={`${PREFIX}__confirm-button`}
+          </PhoneButton>
-              onSuccess={onSuccess}
-              onBindPhone={onBindPhone}
-              needPhone={needPhone}
-            >
-              登录
-            </PhoneButton>
-          )}
-          <Button className={`${PREFIX}__cancel-button`} onClick={onCancel}>
-            跳过，暂不登录
-          </Button>
-          <ProtocolPrivacyCheckbox checked={checked} onChange={setChecked} className={`${PREFIX}__checkbox`} />
         </div>
       </Dialog.Content>
     </Dialog>

src/components/message-chat/base/index.tsx

@@ -2,13 +2,13 @@ import { Image } from '@tarojs/components';
 
 import classNames from 'classnames';
 import { PropsWithChildren, useEffect, useState, useCallback } from 'react';
-import { MaterialViewSource } from '@/constants/material';
 
+import { PageUrl } from '@/constants/app';
+import { MaterialViewSource } from '@/constants/material';
 import useUserInfo from '@/hooks/use-user-info';
 import { IChatMessage } from '@/types/message';
 import { getScrollItemId } from '@/utils/common';
 import { navigateTo } from '@/utils/route';
-import { PageUrl } from '@/constants/app';
 
 import './index.less';
 
@@ -19,12 +19,13 @@ export interface IBaseMessageProps {
 
 export interface IUserMessageProps extends PropsWithChildren, IBaseMessageProps {
   isRead?: boolean;
+  resumeId?: string;
 }
 
 const PREFIX = 'base-message';
 
 function BaseMessage(props: IUserMessageProps) {
-  const { id, message, isRead: isReadProps, children } = props;
+  const { id, message, isRead: isReadProps, children, resumeId } = props;
   const { userId } = useUserInfo();
   const [isRead, setIsRead] = useState(message.isRead);
   const isSender = message.senderUserId === userId;
@@ -37,10 +38,12 @@ function BaseMessage(props: IUserMessageProps) {
   //   const timer = setTimeout(() => setIsRead(true), 1200);
   //   return () => clearTimeout(timer);
   // }, [isSender]);
-  const handleClick = useCallback(
+  const handleClick = useCallback(() => {
-    () => navigateTo(PageUrl.MaterialView, { resumeId: message.jobId, source: MaterialViewSource.Chat }),
+    if (!resumeId || isSender) {
-    [message.jobId]
+      return;
-  );
+    }
+    navigateTo(PageUrl.MaterialView, { resumeId: resumeId, source: MaterialViewSource.Chat });
+  }, [resumeId, isSender]);
   useEffect(() => {
     if (isRead) {
       return;
@@ -53,6 +56,7 @@ function BaseMessage(props: IUserMessageProps) {
       <Image
         mode="aspectFit"
         className={`${PREFIX}__avatar`}
+        onClick={handleClick}
         src={message.senderAvatarUrl || require('@/statics/png/default_avatar.png')}
       />
       <div className={`${PREFIX}__content-container`}>

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/components/partner-intro/index.less

@@ -61,6 +61,10 @@
     font-weight: 400;
     font-size: 28px;
     line-height: 40px;
+
+    &.grey {
+      color: @blColorG2
+    }
   }
 
   &__title {

src/components/partner-intro/index.tsx

@@ -142,12 +142,18 @@ export default function PartnerIntro() {
           </div>
         </div>
         <div className={`${PREFIX}__block`}>
-          <div className={`${PREFIX}__title`}>群主特别通道</div>
+          <div className={`${PREFIX}__title`}>分享方法</div>
+          <div className={`${PREFIX}__card`}>
+            <div className={`${PREFIX}__body`}>分享小程序任意页面到群、朋友圈、好友即可</div>
+          </div>
+        </div>
+        <div className={`${PREFIX}__block`}>
+          <div className={`${PREFIX}__title`}>合伙人交流群</div>
           <div className={`${PREFIX}__card  ${PREFIX}__special`}>
-            <div className={`${PREFIX}__body`}>如果您是主播群群主，请务必添加播络小伙计</div>
+            <div className={`${PREFIX}__h1`}>加入播络合伙人交流群</div>
-            <div className={`${PREFIX}__body`}>我们会为您提供专属服务，让您的收益最大化</div>
+            <div className={`${PREFIX}__body grey`}>学习分享邀请经验，一起赚钱</div>
             <Button className={`${PREFIX}__service`} onClick={handleOpenService}>
-              点击添加播络伙计
+              点击加入
             </Button>
           </div>
           <div className={`${PREFIX}__tip`}>注：收益不设时限，可重复享有，播络保留活动最终解释权</div>

src/components/partner-invite-list/index.less

@@ -41,14 +41,18 @@
     height: 131px;
     width: 100%;
     background: #fff;
-    padding: 24px 32px;
+    padding: 24px 32px 0 32px;
     box-sizing: border-box;
     font-size: 28px;
 
+    &-border {
+      border-bottom: 1px solid #e6e7e8;
+    }
+
     &-content {
       .flex-row();
       width: 100%;
-      border-bottom: 1px solid #e6e7e8;
+      padding-bottom: 24px;
     }
 
     &-time-id {

src/components/partner-invite-list/index.tsx

@@ -12,6 +12,8 @@ import './index.less';
 const PREFIX = 'partner-invite-list';
 const log = logWithPrefix(PREFIX);
 
+const FIRST_PAGE = 0;
+
 function PartnerList(props: {
   refreshDisabled?: boolean;
   visible?: boolean;
@@ -20,10 +22,12 @@ function PartnerList(props: {
   onListEmpty?: () => void;
 }) {
   const { className, listHeight, refreshDisabled, visible = true, onListEmpty } = props;
+  const [hasMore, setHasMore] = useState(true);
   const [refreshing, setRefreshing] = useState(false);
   const [loadingMore, setLoadingMore] = useState(false);
   const [loadMoreError, setLoadMoreError] = useState(false);
   const [dataList, setDataList] = useState<InviteUserInfo[]>([]);
+  const currentPage = useRef<number>(FIRST_PAGE);
   const onListEmptyRef = useRef(onListEmpty);
 
   const handleRefresh = useCallback(async () => {
@@ -31,19 +35,44 @@ function PartnerList(props: {
     try {
       setRefreshing(true);
       setLoadMoreError(false);
-      const list = await requestData();
+      const { content, totalPages } = await requestData({ page: 1 });
-      setDataList(list);
+      setDataList(content);
-      !list.length && onListEmptyRef.current?.();
+      currentPage.current = 1;
+      setHasMore(currentPage.current < totalPages);
+      !content.length && onListEmptyRef.current?.();
       log('pull refresh success');
     } catch (e) {
       setDataList([]);
+      setHasMore(false);
       setLoadMoreError(true);
+      currentPage.current = FIRST_PAGE;
       log('pull refresh failed');
     } finally {
       setRefreshing(false);
     }
   }, []);
 
+  const handleLoadMore = useCallback(async () => {
+    log('start load more', hasMore);
+    if (!hasMore) {
+      return;
+    }
+    setLoadMoreError(false);
+    setLoadingMore(true);
+    try {
+      const { totalPages, content } = await requestData({ page: currentPage.current + 1 });
+      setDataList([...dataList, ...content]);
+      currentPage.current = currentPage.current + 1;
+      setHasMore(currentPage.current < totalPages);
+      log('load more success');
+    } catch (e) {
+      setLoadMoreError(true);
+      log('load more failed');
+    } finally {
+      setLoadingMore(false);
+    }
+  }, [dataList, hasMore]);
+
   useEffect(() => {
     onListEmptyRef.current = onListEmpty;
   }, [onListEmpty]);
@@ -62,11 +91,14 @@ function PartnerList(props: {
         setDataList([]);
         setLoadingMore(true);
         setLoadMoreError(false);
-        const list = await requestData();
+        const { totalPages, content } = await requestData({ page: 1 });
-        setDataList(list);
+        setDataList(content);
-        !list.length && onListEmptyRef.current?.();
+        currentPage.current = 1;
+        setHasMore(currentPage.current < totalPages);
+        !content.length && onListEmptyRef.current?.();
       } catch (e) {
         setDataList([]);
+        setHasMore(false);
         setLoadMoreError(true);
       } finally {
         log('visible changed, refresh list data end');
@@ -90,22 +122,24 @@ function PartnerList(props: {
         disabled={refreshDisabled}
       >
         <List
-          hasMore={false}
+          hasMore={hasMore}
-          onLoad={() => {}}
+          onLoad={handleLoadMore}
           loading={loadingMore || refreshing}
-          disabled={loadMoreError}
+          disabled={loadMoreError || !visible}
           fixedHeight={typeof listHeight !== 'undefined'}
           style={listHeight ? { height: `${listHeight}px` } : undefined}
         >
           {dataList.map(item => (
             <div className={`${PREFIX}__item`} key={item.id || item.userId}>
-              <div className={`${PREFIX}__item-content`}>
+              <div className={`${PREFIX}__item-border`}>
-                <div className={`${PREFIX}__item-time-id`}>
+                <div className={`${PREFIX}__item-content`}>
-                  <div className={`${PREFIX}__item-time`}>{formatTimestamp(item.created)}</div>
+                  <div className={`${PREFIX}__item-time-id`}>
-                  <div className={`${PREFIX}__item-id`}>{formatUserId(item.userId)}</div>
+                    <div className={`${PREFIX}__item-time`}>{formatTimestamp(item.created)}</div>
+                    <div className={`${PREFIX}__item-id`}>{formatUserId(item.userId)}</div>
+                  </div>
+                  <div className={`${PREFIX}__item-created`}>{item.isCreateResume ? '已创建' : '未创建'}</div>
+                  <div className={`${PREFIX}__item-joined`}>{item.isPartner ? '已加入' : '未加入'}</div>
                 </div>
-                <div className={`${PREFIX}__item-created`}>{item.isCreateResume ? '已创建' : '未创建'}</div>
-                <div className={`${PREFIX}__item-joined`}>{item.isPartner ? '已加入' : '未加入'}</div>
               </div>
             </div>
           ))}

src/components/partner-kanban/index.tsx

@@ -1,14 +1,16 @@
 import { Button, Image } from '@tarojs/components';
+import Taro, { useDidShow } from '@tarojs/taro';
 
 import { Dialog } from '@taroify/core';
 import { Question } from '@taroify/icons';
-import { useCallback, useState, useEffect } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 import { PageUrl } from '@/constants/app';
 import { PartnerProfitsState } from '@/types/partner';
-import { formatMoney, getPartnerProfitStat } from '@/utils/partner';
+import { formatMoney, getPartnerProfitStat, withdrawMoney } from '@/utils/partner';
 import { navigateTo } from '@/utils/route';
 import Toast from '@/utils/toast';
+
 import './index.less';
 
 const PREFIX = 'partner-kanban';
@@ -31,17 +33,48 @@ function TipDialog(props: { open: boolean; onClose: () => void }) {
 }
 
 function WithdrawDialog(props: { open: boolean; onClose: () => void; count: number }) {
-  const handleWithdraw = useCallback(() => {}, []);
+  const handleWithdraw = useCallback(async () => {
+    if (Taro.canIUse('requestMerchantTransfer')) {
+      try {
+        const result = await withdrawMoney();
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error
+        wx.requestMerchantTransfer({
+          mchId: '1642470088',
+          appId: 'wxf0724a83f8e377d2',
+          package: result.packageInfo,
+          success: (res: never) => {
+            // res.err_msg将在页面展示成功后返回应用时返回ok，并不代表付款成功
+            console.log('success:', res);
+            Toast.success('提现成功');
+            props.onClose();
+          },
+          fail: (res: never) => {
+            Toast.error('提现失败');
+            console.log('fail:', res);
+          },
+        });
+      } catch (e) {
+        Toast.error('提现订单创建失败');
+        console.log(e);
+      }
+    } else {
+      await Taro.showModal({
+        content: '你的微信版本过低，请更新至最新版本。',
+        showCancel: false,
+      });
+    }
+  }, [props]);
   return (
     <Dialog open={props.open} onClose={props.onClose}>
       <Dialog.Content>
         <div className={`${PREFIX}-withdraw-dialog__container`}>
           <div className={`${PREFIX}-withdraw-dialog__title`}>本次申请提现金额为</div>
           <div className={`${PREFIX}-withdraw-dialog__count`}>
-            {props.count}
+            {+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>
@@ -86,20 +119,28 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
   const handleTipClose = useCallback(() => {
     setTipOpen(false);
   }, []);
-  const handleViewWithdraw = useCallback(() => {
-    if (stats.availableBalance < 10 * 1000) {
-      Toast.info('提现金额需大于等于10元');
-      return;
-    }
-    setWithdrawOpen(true);
-  }, []);
-  const handleWithdrawClose = useCallback(() => {
-    setWithdrawOpen(false);
-  }, []);
   const getProfitStats = useCallback(async () => {
     const data = await getPartnerProfitStat();
     setStats(data);
   }, []);
+  const handleViewWithdraw = useCallback(() => {
+    if (stats.availableBalance < 0) {
+      Toast.info('提现金额需大于等于0元');
+      return;
+    }
+    // if (stats.availableBalance < 10 * 1000) {
+    //   Toast.error('提现金额需大于等于10元');
+    //   return;
+    // }
+    setWithdrawOpen(true);
+  }, [stats.availableBalance]);
+  const handleWithdrawClose = useCallback(() => {
+    setWithdrawOpen(false);
+    getProfitStats();
+  }, [getProfitStats]);
+  useDidShow(() => {
+    getProfitStats();
+  });
   useEffect(() => {
     getProfitStats();
   }, []);
@@ -154,7 +195,13 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
         )}
       </div>
       {!simple && <TipDialog open={tipOpen} onClose={handleTipClose} />}
-      {!simple && <WithdrawDialog count={350} open={withdrawOpen} onClose={handleWithdrawClose} />}
+      {!simple && (
+        <WithdrawDialog
+          count={Math.min(Number(formatMoney(stats.availableBalance)), 200)}
+          open={withdrawOpen}
+          onClose={handleWithdrawClose}
+        />
+      )}
     </div>
   );
 }

src/components/partner-profit/ProfitList.tsx

@@ -96,7 +96,8 @@ function ProfitList(props: IPartnerProfitListProps) {
           style={listHeight ? { height: `${listHeight}px` } : undefined}
         >
           {dataList.map(item => {
-            const isChat = type === ProfitType.CHAT_SHARE || item.earnType.toString().toLowerCase().indexOf('chat');
+            const isChat =
+              type === ProfitType.CHAT_SHARE || item.earnType.toString().toLowerCase().indexOf('chat') > -1;
             return (
               <div className={`${PREFIX}__row`} key={item.id}>
                 <div className={`${PREFIX}__row-content`}>

src/components/partner-profit/index.less

@@ -28,6 +28,14 @@
     }
   }
 
+  &__help-icon {
+    width: 28px;
+    height: 28px;
+    margin-left: 2px;
+    position: relative;
+    top: 6px;
+  }
+
   &__title {
     height: 72px;
     width: 100%;
@@ -70,10 +78,13 @@
     &:last-child {
       padding-right: 0;
     }
-    &.time,
+    &.time {
-    &.project {
       flex: 2;
     }
+    &.project {
+      width: 150px;
+      flex-shrink: 0;
+    }
     &.status {
       width: 96px;
       padding: 0 8px;

src/components/partner-profit/index.tsx

@@ -1,7 +1,10 @@
+import { Image } from '@tarojs/components';
+
 import { Tabs } from '@taroify/core';
 
 import PartnerKanban from '@/components/partner-kanban';
 import { ProfitType } from '@/types/partner';
+import Toast from '@/utils/toast';
 
 import ProfitList from './ProfitList';
 
@@ -21,22 +24,64 @@ function TableTitle() {
 }
 
 export default function PartnerProfit() {
+  const handleClickHelpChat = () => {
+    Toast.info('主播被开聊14天后会显示收益');
+  };
+  const handleClickHelpPay = () => {
+    Toast.info('会员支付15日后结算收益');
+  };
+  const handleClickHelpInvite = () => {
+    Toast.info('所邀合伙人获得收益后自动获得收益');
+  };
   return (
     <div className={PREFIX}>
       <div className={`${PREFIX}__top`}>
         <PartnerKanban />
       </div>
       <div className={`${PREFIX}__main`}>
-        <Tabs className={`${PREFIX}__tabs`}>
+        <Tabs className={`${PREFIX}__tabs`} ellipsis={false}>
-          <Tabs.TabPane title="推荐主播收益">
+          <Tabs.TabPane
+            title={
+              <>
+                推荐主播收益
+                <Image
+                  className={`${PREFIX}__help-icon`}
+                  src={require('@/statics/svg/help.svg')}
+                  onClick={handleClickHelpChat}
+                />
+              </>
+            }
+          >
             <TableTitle />
             <ProfitList type={ProfitType.CHAT_SHARE} />
           </Tabs.TabPane>
-          <Tabs.TabPane title="推荐会员权益">
+          <Tabs.TabPane
+            title={
+              <>
+                推荐会员权益
+                <Image
+                  className={`${PREFIX}__help-icon`}
+                  src={require('@/statics/svg/help.svg')}
+                  onClick={handleClickHelpPay}
+                />
+              </>
+            }
+          >
             <TableTitle />
             <ProfitList type={ProfitType.PAYMENT_SHARE} />
           </Tabs.TabPane>
-          <Tabs.TabPane title="推荐合伙人收益">
+          <Tabs.TabPane
+            title={
+              <>
+                推荐合伙人收益
+                <Image
+                  className={`${PREFIX}__help-icon`}
+                  src={require('@/statics/svg/help.svg')}
+                  onClick={handleClickHelpInvite}
+                />
+              </>
+            }
+          >
             <TableTitle />
             <ProfitList type={ProfitType.INDIRECT_MEMBER_REFERRAL} />
           </Tabs.TabPane>

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,4 +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__',
+  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/constants/partner.ts

@@ -2,53 +2,59 @@ export enum ProfitStatus {
   /**
    * 待处理/待计算 (例如，等待上游数据或条件满足)
    */
-  PENDING_CALCULATION = 0,
+  PENDING_CALCULATION = 'PENDING_CALCULATION',
 
   /**
    * 待直接结算/待直接分账 (例如，T+7 到账)
    * 这种类型的佣金会计入银行账户，而非平台余额
    */
-  DIRECT_SETTLEMENT_PENDING = 1,
+  DIRECT_SETTLEMENT_PENDING = 'DIRECT_SETTLEMENT_PENDING',
 
   /**
    * 直接结算已完成/直接分账已完成
    */
-  DIRECT_SETTLEMENT_PROCESSING = 2,
+  DIRECT_SETTLEMENT_PROCESSING = 'DIRECT_SETTLEMENT_PROCESSING',
 
   /**
    * 间接收益已结算到合伙人余额 (例如，主播推荐奖金进入可提现余额)
    */
-  INDIRECT_SETTLED_TO_BALANCE = 3,
+  INDIRECT_SETTLED_TO_BALANCE = 'INDIRECT_SETTLED_TO_BALANCE',
 
   /**
    * 佣金已取消 (例如，订单退款，不满足条件等)
    */
-  CANCELLED = 4,
+  CANCELLED = 'CANCELLED',
 
   /**
    * 佣金处理失败
    */
-  FAILED = 5,
+  FAILED = 'FAILED',
 
   /**
    * 其他状态
    */
-  OTHER = 6,
+  OTHER = 'OTHER',
 
   /**
    * 已完成
    */
-  FINISHED = 7,
+  FINISHED = 'FINISHED',
 }
 
 // 如果需要为每个枚举值添加描述，可以使用一个单独的映射对象
-export const ProfitStatusDescriptions: { [key in ProfitStatus]: string } = {
+export const ProfitStatusDescriptions = {
-  [ProfitStatus.PENDING_CALCULATION]: '',
+  PENDING_CALCULATION: '',
-  [ProfitStatus.DIRECT_SETTLEMENT_PENDING]: '待分账',
+  DIRECT_SETTLEMENT_PENDING: '待分账',
-  [ProfitStatus.DIRECT_SETTLEMENT_PROCESSING]: '',
+  DIRECT_SETTLEMENT_PROCESSING: '',
-  [ProfitStatus.INDIRECT_SETTLED_TO_BALANCE]: '',
+  INDIRECT_SETTLED_TO_BALANCE: '',
-  [ProfitStatus.CANCELLED]: '',
+  CANCELLED: '',
-  [ProfitStatus.FAILED]: '',
+  FAILED: '',
-  [ProfitStatus.OTHER]: '',
+  OTHER: '',
-  [ProfitStatus.FINISHED]: '已分账',
+  FINISHED: '已分账',
+};
+
+export const WithdrawStatusDescriptions = {
+  0: '提现中',
+  1: '已提现',
+  2: '失败',
 };

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/hooks/user-role-type.tsx

@@ -1,9 +1,10 @@
 import { useSelector } from 'react-redux';
 
+import { RoleType } from '@/constants/app';
 import { selectRoleType } from '@/store/selector';
 
 function useRoleType() {
-  return useSelector(selectRoleType);
+  return useSelector(selectRoleType) || RoleType.Anchor;
 }
 
 export default useRoleType;

src/http/api.ts

@@ -78,8 +78,10 @@ export enum API {
   // partner
   PARTNER_QRCODE = '/user/getInviteQrCode',
   GET_INVITE_CODE = '/user/getUserInviteCode',
-  GET_INVITE_LIST = '/user/inviteUsers',
+  GET_INVITE_LIST = '/user/inviteUsers/list',
   BECOME_PARTNER = '/user/becomePartner',
   GET_PROFIT_LIST = '/user/profit/list',
   GET_PROFIT_STAT = '/user/profits',
+  WITHDRAW = '/user/withdraw',
+  GET_WITHDRAW_LIST = '/user/withdraw/records',
 }

src/http/index.ts

@@ -107,14 +107,14 @@ class Http {
       url: BASE_URL + url,
       data,
       method: method,
-      header: { 'content-type': contentType /*,  'user-Id': '588002047871053824' */ },
+      header: { 'content-type': contentType /*'user-Id': '588002047871053824' */ },
     };
     return this.request(option);
   };
 
-  async init() {
+  async init(inviteCode?: string) {
     if (isTokenExpired()) {
-      await refreshToken();
+      await refreshToken(inviteCode);
     }
   }
 

src/http/interceptor.ts

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/taro';
 
-import { getRoleType } from '@/utils/app';
+import { getRoleTypeWithDefault } from '@/utils/app';
 import { isDev } from '@/utils/common';
 
 import { getToken } from './utils';
@@ -20,7 +20,7 @@ const tokenInterceptor: Taro.interceptor = (chain: Taro.Chain) => {
 
 const roleInterceptor: Taro.interceptor = (chain: Taro.Chain) => {
   const requestParams = chain.requestParams;
-  const roleType = getRoleType();
+  const roleType = getRoleTypeWithDefault();
   requestParams.header = {
     ...requestParams.header,
     'role-type': roleType,

src/http/utils.ts

@@ -24,10 +24,10 @@ const clearToken = () => {
   Taro.setStorageSync(TOKEN_EXPIRES_TIME, 0);
 };
 
-const requestToken = (): Promise<string> => {
+const requestToken = (inviteCode?: string): Promise<string> => {
   return getCode()
     .then(code => {
-      return http.post<LoginResponse>(API.LOGIN, { data: { code } }).then(data => {
+      return http.post<LoginResponse>(API.LOGIN, { data: { code, inviteCode } }).then(data => {
         const newToken = data?.token || '';
         const expires = data?.expires || 0;
         if (newToken) {
@@ -47,12 +47,12 @@ const requestToken = (): Promise<string> => {
 
 export const isTokenExpired = () => (Taro.getStorageSync(TOKEN_EXPIRES_TIME) || 0) < Date.now();
 
-export const refreshToken = () => {
+export const refreshToken = (inviteCode?: string) => {
   if (_fetchTokenPromise) {
     return _fetchTokenPromise;
   }
   clearToken();
-  _fetchTokenPromise = requestToken();
+  _fetchTokenPromise = requestToken(inviteCode);
   return _fetchTokenPromise;
 };
 

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/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

@@ -95,6 +95,7 @@ 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 [material, setMaterial] = useState<IMaterialMessage>();
   const [scrollItemId, setScrollItemId] = useState<string>();
@@ -298,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));
@@ -353,6 +355,7 @@ export default function MessageChat() {
                   id={message.msgId}
                   key={message.msgId}
                   message={message}
+                  resumeId={resumeId}
                   isRead={messageStatusList.some(m => m.msgId === message.msgId && !!m.isRead)}
                 />
               );

src/pages/partner/index.tsx

@@ -1,20 +1,23 @@
 import { useShareAppMessage } from '@tarojs/taro';
 
 import { Tabs } from '@taroify/core';
+import { useState } from 'react';
 
 import PartnerIntro from '@/components/partner-intro';
 import PartnerInviteList from '@/components/partner-invite-list';
 import PartnerProfit from '@/components/partner-profit';
 import useInviteCode from '@/hooks/use-invite-code';
 import { getCommonShareMessage } from '@/utils/share';
-
 import './index.less';
 
 const PREFIX = 'partner';
 
 export default function Partner() {
   const inviteCode = useInviteCode();
-
+  const [tab, setTab] = useState<number>(0);
+  const handleChange = v => {
+    setTab(v);
+  };
   useShareAppMessage(() => {
     console.log('Partner inviteCode', inviteCode);
     return getCommonShareMessage(false, inviteCode);
@@ -22,12 +25,12 @@ export default function Partner() {
 
   return (
     <div className={PREFIX}>
-      <Tabs className={`${PREFIX}__tabs`}>
+      <Tabs className={`${PREFIX}__tabs`} value={tab} onChange={handleChange}>
         <Tabs.TabPane value={0} title="简介">
           <PartnerIntro />
         </Tabs.TabPane>
         <Tabs.TabPane value={1} title="邀请名单">
-          <PartnerInviteList />
+          <PartnerInviteList refreshDisabled={tab !== 1} visible={tab === 1} />
         </Tabs.TabPane>
         <Tabs.TabPane value={2} title="我的收益">
           <PartnerProfit />

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

@@ -1,4 +1,5 @@
 import { useShareAppMessage } from '@tarojs/taro';
+
 import { Button, Tabs } from '@taroify/core';
 import { useCallback } from 'react';
 
@@ -6,24 +7,31 @@ import HomePage from '@/components/home-page';
 import SearchCity from '@/components/search-city';
 import UserBatchPublish from '@/components/user-batch-publish';
 import { GROUPS } from '@/constants/group';
+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';
 
 export default function BizService() {
+  const inviteCode = useInviteCode();
+
   const handleOpenService = useCallback(() => {
     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);
     }
   }, []);
-  useShareAppMessage(() => getCommonShareMessage());
+  useShareAppMessage(() => getCommonShareMessage(true, inviteCode));
 
   return (
     <HomePage>

src/pages/withdraw-record/index.less

@@ -2,4 +2,52 @@
 @import '@/styles/variables.less';
 
 .withdraw-record {
+  &__item {
+    height: 131px;
+    width: 100%;
+    background: #fff;
+    padding: 24px 32px 0 32px;
+    box-sizing: border-box;
+    font-size: 28px;
+
+    &-border {
+      border-bottom: 1px solid #e6e7e8;
+    }
+
+    &-content {
+      .flex-row();
+      width: 100%;
+      padding-bottom: 24px;
+    }
+
+    &-time {
+      padding-right: 8px;
+      line-height: 40px;
+      flex: 1;
+      .noWrap();
+    }
+
+    &-withdraw {
+      width: 200px;
+      text-align: right;
+      padding-left: 8px;
+      flex-shrink: 0;
+    }
+
+    &-money {
+      line-height: 40px;
+      padding-bottom: 8px;
+      .noWrap();
+      font-weight: 600;
+      font-size: 30px;
+      color: #ff5051;
+    }
+
+    &-status {
+      font-size: 24px;
+      line-height: 36px;
+      color: #999999;
+      .noWrap();
+    }
+  }
 }

src/pages/withdraw-record/index.tsx

@@ -1,14 +1,119 @@
 import { useShareAppMessage } from '@tarojs/taro';
 
+import { List, PullRefresh } from '@taroify/core';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import ListPlaceholder from '@/components/list-placeholder';
+import { WithdrawStatusDescriptions } from '@/constants/partner';
+import useInviteCode from '@/hooks/use-invite-code';
+import { WithdrawRecord } from '@/types/partner';
+import { logWithPrefix } from '@/utils/common';
+import { formatMoney, formatTimestamp, getWithdrawList as requestData } from '@/utils/partner';
 import { getCommonShareMessage } from '@/utils/share';
+
 import './index.less';
 
 const PREFIX = 'withdraw-record';
+const log = logWithPrefix(PREFIX);
+const FIRST_PAGE = 0;
 
-export default function WithdrawRecord() {
+export default function WithdrawRecords() {
+  const inviteCode = useInviteCode();
+  const [hasMore, setHasMore] = useState(true);
+  const [refreshing, setRefreshing] = useState(false);
+  const [loadingMore, setLoadingMore] = useState(false);
+  const [loadMoreError, setLoadMoreError] = useState(false);
+  const [dataList, setDataList] = useState<WithdrawRecord[]>([]);
+  const currentPage = useRef<number>(FIRST_PAGE);
+
+  const handleRefresh = useCallback(async () => {
+    log('start pull refresh');
+    try {
+      setRefreshing(true);
+      setLoadMoreError(false);
+      const { content, totalPages } = await requestData({ page: 1 });
+      setDataList(content);
+      currentPage.current = 1;
+      setHasMore(currentPage.current < totalPages);
+      log('pull refresh success');
+    } catch (e) {
+      setDataList([]);
+      setHasMore(false);
+      setLoadMoreError(true);
+      currentPage.current = FIRST_PAGE;
+      log('pull refresh failed');
+    } finally {
+      setRefreshing(false);
+    }
+  }, []);
+
+  const handleLoadMore = useCallback(async () => {
+    log('start load more', hasMore);
+    if (!hasMore) {
+      return;
+    }
+    setLoadMoreError(false);
+    setLoadingMore(true);
+    try {
+      const { totalPages, content } = await requestData({ page: currentPage.current + 1 });
+      setDataList([...dataList, ...content]);
+      currentPage.current = currentPage.current + 1;
+      setHasMore(currentPage.current < totalPages);
+      log('load more success');
+    } catch (e) {
+      setLoadMoreError(true);
+      log('load more failed');
+    } finally {
+      setLoadingMore(false);
+    }
+  }, [dataList, hasMore]);
+  // 初始化数据&配置变更后刷新数据
+  useEffect(() => {
+    const refresh = async () => {
+      log('visible changed, start refresh list data');
+      try {
+        setDataList([]);
+        setLoadingMore(true);
+        setLoadMoreError(false);
+        const { totalPages, content } = await requestData({ page: 1 });
+        setDataList(content);
+        currentPage.current = 1;
+        setHasMore(currentPage.current < totalPages);
+      } catch (e) {
+        setDataList([]);
+        setHasMore(false);
+        setLoadMoreError(true);
+      } finally {
+        log('visible changed, refresh list data end');
+        setLoadingMore(false);
+      }
+    };
+    refresh();
+  }, []);
   useShareAppMessage(() => {
-    return getCommonShareMessage(false);
+    return getCommonShareMessage(false, inviteCode);
   });
 
-  return <div className={PREFIX}></div>;
+  return (
+    <div className={PREFIX}>
+      <PullRefresh className={`${PREFIX}__pull-refresh`} loading={refreshing} onRefresh={handleRefresh}>
+        <List hasMore={hasMore} onLoad={handleLoadMore} loading={loadingMore || refreshing} disabled={loadMoreError}>
+          {dataList.map(item => (
+            <div className={`${PREFIX}__item`} key={item.id || item.userId}>
+              <div className={`${PREFIX}__item-border`}>
+                <div className={`${PREFIX}__item-content`}>
+                  <div className={`${PREFIX}__item-time`}>{formatTimestamp(item.created)}</div>
+                  <div className={`${PREFIX}__item-withdraw`}>
+                    <div className={`${PREFIX}__item-money`}>{formatMoney(item.amt)}</div>
+                    <div className={`${PREFIX}__item-status`}>{WithdrawStatusDescriptions[item.status]}</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          ))}
+          <ListPlaceholder hasMore={false} loadingMore={loadingMore} loadMoreError={loadMoreError} />
+        </List>
+      </PullRefresh>
+    </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/types/partner.ts

@@ -64,3 +64,26 @@ export interface PartnerProfitItem {
   expectedSettlementDate: string;
   actualSettlementDate: string;
 }
+export interface WithdrawResponse {
+  outBillNo: string;
+  transferBillNo: string;
+  createTime: string;
+  state: string;
+  packageInfo: string;
+}
+export interface WithdrawRecord {
+  id: number;
+  userId: string;
+  orderNo: string;
+  outTradeId: string;
+  amt: number;
+  status: number;
+  remark: string;
+  created: string;
+  updated: string;
+  finishedTime: string;
+}
+export interface PartnerPagination<T> {
+  content: T[];
+  totalPages: number;
+}

src/utils/app.ts

@@ -1,10 +1,10 @@
-import { RoleType, PageUrl } from '@/constants/app';
+import { PageUrl, RoleType } from '@/constants/app';
 import { CollectEventName } from '@/constants/event';
 import { ANCHOR_TAB_LIST, COMPANY_TAB_LIST } from '@/hooks/use-config';
 import http from '@/http';
 import { API } from '@/http/api';
 import store from '@/store';
-import { changeRoleType, changeHomePage } from '@/store/actions';
+import { changeHomePage, changeRoleType } from '@/store/actions';
 import { selectRoleType } from '@/store/selector';
 import { sleep } from '@/utils/common';
 import { collectEvent } from '@/utils/event';
@@ -18,7 +18,9 @@ const postSwitchRoleType = (appMode: RoleType) => {
 
 export const getRoleType = () => selectRoleType(store.getState());
 
-export const isAnchorMode = () => getRoleType() === RoleType.Anchor;
+export const getRoleTypeWithDefault = () => getRoleType() || RoleType.Anchor;
+
+export const isAnchorMode = () => getRoleTypeWithDefault() === RoleType.Anchor;
 
 export const isCompanyMode = () => getRoleType() === RoleType.Company;
 
@@ -39,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/message.ts

@@ -18,7 +18,7 @@ import {
   IChatActionDetail,
   ChatWatchRequest,
 } from '@/types/message';
-import { getRoleType } from '@/utils/app';
+import { getRoleTypeWithDefault } from '@/utils/app';
 import { logWithPrefix, oncePromise } from '@/utils/common';
 import { collectEvent } from '@/utils/event';
 import { navigateTo } from '@/utils/route';
@@ -60,12 +60,12 @@ export const requestMessageList = oncePromise(async () => {
 });
 
 export const requestChatDetail = (chatId: string) => {
-  const data = { chatId, roleType: getRoleType() };
+  const data = { chatId, roleType: getRoleTypeWithDefault() };
   return http.post<IChatInfo>(API.MESSAGE_CHAT, { data, contentType: 'application/x-www-form-urlencoded' });
 };
 
 export const requestNewChatMessages = (params: GetNewChatMessagesRequest) => {
-  const data = { ...params, roleType: getRoleType() };
+  const data = { ...params, roleType: getRoleTypeWithDefault() };
   return http.post<IChatMessage[]>(API.MESSAGE_CHAT_NEW, { data });
 };
 

src/utils/partner.ts

@@ -5,12 +5,16 @@ import http from '@/http';
 import { API } from '@/http/api';
 import store from '@/store';
 import { setInviteCode } from '@/store/actions/partner';
+import { IPaginationRequest } from '@/types/common';
 import {
   GetProfitRequest,
   InviteUserInfo,
   PartnerInviteCode,
+  PartnerPagination,
   PartnerProfitItem,
   PartnerProfitsState,
+  WithdrawRecord,
+  WithdrawResponse,
 } from '@/types/partner';
 import { requestUserInfo } from '@/utils/user';
 
@@ -51,8 +55,11 @@ export const getPartnerQrcode = async () => {
 export const getPartnerProfitStat = async () => {
   return await http.post<PartnerProfitsState>(API.GET_PROFIT_STAT);
 };
-export const getPartnerInviteList = async () => {
+export const getPartnerInviteList = async (data: IPaginationRequest) => {
-  return await http.post<InviteUserInfo[]>(API.GET_INVITE_LIST);
+  return await http.post<PartnerPagination<InviteUserInfo>>(API.GET_INVITE_LIST, {
+    data,
+    contentType: 'application/x-www-form-urlencoded',
+  });
 };
 export const dispatchUpdateInviteCode = (code: string) => store.dispatch(setInviteCode(code));
 export const getInviteCode = async () => {
@@ -77,7 +84,7 @@ export const formatMoney = (cents: number) => {
 };
 export function formatTimestamp(timestamp: string): string {
   // 创建 Date 对象
-  const date = new Date(timestamp);
+  const date = new Date(/^\d+$/.test(timestamp) ? Number(timestamp) : timestamp);
 
   // 获取年、月、日、时、分、秒
   const YYYY = date.getFullYear();
@@ -109,3 +116,14 @@ export function formatUserId(input: string): string {
   // 拼接结果
   return beforeMask + maskedPart + afterMask;
 }
+
+export async function withdrawMoney() {
+  return await http.post<WithdrawResponse>(API.WITHDRAW);
+}
+
+export async function getWithdrawList(data: IPaginationRequest) {
+  return await http.post<PartnerPagination<WithdrawRecord>>(API.GET_WITHDRAW_LIST, {
+    data,
+    contentType: 'application/x-www-form-urlencoded',
+  });
+}

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

@@ -148,3 +148,23 @@ 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;
+};