feat:

.gitignore

@@ -1,4 +1,5 @@
 dist/
+dist-dev/
 deploy_versions/
 .temp/
 .rn_temp/

config/index.ts

@@ -12,6 +12,20 @@ const MockPlugin: PluginItem = [
   }
 ];
 
+const CIPluginOpt = () => {
+  const brand = process.env.BRAND as 'prod' | 'dev';      // 取环境变量
+  const map = {
+    prod: { appid: 'wxf0724a83f8e377d2', privateKeyPath: 'keys/private.wxf0724a83f8e377d2.key' },
+    dev: { appid: 'wx2d56597fd541f1a6', privateKeyPath: 'keys/private.wx2d56597fd541f1a6.key'  },
+  };
+  return {
+    weapp: map[brand] || map.prod,
+    version: process.env.VERSION || '1.0.0',
+    desc: `build for ${brand}`,
+  };
+};
+
+
 // https://taro-docs.jd.com/docs/next/config#defineconfig-辅助函数
 export default defineConfig(async (merge, _env: ConfigEnv) => {
   const baseConfig: UserConfigExport = {
@@ -25,13 +39,15 @@ export default defineConfig(async (merge, _env: ConfigEnv) => {
       828: 1.81 / 2
     },
     sourceRoot: 'src',
-    outputRoot: 'dist',
+    outputRoot: process.env.OUTPUT_ROOT || 'dist',
-    plugins: ['@tarojs/plugin-html'],
+    plugins: [['@tarojs/plugin-mini-ci', CIPluginOpt()], '@tarojs/plugin-html'],
     // plugins: ['@tarojs/plugin-html', MockPlugin],
     defineConstants: {
+      'process.env.BRAND': JSON.stringify(process.env.BRAND),
     },
     copy: {
       patterns: [
+        {from: 'project.config.dev.json',to: 'dist-dev/project.config.json'},
       ],
       options: {
       }

keys/private.wx2d56597fd541f1a6.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEArjidDs/HGidBTzyOssyhX/Yvlr+BZxO3Qqe1iFBIJYWVXwiJ
+KFVZw14rPKnh6ORB9qpMq3+fYJ7VsodmobnVlTaFXxJ8yi+tVZSZyZPtHabu2JVO
+qu7LX709p5NTFcrmOY6+NJA827+hg6V0Nl3b4CWLsouPHgiIxpqnLeaOka3lbPMq
+vQuDeMCbQNFe5Jz7C0gc6dXwEpDExNX4WiVfi4UP5bcYiUKlbdben5i6qbFrZ4QK
+woYoAIhr60jQGfB6Jg7YkbbAyh42XR3BMkf2TPQqieZM1/IKNuw2evtA2BqLJuiz
+cQ1qNBBXczbJv9KjBVAzAJgT4InUyJF+QfFJ6wIDAQABAoIBAQCf2kohIPvqP0Jp
+VYMJA0C+L8CSbLxqu2hWvFKP9Dl+VAct30MZwtZNr8W0L5uceHMdxDv8z2iI2rPw
+ztOYaE5UTmYpSWk+imhcMbC5iAT0RAq6pqQ7qkboXVaIv2BoinabMSHMUNvGNRoZ
+FGKAz7XDADAhbnOudt4ofBYQw47kkko8vaDZBJS6UGN+QVJpyBtJKohaXKC6HRva
+2c8zDwVZlKMrPl4WB4cg0+WPv6vUZymv8U7flwY0xJBBWwZUxqbmjqbTg8BGb5Mu
+tpIZRvTGNxbDu9Ms7mdYdGGe/PFmqgj1hOomeXvBlnYz+fmWHu5ElyPGBHD92N7x
+Hdcopp4BAoGBANqQUfxzjGcBvSSSowehSvgVCnUFsTxSE8c9HQRX4LtMnLCo6c6m
+Hxf+l67FyY5704EW29PLu5ETdLBm6pCaIk8aJo467l8M9BOHmE/CwNciloHxXa4h
+/gUKex6EsFJoT+1gaCaDJeu0gDJl49QnpYOrma2CZ8vyG3+NCotuYturAoGBAMwP
+8G2ObLZUFPZAfhGZrobUom2dCtJXenYupxSvJ/rNd7zY+F3pcyi461eMIkKFaxQX
+bRyDi/LRCQRKrSDuw3Dt4Ne9gkpdlI/LUDTUUbWdDuCXxfsXSRAYHC1ae0rsiGQv
+PaTotkDSjdAIKdgd0bmeufFZ2Ozmid2lHzSZfwrBAoGAQXSVSSClvLeVmJ1du8w/
+MnrCrfctdB40lCemSAW1ZQJ1rqZ3lw7DIyF49buAOG63EeLxpMVQAAuul6HKv9GZ
+Us1HHLNjbg3oDu093S07KXLPVk0dvCer9oCEDMi6MYPR5ApKRrZiJevhtLY0+/V/
+qSY8GO2D/l0chR+NN+KwMo8CgYB4Y07s04G/b4uOXC4EJC6azQems2eXAJT29D8O
+LOfhRybE+xxMC1YtSCtP0xTDOgMaL1fn4pPGBRzUs1nAfBxBm5VyshMT3HGxA7ml
+8TzjcG0+g0wB/pLUM+UrvJ3QbgtpT5WGnOQpCg8wFCDbp3v7jnEUunUIDlp3sNrg
+JU6WAQKBgDjcfRDtnmSxSiejsZaZM7gCAYlZq6WBuvQ6WF+nD9mzEgzkw3F+1cHC
+Y905VPGb/vCPAV+JdN7LxnMn2G3JoWPqrhOIT6KgPgAYbVAq1hmLqXMjGi53n9uY
+39GL4UgJkywIdEkla/8zNFNKZgQulWPDJqb/MFcVo3/VegEfwdbk
+-----END RSA PRIVATE KEY-----

keys/private.wxf0724a83f8e377d2.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA1Tl6FYIIWB8b+OjYY9s6cOJf71Vn0J/u/kdq5CH/LMOdNrUh
+fq3shAwdDkXmuRIpHU7Noxisu71tB2EumigIwBDRVyrdwPu/p6QWyaMgrh0bdtaC
+LKW/j2teNU1MCSWyCDyEeZ9PJteK5+ieX+ZPDg17HLV2dISpB71AGyM461DIHCAV
+uaanUJ4MYCtp9t7OFgrD4dNzDMH0lBJBczRQAmnit0GpJD/y2rfgtL+HaKpDN8rc
+w80+3HVfhKq3niy/vBbI6alqFb1Mh9O5q6/c1tEWQKPn3TzneGIDhMupGzHEzrVR
+j87+1cyYi8PtBdNMPls+zPn7MoajjrASFyo1hQIDAQABAoIBABHu652zehAvTaL5
+snlzjs6/u2HdxQV+7hLk3tChK10QdsCLK24EIshYXHk+19Do/hxA7HqzMJP5spnU
+Sp8cjt/YikLSkCQTCGOJIYGD/tOmDxFHqVsn9ZySYzIIdkSurvKSZHH2PCoAJuaq
+Yeee7zc3WwtnF7dlEPJdsG6X38mqslzaLOuiftkHJ8hQ+1rWM9FFEp/S3pLfLB+7
+jEQhuVk0WjLTqmWmKvi0Nz5tUibBpF1OHtCfIhPjb1N8k/bcv1jumETx+2PDxA62
+zpPNGespBaET+jeEqNCqLO7Zq8+iUO8d4XpZsFCR2cyE6zzXK2mhQ+2pW2BRU/DI
+w/ZylmECgYEA6uPRJ4uk+NavoJlQCv7R9B8CGbwzbRaG8sg/NuwvTOO6D4FGUdcu
+f8qA2kCd8bSCuWrS1mVgPpvzwHt5Bh3k7FC/0SfW5ZDC5Lp1IssI0jeka39vfPOD
+ZdcvgJ3dUnHUrvb4L4PclgCa3KPXLTVDnK+4ExvaYOxNAaG6wROCGBsCgYEA6GMy
+nCsPr21kKmhybCrhcTYoENb45hz6CCnXr4MGnYzF9c2ss2KXjR/boCdhF+3wxmmm
+F4TKgcicOUfOJIXSIHBD9nphLa5CfrksLxfX0iIyNCG74aXIWl6M6QgQZdWqV4qC
+xYTtFYACELIb8qK/mraMP28c9BzDpwd909ZlAt8CgYEAmpXCIa+CrA3GWgBsMEBR
+9sKthDha8/E+cOuexsubuZOp8OhYWiYuwQWJ1ZlvGRJ+cf6+sUDYnXvPaJ8aIA9u
+iKQACWuZv02NJjEcRACxVoAuIl0lB2vPzydWaOP8M3UczuVUoxi6BLJzOMBPLb5/
+N9BhaZoMF3uMloVUvhrTpH8CgYA9sQfgeXYChjHPKEcn/AI5Qb1FKyyMOikOPb1q
+dIgvDw4GgQFV5diBuHFfhNS7u4jtw2I6YCA6b/05H5zUCUqNHgCM0FQ4AkjYx2O5
+ZMUAnd9iA4qTDqWvh+Y0ftWLkztTXgv1T6J40LC7qezNbvMaqVd2B5NSIsi18MEw
+mXvbVQKBgQC0Rh5TJEfeBWRoIixwFuDUgHYRsdk3SV1hymYO3aKBr0uD8Arv4v1M
+XO6DchFjcpKuwScjXX5yEot5PJOUTPG2T2uBPnJggtNig2dnRzQDLM+bK0vVecoz
+QL9YMOYv6DNH6Z2yEfMZHZLto9Oaqm9J62hZahZ2GukFLOMBGZAVhA==
+-----END RSA PRIVATE KEY-----

package.json

@@ -10,29 +10,10 @@
 		"framework": "React"
 	},
 	"scripts": {
-		"build:weapp": "taro build --type weapp",
+		"build:weapp": "BRAND=prod taro build --type weapp",
-		"build:swan": "taro build --type swan",
+		"build:dev:weapp": "BRAND=dev OUTPUT_ROOT=dist-dev taro build --type weapp --upload",
-		"build:alipay": "taro build --type alipay",
+    "dev:weapp": "BRAND=prod npm run build:weapp -- --watch",
-		"build:tt": "taro build --type tt",
+    "dev:dev:weapp": "BRAND=dev OUTPUT_ROOT=dist-dev taro build --type weapp --watch"
-		"build:h5": "taro build --type h5",
-		"build:rn": "taro build --type rn",
-		"build:qq": "taro build --type qq",
-		"build:jd": "taro build --type jd",
-		"build:quickapp": "taro build --type quickapp",
-		"build:harmony-hybrid": "taro build --type harmony-hybrid",
-		"dev:weapp": "npm run build:weapp -- --watch",
-		"dev:swan": "npm run build:swan -- --watch",
-		"dev:alipay": "npm run build:alipay -- --watch",
-		"dev:tt": "npm run build:tt -- --watch",
-		"dev:h5": "npm run build:h5 -- --watch",
-		"dev:rn": "npm run build:rn -- --watch",
-		"dev:qq": "npm run build:qq -- --watch",
-		"dev:jd": "npm run build:jd -- --watch",
-		"dev:quickapp": "npm run build:quickapp -- --watch",
-		"dev:harmony-hybrid": "npm run build:harmony-hybrid -- --watch",
-		"test": "jest",
-		"lint:format": "npx prettier --write",
-		"lint:format-all": "npx prettier --write 'src/**/*.{ts,js,css,jsx,html,vue,tsx}'"
 	},
 	"browserslist": [
 		"last 3 versions",
@@ -76,6 +57,7 @@
 		"@babel/core": "^7.8.0",
 		"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
 		"@tarojs/cli": "4.0.9",
+		"@tarojs/plugin-mini-ci": "^4.1.5",
 		"@tarojs/plugin-mock": "^0.0.9",
 		"@tarojs/taro-loader": "4.0.9",
 		"@tarojs/test-utils-react": "^0.1.1",
@@ -95,6 +77,7 @@
 		"eslint-plugin-react-hooks": "^4.2.0",
 		"jest": "^29.3.1",
 		"jest-environment-jsdom": "^29.5.0",
+		"miniprogram-ci": "^2.1.14",
 		"postcss": "^8.4.18",
 		"prettier": "^3.3.1",
 		"react-refresh": "^0.11.0",
@@ -109,5 +92,6 @@
 		"ignoredBuiltDependencies": [
 			"@tarojs/binding"
 		]
-	}
+	},
+	"packageManager": "pnpm@10.12.4+sha512.5ea8b0deed94ed68691c9bad4c955492705c5eeb8a87ef86bc62c74a26b037b08ff9570f108b2e4dbd1dd1a9186fea925e527f141c648e85af45631074680184"
 }

project.config.dev.json

@@ -0,0 +1,47 @@
+{
+  "miniprogramRoot": "./",
+  "description": "boluo app",
+  "setting": {
+    "urlCheck": true,
+    "es6": false,
+    "enhance": false,
+    "compileHotReLoad": false,
+    "postcss": false,
+    "minified": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "coverView": false,
+    "showShadowRootInWxmlPanel": false,
+    "packNpmRelationList": [],
+    "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/",
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
+  "libVersion": "3.4.6",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wx2d56597fd541f1a6",
+  "simulatorPluginLibVersion": {}
+}

src/app.less

@@ -13,3 +13,8 @@ page {
     .base-bg();
   }
 }
+
+@font-face {
+  font-family: 'Alimama ShuHeiTi';
+  src: url('https://publiccdn.neighbourhood.com.cn/font/almmheiti.ttf');
+}

src/app.tsx

@@ -1,4 +1,4 @@
-import { useLaunch } from '@tarojs/taro';
+import Taro, { useDidShow, useLaunch } from '@tarojs/taro';
 
 import { PropsWithChildren } from 'react';
 import { Provider } from 'react-redux';
@@ -6,8 +6,9 @@ import { Provider } from 'react-redux';
 import { REFRESH_UNREAD_COUNT_TIME } from '@/constants/message';
 import http from '@/http';
 import store from '@/store';
+import { requestCityConfigs } from '@/utils/location';
 import { requestUnreadMessageCount } from '@/utils/message';
-import { getInviteCode, getInviteCodeFromQuery } from '@/utils/partner';
+import { decryptOpenGid, getInviteCode, getInviteCodeFromQuery } from '@/utils/partner';
 import qiniuUpload from '@/utils/qiniu-upload';
 import { requestUserInfo, updateLastLoginTime } from '@/utils/user';
 
@@ -28,6 +29,33 @@ function App({ children }: PropsWithChildren<BL.Anything>) {
     setInterval(() => requestUnreadMessageCount(), REFRESH_UNREAD_COUNT_TIME);
   });
 
+  useDidShow(options => {
+    requestCityConfigs();
+
+    console.log(options);
+    const inviteCode = getInviteCodeFromQuery(options?.query || {});
+    const authCode = options?.query?.authCode;
+    if (inviteCode || authCode) {
+      Taro.getGroupEnterInfo()
+        .then(info => {
+          decryptOpenGid({
+            inviteCode,
+            authCode,
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error
+            iv: info.iv,
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error
+            encryptedData: info.encryptedData,
+          });
+          console.log('getGroupEnterInfo', info);
+        })
+        .catch(() => {
+          console.log('没有解析到群', options?.scene);
+        });
+    }
+  });
+
   return <Provider store={store}>{children}</Provider>;
 }
 

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';
@@ -8,23 +8,23 @@ import PhoneButton from '@/components/phone-button';
 import { ProtocolPrivacy } from '@/components/protocol-privacy';
 import SafeBottomPadding from '@/components/safe-bottom-padding';
 
-
 import './index.less';
 
 interface IProps {
   open: boolean;
   onCancel: () => void;
-  onConfirm: () => void;
+  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();
       }
@@ -49,8 +49,8 @@ export function AgreementPopup({ open, onCancel, onConfirm, needPhone }: IProps)
           <Button className={`${PREFIX}__cancel-button`} onClick={onCancel}>
             拒绝
           </Button>
-          {needPhone ? (
+          {needBindPhone ? (
-            <PhoneButton className={`${PREFIX}__confirm-button`} needPhone onBindPhone={handleBindPhone}>
+            <PhoneButton className={`${PREFIX}__confirm-button`} needPhone={needPhone} onBindPhone={handleBindPhone}>
               同意
             </PhoneButton>
           ) : (

src/components/anchor-card/index.tsx

@@ -9,7 +9,7 @@ import { PageUrl } from '@/constants/app';
 import { MaterialViewSource, WORK_YEAR_LABELS } from '@/constants/material';
 import { AnchorInfo } from '@/types/material';
 import { calcDistance } from '@/utils/location';
-import { getBasicInfo } from '@/utils/material';
+import { getBasicInfo, getSalary } from '@/utils/material';
 import { navigateTo } from '@/utils/route';
 import { activeDate } from '@/utils/time';
 
@@ -22,17 +22,6 @@ interface IProps {
 }
 
 const PREFIX = 'anchor-card';
-const getSalary = (data: AnchorInfo) => {
-  const { fullTimeMinPrice, fullTimeMaxPrice, partyTimeMinPrice, partyTimeMaxPrice } = data;
-  const prices: string[] = [];
-  if (fullTimeMinPrice && fullTimeMaxPrice) {
-    prices.push(`${fullTimeMinPrice / 1000}-${fullTimeMaxPrice / 1000}K/月`);
-  }
-  if (partyTimeMinPrice && partyTimeMaxPrice) {
-    prices.push(`${partyTimeMinPrice}-${partyTimeMaxPrice}/小时`);
-  }
-  return prices.filter(Boolean).join(' ');
-};
 
 function AnchorCard(props: IProps) {
   const { data, jobId, validator } = props;

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()) {
+    successCallback.current = onSuccess;
-      onSuccess();
+    if (!getAgreementSigned()) {
+      setAssignmentOpen(true);
+    } else if (needLogin) {
+      setLoginOpen(true);
     } else {
-      successCallback.current = onSuccess;
+      onSuccess();
-      setOpen(true);
     }
   };
 
@@ -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/anchor-picker/index.tsx

@@ -5,34 +5,19 @@ import { isEqual } from 'lodash-es';
 import { useCallback, useState } from 'react';
 
 import PickerToolbar from '@/components/picker-toolbar';
-import {
+import { FULL_PRICE_OPTIONS, PART_PRICE_OPTIONS } from '@/constants/job';
-  EmployType,
+import { ALL_ANCHOR_READ_TYPES, ANCHOR_READ_TITLE_MAP, AnchorReadType } from '@/constants/material';
-  ALL_EMPLOY_TYPES,
-  FULL_PRICE_OPTIONS,
-  PART_PRICE_OPTIONS,
-  EMPLOY_TYPE_TITLE_MAP,
-} from '@/constants/job';
-import {
-  ALL_ANCHOR_READ_TYPES,
-  ALL_GENDER_TYPES,
-  ANCHOR_READ_TITLE_MAP,
-  AnchorReadType,
-  GENDER_TYPE_TITLE_MAP,
-  GenderType,
-} from '@/constants/material';
 import { IAnchorFilters } from '@/types/material';
-import { isUndefined } from '@/utils/common';
 
 import './index.less';
 
+type MoreFilter = Omit<IAnchorFilters, 'employType' | 'gender'>;
 interface IProps {
-  value: IAnchorFilters;
+  value: MoreFilter;
-  onConfirm: (newValue: IAnchorFilters) => void;
+  onConfirm: (newValue: MoreFilter) => void;
 }
 
 const PREFIX = 'anchor-picker';
-const getDefaultGender = (value: IAnchorFilters) => value.gender;
-const getDefaultEmploy = (value: IAnchorFilters) => value.employType;
 const getDefaultReadType = (value: IAnchorFilters) => value.readType;
 const getDefaultCategory = (value: IAnchorFilters) => value.category || '';
 const getSalaryValue = (value: IAnchorFilters, full: boolean) => {
@@ -47,9 +32,7 @@ const getSalaryValue = (value: IAnchorFilters, full: boolean) => {
 
 function AnchorPicker(props: IProps) {
   const { value, onConfirm } = props;
-  const [gender, setGender] = useState<GenderType | undefined>(getDefaultGender(value));
   const [readType, setReadType] = useState<AnchorReadType | undefined>(getDefaultReadType(value));
-  const [employType, setEmployType] = useState<EmployType | undefined>(getDefaultEmploy(value));
   const [fullSalary, setFullSalary] = useState(getSalaryValue(value, true));
   const [partSalary, setPartSalary] = useState(getSalaryValue(value, false));
   const [category, setCategory] = useState(getDefaultCategory(value));
@@ -59,9 +42,7 @@ function AnchorPicker(props: IProps) {
   }, []);
 
   const handleClickReset = useCallback(() => {
-    setGender(undefined);
     setReadType(undefined);
-    setEmployType(undefined);
     setFullSalary(null);
     setPartSalary(null);
     setCategory('');
@@ -83,10 +64,6 @@ function AnchorPicker(props: IProps) {
 
   const handleClickConfirm = useCallback(() => {
     const filters: IAnchorFilters = {};
-    if (!isUndefined(gender)) {
-      filters.gender = gender === GenderType.All ? undefined : gender;
-    }
-    employType && (filters.employType = employType);
     readType && (filters.readType = readType);
     category && (filters.category = category);
     if (fullSalary) {
@@ -98,34 +75,10 @@ function AnchorPicker(props: IProps) {
       filters.highPriceForPartyTime = partSalary.maxSalary;
     }
     onConfirm(filters);
-  }, [gender, employType, readType, category, fullSalary, partSalary, onConfirm]);
+  }, [readType, category, fullSalary, partSalary, onConfirm]);
 
   return (
     <div className={PREFIX}>
-      <div className={`${PREFIX}__title`}>性别</div>
-      <div className={`${PREFIX}__container`}>
-        {ALL_GENDER_TYPES.map((type: GenderType) => (
-          <div
-            key={type}
-            onClick={() => setGender(type)}
-            className={classNames(`${PREFIX}__item`, { selected: type === gender })}
-          >
-            {GENDER_TYPE_TITLE_MAP[type]}
-          </div>
-        ))}
-      </div>
-      <div className={`${PREFIX}__title`}>全职/兼职</div>
-      <div className={`${PREFIX}__container`}>
-        {ALL_EMPLOY_TYPES.map(type => (
-          <div
-            key={type}
-            onClick={() => setEmployType(type)}
-            className={classNames(`${PREFIX}__item`, { selected: type === employType })}
-          >
-            {EMPLOY_TYPE_TITLE_MAP[type]}
-          </div>
-        ))}
-      </div>
       <div className={`${PREFIX}__title`}>已读/未读</div>
       <div className={`${PREFIX}__container`}>
         {ALL_ANCHOR_READ_TYPES.map(type => (

src/components/bl-checkbox/index.less

@@ -2,20 +2,36 @@
 @import '@/styles/variables.less';
 
 .profile-checkbox {
-
   &__group {
     width: 100%;
     height: 100%;
     .flex-row();
+    flex-wrap: wrap;
+    gap: 24px;
   }
 
   &__item {
-    flex: 1;
+    flex: 0 1 auto;
-    height: 100%;
+    padding: 34px 36px;
-  }
+    line-height: 32px;
+    border-radius: 16px;
+    border: 2px solid #fff;
+    background: #fff;
+    margin-right: 0;
+    margin-bottom: 0;
+    box-sizing: border-box;
+    &.active {
+      background: rgba(109, 61, 245, 0.12);
+      border: 2px solid #6d3df5;
 
-  &__icon {
+      .taroify-checkbox__label {
-    width: 36px;
+        color: #6d3df5;
-    height: 36px;
+      }
+    }
+
+    .taroify-checkbox__label {
+      line-height: 32px;
+      margin-left: 0;
+    }
   }
 }

src/components/bl-checkbox/index.tsx

@@ -1,42 +1,44 @@
-import { Image } from '@tarojs/components';
-
 import { Checkbox } from '@taroify/core';
 import { CheckboxProps, CheckboxGroupProps } from '@taroify/core/checkbox';
+import CheckboxGroupContext from '@taroify/core/checkbox/checkbox-group.context';
+import { useContext } from 'react';
 
 import './index.less';
 
 interface IProps extends CheckboxProps {
   text: string;
+}
+
+interface IGroupProps extends CheckboxGroupProps {
   value: BL.Anything[];
 }
 
-interface IGroupProps extends CheckboxGroupProps {}
-
 const PREFIX = 'profile-checkbox';
 
-export function BlCheckboxGroup(props: IGroupProps) {
+export function BlCheckboxGroup({ value, onChange, children }: IGroupProps) {
-  return <Checkbox.Group className={`${PREFIX}__group`} direction="horizontal" {...props} />;
+  return (
+    <Checkbox.Group className={`${PREFIX}__group`} value={value} onChange={onChange}>
+      {children}
+    </Checkbox.Group>
+  );
 }
 
 export function BlCheckbox(props: IProps) {
-  const { name, text, value } = props;
+  const { name, text } = props;
+  const { value: names = [], onChange: onNamesChange } = useContext(CheckboxGroupContext);
+  const checked = names.includes(name);
+  const handleClick = () => {
+    if (!name) return;
+
+    if (checked) {
+      onNamesChange?.(names.filter(aName => aName !== name));
+    } else {
+      onNamesChange?.([...names, name]);
+    }
+  };
 
   return (
-    <Checkbox
+    <Checkbox className={`${PREFIX}__item ${checked ? 'active' : ''}`} name={name} icon={null} onClick={handleClick}>
-      className={`${PREFIX}__item`}
-      name={name}
-      icon={
-        <Image
-          className={`${PREFIX}__icon`}
-          mode="aspectFit"
-          src={
-            value.includes(name)
-              ? require('@/statics/svg/radio-checked.svg')
-              : require('@/statics/svg/radio-uncheck.svg')
-          }
-        />
-      }
-    >
       {text}
     </Checkbox>
   );

src/components/employ-type-select/index.tsx

@@ -0,0 +1,13 @@
+import Select, { ISelectProps } from '@/components/select';
+import { EmployType, JOB_EMPLOY_TYPE_OPTIONS } from '@/constants/job';
+
+interface IProps extends Omit<ISelectProps<EmployType>, 'options'> {
+  value: EmployType;
+}
+
+function EmployTypeSelect(props: IProps) {
+  const { value: selectValue, onSelect } = props;
+  return <Select options={JOB_EMPLOY_TYPE_OPTIONS} title="类型" value={selectValue} onSelect={onSelect} />;
+}
+
+export default EmployTypeSelect;

src/components/gender-select/index.tsx

@@ -0,0 +1,13 @@
+import Select, { ISelectProps } from '@/components/select';
+import { GENDER_OPTIONS, GenderType } from '@/constants/material';
+
+interface IProps extends Omit<ISelectProps<GenderType>, 'options'> {
+  value: GenderType;
+}
+
+function GenderSelect(props: IProps) {
+  const { value: selectValue, onSelect } = props;
+  return <Select options={GENDER_OPTIONS} title="性别" value={selectValue} onSelect={onSelect} />;
+}
+
+export default GenderSelect;

src/components/group-certification-list/index.less

@@ -0,0 +1,85 @@
+@import '@/styles/common.less';
+
+.group-certification-list {
+  min-height: calc(100vh - 98rpx);
+  &__banner {
+    font-weight: 400;
+    font-size: 24px;
+    height: 74px;
+    padding: 32px 32px 25px;
+    line-height: 36px;
+    color: #999999;
+    background: #F5F6FA;
+    position: fixed;
+    z-index: 1;
+    top: 99px;
+    left: 0;
+    right: 0;
+  }
+  &__title {
+    height: 72px;
+    width: 100%;
+    padding: 0 24px;
+    box-sizing: border-box;
+    line-height: 72px;
+    font-size: 24px;
+    color: rgba(0, 0, 0, 0.5);
+    position: fixed;
+    top: 227rpx;
+    left: 0;
+    z-index: 1;
+    background: #fff;
+
+    &-border {
+      border-bottom: 1px solid #e6e7e8;
+      .flex-row();
+    }
+
+    &-time {
+      padding: 0 8px;
+      flex: 0 0 120px;
+      width: 120px;
+      flex-shrink: 0;
+    }
+
+    &-name {
+      text-align: right;
+      flex: 1;
+    }
+  }
+
+  &__pull-refresh {
+    margin-top: 204px;
+  }
+
+  &__item {
+    height: 100px;
+    width: 100%;
+    padding: 24px 32px 0 32px;
+    box-sizing: border-box;
+    font-size: 28px;
+    background: #fff;
+
+    &-border {
+      border-bottom: 1px solid #e6e7e8;
+    }
+
+    &-content {
+      .flex-row();
+      width: 100%;
+      padding-bottom: 24px;
+    }
+
+    &-time {
+      padding: 0 8px;
+      flex: 0 0 120px;
+      width: 120px;
+      flex-shrink: 0;
+    }
+
+    &-name {
+      text-align: right;
+      flex: 1;
+    }
+  }
+}

src/components/group-certification-list/index.tsx

@@ -0,0 +1,153 @@
+import { List, PullRefresh } from '@taroify/core';
+import classNames from 'classnames';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import ListPlaceholder from '@/components/list-placeholder';
+import { AuthedGroupInfo } from '@/types/partner';
+import { logWithPrefix } from '@/utils/common';
+import { formatTimestamp, getAuthedGroupList as requestData } from '@/utils/partner';
+
+import './index.less';
+
+const PREFIX = 'group-certification-list';
+const log = logWithPrefix(PREFIX);
+
+const FIRST_PAGE = 0;
+
+function GroupCertificationList(props: {
+  refreshDisabled?: boolean;
+  visible?: boolean;
+  listHeight?: number;
+  className?: string;
+  onListEmpty?: () => void;
+}) {
+  const { className, listHeight, refreshDisabled, visible = true, onListEmpty } = props;
+  const [hasMore, setHasMore] = useState(false);
+  const [refreshing, setRefreshing] = useState(false);
+  const [loadingMore, setLoadingMore] = useState(false);
+  const [loadMoreError, setLoadMoreError] = useState(false);
+  const [dataList, setDataList] = useState<AuthedGroupInfo[]>([]);
+  const currentPage = useRef<number>(FIRST_PAGE);
+  const onListEmptyRef = useRef(onListEmpty);
+
+  const handleRefresh = useCallback(async () => {
+    log('start pull refresh');
+    try {
+      setRefreshing(true);
+      setLoadMoreError(false);
+      const content = await requestData();
+      setDataList(content);
+      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 content = await requestData();
+      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]);
+
+  // 初始化数据&配置变更后刷新数据
+  useEffect(() => {
+    // 列表不可见时，先不做处理
+    if (!visible) {
+      log('visible changed, but is not visible, only clear list');
+      return;
+    }
+
+    const refresh = async () => {
+      log('visible changed, start refresh list data');
+      try {
+        setDataList([]);
+        setLoadingMore(true);
+        setLoadMoreError(false);
+        const content = await requestData();
+        setDataList(content);
+        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');
+        setLoadingMore(false);
+      }
+    };
+    refresh();
+  }, [visible]);
+
+  return (
+    <div className={PREFIX}>
+      <div className={`${PREFIX}__banner`}>
+        以下均为认证成功的群，没认证成功请先确认是否有拉运营进群，如果在，可以尝试重新分享小程序
+      </div>
+      <div className={`${PREFIX}__title`}>
+        <div className={`${PREFIX}__title-border`}>
+          <div className={`${PREFIX}__title-time`}>认证日期</div>
+          <div className={`${PREFIX}__title-name`}>群名称</div>
+        </div>
+      </div>
+      <PullRefresh
+        className={classNames(`${PREFIX}__pull-refresh`, className)}
+        loading={refreshing}
+        onRefresh={handleRefresh}
+        disabled={refreshDisabled}
+      >
+        <List
+          hasMore={hasMore}
+          onLoad={handleLoadMore}
+          loading={loadingMore || refreshing}
+          disabled={loadMoreError || !visible}
+          fixedHeight={typeof listHeight !== 'undefined'}
+          style={listHeight ? { height: `${listHeight}px` } : undefined}
+        >
+          {dataList.map(item => (
+            <div className={`${PREFIX}__item`} key={item.openGid}>
+              <div className={`${PREFIX}__item-border`}>
+                <div className={`${PREFIX}__item-content`}>
+                  <div className={`${PREFIX}__item-time`}>{formatTimestamp(item.authDate, true)}</div>
+                  <div className={`${PREFIX}__item-name`}>{item.groupName}</div>
+                </div>
+              </div>
+            </div>
+          ))}
+          <ListPlaceholder hasMore={false} loadingMore={loadingMore} loadMoreError={loadMoreError} />
+        </List>
+      </PullRefresh>
+    </div>
+  );
+}
+
+export default GroupCertificationList;

src/components/home-page/index.tsx

@@ -1,18 +1,21 @@
 import React from 'react';
 
 import BaseTabBar from '@/components/tab-bar';
+import { PageType } from '@/constants/app';
 
 import './index.less';
 
-interface IProps extends React.PropsWithChildren {}
+interface IProps extends React.PropsWithChildren {
+  type: PageType;
+}
 
 export default function HomePage(props: IProps) {
-  const { children } = props;
+  const { children, type } = props;
 
   return (
     <React.Fragment>
       {children}
-      <BaseTabBar />
+      <BaseTabBar type={type} />
     </React.Fragment>
   );
 }

src/components/job-card/index.less

@@ -11,6 +11,16 @@
     border-radius: 16px;
     background: #FFFFFF;
     margin-bottom: 24px;
+    position: relative;
+  }
+
+  &__mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(255, 255, 255, 0.4);
   }
 
   &__header {

src/components/job-card/index.tsx

@@ -5,11 +5,11 @@ import React, { useCallback } from 'react';
 
 import { CertificationStatusIcon } from '@/components/certification-status';
 import { PageUrl } from '@/constants/app';
-import { CITY_CODE_TO_NAME_MAP, COUNTY_CODE_TO_NAME_MAP } from '@/constants/city';
+// import { CITY_CODE_TO_NAME_MAP, COUNTY_CODE_TO_NAME_MAP } from '@/constants/city';
 import { CertificationStatusType } from '@/constants/company';
 import { EMPLOY_TYPE_TITLE_MAP, EmployType } from '@/constants/job';
 import { JobInfo } from '@/types/job';
-import { LocationInfo } from '@/types/location';
+// import { LocationInfo } from '@/types/location';
 import { getJobSalary, getJobTitle } from '@/utils/job';
 import { calcDistance } from '@/utils/location';
 import { navigateTo, redirectTo } from '@/utils/route';
@@ -23,16 +23,16 @@ interface IProps {
 }
 
 const PREFIX = 'job-card';
-const getCityDes = (location: LocationInfo) => {
+// const getCityDes = (location: LocationInfo) => {
-  if (!location) {
+//   if (!location) {
-    return '';
+//     return '';
-  }
+//   }
-  let des = CITY_CODE_TO_NAME_MAP.get(location.cityCode);
+//   let des = CITY_CODE_TO_NAME_MAP.get(location.cityCode);
-  if (location.countyCode) {
+//   if (location.countyCode) {
-    des += `-${COUNTY_CODE_TO_NAME_MAP.get(location.countyCode)}`;
+//     des += `-${COUNTY_CODE_TO_NAME_MAP.get(location.countyCode)}`;
-  }
+//   }
-  return des;
+//   return des;
-};
+// };
 
 function JobCard(props: IProps) {
   const { className, data, redirectOpen } = props;
@@ -102,8 +102,9 @@ function JobCard(props: IProps) {
           />
           <div className={`${PREFIX}__publisher-name`}>{publisher}</div>
         </div>
-        <div className={`${PREFIX}__city`}>{getCityDes(jobLocation)}</div>
+        {/*<div className={`${PREFIX}__city`}>{getCityDes(jobLocation)}</div>*/}
       </div>
+      {data.isRead && <div className={`${PREFIX}__mask`} />}
     </div>
   );
 }

src/components/job-list/index.tsx

@@ -1,3 +1,5 @@
+import Taro from '@tarojs/taro';
+
 import { List, PullRefresh } from '@taroify/core';
 import classNames from 'classnames';
 import { isEqual } from 'lodash-es';
@@ -5,6 +7,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 
 import JobCard from '@/components/job-card';
 import ListPlaceholder from '@/components/list-placeholder';
+import { EventName } from '@/constants/app';
 import { JobType, EmployType, SortType } from '@/constants/job';
 import { JobInfo, GetJobsRequest } from '@/types/job';
 import { logWithPrefix } from '@/utils/common';
@@ -35,6 +38,7 @@ function JobList(props: IJobListProps) {
     visible = true,
     cityCode = 'ALL',
     category = JobType.All,
+    sourceType,
     employType = EmployType.All,
     sortType = SortType.RECOMMEND,
     isFollow = false,
@@ -57,6 +61,23 @@ function JobList(props: IJobListProps) {
   const prevRequestProps = useRef<IRequestProps>({});
   const onListEmptyRef = useRef(onListEmpty);
 
+  const handleReadJob = useCallback(
+    (jobId: string) => {
+      const index = dataList.findIndex(d => String(d.id) === jobId);
+      if (index < 0) {
+        return;
+      }
+      const job = dataList[index];
+      if (!job || job.isRead) {
+        return;
+      }
+      log('auto mark read', jobId);
+      dataList.splice(index, 1, { ...job, isRead: true });
+      setDataList([...dataList]);
+    },
+    [dataList]
+  );
+
   const handleRefresh = useCallback(async () => {
     log('start pull refresh');
     try {
@@ -108,12 +129,20 @@ function JobList(props: IJobListProps) {
     onListEmptyRef.current = onListEmpty;
   }, [onListEmpty]);
 
+  useEffect(() => {
+    Taro.eventCenter.on(EventName.VIEW_JOB_SUCCESS, handleReadJob);
+    return () => {
+      Taro.eventCenter.off(EventName.VIEW_JOB_SUCCESS, handleReadJob);
+    };
+  }, [handleReadJob]);
+
   useEffect(() => {
     log('request params changed');
     requestProps.current = {
       category,
       cityCode,
       employType,
+      sourceType,
       sortType,
       isFollow,
       isOwner,
@@ -128,6 +157,7 @@ function JobList(props: IJobListProps) {
   }, [
     category,
     cityCode,
+    sourceType,
     employType,
     sortType,
     isFollow,
@@ -176,7 +206,7 @@ function JobList(props: IJobListProps) {
       }
     };
     refresh();
-  }, [visible, cityCode, employType, sortType, keyWord, minSalary, maxSalary, blGroupId]);
+  }, [visible, cityCode, employType, sourceType, sortType, keyWord, minSalary, maxSalary, blGroupId]);
 
   // log('render', `hasMore: ${hasMore}, loadingMore: ${loadingMore}, refreshing: ${refreshing}`);
 

src/components/job-manage-card/index.less

@@ -6,12 +6,12 @@
   height: 152px;
   .flex-row();
   padding: 24px 32px;
-  background: #FFF;
+  background: #fff;
   box-sizing: border-box;
   position: relative;
 
   &::after {
-    content: "";
+    content: '';
     height: 2px;
     background: #00000026;
     position: absolute;
@@ -52,7 +52,11 @@
 
   &__status {
     height: 100%;
-    .flex-row();
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: flex-end;
+    gap: 24px;
     font-size: 28px;
     line-height: 32px;
     font-weight: 400;
@@ -63,7 +67,27 @@
     }
 
     &.error {
-      color: #FF5051;
+      color: #ff5051;
+    }
+  }
+
+  &__buy-tag {
+    padding: 8px;
+    background: rgba(255, 80, 81, 0.12);
+    border-radius: 4px;
+    font-size: 24px;
+    line-height: 24px;
+    color: #ff5051;
+    .flex-row();
+
+    &-wrapper {
+      padding-top: 8px;
+    }
+
+    &-icon {
+      width: 13px;
+      height: 18px;
+      margin-right: 5px;
     }
   }
 }

src/components/job-manage-card/index.tsx

@@ -1,6 +1,10 @@
+import { Image } from '@tarojs/components';
+
+import { Arrow } from '@taroify/icons';
 import classNames from 'classnames';
 import React, { useCallback } from 'react';
 
+import { cityValues } from '@/components/user-batch-publish';
 import { PageUrl } from '@/constants/app';
 import { JOB_MANAGE_STATUS_TITLE_MAP, JobManageStatus } from '@/constants/job';
 import { JobManageInfo } from '@/types/job';
@@ -25,6 +29,29 @@ const STATUS_CLASS_MAP = {
   [JobManageStatus.Expire]: 'close',
 };
 
+function GoBatchTag({ cityCode, jobId }: { cityCode: string; jobId: JobManageInfo['id'] }) {
+  const handleClick = useCallback(
+    e => {
+      e.preventDefault();
+      e.stopPropagation();
+      navigateTo(PageUrl.GroupDelegatePublish, { cityCode, jobId });
+    },
+    [cityCode, jobId]
+  );
+  if (!cityValues.find(c => c.cityCode === cityCode)) {
+    return null;
+  }
+  return (
+    <div onClick={handleClick} className={`${PREFIX}__buy-tag-wrapper`}>
+      <div className={`${PREFIX}__buy-tag`}>
+        <Image className={`${PREFIX}__buy-tag-icon`} src="https://publiccdn.neighbourhood.com.cn/img/lightning.svg" />
+        <div>加速招聘</div>
+        <Arrow size={12} />
+      </div>
+    </div>
+  );
+}
+
 function JobManageCard(props: IProps) {
   const { data = {} } = props;
   const { id, title, status } = data as JobManageInfo;
@@ -41,6 +68,7 @@ function JobManageCard(props: IProps) {
       </div>
       <div className={classNames(`${PREFIX}__status`, { [STATUS_CLASS_MAP[status]]: true })}>
         <div>{JOB_MANAGE_STATUS_TITLE_MAP[status]}</div>
+        <GoBatchTag cityCode={props.data.cityCode} jobId={props.data.id} />
       </div>
     </div>
   );

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/join-group-hint/index.less

@@ -0,0 +1,41 @@
+@import '@/styles/common.less';
+@import '@/styles/variables.less';
+
+.join-group-hint {
+  .flex-row();
+  background: #FFFFFF;
+  border-radius: 16px;
+  padding: 32px 24px;
+  margin-top: 24px;
+  margin-bottom: 24px;
+
+  &__icon {
+    width: 80px;
+    height: 80px;
+    margin-right: 32px;
+  }
+
+  &__left {
+    flex: 1;
+    padding-left: 8px;
+    &-title {
+      font-weight: 500;
+      font-size: 32px;
+      line-height: 40px;
+      margin-bottom: 16px;
+    }
+    &-desc {
+      font-weight: 400;
+      font-size: 28px;
+      line-height: 40px;
+    }
+  }
+
+  &__right {
+    flex: 0 0 auto;
+  }
+
+  &__button {
+    .button(@width: 186px, @height: 64px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 32px, @highlight: 0);
+  }
+}

src/components/join-group-hint/index.tsx

@@ -0,0 +1,63 @@
+import { Button, Image } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+
+import { Plus } from '@taroify/icons';
+import { useCallback, useState } from 'react';
+
+import { RoleType } from '@/constants/app';
+import { CacheKey } from '@/constants/cache-key';
+import { CITY_CODE_TO_NAME_MAP } from '@/constants/city';
+import useCityOperators from '@/hooks/use-city-operators';
+import { getRoleTypeWithDefault } from '@/utils/app';
+import { openCustomerServiceChat } from '@/utils/common';
+import { getCurrentCityCode } from '@/utils/location';
+import { checkCityCode, validCityCode } from '@/utils/user';
+import './index.less';
+
+const PREFIX = 'join-group-hint';
+
+const DEFAULT_GROUP = {
+  name: '播络主播招聘群',
+  serviceUrl: 'https://work.weixin.qq.com/kfid/kfcc60ac7b6420787a8',
+};
+
+export function JoinGroupHint() {
+  const cityCode = getCurrentCityCode();
+  const roleType = getRoleTypeWithDefault();
+  const cityOperators = useCityOperators();
+  const group = cityOperators.find(g => String(g.cityCode) === cityCode);
+  const [clicked, setClicked] = useState(!!Taro.getStorageSync(CacheKey.JOIN_GROUP_CARD_CLICKED));
+  const handleClick = useCallback(() => {
+    if (group && !checkCityCode(cityCode)) {
+      return;
+    }
+    openCustomerServiceChat(group ? group.groupLink : DEFAULT_GROUP.serviceUrl);
+    Taro.setStorageSync(CacheKey.JOIN_GROUP_CARD_CLICKED, true);
+    setClicked(true);
+  }, [cityCode, group]);
+  if (!validCityCode(cityCode) || clicked) {
+    return null;
+  }
+
+  return (
+    <div className={PREFIX}>
+      <Image
+        className={`${PREFIX}__icon`}
+        src="https://publiccdn.neighbourhood.com.cn/img/group-avatar.png"
+        mode="aspectFit"
+      />
+      <div className={`${PREFIX}__left`}>
+        <div className={`${PREFIX}__left-title`}>
+          {group ? `${CITY_CODE_TO_NAME_MAP.get(cityCode)}主播招聘群` : DEFAULT_GROUP.name}
+        </div>
+        <div className={`${PREFIX}__left-desc`}>{roleType === RoleType.Anchor ? '高薪工作早知道' : '免费招主播'}</div>
+      </div>
+      <div className={`${PREFIX}__right`}>
+        <Button className={`${PREFIX}__button`} onClick={handleClick}>
+          <Plus />
+          加入该群
+        </Button>
+      </div>
+    </div>
+  );
+}

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, requestUserInfo, setAgreementSigned } from '@/utils/user';
 
 import './index.less';
 
@@ -17,34 +18,83 @@ export enum BindPhoneStatus {
 
 export interface ILoginButtonProps extends ButtonProps {
   needPhone?: boolean;
+  needRefresh?: boolean;
+  onRefresh?: (() => void) | (() => Promise<void>);
+  needAssignment?: boolean;
 }
 
 const PREFIX = 'login-button';
 
 function LoginButton(props: ILoginButtonProps) {
-  const { className, children, needPhone, onClick, ...otherProps } = props;
+  const { className, children, needPhone, onRefresh, onClick, needRefresh, ...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 => {
+    (e: ITouchEvent) => {
-      setVisible(false);
+      setAssignVisible(false);
-      onClick?.(e);
+      setAgreementSigned(true);
+      if (onClick) {
+        onClick(e);
+      }
     },
     [onClick]
   );
 
+  const handleCancel = useCallback(() => {
+    setAgreementSigned(false);
+    setAssignVisible(false);
+  }, []);
+
+  const handleLoginSuccess = useCallback(
+    async e => {
+      setLoginVisible(false);
+      if (needRefresh) {
+        requestUserInfo();
+        onRefresh && (await onRefresh());
+      }
+      onClick?.(e);
+    },
+    [needRefresh, onClick]
+  );
+
   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 open onClose={onCancel} className={PREFIX}>
       <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/material-card/index.less

@@ -4,7 +4,7 @@
 .material-card {
   padding: 32px 24px;
   border-radius: 16px;
-  background: #FFFFFF;
+  background: #ffffff;
   box-sizing: border-box;
 
   &__header {
@@ -16,6 +16,10 @@
       .flex-row();
     }
 
+    &__right {
+      color: @blHighlightColor;
+    }
+
     &__title {
       font-size: 32px;
       line-height: 40px;
@@ -50,7 +54,7 @@
 
   &__body {
     width: 100%;
-    height: 156px;
+    height: 160px;
     margin-top: 24px;
     .flex-column();
     justify-content: center;
@@ -80,38 +84,44 @@
     }
   }
 
-  &__scroll-view {
+  &__info {
-    position: relative;
+    .flex-row();
+    gap: 24px;
     width: 100%;
-    height: 100%;
-    .flex-row();
 
-    &::-webkit-scrollbar {
+    &-left {
-      display: none;
+      width: 125px;
+      height: 160px;
     }
-
+    &-cover {
-    &::after {
+      width: 100%;
-      content: '';
-      position: absolute;
-      right: 0;
-      width: 102px;
       height: 100%;
-      background: linear-gradient(91.41deg, rgba(255, 255, 255, 0) 1.86%, #FFFFFF 99.47%);
+      border-radius: 12px;
+    }
+    &-right {
+      .name {
+        font-style: normal;
+        font-weight: 500;
+        font-size: 28px;
+        line-height: 32px;
+        color: @blColor;
+        margin-bottom: 12px;
+      }
+      .info,
+      .worked {
+        font-weight: 400;
+        font-size: 24px;
+        line-height: 36px;
+        color: @blColorG2;
+        margin-bottom: 8px;
+      }
+      .salary {
+        font-weight: 500;
+        font-size: 24px;
+        line-height: 36px;
+        color: @blColor;
+
+      }
     }
   }
-
-  &__cover-list {
-    height: 100%;
-    .flex-row();
-  }
-
-  &__cover-image {
-    width: 120px;
-    height: 100%;
-    margin-right: 24px;
-    // 不知道为啥高度不对，可能 scroll-view 默认底部是滚动条高度？
-    margin-top: 38px;
-    border-radius: 8px;
-  }
-
 }

src/components/material-card/index.tsx

@@ -1,4 +1,4 @@
-import { Image, ScrollView } from '@tarojs/components';
+import { Image } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
 import { Loading } from '@taroify/core';
@@ -9,11 +9,12 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import LoginButton from '@/components/login-button';
 import { EventName, PageUrl } from '@/constants/app';
 import { CollectEventName, ReportEventId } from '@/constants/event';
+import { WORK_YEAR_LABELS } from '@/constants/material';
 import useUserInfo from '@/hooks/use-user-info';
 import { MaterialProfile } from '@/types/material';
 import { logWithPrefix } from '@/utils/common';
 import { collectEvent, reportEvent } from '@/utils/event';
-import { requestProfileDetail, sortVideos } from '@/utils/material';
+import { getBasicInfo, getSalary, requestProfileDetail, sortVideos } from '@/utils/material';
 import { navigateTo } from '@/utils/route';
 import Toast from '@/utils/toast';
 import { isValidUserInfo } from '@/utils/user';
@@ -34,8 +35,9 @@ function MaterialCard(props: IProps) {
   const userInfo = useUserInfo();
   const [loading, setLoading] = useState(true);
   const [profile, setProfile] = useState<MaterialProfile | null>(null);
-  const refreshRef = useRef((_f?: boolean) => { });
+  const refreshRef = useRef((_f?: boolean) => {});
   const hasMaterial = !!profile;
+  const firstCover = sortVideos(profile?.materialVideoInfoList || [])[0];
 
   const handleGoCreateProfile = useCallback(() => {
     reportEvent(ReportEventId.CLICK_GO_TO_CREATE_MATERIAL);
@@ -44,7 +46,7 @@ function MaterialCard(props: IProps) {
 
   const handleGoProfile = useCallback(() => {
     if (!hasMaterial) {
-      realtimeLogger.info('handleGoProfile noMaterial')
+      realtimeLogger.info('handleGoProfile noMaterial');
       return;
     }
     navigateTo(PageUrl.MaterialProfile).catch(err => {
@@ -67,7 +69,7 @@ function MaterialCard(props: IProps) {
       try {
         const profileDetail = await requestProfileDetail();
         if (!profileDetail) {
-          realtimeLogger.info('getProfileDetail no profileDetail')
+          realtimeLogger.info('getProfileDetail no profileDetail');
         }
         setProfile(profileDetail);
       } catch (e) {
@@ -90,8 +92,10 @@ function MaterialCard(props: IProps) {
       refreshRef.current?.(true);
     };
     Taro.eventCenter.on(EventName.CREATE_PROFILE, callback);
+    Taro.eventCenter.on(EventName.UPDATE_PROFILE, callback);
     return () => {
       Taro.eventCenter.off(EventName.CREATE_PROFILE, callback);
+      Taro.eventCenter.on(EventName.UPDATE_PROFILE, callback);
     };
   }, [userInfo]);
 
@@ -100,16 +104,11 @@ function MaterialCard(props: IProps) {
       <div className={`${PREFIX}__header`}>
         <div className={`${PREFIX}__header__left`}>
           <div className={`${PREFIX}__header__title`}>我的模卡</div>
-          {/* {profile && (
-            <div
-              className={`${PREFIX}__header__progress`}
-            >{`完成度${Math.min((profile.progressBar || 0) * 100, 100)}%`}</div>
-          )} */}
         </div>
         {profile && (
           <div className={`${PREFIX}__header__right`}>
-            {/* <div className={`${PREFIX}__header__status`}>{profile?.isOpen ? '开放中' : '关闭'}</div> */}
+            <div>去分享</div>
-            <ArrowRight className={`${PREFIX}__header__icon`} />
+            <ArrowRight color="#6D3DF5" className={`${PREFIX}__header__icon`} />
           </div>
         )}
       </div>
@@ -123,18 +122,21 @@ function MaterialCard(props: IProps) {
           </div>
         )}
         {!loading && hasMaterial && (
-          <ScrollView className={`${PREFIX}__scroll-view`} showScrollbar={false} enableFlex enhanced scrollX>
+          <div className={`${PREFIX}__info`}>
-            <div className={`${PREFIX}__cover-list`}>
+            {firstCover && (
-              {sortVideos(profile?.materialVideoInfoList || []).map(video => (
+              <div className={`${PREFIX}__info-left`}>
-                <Image
+                <Image className={`${PREFIX}__info-cover`} mode="aspectFill" src={firstCover.coverUrl} />
-                  className={`${PREFIX}__cover-image`}
+              </div>
-                  mode="aspectFit"
+            )}
-                  key={video.coverUrl}
+            <div className={`${PREFIX}__info-right`}>
-                  src={video.coverUrl}
+              <div className="name">{profile?.name}</div>
-                />
+              <div className="info">
-              ))}
+                {WORK_YEAR_LABELS[profile?.workedYear] || ''}·{getBasicInfo({ ...profile, shoeSize: null })}
+              </div>
+              <div className="worked">播过 {profile?.workedSecCategoryStr}</div>
+              <div className="salary">{getSalary(profile)}</div>
             </div>
-          </ScrollView>
+          </div>
         )}
         {loading && <Loading />}
       </div>

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/message-dialog/index.less

@@ -80,4 +80,8 @@
       margin-top: 24px;
     }
   }
+
+  &__no-subscription {
+
+  }
 }

src/components/message-dialog/index.tsx

@@ -57,7 +57,9 @@ export function MessageNoTimesDialog(props: INoTimesProps) {
     <Dialog className={NO_TIMES} onClose={onClose} open={open}>
       <Dialog.Content>
         <div className={`${NO_TIMES}__title`}>未读消息提醒次数不够了！</div>
-        <div className={`${NO_TIMES}__tips`}>有通知次数才能<span className="highlight">及时收到</span>招聘邀请，快点击“点我增加”吧～</div>
+        <div className={`${NO_TIMES}__tips`}>
+          有通知次数才能<span className="highlight">及时收到</span>招聘邀请，快点击“点我增加”吧～
+        </div>
         <div className={`${NO_TIMES}__body`}>
           <div className={`${NO_TIMES}__times`}>{`未读消息提醒剩余：${times}次`}</div>
           <Button className={`${NO_TIMES}__btn`} onClick={onClick}>

src/components/partner-banner/index.tsx

@@ -12,7 +12,7 @@ import './index.less';
 
 const PREFIX = 'partner-fragment-banner';
 
-export default function PartnerBanner() {
+export default function PartnerBanner({ isBoss = false }) {
   const userInfo = useUserInfo();
   const needPhone = isNeedPhone(userInfo);
   const isPartner = userInfo.isPartner;
@@ -50,7 +50,11 @@ export default function PartnerBanner() {
       <div className={PREFIX} onClick={handleClick}>
         <Image
           className={`${PREFIX}__image`}
-          src="https://publiccdn.neighbourhood.com.cn/img/partner_banner.png"
+          src={
+            isBoss
+              ? 'https://publiccdn.neighbourhood.com.cn/img/partner_banner.png'
+              : 'https://publiccdn.neighbourhood.com.cn/img/partner-banner-boss.png'
+          }
           mode="scaleToFill"
         />
         {needPhone && (

src/components/partner-intro/index.less

@@ -2,26 +2,53 @@
 @import '@/styles/common.less';
 
 .partner-intro {
-  padding-top: 112px;
+  background: #eae5fb;
-  padding-bottom: calc(112px + constant(safe-area-inset-bottom));
+  padding-top: 271px;
-  padding-bottom: calc(112px + env(safe-area-inset-bottom));
+  position: relative;
+  padding-bottom: calc(142px + constant(safe-area-inset-bottom));
+  padding-bottom: calc(142px + env(safe-area-inset-bottom));
 
-  &__banner {
+  &__bg {
-    background: fade(@blHighlightBg, 8);
+    width: 100%;
-    height: 88px;
+    height: 705px;
-    line-height: 88px;
+    position: absolute;
-    text-align: center;
+    top: 0;
-    font-size: 28px;
-    position: fixed;
-    top: 98px;
     left: 0;
-    right: 0;
+  }
-    width: 100vw;
+  &__slogan {
+    top: 66px;
+    left: 44px;
+    position: absolute;
+    font-family: 'Alimama ShuHeiTi';
+    font-style: normal;
+    font-weight: 700;
+    font-size: 44px;
+    line-height: 62px;
+    color: #333333;
+
+    > div {
+      margin-bottom: 12px;
+    }
+
+    &-highlight {
+      display: inline-block;
+      padding-left: 12px;
+      padding-right: 9px;
+      font-size: 64px;
+      line-height: 62px;
+      background: linear-gradient(87.53deg, #683de3 0.4%, #39227d 84.55%);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      background-clip: text;
+      text-fill-color: transparent;
+    }
   }
 
   &__main {
     padding-left: 24px;
     padding-right: 24px;
+    position: relative;
+    z-index: 1;
   }
 
   &__highlight {
@@ -34,14 +61,90 @@
   }
 
   &__block {
-    margin-bottom: 40px;
+    margin-bottom: 12px;
+    position: relative;
   }
 
+  &__swiper {
+    &-wrapper {
+      margin-bottom: 8px;
+      background: #fff;
+      border-radius: 24px;
+      position: relative;
+      border: 1px solid #6d3df5;
+    }
+
+    &-bg {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  &__swiper-item {
+    box-sizing: border-box;
+    height: 130px;
+    padding: 24px 32px;
+    &-top-line {
+      .flex-row();
+      font-style: normal;
+      font-size: 28px;
+      line-height: 40px;
+      color: #333333;
+      font-weight: 400;
+      position: relative;
+      .noWrap();
+    }
+    &-id {
+      .id {
+        color: #999999;
+        display: inline-block;
+        padding-left: 10px;
+      }
+    }
+    &-time {
+      padding-right: 55px;
+    }
+    &-details {
+      margin-top: 5px;
+      .flex-row();
+      justify-content: space-between;
+    }
+    &-tag {
+      height: 36px;
+      margin-right: 16px;
+      padding: 0 12px;
+      border: 1px solid #6d3df5;
+      border-radius: 4px;
+      font-size: 24px;
+      line-height: 36px;
+      color: #6d3df5;
+      display: inline-block;
+    }
+    &-info {
+      font-size: 28px;
+      line-height: 40px;
+      color: #333333;
+      display: inline-block;
+      margin-right: 16px;
+      &:last-child {
+        margin-right: 0;
+      }
+
+      .money {
+        color: #ff5051;
+        display: inline-block;
+        padding-left: 8px;
+      }
+    }
+  }
 
   &__card {
     background: #fff;
     border-radius: 24px;
-    padding: 24px 32px;
+    padding: 68px 32px 44px;
   }
 
   &__h1 {
@@ -51,33 +154,81 @@
     color: #1d2129;
     margin-bottom: 16px;
     margin-top: 32px;
+    position: relative;
+    z-index: 0;
+
+    &.no-dot {
+      &:after {
+        background: transparent;
+      }
+    }
 
     &:first-child {
       margin-top: 0;
     }
+
+    &:after {
+      content: '';
+      width: 28px;
+      height: 28px;
+      background: #ffd236;
+      border-radius: 50%;
+      position: absolute;
+      left: -6px;
+      top: -3px;
+      z-index: -1;
+    }
   }
 
   &__body {
     font-weight: 400;
     font-size: 28px;
     line-height: 40px;
+    color: @blColor;
 
     &.grey {
-      color: @blColorG2
+      color: @blColorG2;
+    }
+
+    &.center {
+      text-align: center;
     }
   }
 
   &__title {
-    margin-bottom: 24px;
+    margin-left: 48px;
+    margin-right: 48px;
     font-weight: 500;
     font-size: 32px;
-    line-height: 32px;
+    line-height: 80px;
-
+    height: 80px;
+    transform: translateY(50%);
+    background: #ffd236;
+    box-shadow: 0px 12px 0px #ffa35d;
+    border-radius: 60px;
     color: #1d2129;
+    text-align: center;
+    position: relative;
+  }
+
+  &__recommend {
+    display: inline-flex;
+    line-height: 36px;
+    padding: 0 8px;
+    height: 36px;
+    background: rgb(255, 80, 81);
+    border-radius: 4px;
+    font-size: 24px;
+    color: #fff;
+    align-items: center;
+    position: absolute;
+    gap: 6px;
+    right: -25px;
+    top: -18px;
   }
 
   &__special {
-    padding: 32px;
+    padding-top: 75px;
     .flex-column();
 
     .partner-intro__body {
@@ -100,6 +251,7 @@
   &__footer {
     position: fixed;
     bottom: 0;
+    z-index: 2;
     width: 100vw;
     background: #ffffff;
     padding: 12px 32px;
@@ -112,17 +264,20 @@
     display: flex;
     flex-direction: row;
     box-sizing: border-box;
+    justify-content: center;
   }
 
   &__download-button {
-    flex: 1 1;
+    //flex: 1 1;
     .button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px; @highlight: 0);
   }
 
   &__share-button {
-    flex: 2 2;
+    //flex: 2 2;
+    flex: 0 0 406px;
+    width: 406px;
     .button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px;);
-    margin-left: 32px;
+    //margin-left: 32px;
   }
 }
 

src/components/partner-intro/index.tsx

@@ -1,174 +1,220 @@
-import { Button, Canvas } from '@tarojs/components';
+import { Button, Canvas, Image } from '@tarojs/components';
-import Taro from '@tarojs/taro';
 
-import { useCallback, useState } from 'react';
+import { Swiper } from '@taroify/core';
+import { GoodJob } from '@taroify/icons';
+import { useCallback, useEffect, useRef, useState } from 'react';
 
+import LoginDialog from '@/components/login-dialog';
+import { PageUrl } from '@/constants/app';
+import useUserInfo from '@/hooks/use-user-info';
+import { EarnType, UserProfitListItem } from '@/types/partner';
 import { openCustomerServiceChat } from '@/utils/common';
-import { getPartnerQrcode } from '@/utils/partner';
+import { becomePartner, formatMoney, formatTimestamp, formatUserId, getLastProfitList } from '@/utils/partner';
+import { navigateTo } from '@/utils/route';
+import { isNeedPhone, requestUserInfo } from '@/utils/user';
+
 import './index.less';
 
 const PREFIX = 'partner-intro';
 
 export default function PartnerIntro() {
-  const [posterPath, setPosterPath] = useState('');
+  const userInfo = useUserInfo();
-  const getQrcode = async () => {
+  const needPhone = isNeedPhone(userInfo);
-    try {
+  const [loginVisible, setLoginVisible] = useState(false);
-      const data = await getPartnerQrcode(); // 假设 getPartnerQrcode 返回 ArrayBuffer
-      const base64 = Taro.arrayBufferToBase64(data);
-      return `data:image/png;base64,${base64}`;
-    } catch (error) {
-      console.error('获取二维码失败', error);
-      Taro.showToast({ title: '获取二维码失败', icon: 'none' });
-      throw error;
-    }
-  };
-  const saveCanvasToTempFile = (): Promise<string> => {
-    return new Promise((resolve, reject) => {
-      try {
-        const query = Taro.createSelectorQuery().select('#posterCanvas');
-        query.fields({ node: true }).exec(async res => {
-          const canvas = res[0].node;
-          const tempFilePath = await Taro.canvasToTempFilePath({
-            canvas,
-            x: 0,
-            y: 0,
-            width: 1500, // 实际绘制宽度
-            height: 2668, // 实际绘制高度
-            destWidth: 750, // 目标显示宽度
-            destHeight: 1334, // 目标显示高度
-            fileType: 'jpg',
-          });
-
-          setPosterPath(tempFilePath.tempFilePath);
-
-          resolve(tempFilePath.tempFilePath);
-        });
-      } catch (error) {
-        console.error('保存 Canvas 到临时文件失败', error);
-        Taro.showToast({ title: '保存 Canvas 失败', icon: 'none' });
-        reject(error);
-      }
-    });
-  };
-  const drawCanvas = (qrCode: string): Promise<string> => {
-    const query = Taro.createSelectorQuery().select('#posterCanvas');
-    return new Promise(resolve => {
-      query.fields({ node: true, size: true }).exec(async res => {
-        const canvas = res[0].node;
-        const ctx = canvas.getContext('2d');
-
-        canvas.width = 1500;
-        canvas.height = 2668;
-        ctx.scale(2, 2);
-
-        // 绘制背景图片
-        const bgImage = canvas.createImage();
-        const poster = 'https://publiccdn.neighbourhood.com.cn/img/poster.png'
-        bgImage.src = poster;
-        bgImage.onload = () => {
-          ctx.drawImage(bgImage, 0, 0, 750, 1334);
-
-          const qrCodeImage = canvas.createImage();
-          qrCodeImage.src = qrCode; // 假设 getQrcode() 返回的是二维码图片的路径
-          qrCodeImage.onload = () => {
-            ctx.drawImage(qrCodeImage, 235, 894, 280, 280); // 绘制二维码，位置和大小
-            saveCanvasToTempFile().then(tempPath => {
-              resolve(tempPath);
-            });
-          };
-        };
-        bgImage.onerror = err => {
-          console.error(err);
-        };
-      });
-    });
-  };
-  const savePoster = async () => {
-    let filePath = posterPath;
-    if (!filePath) {
-      Taro.showLoading({ title: '正在生成海报' });
-      const qrCode = await getQrcode();
-      filePath = await drawCanvas(qrCode);
-      Taro.hideLoading();
-    }
-
-    const res = await Taro.getSetting();
-    const hasPermission = res.authSetting['scope.writePhotosAlbum'];
-    if (hasPermission === false) {
-      Taro.showModal({
-        title: '提示',
-        content: '需要访问相册权限才能保存图片，请前往设置开启权限',
-        showCancel: false,
-        success() {
-          Taro.openSetting();
-        },
-      });
-    } else {
-      try {
-        await Taro.authorize({ scope: 'scope.writePhotosAlbum' });
-        await Taro.saveImageToPhotosAlbum({ filePath });
-        Taro.showToast({ title: '保存成功', icon: 'success' });
-      } catch (error) {
-        console.error(error);
-        Taro.showToast({ title: '保存失败', icon: 'none' });
-      }
-    }
-  };
 
   const handleOpenService = useCallback(() => {
     openCustomerServiceChat('https://work.weixin.qq.com/kfid/kfc4fcf6b109b3771d7');
   }, []);
+
+  const handleBindSuccess = useCallback(async () => {
+    await becomePartner();
+    await requestUserInfo();
+    setLoginVisible(false);
+  }, []);
+  const handleBecomePartner = useCallback(() => {
+    if (needPhone) {
+      setLoginVisible(true);
+      return false;
+    } else {
+      handleBindSuccess();
+      return true;
+    }
+  }, [handleBindSuccess, needPhone]);
+
+  const handleConfirm = useCallback(() => {
+    if (!userInfo.isPartner && !handleBecomePartner()) {
+      return;
+    }
+    navigateTo(PageUrl.GroupOwnerCertificate);
+  }, [handleBecomePartner, userInfo.isPartner]);
+
+  const handleJump = useCallback(() => {
+    if (!userInfo.isPartner && !handleBecomePartner()) {
+      return;
+    }
+    navigateTo(PageUrl.PartnerShareVip);
+  }, [handleBecomePartner, userInfo.isPartner]);
+
+  const timerRef = useRef<NodeJS.Timeout | null>(null);
+  const [bannerList, setBannerList] = useState<UserProfitListItem[]>([]);
+
+  const getBannerList = useCallback(async () => {
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
+      timerRef.current = null;
+    }
+
+    const list = await getLastProfitList();
+    setBannerList(list);
+
+    timerRef.current = setTimeout(
+      () => {
+        getBannerList();
+      },
+      3000 * (list.length || 10)
+    );
+  }, []);
+
+  useEffect(() => {
+    getBannerList();
+
+    return () => {
+      if (timerRef.current) {
+        clearTimeout(timerRef.current);
+        timerRef.current = null;
+      }
+    };
+  }, [getBannerList]);
+
+  const showedRef = useRef(false);
+
+  useEffect(() => {
+    if (showedRef.current || !userInfo.userId) {
+      return;
+    }
+    showedRef.current = true;
+    if (!userInfo.isPartner) {
+      handleBecomePartner();
+    }
+  }, [userInfo]);
+
   return (
     <div className={PREFIX}>
-      <div className={`${PREFIX}__banner`}>
+      <Image
-        邀请朋友加入播络，高达<span className={`${PREFIX}__highlight`}>75%</span>分成
+        src="https://publiccdn.neighbourhood.com.cn/img/partner-intro-bg.png"
+        className={`${PREFIX}__bg`}
+        mode="aspectFill"
+      />
+      <div className={`${PREFIX}__slogan`}>
+        <div>邀请朋友加入播络</div>
+        <div>
+          高达<div className={`${PREFIX}__slogan-highlight`}>75%</div>分成
+        </div>
       </div>
       <div className={`${PREFIX}__main`}>
+        <div className={`${PREFIX}__swiper-wrapper`}>
+          <Image
+            className={`${PREFIX}__swiper-bg`}
+            src="https://publiccdn.neighbourhood.com.cn/img/partner-swipe-item.png"
+            mode="aspectFill"
+          />
+          <Swiper className={`${PREFIX}__swiper`} autoplay={3000} touchable={false}>
+            {bannerList.map((item, index) => (
+              <Swiper.Item className={`${PREFIX}__swiper-item`} key={`${item.userId}-${index}`}>
+                <div className={`${PREFIX}__swiper-item-top-line`}>
+                  <div className={`${PREFIX}__swiper-item-time`}>{formatTimestamp(item.updatedAt)}</div>
+                  <div className={`${PREFIX}__swiper-item-id`}>
+                    用户 <div className="id">{formatUserId(item.userId)}</div>
+                  </div>
+                </div>
+                <div className={`${PREFIX}__swiper-item-details`}>
+                  <div>
+                    <div className={`${PREFIX}__swiper-item-tag`}>分成收入</div>
+                    <div className={`${PREFIX}__swiper-item-info`}>
+                      {[EarnType.CHAT_ACTIVITY_SHARE_L1, EarnType.CHAT_ACTIVITY_SHARE_L2].includes(item.earnType)
+                        ? '主播被开聊'
+                        : '会员支付'}
+                      <div className="money">+{formatMoney(item.amount)}</div>
+                    </div>
+                  </div>
+                  <div className={`${PREFIX}__swiper-item-info`}>
+                    累计<div className="money">{formatMoney(item.total)}</div>
+                  </div>
+                </div>
+              </Swiper.Item>
+            ))}
+          </Swiper>
+        </div>
+
         <div className={`${PREFIX}__block`}>
+          <div className={`${PREFIX}__title`}>
+            群主认证
+            <div className={`${PREFIX}__recommend`}>
+              <GoodJob />
+              强烈推荐
+            </div>
+          </div>
+          <div className={`${PREFIX}__card ${PREFIX}__special`}>
+            <div className={`${PREFIX}__body`}>
+              <div className="center">
+                完成群主认证后，群成员通过该群访问任何人分享的播络小程序进行注册，你都能获得分成
+              </div>
+            </div>
+            <Button className={`${PREFIX}__service`} onClick={handleConfirm}>
+              立即认证
+            </Button>
+          </div>
+        </div>
+        <div className={`${PREFIX}__block`}>
+          <div className={`${PREFIX}__title`}>3重收益</div>
           <div className={`${PREFIX}__card`}>
-            <div className={`${PREFIX}__h1`}>收益一</div>
+            <div className={`${PREFIX}__h1`}>直接分成：</div>
             <div className={`${PREFIX}__body`}>
               直接获得被邀请人付款金额的<span className={`${PREFIX}__highlight`}>20%</span>
             </div>
-            <div className={`${PREFIX}__h1`}>收益二</div>
+            <div className={`${PREFIX}__h1`}>主播分成：</div>
             <div className={`${PREFIX}__body`}>
               邀请的主播创建模卡，被企业开聊，每日可获得收益，分成比例高达
               <span className={`${PREFIX}__highlight`}>50%</span>
             </div>
-            <div className={`${PREFIX}__h1`}>收益三</div>
+            <div className={`${PREFIX}__h1`}>邀请合伙人：</div>
             <div className={`${PREFIX}__body`}>
-              邀请朋友加入合伙人，可额外获得所邀合伙人收益的<span className={`${PREFIX}__highlight`}>5%</span>
+              你邀请的人也加入合伙人，你可获得所邀合伙人收益的<span className={`${PREFIX}__highlight`}>5%</span>
             </div>
           </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 className={`${PREFIX}__body`}>
+              <div className={`${PREFIX}__h1`}>方法一：</div>
+              <div>点击下方“赠送会员给好友”，给群员、好友送会员，每周可以送一次</div>
+              <div className={`${PREFIX}__h1`}>方法二：</div>
+              <div>分享通告列表页、通告详情页等页面至群、好友</div>
+            </div>
           </div>
         </div>
         <div className={`${PREFIX}__block`}>
-          <div className={`${PREFIX}__title`}>合伙人交流群</div>
+          <div className={`${PREFIX}__title`}>交流群</div>
           <div className={`${PREFIX}__card  ${PREFIX}__special`}>
-            <div className={`${PREFIX}__h1`}>加入播络合伙人交流群</div>
+            <div className={`${PREFIX}__h1 no-dot`}>加入播络合伙人交流群，分享经验</div>
-            <div className={`${PREFIX}__body grey`}>学习分享邀请经验，一起赚钱</div>
             <Button className={`${PREFIX}__service`} onClick={handleOpenService}>
               点击加入
             </Button>
           </div>
-          <div className={`${PREFIX}__tip`}>注：收益不设时限，可重复享有，播络保留活动最终解释权</div>
         </div>
       </div>
       <Canvas id="posterCanvas" canvas-id="posterCanvas" type="2d" style="width: 750px; height: 1334px;" />
 
       <div className={`${PREFIX}__footer`}>
-        <Button className={`${PREFIX}__download-button`} onClick={savePoster}>
+        <Button className={`${PREFIX}__share-button`} onClick={handleJump}>
-          下载海报
+          赠送会员给好友
-        </Button>
-        <Button className={`${PREFIX}__share-button`} openType="share">
-          分享邀请
         </Button>
       </div>
+
+      {loginVisible && (
+        <LoginDialog onCancel={() => setLoginVisible(false)} onSuccess={handleBindSuccess} needPhone={needPhone} />
+      )}
     </div>
   );
 }

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

@@ -125,7 +125,7 @@ function PartnerList(props: {
           hasMore={hasMore}
           onLoad={handleLoadMore}
           loading={loadingMore || refreshing}
-          disabled={loadMoreError}
+          disabled={loadMoreError || !visible}
           fixedHeight={typeof listHeight !== 'undefined'}
           style={listHeight ? { height: `${listHeight}px` } : undefined}
         >

src/components/partner-kanban/index.less

@@ -8,7 +8,51 @@
   background: #6d3df5;
   color: #fff;
 
-  &__simple {
+  &-simple {
+    padding:  39px 35px;
+    height: 120px;
+    box-sizing: border-box;
+    &__bg {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      border-radius: 16px;
+      height: 100%;
+    }
+    &__content {
+      .flex-row();
+      line-height: 42px;
+      position: relative;
+      z-index: 1;
+    }
+
+    &__title {
+      font-size: 26px;
+      color: #FFFFFF;
+
+
+    }
+
+    &__money {
+      font-weight: 800;
+      margin-left: 12px;
+      font-size: 44px;
+    }
+    &__button {
+      position: absolute;
+      z-index: 2;
+      top: 44px;
+      right: 24px;
+      font-size: 28px;
+      line-height: 32px;
+      &-image {
+        width: 24px;
+        height: 24px;
+        display: inline-block;
+        margin-left: 8px;
+      }
+    }
   }
 
   &__bg {
@@ -28,20 +72,7 @@
     z-index: 1;
   }
 
-  &__button {
+
-    position: absolute;
-    z-index: 2;
-    top: 44px;
-    right: 56px;
-    font-size: 24px;
-    line-height: 24px;
-    &-image {
-      width: 20px;
-      height: 20px;
-      display: inline-block;
-      margin-left: 4px;
-    }
-  }
   &__title {
     font-style: normal;
     font-weight: 400;

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,41 +119,62 @@ 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();
   }, []);
+  if (simple) {
+    return (
+      <div className={`${PREFIX} ${PREFIX}-simple`}>
+        <Image
+          className={`${PREFIX}-simple__bg`}
+          src="https://publiccdn.neighbourhood.com.cn/img/partner_bg.png"
+          mode="aspectFill"
+        />
+        <div className={`${PREFIX}-simple__content`}>
+          <div className={`${PREFIX}-simple__title`}>总收益(元)</div>
+          <div className={`${PREFIX}-simple__money`}>{formatMoney(total)}</div>
+        </div>
+        <div className={`${PREFIX}-simple__button`} onClick={handleNavigate}>
+          详情
+          <Image
+            className={`${PREFIX}-simple__button-image`}
+            mode="aspectFit"
+            src={require('@/statics/svg/caret-right.svg')}
+          />
+        </div>
+      </div>
+    );
+  }
   return (
-    <div className={`${PREFIX} ${simple ? `${PREFIX}__simple` : ''}`}>
+    <div className={PREFIX}>
       <Image
         className={`${PREFIX}__bg`}
         src="https://publiccdn.neighbourhood.com.cn/img/partner_bg.png"
         mode="aspectFill"
       />
       <div className={`${PREFIX}__content`}>
-        {simple && (
-          <div className={`${PREFIX}__button`} onClick={handleNavigate}>
-            查看详情
-            <Image
-              className={`${PREFIX}__button-image`}
-              mode="aspectFit"
-              src={require('@/statics/svg/caret-right.svg')}
-            />
-          </div>
-        )}
         <div className={`${PREFIX}__total`}>
           <div className={`${PREFIX}__title`}>总收益（元）</div>
           <div className={`${PREFIX}__money`}>{formatMoney(total)}</div>
@@ -142,19 +196,21 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
             <div className={`${PREFIX}__money`}>{formatMoney(stats.availableProfit)}</div>
           </div>
         </div>
-        {!simple && (
+        <div className={`${PREFIX}__buttons`}>
-          <div className={`${PREFIX}__buttons`}>
+          <Button className={`${PREFIX}__withdraw`} onClick={handleViewWithdraw}>
-            <Button className={`${PREFIX}__withdraw`} onClick={handleViewWithdraw}>
+            提现
-              提现
+          </Button>
-            </Button>
+          <Button className={`${PREFIX}__record`} onClick={handleNavigateRecord}>
-            <Button className={`${PREFIX}__record`} onClick={handleNavigateRecord}>
+            提现记录
-              提现记录
+          </Button>
-            </Button>
+        </div>
-          </div>
-        )}
       </div>
-      {!simple && <TipDialog open={tipOpen} onClose={handleTipClose} />}
+      <TipDialog open={tipOpen} onClose={handleTipClose} />
-      {!simple && <WithdrawDialog count={350} open={withdrawOpen} onClose={handleWithdrawClose} />}
+      <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') > -1;
+            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

@@ -78,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/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/components/prejob-popup/index.less

@@ -0,0 +1,82 @@
+@import '@/styles/common.less';
+@import '@/styles/variables.less';
+
+.prejob-popup {
+  &__content {
+    padding: 40px 32px;
+  }
+
+  &__title {
+    font-weight: 500;
+    font-size: 32px;
+    line-height: 48px;
+    margin-bottom: 31px;
+    text-align: center;
+  }
+
+  &__body {
+  }
+
+  &__item {
+    .flex-row();
+    margin-bottom: 40px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    &-icon {
+      width: 88px;
+      height: 88px;
+      border-radius: 8px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      &.material {
+        background: #feba00;
+        > image {
+          width: 40px;
+          height: 46px;
+        }
+      }
+      &.vip {
+        background: #b094ff;
+        > image {
+          width: 48px;
+          height: 42px;
+        }
+      }
+      &.video {
+        background: #34a853;
+        > image {
+          width: 46px;
+          height: 44px;
+        }
+      }
+    }
+    &-main {
+      padding: 0 24px;
+      flex: 1;
+      .title {
+        font-weight: 500;
+        font-size: 28px;
+        line-height: 40px;
+        margin-bottom: 8px;
+      }
+      .desc {
+        font-size: 24px;
+        line-height: 36px;
+        color: @blColorG1;
+      }
+    }
+    &-action {
+      flex: 0 0 auto;
+    }
+  }
+
+  &__btn {
+    .button(@width: 136px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 43px, @highlight: 0);
+    background: #f2f2f2;
+  }
+}

src/components/prejob-popup/index.tsx

@@ -0,0 +1,108 @@
+import { Button, Image } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+
+import { Dialog, Popup } from '@taroify/core';
+import { Fragment, useCallback, useState } from 'react';
+
+import JobBuy from '@/components/product-dialog/steps-ui/job-buy';
+import SafeBottomPadding from '@/components/safe-bottom-padding';
+import { PageUrl } from '@/constants/app';
+import { CacheKey } from '@/constants/cache-key';
+import { GET_CONTACT_TYPE } from '@/constants/job';
+import { switchTab, navigateTo } from '@/utils/route';
+import './index.less';
+
+interface IProps {
+  onCancel: () => void;
+  isCreateResume?: boolean;
+  onConfirm: (type: GET_CONTACT_TYPE) => void;
+}
+
+const PREFIX = 'prejob-popup';
+
+const GET_CONTACT_TYPE_OPTIONS = [
+  {
+    type: GET_CONTACT_TYPE.MATERIAL,
+    icon: 'https://publiccdn.neighbourhood.com.cn/img/file.svg',
+    title: '创建模卡（免费报单）',
+    desc: '免费报单，优先推荐给企业，机会更多',
+    btnText: '创建',
+  },
+  {
+    type: GET_CONTACT_TYPE.VIP,
+    icon: 'https://publiccdn.neighbourhood.com.cn/img/diamond.svg',
+    title: '播络会员',
+    desc: '开通会员每天免费查看',
+    btnText: '开通',
+  },
+  {
+    type: GET_CONTACT_TYPE.GROUP,
+    icon: 'https://publiccdn.neighbourhood.com.cn/img/group-avatar.png',
+    title: '进群领会员（免费报单）',
+    desc: '群内定期发放会员，免费报单',
+    btnText: '进群',
+  },
+];
+
+export function PrejobPopup({ onCancel, isCreateResume, onConfirm }: IProps) {
+  const [openPopup, setOpenPopup] = useState(true);
+  const [openDialog, setOpenDialog] = useState(false);
+  const [clicked, setClicked] = useState(!!Taro.getStorageSync(CacheKey.JOIN_GROUP_POPUP_CLICKED));
+  const handleClick = (type: GET_CONTACT_TYPE) => () => {
+    if (type === GET_CONTACT_TYPE.MATERIAL) {
+      navigateTo(PageUrl.MaterialUploadVideo);
+      onConfirm(type);
+    }
+    if (type === GET_CONTACT_TYPE.VIP) {
+      setOpenPopup(false);
+      setOpenDialog(true);
+    }
+    if (type === GET_CONTACT_TYPE.GROUP) {
+      Taro.setStorageSync(CacheKey.JOIN_GROUP_POPUP_CLICKED, true);
+      setClicked(true);
+      switchTab(PageUrl.GroupV2);
+      onConfirm(type);
+    }
+  };
+  const handleAfterBuy = useCallback(async () => {
+    onConfirm(GET_CONTACT_TYPE.VIP);
+  }, [onConfirm]);
+  return (
+    <Fragment>
+      <Popup rounded className={PREFIX} placement="bottom" open={openPopup} onClose={onCancel}>
+        <div className={`${PREFIX}__content`}>
+          <div className={`${PREFIX}__title`}>以下方式任选其一均可获取联系方式</div>
+          <div className={`${PREFIX}__body`}>
+            {GET_CONTACT_TYPE_OPTIONS.map(option => {
+              if (clicked && option.type === GET_CONTACT_TYPE.GROUP) {
+                return;
+              }
+              return (
+                <div className={`${PREFIX}__item`} key={option.type}>
+                  <div className={`${PREFIX}__item-icon ${option.type}`}>
+                    <Image mode="aspectFit" src={option.icon} />
+                  </div>
+                  <div className={`${PREFIX}__item-main`}>
+                    <div className="title">{option.title}</div>
+                    <div className="desc">{option.desc}</div>
+                  </div>
+                  <div className={`${PREFIX}__item-action`}>
+                    <Button className={`${PREFIX}__btn`} onClick={handleClick(option.type)}>
+                      {option.btnText}
+                    </Button>
+                  </div>
+                </div>
+              );
+            })}
+          </div>
+        </div>
+        <SafeBottomPadding />
+      </Popup>
+      <Dialog open={openDialog} onClose={onCancel}>
+        <Dialog.Content>
+          <JobBuy onConfirm={handleAfterBuy} isCreateResume={isCreateResume} />
+        </Dialog.Content>
+      </Dialog>
+    </Fragment>
+  );
+}

src/components/product-dialog/const.ts

@@ -3,6 +3,7 @@ export const PREFIX = 'product-dialog';
 export enum DialogStatus {
   // 加载中
   LOADING = 'loading',
+  PRE_ACTION = 'pre_action',
   // 直接联系通告主
   JOB_CONTACT_DIRECT = 'job_contact_direct',
   // 联系客服去联系通告主 -> 订阅通知

src/components/product-dialog/group/index.tsx

@@ -82,7 +82,10 @@ function ProductGroupDialog(props: IProps) {
           return;
         }
         // 否则：如果有解锁次数，显示是否确定消费。无解锁次数，显示不无次数 UI
-        const [time, detail] = await Promise.all([requestProductBalance(PRODUCT_CODE), requestGroupDetail(blGroupId)]);
+        const [[time], detail] = await Promise.all([
+          requestProductBalance(PRODUCT_CODE),
+          requestGroupDetail(blGroupId),
+        ]);
         setGroupDetail(detail);
         if (time <= 0) {
           setStatus(DialogStatus.GROUP_NEED_BUY_ADD);

src/components/product-dialog/index.less

@@ -133,6 +133,7 @@
     &__header {
       .flex-row();
       .header-font();
+      font-size: 32px;
 
       .highlight {
         color: @blHighlightColor;
@@ -143,7 +144,8 @@
     &__describe {
       .flex-row();
       .describe-font();
-      margin-top: 24px;
+      margin-top: 18px;
+      line-height: 40px;
 
       .highlight {
         color: @blHighlightColor;
@@ -158,13 +160,13 @@
 
     &__item {
       position: relative;
-      width: 170px;
+      width: 182px;
       height: 192px;
       .flex-column();
       justify-content: center;
       border: 2px solid @blHighlightColor;
       border-radius: 8px;
-      margin-right: 24px;
+      margin-right: 15px;
 
       &:last-child {
         margin-right: 0;
@@ -224,6 +226,20 @@
       margin-top: 32px;
     }
 
+    &__hint {
+      font-size: 24px;
+      line-height: 40px;
+      text-align: center;
+      color: @blColorG1;
+      margin-top: 24px;
+
+      .highlight {
+        color: @blHighlightColor;
+        display: inline;
+      }
+
+    }
+
   }
 
   // ============================================= 群 ================================================= //
@@ -652,6 +668,11 @@
       &.highlight {
         color: @blHighlightColor;
       }
+
+      .highlight-span {
+        color: @blHighlightColor;
+        display: inline;
+      }
     }
 
     &__button {

src/components/product-dialog/job-contact/index.tsx

@@ -0,0 +1,175 @@
+import Taro from '@tarojs/taro';
+
+import { Dialog } from '@taroify/core';
+import { useCallback, useEffect, useState } from 'react';
+
+import { DialogStatus, PREFIX } from '@/components/product-dialog/const';
+import JobBuy from '@/components/product-dialog/steps-ui/job-buy';
+import ContactCustomerService from '@/components/product-dialog/steps-ui/job-contact-customer';
+import ContactDirect from '@/components/product-dialog/steps-ui/job-contact-direct';
+import UnableUnlockContent from '@/components/product-dialog/steps-ui/job-unable';
+import { DeclarationType, ProductType } from '@/constants/product';
+import { JobDetails } from '@/types/job';
+import { GetProductIsUnlockResponse, ProductInfo } from '@/types/product';
+import { logWithPrefix } from '@/utils/common';
+import { requestUseProduct } from '@/utils/product';
+import Toast from '@/utils/toast';
+
+import '../index.less';
+
+interface IProps {
+  data: JobDetails;
+  /** Product use record from parent - if exists, user has already unlocked this job */
+  productRecord?: GetProductIsUnlockResponse | null;
+  /** Product balance info from parent */
+  productInfo?: ProductInfo;
+  /** Callback to refresh product balance in parent after purchase */
+  onRefreshBalance?: () => Promise<ProductInfo | undefined>;
+  onClose: () => void;
+}
+
+const PRODUCT_CODE = ProductType.VIP;
+const log = logWithPrefix('product-job-contact-dialog');
+
+/**
+ * Integrated dialog component for job contact flow
+ * Handles: balance check -> buy if needed -> use product -> show contact info
+ *
+ * @param productRecord - Pass from parent to avoid duplicate API calls
+ * @param productInfo - Pass from parent to avoid duplicate API calls
+ * @param onRefreshBalance - Callback to refresh balance in parent after purchase
+ */
+function ProductJobContactDialog(props: IProps) {
+  const { data, productRecord, productInfo, onRefreshBalance, onClose } = props;
+  const [status, setStatus] = useState<DialogStatus>(DialogStatus.LOADING);
+  const [publisherAcctNo, setPublisherAcctNo] = useState<string>('');
+
+  /**
+   * Handle contact display based on declaration type
+   */
+  const showContactResult = useCallback((declarationTypeResult?: ProductInfo['declarationTypeResult']) => {
+    if (declarationTypeResult?.type === DeclarationType.Direct && declarationTypeResult.publisherAcctNo) {
+      log('show JOB_CONTACT_DIRECT', declarationTypeResult.publisherAcctNo);
+      setPublisherAcctNo(declarationTypeResult.publisherAcctNo);
+      setStatus(DialogStatus.JOB_CONTACT_DIRECT);
+    } else {
+      log('show JOB_CONTACT_CS');
+      setStatus(DialogStatus.JOB_CONTACT_CS);
+    }
+  }, []);
+
+  /**
+   * Use product and show contact info
+   */
+  const consumeProductAndShowContact = useCallback(async () => {
+    const productResult = await requestUseProduct(PRODUCT_CODE, { jobId: data.id });
+    log('consumeProductAndShowContact result', productResult);
+    // Refresh balance in parent after consuming product
+    await onRefreshBalance?.();
+    showContactResult(productResult?.declarationTypeResult);
+  }, [data.id, showContactResult, onRefreshBalance]);
+
+  /**
+   * Callback after successful purchase
+   * Refresh balance via parent callback and use product to show contact info
+   */
+  const handleAfterBuy = useCallback(async () => {
+    log('handleAfterBuy - start');
+    try {
+      Taro.showLoading({ mask: true, title: '加载中...' });
+
+      // Refresh balance via parent callback
+      await onRefreshBalance?.();
+
+      // Use product and show contact info after purchase
+      await consumeProductAndShowContact();
+    } catch (e) {
+      log('handleAfterBuy error', e);
+      Toast.error('出错了，请重试');
+      onClose();
+    } finally {
+      Taro.hideLoading();
+    }
+  }, [consumeProductAndShowContact, onRefreshBalance, onClose]);
+
+  const handleReport = useCallback(() => {
+    log('report', data.id);
+  }, [data.id]);
+
+  /**
+   * Initialize dialog on mount
+   */
+  useEffect(() => {
+    let isMounted = true;
+
+    const init = async () => {
+      try {
+        Taro.showLoading({ mask: true, title: '加载中...' });
+
+        log('init with productRecord', productRecord);
+        log('init with productInfo', productInfo);
+
+        // Step 1: Already unlocked - show contact directly
+        if (productRecord) {
+          log('show JOB_CONTACT_DIRECT from productRecord', productRecord.declarationTypeResult);
+          showContactResult(productRecord.declarationTypeResult);
+          return;
+        }
+
+        // Step 2: No productInfo - error state
+        if (!productInfo) {
+          log('no productInfo provided, closing');
+          Toast.error('出错了，请重试');
+          onClose();
+          return;
+        }
+
+        // Step 3: Determine status based on balance
+        if (!productInfo.isPaidVip && !productInfo.freeBalance) {
+          log('show JOB_BUY');
+          if (isMounted) setStatus(DialogStatus.JOB_BUY);
+        } else if (!productInfo.balance) {
+          log('show JOB_UNABLE_UNLOCK');
+          if (isMounted) setStatus(DialogStatus.JOB_UNABLE_UNLOCK);
+        } else {
+          await consumeProductAndShowContact();
+        }
+      } catch (e) {
+        log('init error', e);
+        Toast.error('出错了，请重试');
+        onClose();
+      } finally {
+        Taro.hideLoading();
+      }
+    };
+
+    init();
+
+    return () => {
+      isMounted = false;
+    };
+    // Only run on mount - props are captured at dialog open time
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  if (status === DialogStatus.LOADING) {
+    return null;
+  }
+
+  return (
+    <Dialog className={PREFIX} onClose={onClose} open>
+      <Dialog.Content>
+        {status === DialogStatus.JOB_CONTACT_CS && <ContactCustomerService onAfterConfirm={onClose} />}
+        {status === DialogStatus.JOB_CONTACT_DIRECT && (
+          <ContactDirect publisherAcctNo={publisherAcctNo} onAfterConfirm={onClose} onReport={handleReport} />
+        )}
+        {status === DialogStatus.JOB_BUY && (
+          <JobBuy onConfirm={handleAfterBuy} isCreateResume={productInfo?.isCreateResume} />
+        )}
+        {status === DialogStatus.JOB_UNABLE_UNLOCK && <UnableUnlockContent onConfirm={onClose} />}
+      </Dialog.Content>
+    </Dialog>
+  );
+}
+
+export default ProductJobContactDialog;

src/components/product-dialog/job-with-group/index.tsx

@@ -102,7 +102,7 @@ function ProductJobWithGroupDialog(props: Omit<IProps, 'visible'>) {
           return;
         }
         // 否则：如果有解锁次数，显示是否确定消费。无解锁次数，显示不无次数 UI
-        const time = await requestProductBalance(ProductType.AddGroup);
+        const [time] = await requestProductBalance(ProductType.AddGroup);
         if (time <= 0) {
           setStatus(DialogStatus.JOB_CONTACT_NEED_BUY_GROUP);
         } else {
@@ -119,7 +119,7 @@ function ProductJobWithGroupDialog(props: Omit<IProps, 'visible'>) {
           return;
         }
         // 自动报单
-        const time = await requestProductBalance(ProductType.GetJob);
+        const [time] = await requestProductBalance(ProductType.GetJob);
         if (time <= 0) {
           setStatus(DialogStatus.JOB_UNABLE_UNLOCK);
         } else {

src/components/product-dialog/job/index.tsx

@@ -41,7 +41,7 @@ function ProductJobDialog(props: Omit<IProps, 'visible'>) {
   }, [onClose]);
 
   const handleAfterBuy = useCallback(async () => {
-    const time = await requestProductBalance(PRODUCT_CODE);
+    const [time] = await requestProductBalance(PRODUCT_CODE);
     if (time <= 0) {
       Toast.error('发生错误请重试');
       onClose();
@@ -83,7 +83,7 @@ function ProductJobDialog(props: Omit<IProps, 'visible'>) {
           handleContact(result.declarationTypeResult);
           return;
         }
-        const time = await requestProductBalance(PRODUCT_CODE);
+        const [time] = await requestProductBalance(PRODUCT_CODE);
         if (time <= 0) {
           const allowBuy = await requestAllBuyProduct(PRODUCT_CODE);
           setStatus(allowBuy ? DialogStatus.JOB_BUY : DialogStatus.JOB_UNABLE_UNLOCK);

src/components/product-dialog/publish-job/index.tsx

@@ -99,12 +99,8 @@ export function CompanyPublishJobDialog(props: IProps) {
 
   const handleNext = useCallback(async () => {
     onClose(true);
-    if (userInfo.bossAuthStatus) {
+    navigateTo(PageUrl.JobPublish);
-      navigateTo(PageUrl.JobPublish);
+  }, [onClose]);
-    } else {
-      navigateTo(PageUrl.CertificationStart);
-    }
-  }, [userInfo, onClose]);
 
   useEffect(() => {
     initRef.current = async () => {
@@ -115,7 +111,7 @@ export function CompanyPublishJobDialog(props: IProps) {
       try {
         const productCode = ProductType.CompanyPublishJob;
         Taro.showLoading();
-        const time = await requestProductBalance(productCode);
+        const [time] = await requestProductBalance(productCode);
         if (time <= 0) {
           setStatus(DialogStatus.COMPANY_PUBLISH_JOB_BUY);
           return;

src/components/product-dialog/steps-ui/company-publish-job-buy.tsx

@@ -2,7 +2,7 @@ import Taro from '@tarojs/taro';
 
 import { Button } from '@taroify/core';
 import classNames from 'classnames';
-import { useCallback, useEffect, useState } from 'react';
+import { Fragment, useCallback, useEffect, useState } from 'react';
 
 import Badge from '@/components/badge';
 import { PREFIX } from '@/components/product-dialog/const';
@@ -11,9 +11,17 @@ import { OrderStatus, OrderType, ProductSpecId, ProductType } from '@/constants/
 import { SubscribeTempId } from '@/constants/subscribe';
 import { logWithPrefix } from '@/utils/common';
 import { collectEvent, reportEvent } from '@/utils/event';
-import { getOrderPrice, isCancelPay, requestCreatePayInfo, requestOrderInfo, requestPayment } from '@/utils/product';
+import {
+  getOrderPrice,
+  isCancelPay,
+  requestCreatePayInfo,
+  requestOrderInfo,
+  requestPayment,
+  requestProductTypeList,
+} from '@/utils/product';
 import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
 import Toast from '@/utils/toast';
+import { ProductSpecResult } from '@/types/product';
 
 interface IProps {
   onNext: () => void;
@@ -26,53 +34,51 @@ interface Item {
   title: string;
   price: string;
   amt: number;
-  contents: { content: string; highlight?: boolean }[];
+  contents: { content: string; highlight?: boolean; inlineHighlight?: string }[];
   badge?: string;
 }
 
 const LIST: Item[] = [
-  {
+  // {
-    id: ProductSpecId.BOSS_VIP_NEW_1,
+  //   id: ProductSpecId.BOSS_VIP_NEW_1,
-    title: '展示一周',
+  //   title: '展示一周',
-    price: '480播豆',
+  //   price: '480播豆',
-    amt: 48,
+  //   amt: 48,
-    badge: '限时体验',
+  //   badge: '限时体验',
-    contents: [
+  //   contents: [
-      { content: '-1个通告' },
+  //     { content: '-通告每日优先展示' },
-      { content: '-每天可查看20个主播详情' },
+  //     { content: '-每天可查看20个主播详情' },
-      { content: '-每天可自主联系10个主播' },
+  //     { content: '-每天可主动联系10个主播' },
-      // { content: '-播络可代为联系20个主播（高成功率）', highlight: true },
+  //     // { content: '-播络可代为联系20个主播（高成功率）', highlight: true },
-      { content: '-有效期一周' },
+  //     { content: '-有效期一周' },
-    ],
+  //   ],
-  },
+  // },
   {
     id: ProductSpecId.BOSS_VIP_NEW_2,
-    title: '展示一月',
+    title: '推荐一月',
-    price: '960播豆',
+    price: '680播豆',
-    amt: 96,
+    amt: 68,
-    badge: '五折',
+    badge: '限时体验',
     contents: [
-      { content: '-1个通告' },
+      { content: '-通告每日优先展示', highlight: true },
-      { content: '-每天可查看20个主播详情' },
+      { content: '-每天可查看20个主播详情，', inlineHighlight: '可主动联系10个' },
-      { content: '-每天可自主联系10个主播' },
       // { content: '-播络可代为联系20个主播（高成功率）', highlight: true },
       { content: '-有效期一个月' },
     ],
   },
-  // {
+  {
-  //   id: ProductSpecId.BOSS_VIP_NEW_3,
+    id: ProductSpecId.BOSS_VIP_NEW_3,
-  //   title: '季会员',
+    title: '推荐一季',
-  //   price: '2680播豆',
+    price: '1360播豆',
-  //   amt: 268,
+    amt: 136,
-  //   badge: '7折',
+    badge: '6.7折',
-  //   contents: [
+    contents: [
-  //     { content: '-1个通告' },
+      { content: '-通告每日优先展示', highlight: true },
-  //     { content: '-每天可查看20个主播详情' },
+      { content: '-每天可查看20个主播详情', inlineHighlight: '可主动联系10个' },
-  //     { content: '-每天可自主联系10个主播' },
+      // { content: '-播络可代为联系60个主播（高成功率）', highlight: true },
-  //     { content: '-播络可代为联系60个主播（高成功率）', highlight: true },
+      { content: '-有效期一个季度' },
-  //     { content: '-有效期3个月' },
+    ],
-  //   ],
+  },
-  // },
 ];
 
 const subscribe = async () => {
@@ -84,22 +90,35 @@ const subscribe = async () => {
   postSubscribe(TEMP_IDS, successIds);
 };
 
+const getJsonContent = (jsonString: string) => {
+  try {
+    return JSON.parse(jsonString);
+  } catch (e) {
+    return [];
+  }
+};
+
 export default function CompanyPublishJobBuy(props: IProps) {
   const { onNext } = props;
-  const [selectItem, setSelectItem] = useState(LIST[0]);
+  const [productList, setProductList] = useState<ProductSpecResult[]>([]);
+  const [selectItem, setSelectItem] = useState<ProductSpecResult | undefined>();
 
-  const handleClickItem = useCallback((newSelectItem: Item) => setSelectItem(newSelectItem), []);
+  const handleClickItem = useCallback((newSelectItem: ProductSpecResult) => setSelectItem(newSelectItem), []);
 
   const handleBuy = useCallback(async () => {
     log('handleBuy');
     reportEvent(ReportEventId.CLICK_PAY_PUBLISH_JOB);
+    if (!selectItem) {
+      Toast.error('请选择购买的产品');
+      return;
+    }
     try {
       Taro.showLoading();
       const { payOrderNo, createPayInfo } = await requestCreatePayInfo({
         type: OrderType.CompanyVip,
-        amt: getOrderPrice(selectItem.amt),
+        amt: selectItem.payPrice,
         productCode: ProductType.BOSS_VIP_NEW,
-        productSpecId: selectItem.id,
+        productSpecId: selectItem.productSpecId,
       });
       log('handleBuy payInfo', payOrderNo, createPayInfo);
       await requestPayment({
@@ -123,8 +142,14 @@ export default function CompanyPublishJobBuy(props: IProps) {
       log('handleBuy error', e);
     }
   }, [selectItem, onNext]);
+  const handleGetProductInfo = useCallback(async () => {
+    const result = await requestProductTypeList(ProductType.BOSS_VIP_NEW);
+    setProductList(result);
+    setSelectItem(result[0]);
+  }, []);
 
   useEffect(() => {
+    handleGetProductInfo();
     collectEvent(CollectEventName.CREATE_ORDER_VIEW, { orderType: OrderType.BossVip, source: 'user-page' });
   }, []);
 
@@ -132,19 +157,21 @@ export default function CompanyPublishJobBuy(props: IProps) {
     <div className={`${PREFIX}__company-publish-job-buy`}>
       <div className={`${PREFIX}__company-publish-job-buy__header`}>发认证通告限时折扣</div>
       <div className={`${PREFIX}__company-publish-job-buy__price-container`}>
-        {LIST.map(item => (
+        {productList.map(item => (
           <div
-            key={item.price}
+            key={item.payPrice}
             className={classNames(`${PREFIX}__company-publish-job-buy__item`, {
-              selected: item.amt === selectItem.amt,
+              selected: selectItem && item.payPrice === selectItem.payPrice,
-              disabled: item.amt === 0,
+              disabled: item.payPrice === 0,
             })}
-            onClick={item.amt === 0 ? undefined : () => handleClickItem(item)}
+            onClick={item.payPrice === 0 ? undefined : () => handleClickItem(item)}
           >
-            <div className={classNames(`${PREFIX}__company-publish-job-buy__item__title`, { free: item.amt === 0 })}>
+            <div
+              className={classNames(`${PREFIX}__company-publish-job-buy__item__title`, { free: item.payPrice === 0 })}
+            >
               {item.title}
             </div>
-            <div className={`${PREFIX}__company-publish-job-buy__item__price`}>{item.price}</div>
+            <div className={`${PREFIX}__company-publish-job-buy__item__price`}>{item.priceText}</div>
             {item.badge && <Badge className={`${PREFIX}__company-publish-job-buy__item__badge`} text={item.badge} />}
           </div>
         ))}
@@ -154,19 +181,24 @@ export default function CompanyPublishJobBuy(props: IProps) {
         <div className={`${PREFIX}__company-publish-job-buy__divider__title`}>包含</div>
         <div className={`${PREFIX}__company-publish-job-buy__divider__right-line`} />
       </div>
-      <div className={`${PREFIX}__company-publish-job-buy__contents`}>
+      {selectItem && (
-        {selectItem.contents.map(i => (
+        <Fragment>
-          <div
+          <div className={`${PREFIX}__company-publish-job-buy__contents`}>
-            className={classNames(`${PREFIX}__company-publish-job-buy__content`, { highlight: i.highlight })}
+            {getJsonContent(selectItem.contentsJson).map(i => (
-            key={i.content}
+              <div
-          >
+                className={classNames(`${PREFIX}__company-publish-job-buy__content`, { highlight: i.highlight })}
-            {i.content}
+                key={i.content}
+              >
+                {i.content}
+                {i.inlineHighlight && <div className="highlight-span">{i.inlineHighlight}</div>}
+              </div>
+            ))}
           </div>
-        ))}
+          <Button className={`${PREFIX}__company-publish-job-buy__button`} onClick={handleBuy}>
-      </div>
+            {`支付${selectItem.showPrice}元`}
-      <Button className={`${PREFIX}__company-publish-job-buy__button`} onClick={handleBuy}>
+          </Button>
-        {`支付${selectItem.amt}元`}
+        </Fragment>
-      </Button>
+      )}
     </div>
   );
 }

src/components/product-dialog/steps-ui/group-buy.tsx

@@ -70,7 +70,7 @@ export default function GroupBuy(props: IProps) {
       if (status !== OrderStatus.Success) {
         throw new Error('order status error');
       }
-      const time = await requestProductBalance(ProductType.AddGroup);
+      const [time] = await requestProductBalance(ProductType.AddGroup);
       log('handleBuy new addGroupTime', time);
       onConfirm(time);
     } catch (e) {

src/components/product-dialog/steps-ui/job-buy.tsx

@@ -6,47 +6,60 @@ import { useCallback, useEffect, useState } from 'react';
 
 import Badge from '@/components/badge';
 import { PREFIX } from '@/components/product-dialog/const';
+import { PageUrl } from '@/constants/app';
 import { CollectEventName } from '@/constants/event';
-import { OrderStatus, OrderType, ProductSpecId, ProductType } from '@/constants/product';
+import { OrderStatus, OrderType, ProductType } from '@/constants/product';
 import { SubscribeTempId } from '@/constants/subscribe';
+import { ProductSpecResult } from '@/types/product';
 import { logWithPrefix } from '@/utils/common';
 import { collectEvent } from '@/utils/event';
-import { getOrderPrice, isCancelPay, requestCreatePayInfo, requestOrderInfo, requestPayment } from '@/utils/product';
+import {
+  isCancelPay,
+  requestCreatePayInfo,
+  requestOrderInfo,
+  requestPayment,
+  requestProductTypeList,
+} from '@/utils/product';
+import { navigateTo } from '@/utils/route';
 import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
 import Toast from '@/utils/toast';
 
 interface IProps {
   onConfirm: () => void;
+  isCreateResume?: boolean;
 }
 
-interface Item {
+// interface Item {
-  id: ProductSpecId;
+//   id: ProductSpecId;
-  title: string;
+//   title: string;
-  content: string;
+//   content: string;
-  price: string;
+//   buyOnlyContent?: string;
-  amt: number;
+//   price: string;
-  badge?: string;
+//   amt: number;
-}
+//   badge?: string;
+// }
 
-const LIST: Item[] = [
+// const LIST: Item[] = [
-  { id: ProductSpecId.WeeklyVIP, title: '非会员', content: '每日2次', price: '免费', amt: 0 },
+//   { id: ProductSpecId.WeeklyVIP, title: '非会员', content: '每日2次', price: '免费', amt: 0 },
-  {
+//   {
-    id: ProductSpecId.WeeklyVIP,
+//     id: ProductSpecId.DailyVIP,
-    title: '周会员',
+//     title: '日会员',
-    content: '每日5次',
+//     content: '每日+10次',
-    price: '60播豆',
+//     buyOnlyContent: '每日12次',
-    amt: 6,
+//     price: '60播豆',
-    badge: '限时体验',
+//     amt: 6,
-  },
+//     badge: '限时体验',
-  {
+//   },
-    id: ProductSpecId.NewMonthlyVIP,
+//   {
-    title: '月会员',
+//     id: ProductSpecId.WeeklyVIP,
-    content: '每日5次',
+//     title: '周会员',
-    price: '180播豆',
+//     content: '每日+10次',
-    amt: 18,
+//     buyOnlyContent: '每日12次',
-    badge: ' 超值',
+//     price: '180播豆',
-  },
+//     amt: 18,
-];
+//     badge: ' 超值',
+//   },
+// ];
 
 const log = logWithPrefix('job-buy');
 const SUBSCRIBE_ID = SubscribeTempId.SUBSCRIBE_VIP;
@@ -62,20 +75,26 @@ const subscribe = async () => {
 };
 
 export default function JobBuy(props: IProps) {
-  const { onConfirm } = props;
+  const { onConfirm, isCreateResume } = props;
-  const [selectItem, setSelectItem] = useState(LIST[1]);
+  const [productList, setProductList] = useState<ProductSpecResult[]>([]);
+  const [selectItem, setSelectItem] = useState<ProductSpecResult | undefined>();
 
-  const handleClickItem = useCallback((newSelectItem: Item) => setSelectItem(newSelectItem), []);
+  const handleClickItem = useCallback((newSelectItem: ProductSpecResult) => setSelectItem(newSelectItem), []);
 
   const handleBuy = useCallback(async () => {
     log('handleBuy', selectItem);
+    if (!selectItem) {
+      Toast.error('请选择购买的产品');
+      return;
+    }
     try {
       Taro.showLoading();
+
       const { payOrderNo, createPayInfo } = await requestCreatePayInfo({
         type: OrderType.VIP,
-        amt: getOrderPrice(selectItem.amt),
+        amt: selectItem.payPrice,
         productCode: ProductType.VIP,
-        productSpecId: selectItem.id,
+        productSpecId: selectItem.productSpecId,
       });
       log('handleBuy payInfo', payOrderNo, createPayInfo);
       await requestPayment({
@@ -100,41 +119,67 @@ export default function JobBuy(props: IProps) {
     }
   }, [selectItem, onConfirm]);
 
+  const handleGetProductInfo = useCallback(async () => {
+    const result = await requestProductTypeList(ProductType.VIP);
+    setProductList(result);
+    setSelectItem(result[0]);
+  }, []);
+
+  const handleResume = useCallback(() => {
+    navigateTo(PageUrl.MaterialUploadVideo);
+  }, []);
+
   useEffect(() => {
+    handleGetProductInfo();
     collectEvent(CollectEventName.CREATE_ORDER_VIEW, { orderType: OrderType.VIP });
   }, []);
 
   return (
     <div className={`${PREFIX}__job-buy`}>
       <div className={`${PREFIX}__job-buy__header`}>
-        <div>今日通告对接次数</div>
+        <div>免费查看次数已用完</div>
-        <div className="highlight">已用完</div>
+        <div className="highlight">请升级会员</div>
       </div>
-      <div className={`${PREFIX}__job-buy__describe`}>
+      {!isCreateResume && (
-        <div>请</div>
+        <div className={`${PREFIX}__job-buy__describe`}>
-        <div className="highlight">明日</div>
+          <div>完善模卡</div>
-        <div>再来 或 </div>
+          <div> 赠5次查看 </div>
-        <div className="highlight">升级会员</div>
+          <div className="highlight" onClick={handleResume}>
-      </div>
+            去完善
-      <div className={`${PREFIX}__job-buy__container`}>
-        {LIST.map(item => (
-          <div
-            key={item.price}
-            className={classNames(`${PREFIX}__job-buy__item`, {
-              selected: item.amt === selectItem.amt,
-              disabled: item.amt === 0,
-            })}
-            onClick={item.amt === 0 ? undefined : () => handleClickItem(item)}
-          >
-            <div className={classNames(`${PREFIX}__job-buy__item__title`, { free: item.amt === 0 })}>{item.title}</div>
-            <div className={`${PREFIX}__job-buy__item__content`}>{item.content}</div>
-            <div className={`${PREFIX}__job-buy__item__price`}>{item.price}</div>
-            {item.badge && <Badge className={`${PREFIX}__job-buy__item__badge`} text={item.badge} />}
           </div>
-        ))}
+        </div>
+      )}
+      <div className={`${PREFIX}__job-buy__container`}>
+        {productList.map(item => {
+          return (
+            <div
+              key={item.payPrice}
+              className={classNames(`${PREFIX}__job-buy__item`, {
+                selected: selectItem && item.payPrice === selectItem.payPrice,
+                disabled: item.payPrice === 0,
+              })}
+              onClick={item.payPrice === 0 ? undefined : () => handleClickItem(item)}
+            >
+              <div className={classNames(`${PREFIX}__job-buy__item__title`, { free: item.payPrice === 0 })}>
+                {item.title}
+              </div>
+              <div className={`${PREFIX}__job-buy__item__content`}>{item.contentSingle}</div>
+              <div className={`${PREFIX}__job-buy__item__price`}>{item.showPrice}元</div>
+              {item.badge && <Badge className={`${PREFIX}__job-buy__item__badge`} text={item.badge} />}
+            </div>
+          );
+        })}
       </div>
-      <Button className={`${PREFIX}__job-buy__button`} onClick={handleBuy}>
+      {selectItem && (
-        {`支付 ${selectItem.amt} 元`}
+        <div className={`${PREFIX}__job-buy__hint`}>
+          注：{selectItem?.title}有效期为
+          <div className="highlight">
+            支付后{selectItem?.expire > 1 ? `${selectItem.expire}天` : `${selectItem.expire * 24}小时`}
+          </div>
+        </div>
+      )}
+      <Button className={`${PREFIX}__job-buy__button`} disabled={!selectItem} onClick={handleBuy}>
+        {`支付 ${selectItem?.showPrice} 元`}
       </Button>
       {/* <div className={`${PREFIX}__job-buy__tips`}>{`已选：${selectItem.title}，含进本地群服务`}</div> */}
     </div>

src/components/product-dialog/steps-ui/job-contact-direct.tsx

@@ -10,7 +10,7 @@ interface IContactDirectProps {
 }
 
 export default function ContactDirect(props: IContactDirectProps) {
-  const { publisherAcctNo, onAfterConfirm, onReport } = props;
+  const { publisherAcctNo, onAfterConfirm } = props;
 
   const handleCopyAndContact = async () => {
     await copy(publisherAcctNo);

src/components/search-city/index.tsx

@@ -2,9 +2,10 @@ import { BaseEventOrig, InputProps, ScrollView } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
 import { Search } from '@taroify/core';
-import { useCallback, useEffect, useState } from 'react';
+import { Fragment, useCallback, useEffect, useState } from 'react';
 
-import { CITY_CODE_TO_NAME_MAP, CITY_INDEXES_LIST, GROUP_CITY_INDEXES_LIST } from '@/constants/city';
+import { CITY_CODE_TO_NAME_MAP, CITY_INDEXES_LIST } from '@/constants/city';
+import useCityOperators from '@/hooks/use-city-operators';
 import { logWithPrefix } from '@/utils/common';
 
 import './index.less';
@@ -68,8 +69,19 @@ export default function SearchCity({
   const [touchAnchor, setTouchAnchor] = useState<string | undefined>();
   const [touchMoving, setTouchMoving] = useState(false);
   const [searchResult, setSearchResult] = useState<Item[]>([]);
+  const cityOperators = useCityOperators();
+  const groupCityCodes = cityOperators.map(it => (it.groupLink ? it.cityCode : null)).filter(Boolean);
   const showSearchList = searchResult.length > 0;
-  const CITY_LIST = forGroup ? GROUP_CITY_INDEXES_LIST : CITY_INDEXES_LIST;
+  const CITY_LIST = forGroup
+    ? CITY_INDEXES_LIST.map(({ letter, data }) => {
+        return {
+          letter,
+          data: data.filter(it => groupCityCodes.includes(it.cityCode)),
+        };
+      }).filter(item => item.data.length > 0)
+    : CITY_INDEXES_LIST;
+
+  const HOT_CITY_LIST = forGroup ? HOT_CITY.filter(it => groupCityCodes.includes(`${it.cityCode}`)) : HOT_CITY;
 
   const handleSearchChange = useCallback((event: BaseEventOrig<InputProps.inputEventDetail>) => {
     const value = event.detail.value;
@@ -173,19 +185,25 @@ export default function SearchCity({
           <div>
             <div className={`${PREFIX}__position-title`}>当前城市</div>
             <div className={`${PREFIX}__position-city`}>{CITY_CODE_TO_NAME_MAP.get(currentCity)}</div>
-            <div className={`${PREFIX}__hot-city-title`}>热门城市</div>
+            {!!HOT_CITY_LIST.length && (
-            <div className={`${PREFIX}__hot-city-container`}>
+              <Fragment>
-              {HOT_CITY.map(city => (
+                <div className={`${PREFIX}__hot-city-title`}>热门城市</div>
-                <div
+                <div className={`${PREFIX}__hot-city-container`}>
-                  key={city.cityCode}
+                  {HOT_CITY_LIST.map(city => {
-                  className={`${PREFIX}__hot-city-item`}
+                    return (
-                  data-code={city.cityCode}
+                      <div
-                  onClick={handleSelectCity}
+                        key={city.cityCode}
-                >
+                        className={`${PREFIX}__hot-city-item`}
-                  {city.cityName}
+                        data-code={city.cityCode}
+                        onClick={handleSelectCity}
+                      >
+                        {city.cityName}
+                      </div>
+                    );
+                  })}
                 </div>
-              ))}
+              </Fragment>
-            </div>
+            )}
             <div className={`${PREFIX}__indexes-list`}>
               {CITY_LIST.map(item => {
                 return (

src/components/select/index.less

@@ -28,6 +28,7 @@
     justify-content: space-between;
     box-sizing: border-box;
     padding: 0 24px;
+    flex: 0 0 96px;
 
     &.selected {
       color: @blHighlightColor;

src/components/tab-bar/index.tsx

@@ -1,14 +1,11 @@
 import { Tabbar } from '@taroify/core';
 import classNames from 'classnames';
 import { useCallback } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
 
 import { APP_TAB_BAR_ID, RoleType, PageType, PageUrl } from '@/constants/app';
 import { ANCHOR_TAB_LIST, COMPANY_TAB_LIST, TabItemType } from '@/hooks/use-config';
 import useMessage from '@/hooks/use-message';
 import useRoleType from '@/hooks/user-role-type';
-import { changeHomePage } from '@/store/actions';
-import { selectHomePageType } from '@/store/selector';
 import { logWithPrefix } from '@/utils/common';
 import { switchTab } from '@/utils/route';
 
@@ -16,6 +13,7 @@ import './index.less';
 
 interface IProps {
   className?: string;
+  type: PageType;
 }
 
 const PREFIX = 'base-tab-bar';
@@ -40,25 +38,21 @@ const TabItem = (props: { item: TabItemType }) => {
   );
 };
 
-function BaseTabBar(props: IProps) {
+function BaseTabBar({ className, type }: IProps) {
-  const { className } = props;
   const roleType = useRoleType();
-  const currentPage = useSelector(selectHomePageType);
-  const dispatch = useDispatch();
 
   const tabs = roleType === RoleType.Anchor ? ANCHOR_TAB_LIST : COMPANY_TAB_LIST;
 
   const handleTabClick = useCallback(
     (value: PageType) => {
-      if (value === currentPage) {
+      if (value === type) {
         return;
       }
-      dispatch(changeHomePage(value));
       const item = tabs.find((i: TabItemType) => i.type === value);
       log('tab bar changed', value, item?.pagePath);
       item && switchTab(item.pagePath as PageUrl);
     },
-    [tabs, currentPage, dispatch]
+    [tabs, type]
   );
 
   // useEffect(() => {
@@ -72,14 +66,14 @@ function BaseTabBar(props: IProps) {
 
   return (
     <div className={classNames(`${PREFIX}__wrapper`, className)} id={APP_TAB_BAR_ID}>
-      <Tabbar className={PREFIX} defaultValue={currentPage}>
+      <Tabbar className={PREFIX} value={type}>
         {tabs.map((item: TabItemType) => {
           return (
             <Tabbar.TabItem
               key={item.pagePath}
               value={item.type}
               onClick={() => handleTabClick(item.type)}
-              className={classNames(`${PREFIX}__item`, { selected: item.type === currentPage })}
+              className={classNames(`${PREFIX}__item`, { selected: item.type === type })}
             >
               <TabItem item={item} />
             </Tabbar.TabItem>

src/components/top-category-select/index.tsx

@@ -0,0 +1,13 @@
+import Select, { ISelectProps } from '@/components/select';
+import { JOB_TYPE_SELECT_OPTIONS_WITH_ALL, JobType } from '@/constants/job';
+
+interface IProps extends Omit<ISelectProps<JobType>, 'options'> {
+  value: JobType;
+}
+
+function TopCategorySelect(props: IProps) {
+  const { value: selectValue, onSelect } = props;
+  return <Select options={JOB_TYPE_SELECT_OPTIONS_WITH_ALL} title="品类" value={selectValue} onSelect={onSelect} />;
+}
+
+export default TopCategorySelect;

src/components/user-batch-publish/index.less

@@ -13,9 +13,9 @@
   &__title {
     font-size: 32px;
     line-height: 48px;
-    font-weight: 500;
+    margin-top: 32px;
-    color: @blColor;
+    font-weight: 400;
-    margin-top: 24px;
+    color: #1d2129;
 
     &:first-child {
       margin-top: 0;
@@ -30,13 +30,21 @@
     margin-top: 24px;
   }
 
+  &__extra {
+    margin-top: 24px;
+    font-weight: 400;
+    font-size: 24px;
+    line-height: 40px;
+    color: @blHighlightColor;
+  }
+
   &__cost-describe {
     height: 100px;
     padding: 0 32px;
     border-radius: 16px;
     .flex-row();
     justify-content: space-between;
-    background: #FFFFFF;
+    background: #ffffff;
     margin-top: 24px;
 
     &__price {
@@ -64,9 +72,22 @@
     line-height: 48px;
     font-weight: 400;
     color: @blColorG2;
-    background: #FFFFFF;
+    background: #ffffff;
     border-radius: 16px;
 
+    .underline {
+      display: inline;
+      font-weight: 500;
+      font-size: 32px;
+      line-height: 48px;
+      color: @blColor;
+      position: relative;
+      background-image: linear-gradient(to bottom, rgba(109, 61, 245, 0.6) 0%, rgba(109, 61, 245, 0.6) 100%);
+      background-repeat: no-repeat;
+      background-size: 100% 12px;
+      background-position: bottom;
+    }
+
     &__describe {
       .flex-row();
       font-size: 28px;
@@ -86,4 +107,16 @@
     .button(@width: 100%; @height: 80px; @fontSize: 32px);
     margin-top: 40px;
   }
+
+  &__publish-title {
+    font-size: 36px;
+    font-weight: 500;
+    line-height: 56px;
+    color: @blColor;
+  }
+
+  &__publish-button {
+    .button(@width: 360px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 44px);
+    margin: 40px auto auto;
+  }
 }

src/components/user-batch-publish/index.tsx

@@ -1,17 +1,21 @@
-import { Button, Image, Text } from '@tarojs/components';
+import { Button } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
-import { Cell } from '@taroify/core';
+import { Cell, Dialog } from '@taroify/core';
-import { useCallback, useState, useEffect } from 'react';
+import { Fragment, useCallback, useEffect, useState } from 'react';
 
 import PageLoading from '@/components/page-loading';
 import { PublishJobQrCodeDialog } from '@/components/product-dialog/publish-job';
+import CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
 import SafeBottomPadding from '@/components/safe-bottom-padding';
-import { ISelectOption, PopupSelect } from '@/components/select';
+import { ISelectOption } from '@/components/select';
 import { PageUrl } from '@/constants/app';
+import { JobManageStatus } from '@/constants/job';
 import { OrderStatus, OrderType, ProductSpecId, ProductType } from '@/constants/product';
+import { usePublishJob } from '@/hooks/use-publish-job';
 import { BatchPublishGroup } from '@/types/group';
 import { logWithPrefix } from '@/utils/common';
+import { requestJobDetail } from '@/utils/job';
 import {
   getOrderPrice,
   isCancelPay,
@@ -22,7 +26,6 @@ import {
 } from '@/utils/product';
 import { navigateTo } from '@/utils/route';
 import Toast from '@/utils/toast';
-
 import './index.less';
 
 interface CityValue extends BatchPublishGroup {
@@ -35,29 +38,32 @@ interface CityOption extends ISelectOption<CityValue> {
 
 const PREFIX = 'user-batch-publish';
 const log = logWithPrefix(PREFIX);
-const SERVICE_ILLUSTRATE = `群发次数：每日一次，连发3天
+export const cityValues: CityValue[] = [
-群发内容：仅限主播招聘通告，违规内容不发
+  { cityCode: '440100', cityName: '广州', count: 800 },
-联系方法：通告中留通告主联系方式，主播直接联系`;
-const cityValues: CityValue[] = [
-  { cityCode: '440100', cityName: '广州', count: 300 },
   { cityCode: '440300', cityName: '深圳', count: 100 },
-  { cityCode: '330100', cityName: '杭州', count: 300 },
+  { cityCode: '330100', cityName: '杭州', count: 750 },
-  { cityCode: '110100', cityName: '北京', count: 100 },
+  { cityCode: '110100', cityName: '北京', count: 150 },
-  { cityCode: '510100', cityName: '成都', count: 50 },
+  { cityCode: '510100', cityName: '成都', count: 100 },
+  { cityCode: '500100', cityName: '重庆', count: 50 },
   { cityCode: '430100', cityName: '长沙', count: 50 },
   { cityCode: '350200', cityName: '厦门', count: 50 },
-  { cityCode: '310100', cityName: '上海', count: 100 },
+  { cityCode: '310100', cityName: '上海', count: 150 },
-  { cityCode: '420100', cityName: '武汉', count: 50 },
+  { cityCode: '420100', cityName: '武汉', count: 80 },
-  { cityCode: '610100', cityName: '西安', count: 50 },
+  { cityCode: '610100', cityName: '西安', count: 60 },
-  { cityCode: '410100', cityName: '郑州', count: 100 },
+  { cityCode: '410100', cityName: '郑州', count: 150 },
 ].sort((a, b) => b.count - a.count);
 const MIN_GROUP_SIZE = 20;
 const GROUP_OPTIONS = [
   { value: MIN_GROUP_SIZE, productSpecId: ProductSpecId.GroupBatchPublish20, label: '20', price: 18 },
   { value: 50, productSpecId: ProductSpecId.GroupBatchPublish50, label: '50', price: 40 },
+  { value: 60, productSpecId: ProductSpecId.GroupBatchPublish60, label: '60', price: 48 },
+  { value: 80, productSpecId: ProductSpecId.GroupBatchPublish80, label: '80', price: 58 },
   { value: 100, productSpecId: ProductSpecId.GroupBatchPublish100, label: '100', price: 68 },
+  { value: 150, productSpecId: ProductSpecId.GroupBatchPublish150, label: '150', price: 98 },
   { value: 300, productSpecId: ProductSpecId.GroupBatchPublish300, label: '300', price: 128 },
-  { value: 500, productSpecId: ProductSpecId.GroupBatchPublish500, label: '500', price: 188 },
+  { value: 500, productSpecId: ProductSpecId.GroupBatchPublish500, label: '500', price: 168 },
+  { value: 750, productSpecId: ProductSpecId.GroupBatchPublish750, label: '750', price: 188 },
+  { value: 800, productSpecId: ProductSpecId.GroupBatchPublish800, label: '800', price: 198 },
   { value: 1000, productSpecId: ProductSpecId.GroupBatchPublish1000, label: '1000', price: 288 },
 ];
 
@@ -72,20 +78,14 @@ const calcPrice = (city: CityValue | null) => {
   return { price, originalPrice, productSpecId };
 };
 
-export default function UserBatchPublish() {
+export default function UserBatchPublish({ cityCode, jobId }: { cityCode: string; jobId: string }) {
   const [loading, setLoading] = useState(true);
-  const [showCitySelect, setShowCitySelect] = useState(false);
   const [showQrCode, setShowQrCode] = useState(false);
   const [city, setCity] = useState<CityOption['value'] | null>(null);
-  const [cityOptions, setCityOptions] = useState<CityOption[]>([]);
   const { price, originalPrice, productSpecId } = calcPrice(city);
+  const [showPublishJob, setShowPublishJob] = useState(false);
 
-  const handleClickCity = useCallback(() => setShowCitySelect(true), []);
+  const [showBuy, setShowBuy, handlePublishJob] = usePublishJob(jobId);
-
-  const handleSelectCity = useCallback(value => {
-    setCity(value);
-    setShowCitySelect(false);
-  }, []);
 
   const handleClickViewGroup = useCallback(() => navigateTo(PageUrl.GroupList, { city: city?.cityCode }), [city]);
 
@@ -107,6 +107,15 @@ export default function UserBatchPublish() {
         setShowQrCode(true);
         return;
       }
+
+      const jobDetail = await requestJobDetail(jobId);
+
+      if (jobDetail.status !== JobManageStatus.Open) {
+        Taro.hideLoading();
+        setShowPublishJob(true);
+        return;
+      }
+
       const { payOrderNo, createPayInfo } = await requestCreatePayInfo({
         type: OrderType.GroupBatchPublish,
         amt: getOrderPrice(price),
@@ -134,21 +143,25 @@ export default function UserBatchPublish() {
       Toast.error(isCancelPay(e) ? '取消购买' : '购买失败请重试');
       log('handleBuy error', e);
     }
-  }, [price, productSpecId]);
+  }, [jobId, price, productSpecId]);
 
   useEffect(() => {
+    if (!cityCode) {
+      return;
+    }
     try {
-      const cOptions: CityOption[] = cityValues.map(value => ({ value, label: value.cityName }));
+      const initCity = cityValues.find(o => o.cityCode === cityCode);
-      const initCity = cOptions[0].value;
 
       setLoading(false);
-      setCity(initCity);
+      if (initCity) {
-      setCityOptions(cOptions);
+        setCity(initCity);
-      log('init data done', cOptions);
+      } else {
+        Toast.info('当前城市不支持代发');
+      }
     } catch (e) {
       Toast.error('加载失败请重试');
     }
-  }, []);
+  }, [cityCode]);
 
   if (loading) {
     return <PageLoading />;
@@ -156,39 +169,47 @@ export default function UserBatchPublish() {
 
   return (
     <div className={PREFIX}>
-      <Image mode="widthFix" className={`${PREFIX}__header-image`} src="https://neighbourhood.cn/pubJob.png" />
+      {/*<Image mode="widthFix" className={`${PREFIX}__header-image`} src="https://neighbourhood.cn/pubJob.png" />*/}
-      <div className={`${PREFIX}__title`}>请选择城市</div>
-      <Cell isLink align="center" className={`${PREFIX}__cell`} title={city?.cityName} onClick={handleClickCity} />
-      <div className={`${PREFIX}__title`}>可购买群数</div>
-      <Cell align="center" className={`${PREFIX}__cell`} title={city?.count} />
-      <div className={`${PREFIX}__title`}>服务费用</div>
-      <div className={`${PREFIX}__cost-describe`}>
-        <div className={`${PREFIX}__cost-describe__price`}>{`${price}元`}</div>
-        <div className={`${PREFIX}__cost-describe__original_price`}>{`原价：${originalPrice}元`}</div>
-      </div>
       <div className={`${PREFIX}__title`}>服务说明</div>
       <div className={`${PREFIX}__illustrate`}>
-        <Text>{SERVICE_ILLUSTRATE}</Text>
+        服务方式：帮您把招聘需求<div className="underline">发到本地主播群，投递量大幅增加</div>
-        <div className={`${PREFIX}__illustrate__describe`}>
-          <div>附：</div>
-          <div className={`${PREFIX}__illustrate__describe__view`} onClick={handleClickViewGroup}>
-            播络合作群列表
-          </div>
-        </div>
       </div>
-      <Button className={`${PREFIX}__buy-button`} onClick={handleClickBuy}>
+      <div className={`${PREFIX}__title`}>当前通告城市</div>
-        立即购买
+      <Cell align="center" className={`${PREFIX}__cell`} title={city ? city.cityName : '暂不支持代发'} />
-      </Button>
+      {city && (
+        <Fragment>
+          <div className={`${PREFIX}__extra`} onClick={handleClickViewGroup}>
+            查看该城市合作群列表
+          </div>
+          <div className={`${PREFIX}__title`}>可购买群数</div>
+          <Cell align="center" className={`${PREFIX}__cell`} title={city?.count} />
+          <div className={`${PREFIX}__title`}>服务费用</div>
+          <div className={`${PREFIX}__cost-describe`}>
+            <div className={`${PREFIX}__cost-describe__price`}>{`${price}元`}</div>
+            <div className={`${PREFIX}__cost-describe__original_price`}>{`原价：${originalPrice}元`}</div>
+          </div>
+
+          <Button className={`${PREFIX}__buy-button`} onClick={handleClickBuy}>
+            立即购买
+          </Button>
+        </Fragment>
+      )}
       <SafeBottomPadding />
       <div>
-        <PopupSelect
-          value={city}
-          options={cityOptions}
-          open={showCitySelect}
-          onSelect={handleSelectCity}
-          onClose={() => setShowCitySelect(false)}
-        />
         <PublishJobQrCodeDialog onClose={() => setShowQrCode(false)} open={showQrCode} />
+        <Dialog open={showBuy} onClose={() => setShowBuy(false)}>
+          <Dialog.Content>
+            <CompanyPublishJobBuy onNext={handlePublishJob} />
+          </Dialog.Content>
+        </Dialog>
+        <Dialog open={showPublishJob} onClose={() => setShowPublishJob(false)}>
+          <Dialog.Content>
+            <div className={`${PREFIX}__publish-title`}>请先发布通告</div>
+            <Button className={`${PREFIX}__publish-button`} onClick={handlePublishJob}>
+              发布该通告
+            </Button>
+          </Dialog.Content>
+        </Dialog>
       </div>
     </div>
   );

src/constants/app.ts

@@ -17,6 +17,7 @@ export enum EventName {
   ADD_GROUP = 'add_group',
   SELECT_CITY = 'select_city',
   CREATE_PROFILE = 'create_profile',
+  READ_CONTACT = 'read_contact',
   UPDATE_PROFILE = 'update_profile',
   EDIT_JOB_DESCRIBE = 'edit_job_describe',
   JOB_UPDATE = 'job_update',
@@ -24,6 +25,7 @@ export enum EventName {
   SELECT_MY_PUBLISH_JOB = 'select_my_publish_job',
   EXIT_CHAT_PAGE = 'exit_chat_page',
   VIEW_MATERIAL_SUCCESS = 'view_material_success',
+  VIEW_JOB_SUCCESS = 'view_job_success',
 }
 
 export enum OpenSource {
@@ -34,6 +36,7 @@ export enum OpenSource {
   UserPage = 'user_page',
   AnchorPage = 'anchor_page',
   MaterialViewPage = 'material_view_page',
+  GroupOwnerCertificate = 'group_owner_certificate',
 }
 
 export enum PageUrl {
@@ -74,6 +77,10 @@ export enum PageUrl {
   PrivacyWebview = 'pages/privacy-webview/index',
   Partner = 'pages/partner/index',
   WithdrawRecord = 'pages/withdraw-record/index',
+  GroupDelegatePublish = 'pages/group-delegate-publish/index',
+  GiveVip = 'pages/give-vip/index',
+  GroupOwnerCertificate = 'pages/group-owner-certification/index',
+  PartnerShareVip = 'pages/partner-share-vip/index',
 }
 
 export enum PluginUrl {

src/constants/cache-key.ts

@@ -10,5 +10,8 @@ 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__',
+  JOIN_GROUP_CARD_CLICKED = '__join_group_card_clicked__',
+  JOIN_GROUP_POPUP_CLICKED = '__join_group_popup_clicked__',
 }

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,16 @@ export const GROUP_CITY_INDEXES_LIST = [
   {
     letter: 'H',
     data: [
+      {
+        cityCode: '330100',
+        cityName: '杭州',
+        keyword: 'HANGZHOU杭州',
+      },
+      {
+        cityCode: '230100',
+        cityName: '哈尔滨',
+        keyword: 'HAERBIN哈尔滨',
+      },
       {
         cityCode: '340100',
         cityName: '合肥',
@@ -5921,6 +5946,26 @@ export const GROUP_CITY_INDEXES_LIST = [
       },
     ],
   },
+  {
+    letter: 'J',
+    data: [
+      {
+        cityCode: '370100',
+        cityName: '济南',
+        keyword: 'JINAN济南',
+      },
+    ],
+  },
+  {
+    letter: 'K',
+    data: [
+      {
+        cityCode: '530100',
+        cityName: '昆明',
+        keyword: 'KUNMING昆明',
+      },
+    ],
+  },
   {
     letter: 'N',
     data: [
@@ -5939,6 +5984,11 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '青岛',
         keyword: 'QINGDAO青岛',
       },
+      {
+        cityCode: '350500',
+        cityName: '泉州',
+        keyword: 'QUANZHOU泉州',
+      },
     ],
   },
   {
@@ -5949,21 +5999,26 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '上海',
         keyword: 'SHANGHAI上海',
       },
+      {
+        cityCode: '210100',
+        cityName: '沈阳',
+        keyword: 'SHENYANG沈阳',
+      },
       {
         cityCode: '440300',
         cityName: '深圳',
         keyword: 'SHENZHEN深圳',
       },
+      {
+        cityCode: '130100',
+        cityName: '石家庄',
+        keyword: 'SHIJIAZHUANG石家庄',
+      },
       {
         cityCode: '320500',
         cityName: '苏州',
         keyword: 'SUZHOU苏州',
       },
-      {
-        cityCode: '330300',
-        cityName: '温州',
-        keyword: 'WENZHOU温州',
-      },
     ],
   },
   {
@@ -5974,11 +6029,21 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '天津',
         keyword: 'TIANJIN天津',
       },
+      {
+        cityCode: '140100',
+        cityName: '太原',
+        keyword: 'TAIYUAN太原',
+      },
     ],
   },
   {
     letter: 'W',
     data: [
+      {
+        cityCode: '330300',
+        cityName: '温州',
+        keyword: 'WENZHOU温州',
+      },
       {
         cityCode: '420100',
         cityName: '武汉',
@@ -5994,6 +6059,11 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '西安',
         keyword: 'XIAN西安',
       },
+      {
+        cityCode: '350200',
+        cityName: '厦门',
+        keyword: 'XIAMEN厦门',
+      },
     ],
   },
   {
@@ -6004,6 +6074,11 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '郑州',
         keyword: 'ZHENGZHOU郑州',
       },
+      {
+        cityCode: '430200',
+        cityName: '株洲',
+        keyword: 'ZHUZHOU株洲',
+      },
     ],
   },
 ];

src/constants/group.ts

@@ -56,5 +56,11 @@ export const GROUPS: GroupItem[] = [
   { title: '【温州】', cityCode: 330300, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcb0ea5f197a18b335' },
   { title: '【天津】', cityCode: 120100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcda46c23dade6f6a3' },
   { title: '【昆明】', cityCode: 530100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcf2aebcbf3d46d9cd' },
+  { title: '【石家庄】', cityCode: 130100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfc7dedcc69aaa9cdae' },
+  { title: '【太原】', cityCode: 140100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfccc8b59411baa7c24' },
+  { title: '【株洲】', cityCode: 430200, serviceUrl: 'https://work.weixin.qq.com/kfid/kfc8584f903f9263f85' },
+  { title: '【哈尔滨】', cityCode: 230100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcaf757d0590d2bad0' },
+  { title: '【沈阳】', cityCode: 210100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcbe96e71d87061f88' },
+  { title: '【济南】', cityCode: 370100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfc57d4d9bd032fe89c' },
   { title: '【全国】', cityCode: 440300, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcc60ac7b6420787a8' },
 ];

src/constants/job.ts

@@ -7,6 +7,7 @@ export enum JobType {
   Jewelry = 'JEWELRY', // 珠宝
   Appliance = 'APPLIANCE', // 家电
   Furniture = 'FURNITURE', // 日用家具
+  OutdoorSports = 'OUTDOOR_SPORTS',
   PetFamily = 'PET_FAMILY', // 母婴宠物
   Luxury = 'LUXURY', // 奢品
   LocalLive = 'LOCAL_LIVE', // 本地生活
@@ -21,6 +22,12 @@ export enum EmployType {
   Part = 'PARTY_TIME',
 }
 
+export enum JobSourceType {
+  All = 'All',
+  VX = 'vx',
+  BL = 'bl',
+}
+
 export enum SortType {
   RECOMMEND = 'RECOMMEND',
   DISTANCE = 'DISTANCE',
@@ -66,6 +73,12 @@ export const EMPLOY_TYPE_TITLE_MAP = {
   [EmployType.Full]: '全职',
 };
 
+export const JOB_SOURCE_TYPE_TITLE_MAP = {
+  [JobSourceType.All]: '全部',
+  [JobSourceType.BL]: '急招',
+  [JobSourceType.VX]: '群通告',
+};
+
 export const JOB_TYPE_TITLE_MAP: { [key in JobType]: string } = {
   [JobType.All]: '全部',
   [JobType.Finery]: '服饰',
@@ -75,6 +88,7 @@ export const JOB_TYPE_TITLE_MAP: { [key in JobType]: string } = {
   [JobType.Jewelry]: '珠宝',
   [JobType.Appliance]: '家电',
   [JobType.Furniture]: '日用家具',
+  [JobType.OutdoorSports]: '户外运动',
   [JobType.PetFamily]: '母婴宠物',
   [JobType.Luxury]: '奢品',
   [JobType.LocalLive]: '本地生活',
@@ -101,16 +115,31 @@ export const JOB_MANAGE_STATUS_TITLE_MAP = {
 
 export const JOB_PAGE_TABS = [
   {
-    type: EmployType.All,
+    type: JobSourceType.All,
-    title: EMPLOY_TYPE_TITLE_MAP[EmployType.All],
+    title: JOB_SOURCE_TYPE_TITLE_MAP[JobSourceType.All],
   },
   {
-    type: EmployType.Part,
+    type: JobSourceType.BL,
-    title: EMPLOY_TYPE_TITLE_MAP[EmployType.Part],
+    title: JOB_SOURCE_TYPE_TITLE_MAP[JobSourceType.BL],
+  },
+  // {
+  //   type: JobSourceType.VX,
+  //   title: JOB_SOURCE_TYPE_TITLE_MAP[JobSourceType.VX],
+  // },
+];
+
+export const JOB_EMPLOY_TYPE_OPTIONS = [
+  {
+    value: EmployType.All,
+    label: EMPLOY_TYPE_TITLE_MAP[EmployType.All],
   },
   {
-    type: EmployType.Full,
+    value: EmployType.Part,
-    title: EMPLOY_TYPE_TITLE_MAP[EmployType.Full],
+    label: EMPLOY_TYPE_TITLE_MAP[EmployType.Part],
+  },
+  {
+    value: EmployType.Full,
+    label: EMPLOY_TYPE_TITLE_MAP[EmployType.Full],
   },
 ];
 
@@ -146,6 +175,7 @@ export const JOB_TYPE_SELECT_OPTIONS = [
   { label: JOB_TYPE_TITLE_MAP[JobType.Jewelry], value: JobType.Jewelry },
   { label: JOB_TYPE_TITLE_MAP[JobType.Appliance], value: JobType.Appliance },
   { label: JOB_TYPE_TITLE_MAP[JobType.Furniture], value: JobType.Furniture },
+  { label: JOB_TYPE_TITLE_MAP[JobType.OutdoorSports], value: JobType.OutdoorSports },
   { label: JOB_TYPE_TITLE_MAP[JobType.PetFamily], value: JobType.PetFamily },
   { label: JOB_TYPE_TITLE_MAP[JobType.Luxury], value: JobType.Luxury },
   { label: JOB_TYPE_TITLE_MAP[JobType.LocalLive], value: JobType.LocalLive },
@@ -154,6 +184,11 @@ export const JOB_TYPE_SELECT_OPTIONS = [
   { label: JOB_TYPE_TITLE_MAP[JobType.Other], value: JobType.Other },
 ];
 
+export const JOB_TYPE_SELECT_OPTIONS_WITH_ALL = [
+  { label: JOB_TYPE_TITLE_MAP[JobType.All], value: JobType.All },
+  ...JOB_TYPE_SELECT_OPTIONS,
+];
+
 const MAX_SALARY = 10000000;
 export const PART_EMPLOY_SALARY_OPTIONS = [
   { label: '不限' },
@@ -174,3 +209,9 @@ export const FULL_EMPLOY_SALARY_OPTIONS = [
 export const PART_PRICE_OPTIONS = PART_EMPLOY_SALARY_OPTIONS.filter(o => !!o.value);
 
 export const FULL_PRICE_OPTIONS = FULL_EMPLOY_SALARY_OPTIONS.filter(o => !!o.value);
+
+export enum GET_CONTACT_TYPE {
+  VIP = 'vip',
+  MATERIAL = 'material',
+  GROUP = 'group',
+}

src/constants/material.ts

@@ -3,6 +3,7 @@ export enum ProfileGroupType {
   Intention = 'intention',
   Experience = 'experience',
   Advantages = 'advantages',
+  Others = 'others',
 }
 
 export const ProfileTitleMap = {
@@ -10,6 +11,7 @@ export const ProfileTitleMap = {
   [ProfileGroupType.Intention]: '求职意向',
   [ProfileGroupType.Experience]: '直播经验',
   [ProfileGroupType.Advantages]: '自身优势',
+  [ProfileGroupType.Others]: '身型、学历',
 };
 
 export enum WorkedYears {
@@ -19,6 +21,13 @@ export enum WorkedYears {
   MoreThreeYear = 3,
 }
 
+export enum EducationType {
+  MiddleSchool = 1,
+  HighSchool = 2,
+  AssociateDegree = 3,
+  BachelorOrAbove = 4,
+}
+
 export enum GenderType {
   All = -1,
   MEN = 0,
@@ -84,14 +93,25 @@ export const WORK_YEAR_OPTIONS = [
   { label: WORK_YEAR_LABELS[WorkedYears.MoreThreeYear], value: WorkedYears.MoreThreeYear },
 ];
 
-export const ALL_GENDER_TYPES = [GenderType.All, GenderType.MEN, GenderType.WOMEN];
-
 export const GENDER_TYPE_TITLE_MAP = {
   [GenderType.All]: '不限',
   [GenderType.WOMEN]: '女',
   [GenderType.MEN]: '男',
 };
-
+export const GENDER_OPTIONS = [
+  {
+    value: GenderType.All,
+    label: GENDER_TYPE_TITLE_MAP[GenderType.All],
+  },
+  {
+    value: GenderType.WOMEN,
+    label: GENDER_TYPE_TITLE_MAP[GenderType.WOMEN],
+  },
+  {
+    value: GenderType.MEN,
+    label: GENDER_TYPE_TITLE_MAP[GenderType.MEN],
+  },
+];
 export const ALL_ANCHOR_READ_TYPES = Object.values(AnchorReadType);
 
 export const ANCHOR_READ_TITLE_MAP = {
@@ -99,3 +119,15 @@ export const ANCHOR_READ_TITLE_MAP = {
   [AnchorReadType.Read]: '已读',
   [AnchorReadType.Unread]: '未读',
 };
+export const EDUCATION_TYPE_LABELS = {
+  [EducationType.MiddleSchool]: '初中',
+  [EducationType.HighSchool]: '职高/高中',
+  [EducationType.AssociateDegree]: '大专',
+  [EducationType.BachelorOrAbove]: '本科及以上',
+};
+export const EDUCATION_TYPE_OPTIONS = [
+  { label: EDUCATION_TYPE_LABELS[EducationType.MiddleSchool], value: EducationType.MiddleSchool },
+  { label: EDUCATION_TYPE_LABELS[EducationType.HighSchool], value: EducationType.HighSchool },
+  { label: EDUCATION_TYPE_LABELS[EducationType.AssociateDegree], value: EducationType.AssociateDegree },
+  { label: EDUCATION_TYPE_LABELS[EducationType.BachelorOrAbove], value: EducationType.BachelorOrAbove },
+];

src/constants/partner.ts

@@ -52,3 +52,9 @@ export const ProfitStatusDescriptions = {
   OTHER: '',
   FINISHED: '已分账',
 };
+
+export const WithdrawStatusDescriptions = {
+  0: '提现中',
+  1: '已提现',
+  2: '失败',
+};

src/constants/product.ts

@@ -27,14 +27,20 @@ export enum ProductSpecId {
   AddGroup2 = 'ADDGROUP_2',
   AddGroup3 = 'ADDGROUP_3',
   BossVip = 'BOSSVIP',
+  DailyVIP = 'VIP_D',
   WeeklyVIP = 'VIP_W',
   MonthlyVIP = 'VIP_M', // 30 每天十次
   NewMonthlyVIP = 'VIP_M_NEW', // 18 每天五次
   GroupBatchPublish20 = 'GROUP_BATCH_PUSH_20',
   GroupBatchPublish50 = 'GROUP_BATCH_PUSH_50',
+  GroupBatchPublish60 = 'GROUP_BATCH_PUSH_60',
+  GroupBatchPublish80 = 'GROUP_BATCH_PUSH_80',
   GroupBatchPublish100 = 'GROUP_BATCH_PUSH_100',
+  GroupBatchPublish150 = 'GROUP_BATCH_PUSH_150',
   GroupBatchPublish300 = 'GROUP_BATCH_PUSH_300',
   GroupBatchPublish500 = 'GROUP_BATCH_PUSH_500',
+  GroupBatchPublish750 = 'GROUP_BATCH_PUSH_750',
+  GroupBatchPublish800 = 'GROUP_BATCH_PUSH_800',
   GroupBatchPublish1000 = 'GROUP_BATCH_PUSH_1000',
   BOSS_PUB_JOB_1 = 'BOSS_PUB_JOB_1', // 旧版企业发通告会员
   BOSS_VIP_NEW_1 = 'BOSS_VIP_NEW_1', // 新版企业发通告会员 - 周

src/constants/subscribe.ts

@@ -1,6 +1,6 @@
 export enum SubscribeTempId {
   INTERVIEW_INVITATION = 'obPJO1nmXoSwAovbuuUz4aVfb6Ir8AOp1kY_JlQ18dY',
-  UNREAD_MESSAGE_REMINDER = 'm-Zx9zgf5KGnlHgxbxSkEtpd7XXCg1r1adC2UZS7sXs',
+  UNREAD_MESSAGE_REMINDER = '5QcNcHdNnWpMvNOUwbazYlWv0VXXAzdF87L7c7vVq2s',
   NEW_MESSAGE_REMINDER = '4lkxb_mDLbJ889PZqunxP5U8auvQHS6hZgzfxgGHo9U',
   SUBSCRIBE_JOB = 'PYekheJ60PA53SB51wFjySYjMUQjS17elPNnLwoIEQM',
   SUBSCRIBE_VIP = 'TxQSUxuB9av1bkWudq-UcM1ey9ChVYqTSC9qBPpW0e8',

src/fragments/job/base/index.less

@@ -54,6 +54,7 @@
     flex: 1 0;
   }
 
+  &__employType-select,
   &__salary-select,
   &__search-city {
     display: flex;

src/fragments/job/base/index.tsx

@@ -2,10 +2,11 @@ import { Image } from '@tarojs/components';
 import { NodesRef, useDidHide } from '@tarojs/taro';
 
 import { Tabs } from '@taroify/core';
-import { ArrowUp, ArrowDown } from '@taroify/icons';
+import { ArrowDown, ArrowUp } from '@taroify/icons';
 import classNames from 'classnames';
 import { useCallback, useEffect, useState } from 'react';
 
+import EmployTypeSelect from '@/components/employ-type-select';
 import JobList, { IJobListProps } from '@/components/job-list';
 import Overlay from '@/components/overlay';
 import PartnerBanner from '@/components/partner-banner';
@@ -13,7 +14,16 @@ import SalarySelect from '@/components/salary-select';
 import SearchInput from '@/components/search';
 import { APP_TAB_BAR_ID, PageUrl } from '@/constants/app';
 import { CITY_CODE_TO_NAME_MAP } from '@/constants/city';
-import { JOB_TABS, JobType, EmployType, ALL_SORT_TYPES, SORT_TYPE_TITLE_MAP, SortType } from '@/constants/job';
+import {
+  ALL_SORT_TYPES,
+  EMPLOY_TYPE_TITLE_MAP,
+  EmployType,
+  JOB_TABS,
+  JobSourceType,
+  JobType,
+  SORT_TYPE_TITLE_MAP,
+  SortType,
+} from '@/constants/job';
 import useListHeight, { IUseListHeightProps } from '@/hooks/use-list-height';
 import { SalaryRange } from '@/types/job';
 import { Coordinate } from '@/types/location';
@@ -24,9 +34,11 @@ import './index.less';
 interface IProps {
   cityCode: string;
   sortType: SortType;
+  sourceType: JobSourceType;
   employType: EmployType;
   coordinate: Coordinate;
   onClickCity: () => void;
+  onClickEmployType: (type: EmployType) => void;
   onClickSort: (type: SortType) => void;
 }
 
@@ -74,20 +86,35 @@ function ListWrapper(props: IJobListProps) {
 }
 
 function JobFragment(props: IProps) {
-  const { cityCode, employType, sortType = SortType.RECOMMEND, coordinate, onClickCity, onClickSort } = props;
+  const {
+    cityCode,
+    employType,
+    sourceType,
+    sortType = SortType.RECOMMEND,
+    coordinate,
+    onClickEmployType,
+    onClickCity,
+    onClickSort,
+  } = props;
   const listHeight = useListHeight(CALC_LIST_PROPS);
   const [tabType, setTabType] = useState<JobType>(JobType.All);
   const [salaryRange, setSalaryRange] = useState<SalaryRange | undefined>();
   const [showSalarySelect, setShowSalarySelect] = useState<boolean>(false);
+  const [showEmployTypeSelect, setShowEmployTypeSelect] = useState<boolean>(false);
   const { latitude, longitude } = coordinate;
 
   const handleClickSearch = useCallback(() => navigateTo(PageUrl.JobSearch, { city: cityCode }), [cityCode]);
 
   const handleClickSalarySelect = useCallback(() => {
-    setShowSalarySelect(!showSalarySelect);
+    setShowSalarySelect(s => !s);
-  }, [showSalarySelect]);
+  }, []);
+
+  const handleClickEmployTypeSelect = useCallback(() => {
+    setShowEmployTypeSelect(s => !s);
+  }, []);
 
   const handleHideSalarySelect = useCallback(() => setShowSalarySelect(false), []);
+  const handleHideEmployTypeSelect = useCallback(() => setShowEmployTypeSelect(false), []);
 
   const handleSelectSalary = useCallback((value?: SalaryRange) => {
     log('handleSelectSalary', value);
@@ -95,6 +122,14 @@ function JobFragment(props: IProps) {
     setShowSalarySelect(false);
   }, []);
 
+  const handleSelectEmployType = useCallback(
+    (value?: EmployType) => {
+      setShowEmployTypeSelect(false);
+      onClickEmployType(value!);
+    },
+    [onClickEmployType]
+  );
+
   const onTypeChange = useCallback(
     value => {
       log('onTypeChange', value);
@@ -109,6 +144,12 @@ function JobFragment(props: IProps) {
     <div className={`${PREFIX}__container`}>
       <div className={`${PREFIX}__top-search-bar`}>
         <SearchInput disabled className={`${PREFIX}__search`} placeholder="试试 女装" onClick={handleClickSearch} />
+        <div className={classNames(`${PREFIX}__employType-select`)} onClick={handleClickEmployTypeSelect}>
+          <div className="title">
+            {employType && employType !== EmployType.All ? EMPLOY_TYPE_TITLE_MAP[employType] : '类型'}
+          </div>
+          {showEmployTypeSelect ? <ArrowUp /> : <ArrowDown />}
+        </div>
         <div className={classNames(`${PREFIX}__search-city`)} onClick={onClickCity}>
           <div className="title">{CITY_CODE_TO_NAME_MAP.get(cityCode)}</div>
           <ArrowDown />
@@ -139,6 +180,7 @@ function JobFragment(props: IProps) {
               sortType={sortType}
               latitude={latitude}
               longitude={longitude}
+              sourceType={sourceType}
               employType={employType}
               minSalary={salaryRange?.minSalary}
               maxSalary={salaryRange?.maxSalary}
@@ -157,6 +199,15 @@ function JobFragment(props: IProps) {
       >
         <SalarySelect type={employType} value={salaryRange} onSelect={handleSelectSalary} />
       </Overlay>
+
+      <Overlay
+        visible={showEmployTypeSelect}
+        onClickOuter={handleHideEmployTypeSelect}
+        outerClassName={`${PREFIX}__overlay-outer`}
+        innerClassName={`${PREFIX}__overlay-inner`}
+      >
+        <EmployTypeSelect value={employType} onSelect={handleSelectEmployType} />
+      </Overlay>
     </div>
   );
 }

src/fragments/profile/basic/index.tsx

@@ -23,9 +23,7 @@ function ProfileBasicFragment(props: IProps, ref) {
   const [name, setName] = useState(profile.name || '');
   const [gender, setGender] = useState<GenderType>(profile.gender || GenderType.WOMEN);
   const [age, setAge] = useState(profile.age || '');
-  const [height, setHeight] = useState(profile.height || '');
+  const [workedSecCategoryStr, setWorkedSecCategoryStr] = useState(profile.workedSecCategoryStr || '');
-  const [weight, setWeight] = useState(profile.weight || '');
-  const [shoeSize, setShoeSize] = useState(profile.shoeSize || '');
 
   const handleInputName = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
     const value = e.detail.value || '';
@@ -40,41 +38,21 @@ function ProfileBasicFragment(props: IProps, ref) {
     setAge(string2Number(value));
   }, []);
 
-  const handleInputHeight = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
-    const value = e.detail.value || '';
-    if (Number.isNaN(Number(value))) {
-      return;
-    }
-    setHeight(string2Number(value));
-  }, []);
-
-  const handleInputWeight = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
-    const value = e.detail.value || '';
-    if (Number.isNaN(Number(value))) {
-      return;
-    }
-    setWeight(string2Number(value));
-  }, []);
-
-  const handleInputShoeSize = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
-    const value = e.detail.value || '';
-    if (Number.isNaN(Number(value))) {
-      return;
-    }
-    setShoeSize(string2Number(value));
-  }, []);
-
   const handleGenderChange = useCallback((value: GenderType) => {
     log('handleGenderChange', value);
     setGender(value);
   }, []);
+  const handleInputWorkedSecCategoryStr = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
+    const value = e.detail.value || '';
+    setWorkedSecCategoryStr(value);
+  }, []);
 
   useImperativeHandle(
     ref,
     () => ({
-      getData: () => ({ name, gender, age, height, weight, shoeSize }),
+      getData: () => ({ name, gender, age, workedSecCategoryStr }),
     }),
-    [name, gender, age, height, weight, shoeSize]
+    [name, gender, age, workedSecCategoryStr]
   );
 
   return (
@@ -82,29 +60,17 @@ function ProfileBasicFragment(props: IProps, ref) {
       <BlFormItem title="称呼">
         <BlFormInput value={name} onInput={handleInputName} />
       </BlFormItem>
+      <BlFormItem title="年龄">
+        <BlFormInput value={String(age)} type="number" maxlength={3} onInput={handleInputAge} rightText="岁" />
+      </BlFormItem>
       <BlFormItem title="性别">
         <BlFormRadioGroup direction="horizontal" value={gender} onChange={handleGenderChange}>
           <BlFormRadio name={GenderType.WOMEN} text="女" value={gender} />
           <BlFormRadio name={GenderType.MEN} text="男" value={gender} />
         </BlFormRadioGroup>
       </BlFormItem>
-      <BlFormItem title="年龄">
+      <BlFormItem title="直播过的品类" optional>
-        <BlFormInput value={String(age)} type="number" maxlength={3} onInput={handleInputAge} rightText="岁" />
+        <BlFormInput value={workedSecCategoryStr} maxlength={140} onInput={handleInputWorkedSecCategoryStr} />
-      </BlFormItem>
-      <BlFormItem title="身高">
-        <BlFormInput value={String(height)} type="number" maxlength={3} onInput={handleInputHeight} rightText="CM" />
-      </BlFormItem>
-      <BlFormItem title="体重">
-        <BlFormInput value={String(weight)} type="number" maxlength={3} onInput={handleInputWeight} rightText="KG" />
-      </BlFormItem>
-      <BlFormItem title="鞋码" optional>
-        <BlFormInput
-          value={String(shoeSize)}
-          type="number"
-          maxlength={2}
-          onInput={handleInputShoeSize}
-          rightText="码"
-        />
       </BlFormItem>
     </div>
   );

src/fragments/profile/experience/index.tsx

@@ -48,10 +48,9 @@ function ProfileExperienceFragment(props: IProps, ref) {
   const [workedYear, setWorkedYear] = useState(profile.workedYear);
   const [workedAccounts, setWorkedAccounts] = useState(profile.workedAccounts || '');
   const [newAccountExperience, setNewAccountExperience] = useState(profile.newAccountExperience);
-  const [workedSecCategoryStr, setWorkedSecCategoryStr] = useState(profile.workedSecCategoryStr || '');
   // const [style, setStyle] = useState(calcInitStyle(profile.style));
   const [maxGmv, setMaxGmv] = useState(calcInitMaxGmv(profile?.maxGmv || 0));
-  const [maxOnline, setMaxOnline] = useState(profile.maxOnline || '');
+  // const [maxOnline, setMaxOnline] = useState(profile.maxOnline || '');
 
   const handleSelectWorkYear = useCallback((newYear: WorkedYears) => {
     setWorkedYear(newYear);
@@ -67,11 +66,6 @@ function ProfileExperienceFragment(props: IProps, ref) {
     setNewAccountExperience(value);
   }, []);
 
-  const handleInputWorkedSecCategoryStr = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
-    const value = e.detail.value || '';
-    setWorkedSecCategoryStr(value);
-  }, []);
-
   // const handleStyleChange = useCallback((value: StyleType[]) => {
   //   log('handleStyleChange', value);
   //   setStyle(value);
@@ -84,14 +78,14 @@ function ProfileExperienceFragment(props: IProps, ref) {
     }
     setMaxGmv(string2Number(value));
   }, []);
-
+  //
-  const handleInputMaxOnline = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
+  // const handleInputMaxOnline = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
-    const value = e.detail.value || '';
+  //   const value = e.detail.value || '';
-    if (Number.isNaN(Number(value))) {
+  //   if (Number.isNaN(Number(value))) {
-      return;
+  //     return;
-    }
+  //   }
-    setMaxOnline(string2Number(value));
+  //   setMaxOnline(string2Number(value));
-  }, []);
+  // }, []);
 
   useImperativeHandle(
     ref,
@@ -100,22 +94,21 @@ function ProfileExperienceFragment(props: IProps, ref) {
         workedYear,
         workedAccounts,
         newAccountExperience,
-        workedSecCategoryStr,
         // style: getStyleString(style.sort()),
-        maxOnline: maxOnline === '' ? undefined : maxOnline,
+        // maxOnline: maxOnline === '' ? undefined : maxOnline,
         maxGmv: maxGmv === '' ? undefined : getMaxGmv(Number(maxGmv)),
       }),
     }),
-    [workedYear, workedAccounts, newAccountExperience, workedSecCategoryStr, maxGmv, maxOnline]
+    [workedYear, workedAccounts, newAccountExperience, maxGmv]
   );
 
   return (
     <div className={PREFIX}>
-      <BlFormItem title="直播经验">
+      <BlFormItem title="直播经验" optional>
         <BlFormSelect title="直播经验" value={workedYear} options={WORK_YEAR_OPTIONS} onSelect={handleSelectWorkYear} />
       </BlFormItem>
-      <BlFormItem title="直播过的品类" optional>
+      <BlFormItem title="直播过的账号" optional>
-        <BlFormInput value={workedSecCategoryStr} maxlength={140} onInput={handleInputWorkedSecCategoryStr} />
+        <BlFormInput value={workedAccounts} maxlength={140} onInput={handleInputWorkedAccounts} />
       </BlFormItem>
       <BlFormItem title="自然流起号经验" optional>
         <BlFormRadioGroup
@@ -127,9 +120,6 @@ function ProfileExperienceFragment(props: IProps, ref) {
           <BlFormRadio name text="有" value={newAccountExperience} />
         </BlFormRadioGroup>
       </BlFormItem>
-      <BlFormItem title="直播过的账号" optional>
-        <BlFormInput value={workedAccounts} maxlength={140} onInput={handleInputWorkedAccounts} />
-      </BlFormItem>
       {/* <ProfileEditItem title="直播风格" optional>
         <ProfileCheckboxGroup value={style} onChange={handleStyleChange}>
           <ProfileCheckbox value={style} name={StyleType.Broadcasting} text="平播" />
@@ -140,9 +130,9 @@ function ProfileExperienceFragment(props: IProps, ref) {
       <BlFormItem title="最高GMV" optional>
         <BlFormInput value={String(maxGmv)} type="number" maxlength={10} onInput={handleInputMaxGmv} rightText="W" />
       </BlFormItem>
-      <BlFormItem title="最高在线人数" optional>
+      {/*<BlFormItem title="最高在线人数" optional>*/}
-        <BlFormInput value={String(maxOnline)} type="number" onInput={handleInputMaxOnline} rightText="人" />
+      {/*  <BlFormInput value={String(maxOnline)} type="number" onInput={handleInputMaxOnline} rightText="人" />*/}
-      </BlFormItem>
+      {/*</BlFormItem>*/}
     </div>
   );
 }

src/fragments/profile/intention/index.less

@@ -45,4 +45,8 @@
     }
   }
 
+  .transparent {
+    background: transparent;
+    padding: 0;
+  }
 }

src/fragments/profile/intention/index.tsx

@@ -3,12 +3,21 @@ import Taro from '@tarojs/taro';
 
 import { forwardRef, useCallback, useEffect, useImperativeHandle, useState } from 'react';
 
+import { BlCheckbox, BlCheckboxGroup } from '@/components/bl-checkbox';
 import BlFormItem from '@/components/bl-form-item';
 import { BlFormRadio, BlFormRadioGroup } from '@/components/bl-form-radio';
 import BlFormSelect from '@/components/bl-form-select';
 import { EventName, OpenSource, PageUrl } from '@/constants/app';
 import { CITY_CODE_TO_NAME_MAP } from '@/constants/city';
-import { EmployType, EMPLOY_TYPE_TITLE_MAP, FULL_PRICE_OPTIONS, PART_PRICE_OPTIONS } from '@/constants/job';
+import {
+  EmployType,
+  EMPLOY_TYPE_TITLE_MAP,
+  FULL_PRICE_OPTIONS,
+  PART_PRICE_OPTIONS,
+  ALL_JOB_TYPES,
+  JobType,
+  JOB_TYPE_TITLE_MAP,
+} from '@/constants/job';
 import { SalaryRange } from '@/types/job';
 import { MaterialProfile } from '@/types/material';
 import { logWithPrefix } from '@/utils/common';
@@ -27,7 +36,7 @@ const log = logWithPrefix(PREFIX);
 const realtimeLogger = Taro.getRealtimeLogManager();
 realtimeLogger.tag(PREFIX);
 const calcInitCityCodes = (codeString: string = '') => {
-  const codes = codeString.split('、');
+  const codes = (codeString || '').split('、');
   return codes.filter(code => !!CITY_CODE_TO_NAME_MAP.get(code));
 };
 
@@ -60,13 +69,20 @@ const getSalaryPrice = (fullSalary?: SalaryRange, partSalary?: SalaryRange) => {
   return price;
 };
 
+const getWorkedCategoryString = (workedCategory: JobType[]) => workedCategory.join(',');
+
+const getWorkedCategory = (workedCategory?: string): JobType[] => {
+  return workedCategory ? (workedCategory.split(',') as JobType[]).filter(v => ALL_JOB_TYPES.includes(v)) : [];
+};
+
 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));
   const [acceptWorkForSit, setAcceptWorkForSit] = useState(profile.acceptWorkForSit);
+  const [workedCategory, setWorkedCategory] = useState<JobType[]>(getWorkedCategory(profile.workedCategory));
 
   const handleDeleteCity = useCallback(
     (deleteCode: string) => {
@@ -85,7 +101,7 @@ function ProfileIntentionFragment(props: IProps, ref) {
     data => {
       log('handleSelectCity', data);
       realtimeLogger.info('handleSelectCity', data);
-      const { openSource, cityCode: code } = data;
+      const { cityCode: code } = data;
       // if (openSource !== OpenSource.AddIndentCity) {
       //   return;
       // }
@@ -118,6 +134,11 @@ function ProfileIntentionFragment(props: IProps, ref) {
     setAcceptWorkForSit(value);
   }, []);
 
+  const handleWorkedCategoryChange = useCallback((value: JobType[]) => {
+    log('handleWorkedCategoryChange', value);
+    setWorkedCategory(value);
+  }, []);
+
   useEffect(() => {
     Taro.eventCenter.on(EventName.SELECT_CITY, handleSelectCity);
     return () => {
@@ -132,10 +153,11 @@ function ProfileIntentionFragment(props: IProps, ref) {
         cityCodes: getCityCodeString(cityCodes),
         employType,
         acceptWorkForSit,
+        workedCategory: getWorkedCategoryString(workedCategory),
         ...getSalaryPrice(fullSalary, partSalary),
       }),
     }),
-    [cityCodes, employType, fullSalary, partSalary, acceptWorkForSit]
+    [cityCodes, employType, fullSalary, partSalary, acceptWorkForSit, workedCategory]
   );
 
   return (
@@ -174,7 +196,7 @@ function ProfileIntentionFragment(props: IProps, ref) {
         </BlFormRadioGroup>
       </BlFormItem>
       {isFullTimePriceRequired(employType) && (
-        <BlFormItem title="期望全职薪资">
+        <BlFormItem title="期望全职薪资" subTitle="重要">
           <BlFormSelect
             title="期望全职薪资"
             value={fullSalary}
@@ -184,7 +206,7 @@ function ProfileIntentionFragment(props: IProps, ref) {
         </BlFormItem>
       )}
       {isPartTimePriceRequired(employType) && (
-        <BlFormItem title="期望兼职薪资">
+        <BlFormItem title="期望兼职薪资" subTitle="重要">
           <BlFormSelect
             title="期望兼职薪资"
             value={partSalary}
@@ -193,12 +215,19 @@ function ProfileIntentionFragment(props: IProps, ref) {
           />
         </BlFormItem>
       )}
-      <BlFormItem title="是否接受坐班">
+      <BlFormItem title="是否接受坐班" optional>
         <BlFormRadioGroup direction="horizontal" value={acceptWorkForSit} onChange={handleAcceptSittingChange}>
           <BlFormRadio name text="接受" value={acceptWorkForSit} />
           <BlFormRadio name={false} text="不接受" value={acceptWorkForSit} />
         </BlFormRadioGroup>
       </BlFormItem>
+      <BlFormItem title="意向类目" subTitle="多选" dynamicHeight contentClassName="transparent">
+        <BlCheckboxGroup value={workedCategory} onChange={handleWorkedCategoryChange}>
+          {ALL_JOB_TYPES.filter(type => type !== JobType.All).map(type => {
+            return <BlCheckbox text={JOB_TYPE_TITLE_MAP[type]} key={type} name={type} />;
+          })}
+        </BlCheckboxGroup>
+      </BlFormItem>
     </div>
   );
 }

src/fragments/profile/others/index.less

@@ -0,0 +1,15 @@
+@import '@/styles/common.less';
+@import '@/styles/variables.less';
+
+.fragment-profile-others {
+  width: 100%;
+
+  &__title {
+    font-weight: 400;
+    font-size: 32px;
+    line-height: 40px;
+
+
+    margin-bottom: 24px;
+  }
+}

src/fragments/profile/others/index.tsx

@@ -0,0 +1,94 @@
+import { BaseEventOrig, InputProps } from '@tarojs/components';
+
+import { forwardRef, useCallback, useImperativeHandle, useState } from 'react';
+
+import BlFormInput from '@/components/bl-form-input';
+import BlFormItem from '@/components/bl-form-item';
+import BlFormSelect from '@/components/bl-form-select';
+import { EDUCATION_TYPE_OPTIONS, EducationType } from '@/constants/material';
+import { MaterialProfile } from '@/types/material';
+import { logWithPrefix, string2Number } from '@/utils/common';
+
+import './index.less';
+
+interface IProps {
+  profile: Partial<MaterialProfile>;
+}
+
+const PREFIX = 'fragment-profile-others';
+const log = logWithPrefix(PREFIX);
+
+function ProfileOthersFragment(props: IProps, ref) {
+  const { profile } = props;
+  const [educationType, setEducationType] = useState(profile.educationType || '');
+  const [height, setHeight] = useState(profile.height || '');
+  const [weight, setWeight] = useState(profile.weight || '');
+  const [shoeSize, setShoeSize] = useState(profile.shoeSize || '');
+
+  const handleInputHeight = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
+    const value = e.detail.value || '';
+    if (Number.isNaN(Number(value))) {
+      return;
+    }
+    setHeight(string2Number(value));
+  }, []);
+
+  const handleInputWeight = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
+    const value = e.detail.value || '';
+    if (Number.isNaN(Number(value))) {
+      return;
+    }
+    setWeight(string2Number(value));
+  }, []);
+
+  const handleInputShoeSize = useCallback((e: BaseEventOrig<InputProps.inputEventDetail>) => {
+    const value = e.detail.value || '';
+    if (Number.isNaN(Number(value))) {
+      return;
+    }
+    setShoeSize(string2Number(value));
+  }, []);
+
+  const handleSelectEducationType = useCallback((type: EducationType) => {
+    setEducationType(type);
+  }, []);
+
+  useImperativeHandle(
+    ref,
+    () => ({
+      getData: () => ({ height, weight, shoeSize, educationType }),
+    }),
+    [height, weight, shoeSize, educationType]
+  );
+
+  return (
+    <div className={PREFIX}>
+      <div className={`${PREFIX}__title`}>服饰等穿版品类必填，其他品类选填</div>
+      <BlFormItem title="身高" optional>
+        <BlFormInput value={String(height)} type="number" maxlength={3} onInput={handleInputHeight} rightText="CM" />
+      </BlFormItem>
+      <BlFormItem title="体重" optional>
+        <BlFormInput value={String(weight)} type="number" maxlength={3} onInput={handleInputWeight} rightText="KG" />
+      </BlFormItem>
+      <BlFormItem title="鞋码" optional>
+        <BlFormInput
+          value={String(shoeSize)}
+          type="number"
+          maxlength={2}
+          onInput={handleInputShoeSize}
+          rightText="码"
+        />
+      </BlFormItem>
+      <BlFormItem title="学历" optional>
+        <BlFormSelect
+          title="学历"
+          value={educationType}
+          options={EDUCATION_TYPE_OPTIONS}
+          onSelect={handleSelectEducationType}
+        />
+      </BlFormItem>
+    </div>
+  );
+}
+
+export default forwardRef(ProfileOthersFragment);

src/fragments/profile/view/index.less

@@ -44,7 +44,7 @@
       font-size: 28px;
       font-weight: 400;
       color: #ffffff;
-      background: #0000005c;
+      background: #6D3DF5B2;
       border-radius: 48px;
     }
 
@@ -232,4 +232,8 @@
       }
     }
   }
+
+  .join-group-hint {
+    margin: 24px;
+  }
 }

src/fragments/profile/view/index.tsx

@@ -8,14 +8,21 @@ import DevDiv from '@/components/dev-div';
 import SafeBottomPadding from '@/components/safe-bottom-padding';
 import { OpenSource, PageUrl } from '@/constants/app';
 import { CITY_CODE_TO_NAME_MAP } from '@/constants/city';
-import { FULL_PRICE_OPTIONS, PART_PRICE_OPTIONS } from '@/constants/job';
+import { FULL_PRICE_OPTIONS, JOB_TYPE_TITLE_MAP, JobType, PART_PRICE_OPTIONS } from '@/constants/job';
-import { ProfileGroupType, ProfileTitleMap, WORK_YEAR_OPTIONS } from '@/constants/material';
+import {
+  EDUCATION_TYPE_LABELS,
+  GenderType,
+  ProfileGroupType,
+  ProfileTitleMap,
+  WORK_YEAR_OPTIONS,
+} from '@/constants/material';
 import { MaterialProfile } from '@/types/material';
-import { logWithPrefix, isDesktop } from '@/utils/common';
+import { isDesktop, logWithPrefix } from '@/utils/common';
-import { getBasicInfo, sortVideos } from '@/utils/material';
+import { sortVideos } from '@/utils/material';
 import { navigateTo } from '@/utils/route';
 
 import './index.less';
+import { JoinGroupHint } from '@/components/join-group-hint';
 import onChangeEventDetail = SwiperProps.onChangeEventDetail;
 
 interface IProps {
@@ -29,7 +36,7 @@ const log = logWithPrefix(PREFIX);
 const DEFAULT_TEXT = '未填写';
 
 const getIndentCity = (codeString: string = '') => {
-  const codes = codeString.split('、');
+  const codes = (codeString || '').split('、');
   const cityNames: string[] = [];
   codes.forEach(code => {
     const cityName = CITY_CODE_TO_NAME_MAP.get(code);
@@ -62,7 +69,14 @@ const getWorkYear = (year: number) => {
   const y = Math.min(year, 3);
   return WORK_YEAR_OPTIONS.find(option => option.value === y)?.label || `${y}年`;
 };
-
+const getWorkedCategory = (workedCategory?: string): string => {
+  return workedCategory
+    ? (workedCategory.split(',') as JobType[])
+        .map(v => (v !== JobType.All ? JOB_TYPE_TITLE_MAP[v] : null))
+        .filter(Boolean)
+        .join('、')
+    : '';
+};
 const getDataGroup = (profile: MaterialProfile | null) => {
   if (!profile) {
     return [];
@@ -76,6 +90,7 @@ const getDataGroup = (profile: MaterialProfile | null) => {
         { title: '兼职薪资', value: getIndentPrice(profile.partyTimeMinPrice, profile.partyTimeMaxPrice, false) || '' },
         { title: '意向城市', value: getIndentCity(profile.cityCodes) || DEFAULT_TEXT },
         { title: '是否接受坐班', value: profile.acceptWorkForSit ? '是' : '否' },
+        { title: '意向品类', value: getWorkedCategory(profile.workedCategory) || DEFAULT_TEXT, fullLine: true },
       ],
     },
     {
@@ -85,9 +100,18 @@ const getDataGroup = (profile: MaterialProfile | null) => {
         { title: '直播年限', value: getWorkYear(profile.workedYear) || DEFAULT_TEXT },
         { title: '直播过的账号', value: profile.workedAccounts || DEFAULT_TEXT },
         { title: '自然流起号经验', value: Boolean(profile.newAccountExperience) ? '有' : '无' },
-        { title: '直播过的品类', value: profile.workedSecCategoryStr || DEFAULT_TEXT },
+        // { title: '直播过的品类', value: profile.workedSecCategoryStr || DEFAULT_TEXT },
         { title: '最高GMV', value: profile.maxGmv ? `${profile.maxGmv / 10000}万` : DEFAULT_TEXT },
-        { title: '最高在线人数', value: profile.maxOnline || DEFAULT_TEXT },
+      ],
+    },
+    {
+      title: ProfileTitleMap[ProfileGroupType.Others],
+      type: ProfileGroupType.Others,
+      items: [
+        { title: '身高', value: profile.height ? `${profile.height}cm` : DEFAULT_TEXT },
+        { title: '体重', value: profile.weight ? `${profile.weight}kg` : DEFAULT_TEXT },
+        { title: '鞋码', value: profile.shoeSize ? `${profile.shoeSize}码` : DEFAULT_TEXT },
+        { title: '学历', value: EDUCATION_TYPE_LABELS[profile.educationType] || DEFAULT_TEXT },
       ],
     },
     {
@@ -98,6 +122,16 @@ const getDataGroup = (profile: MaterialProfile | null) => {
   ];
 };
 
+export const getBasicInfo = (profile: Pick<MaterialProfile, 'age' | 'gender'>) => {
+  const result: string[] = [];
+  if (typeof profile.age !== 'undefined' && profile.age !== null) {
+    result.push(`${profile.age}岁`);
+  }
+  result.push(profile.gender === GenderType.MEN ? '男' : '女');
+
+  return result.join('·');
+};
+
 export default function ProfileViewFragment(props: IProps) {
   const { profile, editable, onDev } = props;
   const [coverIndex, setCoverIndex] = useState(0);
@@ -207,6 +241,7 @@ export default function ProfileViewFragment(props: IProps) {
           >{`${coverIndex + 1}/${profile.materialVideoInfoList.length}`}</div>
         </div>
       </div>
+      {!editable && <JoinGroupHint />}
       <div className={`${PREFIX}__body`}>
         <div className={`${PREFIX}__basic-info`}>
           <div className={`${PREFIX}__basic-info__name-container`}>
@@ -219,7 +254,10 @@ export default function ProfileViewFragment(props: IProps) {
               </div>
             )}
           </div>
-          <div className={`${PREFIX}__basic-info__content`}>{getBasicInfo(profile)}</div>
+          <DevDiv className={`${PREFIX}__basic-info__content`} OnDev={onDev}>
+            <div>{getBasicInfo(profile)}</div>
+            <div>{profile.workedSecCategoryStr ? `播过：${profile.workedSecCategoryStr}` : ''}</div>
+          </DevDiv>
           <div className={`${PREFIX}__divider`} />
         </div>
         {dataGroup.map((data, index: number) => (
@@ -228,7 +266,9 @@ export default function ProfileViewFragment(props: IProps) {
               {index ? (
                 <div className={`${PREFIX}__info-group__header__title`}>{data.title}</div>
               ) : (
-                <DevDiv className={`${PREFIX}__info-group__header__title`} OnDev={onDev}>{data.title}</DevDiv>
+                <DevDiv className={`${PREFIX}__info-group__header__title`} OnDev={onDev}>
+                  {data.title}
+                </DevDiv>
               )}
               {editable && (
                 <div className={`${PREFIX}__info-group__header__edit`} onClick={() => handleEditGroupItem(data.type)}>

src/fragments/user/company/index.less

@@ -13,6 +13,21 @@
     .taroify-cell__value {
       color: @blColor;
     }
+
+    &-icon {
+      width: 40px;
+      height: 40px;
+      border-radius: 50%;
+      background: rgba(255, 80, 81, 0.16);
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      margin-right: 16px;
+      > image {
+        width: 18px;
+        height: 24px;
+      }
+    }
   }
 
   &__go-publish-cell {
@@ -24,4 +39,6 @@
       color: @blHighlightColor;
     }
   }
+
+
 }

src/fragments/user/company/index.tsx

@@ -1,3 +1,5 @@
+import { Image } from '@tarojs/components';
+
 import { Cell } from '@taroify/core';
 import classNames from 'classnames';
 import { useCallback } from 'react';
@@ -5,7 +7,6 @@ import { useCallback } from 'react';
 import CertificationStatus from '@/components/certification-status';
 import WechatCell from '@/components/wx-cell';
 import { PageUrl } from '@/constants/app';
-import { CertificationStatusType } from '@/constants/company';
 import useUserInfo from '@/hooks/use-user-info';
 import { navigateTo } from '@/utils/route';
 
@@ -18,10 +19,6 @@ export default function CompanyFragment() {
   // const [showPublish, setShowPublish] = useState(false);
 
   const handlePublishJob = useCallback(async () => {
-    if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
-      navigateTo(PageUrl.CertificationStart);
-      return;
-    }
     navigateTo(PageUrl.CertificationManage);
   }, [userInfo]);
 
@@ -32,7 +29,14 @@ export default function CompanyFragment() {
       <Cell
         isLink
         align="center"
-        title="发通告，让主播主动报单"
+        title={
+          <div>
+            <div className={`${PREFIX}__cell-icon`}>
+              <Image src="https://publiccdn.neighbourhood.com.cn/img/lightning.svg" />
+            </div>
+            发布急招通告，优先展示
+          </div>
+        }
         className={classNames(`${PREFIX}__cell`, `${PREFIX}__go-publish-cell`)}
         onClick={handlePublishJob}
       >

src/hooks/use-cached-job.tsx

@@ -0,0 +1,10 @@
+import { useSelector } from 'react-redux';
+
+import { selectCreatedJob } from '@/store/selector/job';
+
+function useCachedJobId() {
+  const data = useSelector(selectCreatedJob);
+  return data;
+}
+
+export default useCachedJobId;

src/hooks/use-city-operators.tsx

@@ -0,0 +1,10 @@
+import { useSelector } from 'react-redux';
+
+import { selectCityConfigs } from '@/store/selector';
+
+function useCityOperators() {
+  const data = useSelector(selectCityConfigs);
+  return data || [];
+}
+
+export default useCityOperators;

src/hooks/use-config.tsx

@@ -48,7 +48,7 @@ const CompanyTabs: TabItemType[] = [
   {
     type: PageType.BatchPublish,
     pagePath: PageUrl.UserBatchPublish,
-    text: '代招代发',
+    text: '代招',
   },
 ];
 
@@ -97,6 +97,10 @@ export const APP_CONFIG: AppConfigType = {
     PageUrl.PrivacyWebview,
     PageUrl.Partner,
     PageUrl.WithdrawRecord,
+    PageUrl.GroupDelegatePublish,
+    PageUrl.GiveVip,
+    PageUrl.GroupOwnerCertificate,
+    PageUrl.PartnerShareVip,
     // PageUrl.DevDebug,
   ],
   window: {

src/hooks/use-previous.ts

@@ -0,0 +1,13 @@
+import { useEffect, useRef } from 'react';
+
+function usePrevious<T>(value: T) {
+  const ref = useRef<T>();
+
+  useEffect(() => {
+    ref.current = value;
+  }, [value]);
+
+  return ref.current;
+}
+
+export default usePrevious;

src/hooks/use-publish-job.ts

@@ -0,0 +1,56 @@
+import Taro from '@tarojs/taro';
+
+import { Dispatch, SetStateAction, useCallback, useState } from 'react';
+
+import { EventName, PageUrl } from '@/constants/app';
+import { CertificationStatusType } from '@/constants/company';
+import { CollectEventName } from '@/constants/event';
+import useUserInfo from '@/hooks/use-user-info';
+import { RESPONSE_ERROR_CODE } from '@/http/constant';
+import { HttpError } from '@/http/error';
+import store from '@/store';
+import { cacheJobId } from '@/store/actions';
+import { collectEvent } from '@/utils/event';
+import { postPublishJob } from '@/utils/job';
+import { navigateTo } from '@/utils/route';
+import Toast from '@/utils/toast';
+
+export const usePublishJob = (jobId: string): [boolean, Dispatch<SetStateAction<boolean>>, () => Promise<void>] => {
+  const userInfo = useUserInfo();
+  const [showBuy, setShowBuy] = useState(false);
+
+  const handlePublishJob = useCallback(async () => {
+    try {
+      if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
+        store.dispatch(cacheJobId(jobId));
+        navigateTo(PageUrl.CertificationStart);
+        return;
+      }
+      Taro.showLoading();
+      await postPublishJob(jobId);
+      Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
+      setShowBuy(false);
+      Toast.success('发布成功');
+      Taro.hideLoading();
+    } catch (error) {
+      Taro.hideLoading();
+      const e = error as HttpError;
+      const errorCode = e.errorCode;
+      const errorMsg = e.info?.() || e.message;
+      collectEvent(CollectEventName.PUBLISH_OPEN_JOB_FAILED, { jobId, error: e.info?.() || e.message });
+      if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_FREE_BALANCE) {
+        setShowBuy(true);
+      } else if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_BALANCE) {
+        Toast.info('您购买的产品已耗尽使用次数');
+        setShowBuy(true);
+      } else if (errorCode === RESPONSE_ERROR_CODE.BOSS_VIP_EXPIRED) {
+        Toast.info('该通告已到期，请创建新通告', 3000);
+      } else {
+        Toast.error(errorMsg || '发布失败请重试', 3000);
+      }
+      console.error(e);
+    }
+  }, [jobId, userInfo.bossAuthStatus]);
+
+  return [showBuy, setShowBuy, handlePublishJob];
+};

src/hooks/use-user-info.tsx

@@ -3,8 +3,8 @@ import { useSelector } from 'react-redux';
 import { selectUserInfo } from '@/store/selector/user';
 
 function useUserInfo() {
-  const useInfo = useSelector(selectUserInfo);
+  const userInfo = useSelector(selectUserInfo);
-  return useInfo;
+  return userInfo;
 }
 
 export default useUserInfo;

src/hooks/user-role-type.tsx

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

src/http/api.ts

@@ -1,5 +1,6 @@
-// export const DOMAIN = 'http://192.168.60.148:8082';
+// export const DOMAIN = 'http://192.168.60.116:8082';
-export const DOMAIN = 'https://neighbourhood.cn';
+export const DOMAIN = process.env.BRAND === 'dev' ? 'https://dev.neighbourhood.cn' : 'https://neighbourhood.cn';
+// export const DOMAIN = 'https://dev.neighbourhood.cn';
 export const BASE_URL = `${DOMAIN}/api`;
 
 export enum API {
@@ -40,6 +41,8 @@ export enum API {
   PRODUCT_USE_RECORD = '/product/getProductUseRecord', // 查询某个产品是否已经解锁
   USE_PRODUCT = '/product/use', // 使用某个产品扣费/次数
   ALLOW_BUY_PRODUCT = '/product/allowBuyProduct', // 是否可以购买某个产品
+  LIST_PRODUCT_TYPE = '/product/listByType/{productType}',
+
   CS_QR_CODE = '/customerService/get', // 客服微信二维码
   CREATE_PAY_ORDER = '/payOrder/create', // 创建支付订单
   GET_PAY_ORDER = '/payOrder/get', // 订单查询
@@ -82,4 +85,17 @@ export enum API {
   BECOME_PARTNER = '/user/becomePartner',
   GET_PROFIT_LIST = '/user/profit/list',
   GET_PROFIT_STAT = '/user/profits',
+  WITHDRAW = '/user/withdraw',
+  GET_WITHDRAW_LIST = '/user/withdraw/records',
+  GENERATE_MEMBERSHIP_COUPON = '/coupon/membership/generate',
+  CLAIM_MEMBERSHIP_COUPON = '/coupon/membership/claim',
+  GET_VIP_QRCODE = '/user/getVipQrCode',
+  // 群认证
+  GENERATE_GROUP_AUTH_CODE = '/partner/generateGroupAuthCode',
+  DECRYPT_OPEN_GID = '/partner/decryptOpenGid',
+  GET_USER_PROFIT_LIST = '/partner/getLatestUserProfitList',
+  GET_AUTHED_GROUP_LIST = '/partner/getAuthedGroupList',
+  GET_STAFF_CODE = '/partner/staff/{cityCode}',
+  // 所有城市运营
+  GET_ALL_CITY_CONFIGS = '/group/getAllGroup',
 }

src/http/constant.ts

@@ -26,6 +26,7 @@ export enum RESPONSE_ERROR_CODE {
   INSUFFICIENT_BALANCE = 'INSUFFICIENT_BALANCE', // 聊天或者模卡查看超出限制
   INSUFFICIENT_FREE_BALANCE = 'INSUFFICIENT_FREE_BALANCE', // 免费查看次数(未购买会员)超限
   BOSS_VIP_EXPIRED = 'BOSS_VIP_EXPIRED', // 会员过期
+  CHAT_MSG_SEND_NOT_ALLOW = 'CHAT_MSG_SEND_NOT_ALLOW',
 }
 
 export const RESPONSE_ERROR_INFO: { [key in RESPONSE_ERROR_CODE]?: string } = {

src/http/index.ts

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

src/pages/anchor/index.less

@@ -52,7 +52,11 @@
     font-size: 28px;
     line-height: 32px;
     color: @blColor;
+    gap: 20px;
 
+    &-item {
+      display: flex;
+    }
     .title {
       margin-right: 5px;
     }
@@ -61,11 +65,17 @@
     padding: 0 24px;
   }
   &__overlay-outer {
-    top: 82px;
+    top: 72px;
   }
 
   &__overlay-inner {
     width: 100%;
+    max-height: 100%;
+    overflow: hidden;
+    .bl-select__items-container {
+      max-height: calc(100vh - 610rpx);
+      overflow-y: auto;
+    }
   }
 
   &__tips-container {
@@ -90,4 +100,23 @@
     color: @blColor;
     margin-top: 50px;
   }
+
+  &__popup {
+    &-content {
+      .flex-column();
+      padding: 40px 32px 64px 32px;
+    }
+
+    &-title {
+      font-weight: 500;
+      font-size: 36px;
+      line-height: 57px;
+      text-align: center;
+      margin-bottom: 48px;
+    }
+
+    &-confirm {
+      .button(@width: 360px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 44px);
+    }
+  }
 }

src/pages/anchor/index.tsx

@@ -1,28 +1,39 @@
-import { Image } from '@tarojs/components';
+import { Button, Image } from '@tarojs/components';
 import Taro, { NodesRef, useDidShow, useLoad, useShareAppMessage } from '@tarojs/taro';
 
-import { ArrowUp, ArrowDown } from '@taroify/icons';
+import { Popup } from '@taroify/core';
+import { ArrowDown, ArrowUp } from '@taroify/icons';
 import classNames from 'classnames';
 import { isEqual } from 'lodash-es';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import AnchorList, { IAnchorListProps } from '@/components/anchor-list';
 import AnchorPicker from '@/components/anchor-picker';
 import CustomNavigationBar from '@/components/custom-navigation-bar';
+import EmployTypeSelect from '@/components/employ-type-select';
+import GenderSelect from '@/components/gender-select';
 import HomePage from '@/components/home-page';
 import Overlay from '@/components/overlay';
 import PageLoading from '@/components/page-loading';
 import PartnerBanner from '@/components/partner-banner';
+import SafeBottomPadding from '@/components/safe-bottom-padding';
 import SwitchBar from '@/components/switch-bar';
-import { APP_TAB_BAR_ID, EventName, OpenSource, PageUrl } from '@/constants/app';
+import { APP_TAB_BAR_ID, EventName, OpenSource, PageType, PageUrl, RoleType } from '@/constants/app';
-import { EmployType, JobManageStatus } from '@/constants/job';
+import { EMPLOY_TYPE_TITLE_MAP, EmployType, JOB_TYPE_TITLE_MAP, JobType } from '@/constants/job';
-import { ALL_ANCHOR_SORT_TYPES, ANCHOR_SORT_TYPE_TITLE_MAP, AnchorSortType } from '@/constants/material';
+import {
+  ALL_ANCHOR_SORT_TYPES,
+  ANCHOR_SORT_TYPE_TITLE_MAP,
+  AnchorSortType,
+  GENDER_TYPE_TITLE_MAP,
+  GenderType,
+} from '@/constants/material';
 import useInviteCode from '@/hooks/use-invite-code';
 import useListHeight, { IUseListHeightProps } from '@/hooks/use-list-height';
 import useLocation from '@/hooks/use-location';
 import { JobManageInfo } from '@/types/job';
 import { Coordinate } from '@/types/location';
 import { IAnchorFilters } from '@/types/material';
+import { switchRoleType } from '@/utils/app';
 import { logWithPrefix } from '@/utils/common';
 import { getLastSelectMyJobId, requestJobManageList, setLastSelectMyJobId } from '@/utils/job';
 import { getWxLocation } from '@/utils/location';
@@ -31,7 +42,9 @@ import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
 import { getPageQuery, navigateTo } from '@/utils/route';
 import { getCommonShareMessage } from '@/utils/share';
 import Toast from '@/utils/toast';
+
 import './index.less';
+import TopCategorySelect from '@/components/top-category-select';
 
 const PREFIX = 'page-anchor';
 const LIST_CONTAINER_CLASS = `${PREFIX}__list-container`;
@@ -74,13 +87,24 @@ function ListWrapper(props: IAnchorListProps) {
   return <AnchorList listHeight={listHeight} {...props} onListEmpty={handleListEmpty} />;
 }
 
+enum FilterType {
+  gender,
+  employType,
+  topCategory,
+  more,
+}
+
 export default function AnchorPage() {
   const location = useLocation();
   const [loading, setLoading] = useState(true);
   const [selectJob, setSelectJob] = useState<JobManageInfo | undefined>();
-  const [filters, setFilters] = useState<IAnchorFilters>({ employType: EmployType.All });
+  const [moreFilters, setMoreFilters] = useState<IAnchorFilters>({});
-  const [showFilter, setShowFilter] = useState<boolean>(false);
+  const [gender, setGender] = useState<GenderType>(GenderType.All);
+  const [employType, setEmployType] = useState<EmployType>(EmployType.All);
+  const [topCategory, setTopCategory] = useState<JobType>(JobType.All);
+  const [showFilter, setShowFilter] = useState<FilterType | null>(null);
   const [sortType, setSortType] = useState<AnchorSortType>(AnchorSortType.Active);
+  const [openPopup, setOpenPopup] = useState<boolean>(false);
   const [coordinate, setCoordinate] = useState<Coordinate>({
     latitude: location.latitude,
     longitude: location.longitude,
@@ -91,6 +115,7 @@ export default function AnchorPage() {
   const handleChangeSelectJob = useCallback((select?: JobManageInfo) => {
     log('select job change', select);
     setSelectJob(select);
+    setOpenPopup(!select);
     setLastSelectMyJobId(select?.id || '');
   }, []);
 
@@ -99,20 +124,35 @@ export default function AnchorPage() {
     [selectJob]
   );
 
-  const handleClickSalarySelect = useCallback(() => {
+  const handleClickFilterSelect = (type: FilterType) => () => {
-    setShowFilter(!showFilter);
+    setShowFilter(type === showFilter ? null : type);
-  }, [showFilter]);
+  };
 
-  const handleHideFilter = useCallback(() => setShowFilter(false), []);
+  const handleHideFilter = useCallback(() => setShowFilter(null), []);
 
   const handleFilterChange = useCallback(
     (newFilters: IAnchorFilters) => {
-      !isEqual(newFilters, filters) && setFilters(newFilters);
+      !isEqual(newFilters, moreFilters) && setMoreFilters(newFilters);
-      setShowFilter(false);
+      setShowFilter(null);
     },
-    [filters]
+    [moreFilters]
   );
 
+  const handleChangeSelectGender = useCallback((value: GenderType) => {
+    setGender(value);
+    setShowFilter(null);
+  }, []);
+
+  const handleChangeSelectEmployType = useCallback((value: EmployType) => {
+    setEmployType(value);
+    setShowFilter(null);
+  }, []);
+
+  const handleChangeSelectTopCategory = useCallback((value: JobType) => {
+    setTopCategory(value);
+    setShowFilter(null);
+  }, []);
+
   const handleClickSortType = useCallback(async (type: AnchorSortType) => setSortType(type), []);
 
   const handleJobChange = useCallback(
@@ -124,7 +164,7 @@ export default function AnchorPage() {
   );
 
   const handlePublishJobChange = useCallback(async () => {
-    const { jobResults = [] } = await requestJobManageList({ status: JobManageStatus.Open });
+    const { jobResults = [] } = await requestJobManageList();
     if (!selectJob) {
       // 之前没有开发中的通告，自动选中第一个开放中的通告
       handleChangeSelectJob(jobResults[0]);
@@ -140,6 +180,10 @@ export default function AnchorPage() {
     }
   }, [selectJob, handleChangeSelectJob]);
 
+  const handleGoCreate = useCallback(() => {
+    navigateTo(PageUrl.JobPublish);
+  }, []);
+
   useEffect(() => {
     Taro.eventCenter.on(EventName.SELECT_MY_PUBLISH_JOB, handleJobChange);
     Taro.eventCenter.on(EventName.COMPANY_JOB_PUBLISH_CHANGED, handlePublishJobChange);
@@ -165,13 +209,16 @@ export default function AnchorPage() {
   }, [location]);
 
   useLoad(async () => {
+    switchRoleType(RoleType.Company);
+
     const query = getPageQuery();
     getInviteCodeFromQueryAndUpdate(query);
 
     try {
-      const { jobResults = [] } = await requestJobManageList({ status: JobManageStatus.Open });
+      const { jobResults = [] } = await requestJobManageList();
       if (!jobResults.length) {
-        Toast.info('当前是根据定位为您展示主播');
+        setOpenPopup(true);
+        // Toast.info('当前是根据定位为您展示主播');
         return;
       }
       const lastSelectJobId = getLastSelectMyJobId();
@@ -185,14 +232,27 @@ export default function AnchorPage() {
     }
   });
 
+  Taro.showShareMenu({
+    withShareTicket: true,
+  });
+
   useShareAppMessage(() => {
-    return getCommonShareMessage(true, inviteCode);
+    return getCommonShareMessage({ inviteCode, title: '数万名优质主播等你来挑', path: PageUrl.Anchor });
   });
 
   useDidShow(() => requestUnreadMessageCount());
 
+  const filters = useMemo(
+    () => ({
+      ...moreFilters,
+      topCategory: topCategory === JobType.All ? undefined : topCategory,
+      gender: gender === -1 ? undefined : gender,
+      employType,
+    }),
+    [moreFilters, gender, employType, topCategory]
+  );
   return (
-    <HomePage>
+    <HomePage type={PageType.Anchor}>
       {!!loading && <PageLoading className={`${PREFIX}__loading`} />}
       <CustomNavigationBar className={`${PREFIX}__navigation-bar`}>
         {selectJob && <SwitchBar title={selectJob.title.substring(0, 4)} onClick={handleClickSwitch} />}
@@ -210,13 +270,27 @@ export default function AnchorPage() {
               </div>
             ))}
           </div>
-          <div className={classNames(`${PREFIX}__filter`)} onClick={handleClickSalarySelect}>
+          <div className={classNames(`${PREFIX}__filter`)}>
-            <div className="title">筛选</div>
+            <div className={`${PREFIX}__filter-item`} onClick={handleClickFilterSelect(FilterType.gender)}>
-            {showFilter ? <ArrowUp /> : <ArrowDown />}
+              <div className="title">{gender === GenderType.All ? '性别' : GENDER_TYPE_TITLE_MAP[gender]}</div>
+              {showFilter === FilterType.gender ? <ArrowUp /> : <ArrowDown />}
+            </div>
+            <div className={`${PREFIX}__filter-item`} onClick={handleClickFilterSelect(FilterType.employType)}>
+              <div className="title">{employType === EmployType.All ? '类型' : EMPLOY_TYPE_TITLE_MAP[employType]}</div>
+              {showFilter === FilterType.employType ? <ArrowUp /> : <ArrowDown />}
+            </div>
+            <div className={`${PREFIX}__filter-item`} onClick={handleClickFilterSelect(FilterType.topCategory)}>
+              <div className="title">{topCategory === JobType.All ? '品类' : JOB_TYPE_TITLE_MAP[topCategory]}</div>
+              {showFilter === FilterType.topCategory ? <ArrowUp /> : <ArrowDown />}
+            </div>
+            <div className={`${PREFIX}__filter-item`} onClick={handleClickFilterSelect(FilterType.more)}>
+              <div className="title">更多</div>
+              {showFilter === FilterType.more ? <ArrowUp /> : <ArrowDown />}
+            </div>
           </div>
         </div>
         <div className={`${PREFIX}__banner`}>
-          <PartnerBanner />
+          <PartnerBanner isBoss />
         </div>
         <ListWrapper
           filters={filters}
@@ -229,14 +303,53 @@ export default function AnchorPage() {
           className={LIST_CONTAINER_CLASS}
         />
         <Overlay
-          visible={showFilter}
+          visible={showFilter === FilterType.gender}
           onClickOuter={handleHideFilter}
           outerClassName={`${PREFIX}__overlay-outer`}
           innerClassName={`${PREFIX}__overlay-inner`}
         >
-          <AnchorPicker value={filters} onConfirm={handleFilterChange} />
+          <GenderSelect value={gender} onSelect={handleChangeSelectGender} />
+        </Overlay>
+        <Overlay
+          visible={showFilter === FilterType.employType}
+          onClickOuter={handleHideFilter}
+          outerClassName={`${PREFIX}__overlay-outer`}
+          innerClassName={`${PREFIX}__overlay-inner`}
+        >
+          <EmployTypeSelect value={employType} onSelect={handleChangeSelectEmployType} />
+        </Overlay>
+        <Overlay
+          visible={showFilter === FilterType.topCategory}
+          onClickOuter={handleHideFilter}
+          outerClassName={`${PREFIX}__overlay-outer`}
+          innerClassName={`${PREFIX}__overlay-inner`}
+        >
+          <TopCategorySelect value={topCategory} onSelect={handleChangeSelectTopCategory} />
+        </Overlay>
+        <Overlay
+          visible={showFilter === FilterType.more}
+          onClickOuter={handleHideFilter}
+          outerClassName={`${PREFIX}__overlay-outer`}
+          innerClassName={`${PREFIX}__overlay-inner`}
+        >
+          <AnchorPicker value={moreFilters} onConfirm={handleFilterChange} />
         </Overlay>
       </div>
+      <Popup
+        rounded
+        open={openPopup}
+        placement="bottom"
+        className={`${PREFIX}__popup`}
+        onClose={() => setOpenPopup(false)}
+      >
+        <div className={`${PREFIX}__popup-content`}>
+          <div className={`${PREFIX}__popup-title`}>创建通告后可根据位置展示主播</div>
+          <Button className={`${PREFIX}__popup-confirm`} onClick={handleGoCreate}>
+            去创建
+          </Button>
+        </div>
+        <SafeBottomPadding />
+      </Popup>
     </HomePage>
   );
 }

src/pages/certification-manage/index.tsx

@@ -6,14 +6,15 @@ import classNames from 'classnames';
 import { useCallback, useEffect, useState } from 'react';
 
 import JobManageList, { IJobManageListProps } from '@/components/job-manage-list';
-import { CompanyPublishJobDialog } from '@/components/product-dialog/publish-job';
 import SafeBottomPadding from '@/components/safe-bottom-padding';
+import { PageUrl } from '@/constants/app';
 import { ReportEventId } from '@/constants/event';
 import { JOB_MANAGE_TABS, JobManageStatus, JobManageType } from '@/constants/job';
 import useListHeight, { IUseListHeightProps } from '@/hooks/use-list-height';
 import useUserInfo from '@/hooks/use-user-info';
 import { logWithPrefix } from '@/utils/common';
 import { reportEvent } from '@/utils/event';
+import { navigateTo } from '@/utils/route';
 import { ensureUserInfo } from '@/utils/user';
 
 import './index.less';
@@ -91,7 +92,6 @@ export default function CertificationManage() {
   const userInfo = useUserInfo();
   const listHeight = useListHeight(CALC_LIST_PROPS);
   const [tabType, setTabType] = useState<JobManageType>(JobManageType.All);
-  const [showPublish, setShowPublish] = useState(false);
 
   const handleTypeChange = useCallback(value => setTabType(value), []);
 
@@ -101,7 +101,7 @@ export default function CertificationManage() {
     if (!(await ensureUserInfo(userInfo))) {
       return;
     }
-    setShowPublish(true);
+    navigateTo(PageUrl.JobPublish);
   }, [userInfo]);
 
   return (
@@ -124,7 +124,6 @@ export default function CertificationManage() {
         </Button>
       </div>
       <SafeBottomPadding className={SAFE_BOTTOM_PADDING_CLASS} />
-      <div>{showPublish && <CompanyPublishJobDialog userInfo={userInfo} onClose={() => setShowPublish(false)} />}</div>
     </div>
   );
 }

src/pages/certification/index.tsx

@@ -1,21 +1,29 @@
 import { BaseEventOrig, Button, ButtonProps, Image, InputProps } from '@tarojs/components';
 import Taro, { UploadTask } from '@tarojs/taro';
 
-import { useCallback, useEffect, useState } from 'react';
+import { Dialog } from '@taroify/core';
+import { useCallback, useEffect,  useState } from 'react';
 
 import BlFormInput from '@/components/bl-form-input';
 import BlFormItem from '@/components/bl-form-item';
 import LoadingDialog from '@/components/loading-dialog';
+import CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
 import SafeBottomPadding from '@/components/safe-bottom-padding';
-import { PageUrl } from '@/constants/app';
+import { EventName, PageUrl } from '@/constants/app';
 import { CertificationStatusType } from '@/constants/company';
 import { CollectEventName, ReportEventId } from '@/constants/event';
+import { ProductType } from '@/constants/product';
+import useCachedJobId from '@/hooks/use-cached-job';
 import useUserInfo from '@/hooks/use-user-info';
+import store from '@/store';
+import { clearCachedJobId } from '@/store/actions';
 import { ICertificationRequest } from '@/types/company';
 import { isValidIdCard, isValidPhone, logWithPrefix } from '@/utils/common';
 import { postCertification, getPhone } from '@/utils/company';
 import { collectEvent, reportEvent } from '@/utils/event';
+import { postPublishJob } from '@/utils/job';
 import { chooseMedia } from '@/utils/material';
+import { requestProductBalance } from '@/utils/product';
 import { redirectTo } from '@/utils/route';
 import Toast from '@/utils/toast';
 import { dispatchUpdateUser, requestUserInfo } from '@/utils/user';
@@ -23,6 +31,7 @@ import { uploadVideo } from '@/utils/video';
 
 import './index.less';
 
+
 const PREFIX = 'page-certification';
 const log = logWithPrefix(PREFIX);
 const needIdCard = false;
@@ -100,6 +109,8 @@ export default function Certification() {
   // const [code, setCode] = useState('');
   const [company, setCompany] = useState('');
   const [open, setOpen] = useState(false);
+  const [showBuy, setShowBuy] = useState(false);
+  const cachedJobId = useCachedJobId();
 
   const handleClickIdCardLeft = useCallback(async () => {
     reportEvent(ReportEventId.CLICK_UPLOAD_ID_CARD, { type: 'left' });
@@ -133,6 +144,29 @@ export default function Certification() {
     setCompany(value);
   }, []);
 
+  const handleCloseBuy = useCallback(() => {
+    setShowBuy(false);
+    redirectTo(PageUrl.CertificationManage);
+  }, []);
+
+  const handlePublishJob = useCallback(async () => {
+    try {
+      Taro.showLoading();
+      await postPublishJob(cachedJobId!);
+      await Toast.success('通告发布成功', 1500, true);
+      store.dispatch(clearCachedJobId());
+      Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
+      redirectTo(PageUrl.CertificationManage);
+    } catch (e) {
+      console.error('submit error', e);
+      Toast.error('通告发布失败');
+      collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
+      redirectTo(PageUrl.CertificationManage);
+    } finally {
+      Taro.hideLoading();
+    }
+  }, [cachedJobId]);
+
   const handleSubmit = useCallback(async () => {
     reportEvent(ReportEventId.CLICK_CERTIFICATION_SUBMIT);
     const data: ICertificationRequest = {
@@ -157,7 +191,14 @@ export default function Certification() {
         return;
       }
       dispatchUpdateUser({ bossAuthStatus: CertificationStatusType.Success });
-      redirectTo(PageUrl.CertificationManage);
+
+      const [time] = await requestProductBalance(ProductType.CompanyPublishJob);
+      if (time <= 0) {
+        setShowBuy(true);
+        Taro.hideLoading();
+      } else {
+        await handlePublishJob();
+      }
     } catch (e) {
       console.error('submit error', e);
       Toast.error('认证失败请重试');
@@ -173,6 +214,7 @@ export default function Certification() {
       try {
         const { phoneNumber } = await getPhone(e.detail.code);
         setRevisedPhone(phoneNumber);
+        // eslint-disable-next-line @typescript-eslint/no-shadow
       } catch (e) {
         Toast.error('获取手机号失败');
       }
@@ -262,6 +304,11 @@ export default function Certification() {
       <div>
         <LoadingDialog open={open} text="认证中" />
       </div>
+      <Dialog open={showBuy} onClose={handleCloseBuy}>
+        <Dialog.Content>
+          <CompanyPublishJobBuy onNext={handlePublishJob} />
+        </Dialog.Content>
+      </Dialog>
     </div>
   );
 }

src/pages/dev-debug/index.tsx

@@ -4,7 +4,7 @@ import { Button } from '@taroify/core';
 import { useCallback } from 'react';
 
 import HomePage from '@/components/home-page';
-import { PageUrl } from '@/constants/app';
+import { PageType, PageUrl } from '@/constants/app';
 import { copy, logWithPrefix } from '@/utils/common';
 import { navigateTo } from '@/utils/route';
 
@@ -136,7 +136,7 @@ export default function DevDebug() {
   });
 
   return (
-    <HomePage>
+    <HomePage type={PageType.DEV}>
       <div className={PREFIX}>
         {/* <div>{`最近一次的订单 ID: ${lastOrderNo}`}</div>
         <Button onClick={() => handleCreateOrder(OrderType.Group)} style={marginTopStyle} color="primary">