feat: update

.gitignore

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

config/index.ts

@@ -12,20 +12,6 @@ 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 = {
@@ -39,15 +25,13 @@ export default defineConfig(async (merge, _env: ConfigEnv) => {
       828: 1.81 / 2
     },
     sourceRoot: 'src',
-    outputRoot: process.env.OUTPUT_ROOT || 'dist',
+    outputRoot: 'dist',
-    plugins: [['@tarojs/plugin-mini-ci', CIPluginOpt()], '@tarojs/plugin-html'],
+    plugins: ['@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

@@ -1,27 +0,0 @@
------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

@@ -1,27 +0,0 @@
------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,10 +10,29 @@
 		"framework": "React"
 	},
 	"scripts": {
-		"build:weapp": "BRAND=prod taro build --type weapp",
+		"build:weapp": "taro build --type weapp",
-		"build:dev:weapp": "BRAND=dev OUTPUT_ROOT=dist-dev taro build --type weapp --upload",
+		"build:swan": "taro build --type swan",
-    "dev:weapp": "BRAND=prod npm run build:weapp -- --watch",
+		"build:alipay": "taro build --type alipay",
-    "dev:dev:weapp": "BRAND=dev OUTPUT_ROOT=dist-dev taro build --type weapp --watch"
+		"build:tt": "taro build --type tt",
+		"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",
@@ -57,7 +76,6 @@
 		"@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",
@@ -77,7 +95,6 @@
 		"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",
@@ -92,6 +109,5 @@
 		"ignoredBuiltDependencies": [
 			"@tarojs/binding"
 		]
-	},
+	}
-	"packageManager": "pnpm@10.12.4+sha512.5ea8b0deed94ed68691c9bad4c955492705c5eeb8a87ef86bc62c74a26b037b08ff9570f108b2e4dbd1dd1a9186fea925e527f141c648e85af45631074680184"
 }

project.config.dev.json

@@ -1,47 +0,0 @@
-{
-  "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": {}
-}

project.config.json

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

src/app.less

@@ -13,8 +13,3 @@ 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 Taro, { useDidShow, useLaunch } from '@tarojs/taro';
+import { useLaunch } from '@tarojs/taro';
 
 import { PropsWithChildren } from 'react';
 import { Provider } from 'react-redux';
@@ -6,9 +6,8 @@ import { Provider } from 'react-redux';
 import { REFRESH_UNREAD_COUNT_TIME } from '@/constants/message';
 import http from '@/http';
 import store from '@/store';
-import { requestCityOperators } from '@/utils/location';
 import { requestUnreadMessageCount } from '@/utils/message';
-import { decryptOpenGid, getInviteCode, getInviteCodeFromQuery } from '@/utils/partner';
+import { getInviteCode, getInviteCodeFromQuery } from '@/utils/partner';
 import qiniuUpload from '@/utils/qiniu-upload';
 import { requestUserInfo, updateLastLoginTime } from '@/utils/user';
 
@@ -29,33 +28,6 @@ function App({ children }: PropsWithChildren<BL.Anything>) {
     setInterval(() => requestUnreadMessageCount(), REFRESH_UNREAD_COUNT_TIME);
   });
 
-  useDidShow(options => {
-    requestCityOperators();
-
-    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('哈哈哈', info);
-        })
-        .catch(() => {
-          console.log('没有解析到群', options?.scene);
-        });
-    }
-  });
-
   return <Provider store={store}>{children}</Provider>;
 }
 

src/components/agreement-popup/index.less

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

src/components/agreement-popup/index.tsx

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

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, getSalary } from '@/utils/material';
+import { getBasicInfo } from '@/utils/material';
 import { navigateTo } from '@/utils/route';
 import { activeDate } from '@/utils/time';
 
@@ -18,23 +18,30 @@ import './index.less';
 interface IProps {
   data: AnchorInfo;
   jobId?: string;
-  validator: (onSuccess: () => void) => void;
 }
 
 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;
+  const { data, jobId } = props;
   const style = data.isRead ? ({ '--read-color': '#999999' } as React.CSSProperties) : {};
   const cover = (data.materialVideoInfoList.find(video => video.isDefault) || data.materialVideoInfoList[0])?.coverUrl;
 
-  const handleNavTo = useCallback(() => {
+  const handleClick = useCallback(
-    navigateTo(PageUrl.MaterialView, { jobId, resumeId: data.id, source: MaterialViewSource.AnchorList });
+    () => navigateTo(PageUrl.MaterialView, { jobId, resumeId: data.id, source: MaterialViewSource.AnchorList }),
-  }, [data, jobId]);
+    [data, jobId]
-
+  );
-  const handleClick = useCallback(() => {
-    validator(handleNavTo);
-  }, [handleNavTo, validator]);
 
   return (
     <div className={PREFIX} style={style} onClick={handleClick}>

src/components/anchor-list/index.tsx

@@ -7,16 +7,11 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 
 import AnchorCard from '@/components/anchor-card';
 import ListPlaceholder from '@/components/list-placeholder';
-import LoginDialog from '@/components/login-dialog';
 import { EventName } from '@/constants/app';
 import { AnchorSortType } from '@/constants/material';
-import useUserInfo from '@/hooks/use-user-info';
 import { AnchorInfo, GetAnchorListRequest, IAnchorFilters } from '@/types/material';
 import { logWithPrefix } from '@/utils/common';
 import { requestAnchorList as requestData } from '@/utils/material';
-import { getAgreementSigned, isNeedLogin, setAgreementSigned } from '@/utils/user';
-
-import { AgreementPopup } from '../agreement-popup';
 
 import './index.less';
 
@@ -60,11 +55,6 @@ function AnchorList(props: IAnchorListProps) {
   const requestProps = useRef<IRequestProps>({});
   const prevRequestProps = useRef<IRequestProps>({});
   const onListEmptyRef = useRef(onListEmpty);
-  const [openLogin, setLoginOpen] = useState(false);
-  const [openAssignment, setAssignmentOpen] = useState(false);
-  const successCallback = useRef<() => void>(() => {});
-  const userInfo = useUserInfo();
-  const needLogin = isNeedLogin(userInfo);
 
   const handleRefresh = useCallback(async () => {
     log('start pull refresh');
@@ -130,37 +120,6 @@ function AnchorList(props: IAnchorListProps) {
     [dataList]
   );
 
-  const handleCancel = useCallback(() => {
-    setAssignmentOpen(false);
-    setAgreementSigned(false);
-  }, []);
-
-  const handleConfirm = useCallback(() => {
-    setAssignmentOpen(false);
-    setAgreementSigned(true);
-    successCallback.current();
-  }, []);
-
-  const handleLoginSuccess = useCallback(() => {
-    setLoginOpen(false);
-    successCallback.current();
-  }, []);
-
-  const handleLoginCancel = useCallback(() => {
-    setLoginOpen(false);
-  }, []);
-
-  const validator = (onSuccess: () => void) => {
-    successCallback.current = onSuccess;
-    if (!getAgreementSigned()) {
-      setAssignmentOpen(true);
-    } else if (needLogin) {
-      setLoginOpen(true);
-    } else {
-      onSuccess();
-    }
-  };
-
   useEffect(() => {
     onListEmptyRef.current = onListEmpty;
   }, [onListEmpty]);
@@ -224,7 +183,6 @@ function AnchorList(props: IAnchorListProps) {
   }, [jobId, ready, filters, cityCode, sortType]);
 
   return (
-    <>
     <PullRefresh
       className={classNames(`${PREFIX}__pull-refresh`, className)}
       loading={refreshing}
@@ -240,19 +198,11 @@ function AnchorList(props: IAnchorListProps) {
         style={listHeight ? { height: `${listHeight}px` } : undefined}
       >
         {dataList.map(item => (
-            <AnchorCard data={item} jobId={jobId} key={item.id} validator={validator} />
+          <AnchorCard data={item} jobId={jobId} key={item.id} />
         ))}
         <ListPlaceholder hasMore={hasMore} loadingMore={loadingMore} loadMoreError={loadMoreError} />
       </List>
     </PullRefresh>
-      <AgreementPopup
-        open={openAssignment}
-        onCancel={handleCancel}
-        onConfirm={handleConfirm}
-        needBindPhone={needLogin}
-      />
-      {openLogin && <LoginDialog onCancel={handleLoginCancel} onSuccess={handleLoginSuccess} />}
-    </>
   );
 }
 

src/components/anchor-picker/index.tsx

@@ -5,19 +5,34 @@ import { isEqual } from 'lodash-es';
 import { useCallback, useState } from 'react';
 
 import PickerToolbar from '@/components/picker-toolbar';
-import { FULL_PRICE_OPTIONS, PART_PRICE_OPTIONS } from '@/constants/job';
+import {
-import { ALL_ANCHOR_READ_TYPES, ANCHOR_READ_TITLE_MAP, AnchorReadType } from '@/constants/material';
+  EmployType,
+  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: MoreFilter;
+  value: IAnchorFilters;
-  onConfirm: (newValue: MoreFilter) => void;
+  onConfirm: (newValue: IAnchorFilters) => 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) => {
@@ -32,7 +47,9 @@ 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));
@@ -42,7 +59,9 @@ function AnchorPicker(props: IProps) {
   }, []);
 
   const handleClickReset = useCallback(() => {
+    setGender(undefined);
     setReadType(undefined);
+    setEmployType(undefined);
     setFullSalary(null);
     setPartSalary(null);
     setCategory('');
@@ -64,6 +83,10 @@ 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) {
@@ -75,10 +98,34 @@ function AnchorPicker(props: IProps) {
       filters.highPriceForPartyTime = partSalary.maxSalary;
     }
     onConfirm(filters);
-  }, [readType, category, fullSalary, partSalary, onConfirm]);
+  }, [gender, employType, 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/employ-type-select/index.tsx

@@ -1,13 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,85 +0,0 @@
-@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: 72px;
-  }
-
-  &__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

@@ -1,153 +0,0 @@
-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,21 +1,18 @@
 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, type } = props;
+  const { children } = props;
 
   return (
     <React.Fragment>
       {children}
-      <BaseTabBar type={type} />
+      <BaseTabBar />
     </React.Fragment>
   );
 }

src/components/job-card/index.less

@@ -11,16 +11,6 @@
     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,9 +102,8 @@ 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,5 +1,3 @@
-import Taro from '@tarojs/taro';
-
 import { List, PullRefresh } from '@taroify/core';
 import classNames from 'classnames';
 import { isEqual } from 'lodash-es';
@@ -7,7 +5,6 @@ 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';
@@ -38,7 +35,6 @@ function JobList(props: IJobListProps) {
     visible = true,
     cityCode = 'ALL',
     category = JobType.All,
-    sourceType,
     employType = EmployType.All,
     sortType = SortType.RECOMMEND,
     isFollow = false,
@@ -61,23 +57,6 @@ 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 {
@@ -129,20 +108,12 @@ 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,
@@ -157,7 +128,6 @@ function JobList(props: IJobListProps) {
   }, [
     category,
     cityCode,
-    sourceType,
     employType,
     sortType,
     isFollow,
@@ -206,7 +176,7 @@ function JobList(props: IJobListProps) {
       }
     };
     refresh();
-  }, [visible, cityCode, employType, sourceType, sortType, keyWord, minSalary, maxSalary, blGroupId]);
+  }, [visible, cityCode, employType, sortType, keyWord, minSalary, maxSalary, blGroupId]);
 
   // log('render', `hasMore: ${hasMore}, loadingMore: ${loadingMore}, refreshing: ${refreshing}`);
 

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

@@ -1,41 +0,0 @@
-@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

@@ -1,63 +0,0 @@
-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,12 +1,11 @@
-import { Button, ButtonProps, ITouchEvent } from '@tarojs/components';
+import { Button, ButtonProps } from '@tarojs/components';
 
 import classNames from 'classnames';
 import { useCallback, useState } from 'react';
 
-import { AgreementPopup } from '@/components/agreement-popup';
 import LoginDialog from '@/components/login-dialog';
 import useUserInfo from '@/hooks/use-user-info';
-import { getAgreementSigned, isNeedLogin, setAgreementSigned } from '@/utils/user';
+import { isNeedLogin } from '@/utils/user';
 
 import './index.less';
 
@@ -18,7 +17,6 @@ export enum BindPhoneStatus {
 
 export interface ILoginButtonProps extends ButtonProps {
   needPhone?: boolean;
-  needAssignment?: boolean;
 }
 
 const PREFIX = 'login-button';
@@ -26,50 +24,12 @@ const PREFIX = 'login-button';
 function LoginButton(props: ILoginButtonProps) {
   const { className, children, needPhone, onClick, ...otherProps } = props;
   const userInfo = useUserInfo();
-  const [loginVisible, setLoginVisible] = useState(false);
+  const [visible, setVisible] = 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 handleConfirm = useCallback(
+  const onSuccess = useCallback(
-    (e: ITouchEvent) => {
-      setAssignVisible(false);
-      setAgreementSigned(true);
-      if (onClick) {
-        onClick(e);
-      }
-    },
-    [onClick]
-  );
-
-  const handleCancel = useCallback(() => {
-    setAgreementSigned(false);
-    setAssignVisible(false);
-  }, []);
-
-  const handleLoginSuccess = useCallback(
     e => {
-      setLoginVisible(false);
+      setVisible(false);
       onClick?.(e);
     },
     [onClick]
@@ -77,18 +37,14 @@ function LoginButton(props: ILoginButtonProps) {
 
   return (
     <>
-      <Button {...otherProps} className={classNames(PREFIX, className)} onClick={handleClick}>
+      <Button
+        {...otherProps}
+        className={classNames(PREFIX, className)}
+        onClick={needLogin ? () => setVisible(true) : onClick}
+      >
         {children}
       </Button>
-      <AgreementPopup
+      {visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={onSuccess} needPhone={needPhone} />}
-        open={assignVisible}
-        onCancel={handleCancel}
-        onConfirm={handleConfirm}
-        needBindPhone={needLogin}
-      />
-      {loginVisible && (
-        <LoginDialog onCancel={() => setLoginVisible(false)} onSuccess={handleLoginSuccess} needPhone={needPhone} />
-      )}
     </>
   );
 }

src/components/login-dialog/index.less

@@ -17,4 +17,22 @@
     .button(@width: 360px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 44px);
     margin-top: 40px;
   }
+
+  &__cancel-button {
+    min-width: fit-content;
+    font-size: 28px;
+    line-height: 32px;
+    color: @blHighlightColor;
+    background: transparent;
+    border: none;
+    margin-top: 40px;
+
+    &::after {
+      border-color: transparent
+    }
+  }
+
+  &__checkbox {
+    margin-top: 40px;
+  }
 }

src/components/login-dialog/index.tsx

@@ -1,6 +1,11 @@
+import { Button } from '@tarojs/components';
+
 import { Dialog } from '@taroify/core';
+import { useCallback, useState } from 'react';
 
 import PhoneButton, { IPhoneButtonProps } from '@/components/phone-button';
+import { ProtocolPrivacyCheckbox } from '@/components/protocol-privacy';
+import Toast from '@/utils/toast';
 
 import './index.less';
 
@@ -16,12 +21,23 @@ const PREFIX = 'login-dialog';
 
 export default function LoginDialog(props: IProps) {
   const { title = '使用播络服务前，请先登录', needPhone, onSuccess, onCancel, onBindPhone } = props;
+  const [checked, setChecked] = useState(false);
+
+  const handleTipCheck = useCallback(() => {
+    Toast.info('请先阅读并同意协议');
+  }, []);
 
   return (
-    <Dialog open onClose={onCancel} className={PREFIX}>
+    <Dialog open onClose={onCancel}>
       <Dialog.Content>
         <div className={`${PREFIX}__container`}>
           <div className={`${PREFIX}__title`}>{title}</div>
+          {!checked && (
+            <Button className={`${PREFIX}__confirm-button`} onClick={handleTipCheck}>
+              登录
+            </Button>
+          )}
+          {checked && (
             <PhoneButton
               className={`${PREFIX}__confirm-button`}
               onSuccess={onSuccess}
@@ -30,6 +46,11 @@ export default function LoginDialog(props: IProps) {
             >
               登录
             </PhoneButton>
+          )}
+          <Button className={`${PREFIX}__cancel-button`} onClick={onCancel}>
+            跳过，暂不登录
+          </Button>
+          <ProtocolPrivacyCheckbox checked={checked} onChange={setChecked} className={`${PREFIX}__checkbox`} />
         </div>
       </Dialog.Content>
     </Dialog>

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,10 +16,6 @@
       .flex-row();
     }
 
-    &__right {
-      color: @blHighlightColor;
-    }
-
     &__title {
       font-size: 32px;
       line-height: 40px;
@@ -54,7 +50,7 @@
 
   &__body {
     width: 100%;
-    height: 160px;
+    height: 156px;
     margin-top: 24px;
     .flex-column();
     justify-content: center;
@@ -84,44 +80,38 @@
     }
   }
 
-  &__info {
+  &__scroll-view {
-    .flex-row();
+    position: relative;
-    gap: 24px;
-    width: 100%;
-
-    &-left {
-      width: 125px;
-      height: 160px;
-    }
-    &-cover {
     width: 100%;
     height: 100%;
-      border-radius: 12px;
+    .flex-row();
-    }
-    &-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;
 
+    &::-webkit-scrollbar {
+      display: none;
+    }
+
+    &::after {
+      content: '';
+      position: absolute;
+      right: 0;
+      width: 102px;
+      height: 100%;
+      background: linear-gradient(91.41deg, rgba(255, 255, 255, 0) 1.86%, #FFFFFF 99.47%);
     }
   }
+
+  &__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 } from '@tarojs/components';
+import { Image, ScrollView } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
 import { Loading } from '@taroify/core';
@@ -9,12 +9,11 @@ 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 { getBasicInfo, getSalary, requestProfileDetail, sortVideos } from '@/utils/material';
+import { requestProfileDetail, sortVideos } from '@/utils/material';
 import { navigateTo } from '@/utils/route';
 import Toast from '@/utils/toast';
 import { isValidUserInfo } from '@/utils/user';
@@ -35,9 +34,8 @@ 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);
@@ -46,7 +44,7 @@ function MaterialCard(props: IProps) {
 
   const handleGoProfile = useCallback(() => {
     if (!hasMaterial) {
-      realtimeLogger.info('handleGoProfile noMaterial');
+      realtimeLogger.info('handleGoProfile noMaterial')
       return;
     }
     navigateTo(PageUrl.MaterialProfile).catch(err => {
@@ -69,7 +67,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) {
@@ -92,10 +90,8 @@ 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]);
 
@@ -104,11 +100,16 @@ 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>去分享</div>
+            {/* <div className={`${PREFIX}__header__status`}>{profile?.isOpen ? '开放中' : '关闭'}</div> */}
-            <ArrowRight color="#6D3DF5" className={`${PREFIX}__header__icon`} />
+            <ArrowRight className={`${PREFIX}__header__icon`} />
           </div>
         )}
       </div>
@@ -122,21 +123,18 @@ function MaterialCard(props: IProps) {
           </div>
         )}
         {!loading && hasMaterial && (
-          <div className={`${PREFIX}__info`}>
+          <ScrollView className={`${PREFIX}__scroll-view`} showScrollbar={false} enableFlex enhanced scrollX>
-            {firstCover && (
+            <div className={`${PREFIX}__cover-list`}>
-              <div className={`${PREFIX}__info-left`}>
+              {sortVideos(profile?.materialVideoInfoList || []).map(video => (
-                <Image className={`${PREFIX}__info-cover`} mode="aspectFill" src={firstCover.coverUrl} />
+                <Image
-              </div>
+                  className={`${PREFIX}__cover-image`}
-            )}
+                  mode="aspectFit"
-            <div className={`${PREFIX}__info-right`}>
+                  key={video.coverUrl}
-              <div className="name">{profile?.name}</div>
+                  src={video.coverUrl}
-              <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>
             </div>
+          </ScrollView>
         )}
         {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 { 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,13 +19,12 @@ 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, resumeId } = props;
+  const { id, message, isRead: isReadProps, children } = props;
   const { userId } = useUserInfo();
   const [isRead, setIsRead] = useState(message.isRead);
   const isSender = message.senderUserId === userId;
@@ -38,12 +37,10 @@ function BaseMessage(props: IUserMessageProps) {
   //   const timer = setTimeout(() => setIsRead(true), 1200);
   //   return () => clearTimeout(timer);
   // }, [isSender]);
-  const handleClick = useCallback(() => {
+  const handleClick = useCallback(
-    if (!resumeId || isSender) {
+    () => navigateTo(PageUrl.MaterialView, { resumeId: message.jobId, source: MaterialViewSource.Chat }),
-      return;
+    [message.jobId]
-    }
+  );
-    navigateTo(PageUrl.MaterialView, { resumeId: resumeId, source: MaterialViewSource.Chat });
-  }, [resumeId, isSender]);
   useEffect(() => {
     if (isRead) {
       return;
@@ -56,7 +53,6 @@ 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,8 +80,4 @@
       margin-top: 24px;
     }
   }
-
-  &__no-subscription {
-
-  }
 }

src/components/message-dialog/index.tsx

@@ -57,9 +57,7 @@ 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`}>
+        <div className={`${NO_TIMES}__tips`}>有通知次数才能<span className="highlight">及时收到</span>招聘邀请，快点击“点我增加”吧～</div>
-          有通知次数才能<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({ isBoss = false }) {
+export default function PartnerBanner() {
   const userInfo = useUserInfo();
   const needPhone = isNeedPhone(userInfo);
   const isPartner = userInfo.isPartner;
@@ -50,11 +50,7 @@ export default function PartnerBanner({ isBoss = false }) {
       <div className={PREFIX} onClick={handleClick}>
         <Image
           className={`${PREFIX}__image`}
-          src={
+          src="https://publiccdn.neighbourhood.com.cn/img/partner_banner.png"
-            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,53 +2,26 @@
 @import '@/styles/common.less';
 
 .partner-intro {
-  background: #eae5fb;
+  padding-top: 112px;
-  padding-top: 271px;
+  padding-bottom: calc(112px + constant(safe-area-inset-bottom));
-  position: relative;
+  padding-bottom: calc(112px + env(safe-area-inset-bottom));
-  padding-bottom: calc(142px + constant(safe-area-inset-bottom));
-  padding-bottom: calc(142px + env(safe-area-inset-bottom));
 
-  &__bg {
+  &__banner {
-    width: 100%;
+    background: fade(@blHighlightBg, 8);
-    height: 705px;
+    height: 88px;
-    position: absolute;
+    line-height: 88px;
-    top: 0;
+    text-align: center;
+    font-size: 28px;
+    position: fixed;
+    top: 98px;
     left: 0;
-  }
+    right: 0;
-  &__slogan {
+    width: 100vw;
-    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 {
@@ -61,73 +34,14 @@
   }
 
   &__block {
-    margin-bottom: 12px;
+    margin-bottom: 40px;
-    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;
-    &-time {
-      font-style: normal;
-      font-size: 28px;
-      line-height: 40px;
-      color: #333333;
-      font-weight: 400;
-      position: relative;
-    }
-    &-details {
-      margin-top: 5px;
-      white-space: nowrap;
-    }
-    &-id {
-      font-size: 24px;
-      line-height: 36px;
-      color: #999999;
-      padding-right: 22px;
-      display: inline-block;
-    }
-    &-info {
-      font-size: 28px;
-      line-height: 40px;
-      color: #333333;
-      margin-right: 16px;
-      display: inline-block;
-      &:last-child {
-        margin-right: 0;
-      }
-
-      .money {
-        color: #ff5051;
-        display: inline-block;
-        padding-left: 8px;
-      }
-    }
-  }
 
   &__card {
     background: #fff;
     border-radius: 24px;
-    padding: 68px 32px 44px;
+    padding: 24px 32px;
   }
 
   &__h1 {
@@ -137,81 +51,33 @@
     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-left: 48px;
+    margin-bottom: 24px;
-    margin-right: 48px;
     font-weight: 500;
     font-size: 32px;
-    line-height: 80px;
+    line-height: 32px;
-    height: 80px;
-    transform: translateY(50%);
-    background: #ffd236;
-    box-shadow: 0px 12px 0px #ffa35d;
-    border-radius: 60px;
-    color: #1d2129;
-    text-align: center;
-    position: relative;
-  }
 
-  &__recommend {
+    color: #1d2129;
-    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-top: 75px;
+    padding: 32px;
     .flex-column();
 
     .partner-intro__body {
@@ -234,7 +100,6 @@
   &__footer {
     position: fixed;
     bottom: 0;
-    z-index: 2;
     width: 100vw;
     background: #ffffff;
     padding: 12px 32px;
@@ -247,20 +112,17 @@
     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,166 +1,172 @@
-import { Button, Canvas, Image } from '@tarojs/components';
+import { Button, Canvas } from '@tarojs/components';
+import Taro from '@tarojs/taro';
 
-import { Swiper } from '@taroify/core';
+import { useCallback, useState } from 'react';
-import { GoodJob } from '@taroify/icons';
-import { useCallback, useEffect, useRef, useState } from 'react';
 
-import { PageUrl } from '@/constants/app';
-import { EarnType, UserProfitListItem } from '@/types/partner';
 import { openCustomerServiceChat } from '@/utils/common';
-import { formatMoney, formatTimestamp, formatUserId, getLastProfitList } from '@/utils/partner';
+import { getPartnerQrcode } from '@/utils/partner';
-import { navigateTo } from '@/utils/route';
-
 import './index.less';
 
 const PREFIX = 'partner-intro';
 
 export default function PartnerIntro() {
-  const handleConfirm = useCallback(() => {
+  const [posterPath, setPosterPath] = useState('');
-    navigateTo(PageUrl.GroupOwnerCertificate);
+  const getQrcode = async () => {
-  }, []);
+    try {
+      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 handleJump = useCallback(() => {
-    navigateTo(PageUrl.PartnerShareVip);
-  }, []);
-
-  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]);
   return (
     <div className={PREFIX}>
-      <Image
+      <div className={`${PREFIX}__banner`}>
-        src="https://publiccdn.neighbourhood.com.cn/img/partner-intro-bg.png"
+        邀请朋友加入播络，高达<span className={`${PREFIX}__highlight`}>75%</span>分成
-        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-time`}>{formatTimestamp(item.updatedAt)}</div>
-                <div className={`${PREFIX}__swiper-item-details`}>
-                  <div className={`${PREFIX}__swiper-item-id`}>{formatUserId(item.userId)}</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, 1)}</div>
-                  </div>
-                  <div className={`${PREFIX}__swiper-item-info`}>
-                    累计<div className="money">{formatMoney(item.total, 1)}</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 className={`${PREFIX}__body`}>分享小程序任意页面到群、朋友圈、好友即可</div>
-              <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 no-dot`}>加入播络合伙人交流群，分享经验</div>
+            <div className={`${PREFIX}__h1`}>加入播络合伙人交流群</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}__share-button`} onClick={handleJump}>
+        <Button className={`${PREFIX}__download-button`} onClick={savePoster}>
-          赠送会员给好友
+          下载海报
+        </Button>
+        <Button className={`${PREFIX}__share-button`} openType="share">
+          分享邀请
         </Button>
       </div>
     </div>

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

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

src/components/partner-kanban/index.less

@@ -8,51 +8,7 @@
   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 {
@@ -72,7 +28,20 @@
     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,16 +1,14 @@
 import { Button, Image } from '@tarojs/components';
-import Taro, { useDidShow } from '@tarojs/taro';
 
 import { Dialog } from '@taroify/core';
 import { Question } from '@taroify/icons';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useState, useEffect } from 'react';
 
 import { PageUrl } from '@/constants/app';
 import { PartnerProfitsState } from '@/types/partner';
-import { formatMoney, getPartnerProfitStat, withdrawMoney } from '@/utils/partner';
+import { formatMoney, getPartnerProfitStat } from '@/utils/partner';
 import { navigateTo } from '@/utils/route';
 import Toast from '@/utils/toast';
-
 import './index.less';
 
 const PREFIX = 'partner-kanban';
@@ -33,48 +31,17 @@ function TipDialog(props: { open: boolean; onClose: () => void }) {
 }
 
 function WithdrawDialog(props: { open: boolean; onClose: () => void; count: number }) {
-  const handleWithdraw = useCallback(async () => {
+  const handleWithdraw = useCallback(() => {}, []);
-    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`}>单日提现最大200元</div>
+          <div className={`${PREFIX}-withdraw-dialog__hint`}>单笔最大500元</div>
           <Button className={`${PREFIX}-withdraw-dialog__confirm-button`} onClick={handleWithdraw}>
             提现
           </Button>
@@ -119,62 +86,41 @@ 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`}>
+    <div className={`${PREFIX} ${simple ? `${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}>
       <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>
@@ -196,6 +142,7 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
             <div className={`${PREFIX}__money`}>{formatMoney(stats.availableProfit)}</div>
           </div>
         </div>
+        {!simple && (
           <div className={`${PREFIX}__buttons`}>
             <Button className={`${PREFIX}__withdraw`} onClick={handleViewWithdraw}>
               提现
@@ -204,13 +151,10 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
               提现记录
             </Button>
           </div>
+        )}
       </div>
-      <TipDialog open={tipOpen} onClose={handleTipClose} />
+      {!simple && <TipDialog open={tipOpen} onClose={handleTipClose} />}
-      <WithdrawDialog
+      {!simple && <WithdrawDialog count={350} open={withdrawOpen} onClose={handleWithdrawClose} />}
-        count={Math.min(Number(formatMoney(stats.availableBalance)), 200)}
-        open={withdrawOpen}
-        onClose={handleWithdrawClose}
-      />
     </div>
   );
 }

src/components/partner-profit/ProfitList.tsx

@@ -96,8 +96,7 @@ function ProfitList(props: IPartnerProfitListProps) {
           style={listHeight ? { height: `${listHeight}px` } : undefined}
         >
           {dataList.map(item => {
-            const isChat =
+            const isChat = type === ProfitType.CHAT_SHARE || item.earnType.toString().toLowerCase().indexOf('chat') > -1;
-              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,12 +78,9 @@
     &:last-child {
       padding-right: 0;
     }
-    &.time {
+    &.time,
-      flex: 2;
-    }
     &.project {
-      width: 150px;
+      flex: 2;
-      flex-shrink: 0;
     }
     &.status {
       width: 96px;

src/components/phone-button/index.tsx

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

src/components/prejob-popup/index.less

@@ -1,82 +0,0 @@
-@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

@@ -1,89 +0,0 @@
-import { Button, Image } from '@tarojs/components';
-
-import { Popup, Dialog } 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 { GET_CONTACT_TYPE } from '@/constants/job';
-import { navigateTo } from '@/utils/route';
-
-import './index.less';
-
-interface IProps {
-  onCancel: () => void;
-  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: '开通会员每天可查看10个',
-    btnText: '开通',
-  },
-];
-
-export function PrejobPopup({ onCancel, onConfirm }: IProps) {
-  const [openPopup, setOpenPopup] = useState(true);
-  const [openDialog, setOpenDialog] = useState(false);
-  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);
-    }
-  };
-  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 => {
-              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} buyOnly />
-        </Dialog.Content>
-      </Dialog>
-    </Fragment>
-  );
-}

src/components/product-dialog/const.ts

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

src/components/product-dialog/index.less

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

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,8 +99,12 @@ export function CompanyPublishJobDialog(props: IProps) {
 
   const handleNext = useCallback(async () => {
     onClose(true);
+    if (userInfo.bossAuthStatus) {
       navigateTo(PageUrl.JobPublish);
-  }, [onClose]);
+    } else {
+      navigateTo(PageUrl.CertificationStart);
+    }
+  }, [userInfo, onClose]);
 
   useEffect(() => {
     initRef.current = async () => {
@@ -111,7 +115,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

@@ -26,51 +26,53 @@ interface Item {
   title: string;
   price: string;
   amt: number;
-  contents: { content: string; highlight?: boolean; inlineHighlight?: string }[];
+  contents: { content: string; highlight?: boolean }[];
   badge?: string;
 }
 
 const LIST: Item[] = [
-  // {
-  //   id: ProductSpecId.BOSS_VIP_NEW_1,
-  //   title: '展示一周',
-  //   price: '480播豆',
-  //   amt: 48,
-  //   badge: '限时体验',
-  //   contents: [
-  //     { content: '-通告每日优先展示' },
-  //     { content: '-每天可查看20个主播详情' },
-  //     { content: '-每天可主动联系10个主播' },
-  //     // { content: '-播络可代为联系20个主播（高成功率）', highlight: true },
-  //     { content: '-有效期一周' },
-  //   ],
-  // },
   {
-    id: ProductSpecId.BOSS_VIP_NEW_2,
+    id: ProductSpecId.BOSS_VIP_NEW_1,
-    title: '推荐一月',
+    title: '展示一周',
-    price: '680播豆',
+    price: '480播豆',
-    amt: 68,
+    amt: 48,
     badge: '限时体验',
     contents: [
-      { content: '-通告每日优先展示', highlight: true },
+      { content: '-1个通告' },
-      { content: '-每天可查看20个主播详情，', inlineHighlight: '可主动联系10个' },
+      { content: '-每天可查看20个主播详情' },
+      { content: '-每天可自主联系10个主播' },
+      // { content: '-播络可代为联系20个主播（高成功率）', highlight: true },
+      { content: '-有效期一周' },
+    ],
+  },
+  {
+    id: ProductSpecId.BOSS_VIP_NEW_2,
+    title: '展示一月',
+    price: '960播豆',
+    amt: 96,
+    badge: '五折',
+    contents: [
+      { content: '-1个通告' },
+      { content: '-每天可查看20个主播详情' },
+      { content: '-每天可自主联系10个主播' },
       // { content: '-播络可代为联系20个主播（高成功率）', highlight: true },
       { content: '-有效期一个月' },
     ],
   },
-  {
+  // {
-    id: ProductSpecId.BOSS_VIP_NEW_3,
+  //   id: ProductSpecId.BOSS_VIP_NEW_3,
-    title: '推荐一季',
+  //   title: '季会员',
-    price: '1360播豆',
+  //   price: '2680播豆',
-    amt: 136,
+  //   amt: 268,
-    badge: '6.7折',
+  //   badge: '7折',
-    contents: [
+  //   contents: [
-      { content: '-通告每日优先展示', highlight: true },
+  //     { content: '-1个通告' },
-      { content: '-每天可查看20个主播详情', inlineHighlight: '可主动联系10个' },
+  //     { content: '-每天可查看20个主播详情' },
+  //     { content: '-每天可自主联系10个主播' },
   //     { content: '-播络可代为联系60个主播（高成功率）', highlight: true },
-      { content: '-有效期一个季度' },
+  //     { content: '-有效期3个月' },
-    ],
+  //   ],
-  },
+  // },
 ];
 
 const subscribe = async () => {
@@ -159,7 +161,6 @@ export default function CompanyPublishJobBuy(props: IProps) {
             key={i.content}
           >
             {i.content}
-            {i.inlineHighlight && <div className="highlight-span">{i.inlineHighlight}</div>}
           </div>
         ))}
       </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

@@ -16,7 +16,6 @@ import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
 import Toast from '@/utils/toast';
 
 interface IProps {
-  buyOnly?: boolean;
   onConfirm: () => void;
 }
 
@@ -24,7 +23,6 @@ interface Item {
   id: ProductSpecId;
   title: string;
   content: string;
-  buyOnlyContent?: string;
   price: string;
   amt: number;
   badge?: string;
@@ -33,19 +31,17 @@ interface Item {
 const LIST: Item[] = [
   { id: ProductSpecId.WeeklyVIP, title: '非会员', content: '每日2次', price: '免费', amt: 0 },
   {
-    id: ProductSpecId.DailyVIP,
+    id: ProductSpecId.WeeklyVIP,
-    title: '日会员',
+    title: '周会员',
-    content: '每日+10次',
+    content: '每日5次',
-    buyOnlyContent: '每日12次',
     price: '60播豆',
     amt: 6,
     badge: '限时体验',
   },
   {
-    id: ProductSpecId.WeeklyVIP,
+    id: ProductSpecId.NewMonthlyVIP,
-    title: '周会员',
+    title: '月会员',
-    content: '每日+10次',
+    content: '每日5次',
-    buyOnlyContent: '每日12次',
     price: '180播豆',
     amt: 18,
     badge: ' 超值',
@@ -66,7 +62,7 @@ const subscribe = async () => {
 };
 
 export default function JobBuy(props: IProps) {
-  const { onConfirm, buyOnly } = props;
+  const { onConfirm } = props;
   const [selectItem, setSelectItem] = useState(LIST[1]);
 
   const handleClickItem = useCallback((newSelectItem: Item) => setSelectItem(newSelectItem), []);
@@ -110,30 +106,18 @@ export default function JobBuy(props: IProps) {
 
   return (
     <div className={`${PREFIX}__job-buy`}>
-      {buyOnly ? (
-        <div className={`${PREFIX}__job-buy__header`}>开通播络会员即可直接查看联系方式</div>
-      ) : (
       <div className={`${PREFIX}__job-buy__header`}>
         <div>今日通告对接次数</div>
         <div className="highlight">已用完</div>
       </div>
-      )}
-      {buyOnly ? (
-        <div className={`${PREFIX}__job-buy__describe`}>每天可获取12个联系方式</div>
-      ) : (
       <div className={`${PREFIX}__job-buy__describe`}>
         <div>请</div>
         <div className="highlight">明日</div>
         <div>再来 或 </div>
         <div className="highlight">升级会员</div>
       </div>
-      )}
       <div className={`${PREFIX}__job-buy__container`}>
-        {LIST.map(item => {
+        {LIST.map(item => (
-          if (buyOnly && !item.amt) {
-            return null;
-          }
-          return (
           <div
             key={item.price}
             className={classNames(`${PREFIX}__job-buy__item`, {
@@ -142,18 +126,12 @@ export default function JobBuy(props: IProps) {
             })}
             onClick={item.amt === 0 ? undefined : () => handleClickItem(item)}
           >
-              <div className={classNames(`${PREFIX}__job-buy__item__title`, { free: item.amt === 0 })}>
+            <div className={classNames(`${PREFIX}__job-buy__item__title`, { free: item.amt === 0 })}>{item.title}</div>
-                {item.title}
+            <div className={`${PREFIX}__job-buy__item__content`}>{item.content}</div>
-              </div>
-              <div className={`${PREFIX}__job-buy__item__content`}>{buyOnly ? item.buyOnlyContent : 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__hint`}>
-        注：日会员有效期为 <div className="highlight">支付后24小时</div>
       </div>
       <Button className={`${PREFIX}__job-buy__button`} onClick={handleBuy}>
         {`支付 ${selectItem.amt} 元`}

src/components/search-city/index.tsx

@@ -2,10 +2,9 @@ import { BaseEventOrig, InputProps, ScrollView } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
 import { Search } from '@taroify/core';
-import { Fragment, useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
-import { CITY_CODE_TO_NAME_MAP, CITY_INDEXES_LIST } from '@/constants/city';
+import { CITY_CODE_TO_NAME_MAP, CITY_INDEXES_LIST, GROUP_CITY_INDEXES_LIST } from '@/constants/city';
-import useCityOperators from '@/hooks/use-city-operators';
 import { logWithPrefix } from '@/utils/common';
 
 import './index.less';
@@ -69,19 +68,8 @@ 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
+  const CITY_LIST = forGroup ? GROUP_CITY_INDEXES_LIST : CITY_INDEXES_LIST;
-    ? 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;
@@ -185,12 +173,9 @@ export default function SearchCity({
           <div>
             <div className={`${PREFIX}__position-title`}>当前城市</div>
             <div className={`${PREFIX}__position-city`}>{CITY_CODE_TO_NAME_MAP.get(currentCity)}</div>
-            {!!HOT_CITY_LIST.length && (
-              <Fragment>
             <div className={`${PREFIX}__hot-city-title`}>热门城市</div>
             <div className={`${PREFIX}__hot-city-container`}>
-                  {HOT_CITY_LIST.map(city => {
+              {HOT_CITY.map(city => (
-                    return (
                 <div
                   key={city.cityCode}
                   className={`${PREFIX}__hot-city-item`}
@@ -199,11 +184,8 @@ export default function SearchCity({
                 >
                   {city.cityName}
                 </div>
-                    );
+              ))}
-                  })}
             </div>
-              </Fragment>
-            )}
             <div className={`${PREFIX}__indexes-list`}>
               {CITY_LIST.map(item => {
                 return (

src/components/select/index.less

@@ -28,7 +28,6 @@
     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,11 +1,14 @@
 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';
 
@@ -13,7 +16,6 @@ import './index.less';
 
 interface IProps {
   className?: string;
-  type: PageType;
 }
 
 const PREFIX = 'base-tab-bar';
@@ -38,21 +40,25 @@ const TabItem = (props: { item: TabItemType }) => {
   );
 };
 
-function BaseTabBar({ className, type }: IProps) {
+function BaseTabBar(props: 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 === type) {
+      if (value === currentPage) {
         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, type]
+    [tabs, currentPage, dispatch]
   );
 
   // useEffect(() => {
@@ -66,14 +72,14 @@ function BaseTabBar({ className, type }: IProps) {
 
   return (
     <div className={classNames(`${PREFIX}__wrapper`, className)} id={APP_TAB_BAR_ID}>
-      <Tabbar className={PREFIX} value={type}>
+      <Tabbar className={PREFIX} defaultValue={currentPage}>
         {tabs.map((item: TabItemType) => {
           return (
             <Tabbar.TabItem
               key={item.pagePath}
               value={item.type}
               onClick={() => handleTabClick(item.type)}
-              className={classNames(`${PREFIX}__item`, { selected: item.type === type })}
+              className={classNames(`${PREFIX}__item`, { selected: item.type === currentPage })}
             >
               <TabItem item={item} />
             </Tabbar.TabItem>

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

@@ -1,13 +0,0 @@
-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.tsx

@@ -1,4 +1,4 @@
-import { Button, Text } from '@tarojs/components';
+import { Button, Image, Text } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
 import { Cell } from '@taroify/core';
@@ -35,36 +35,29 @@ interface CityOption extends ISelectOption<CityValue> {
 
 const PREFIX = 'user-batch-publish';
 const log = logWithPrefix(PREFIX);
-const SERVICE_ILLUSTRATE = `服务方式：帮您把招聘需求发到众多同城合作主播群
+const SERVICE_ILLUSTRATE = `群发次数：每日一次，连发3天
-群发次数：杭州、广州发3次，其他城市1次
+群发内容：仅限主播招聘通告，违规内容不发
-内容要求：仅限带货主播招聘需求，其他不发
+联系方法：通告中留通告主联系方式，主播直接联系`;
-主播联系：内容中留招聘方联系方式，主播直接联系`;
 const cityValues: CityValue[] = [
-  { cityCode: '440100', cityName: '广州', count: 800 },
+  { cityCode: '440100', cityName: '广州', count: 300 },
   { cityCode: '440300', cityName: '深圳', count: 100 },
-  { cityCode: '330100', cityName: '杭州', count: 750 },
+  { cityCode: '330100', cityName: '杭州', count: 300 },
-  { cityCode: '110100', cityName: '北京', count: 150 },
+  { cityCode: '110100', cityName: '北京', count: 100 },
-  { cityCode: '510100', cityName: '成都', count: 100 },
+  { cityCode: '510100', cityName: '成都', count: 50 },
-  { cityCode: '500100', cityName: '重庆', count: 50 },
   { cityCode: '430100', cityName: '长沙', count: 50 },
   { cityCode: '350200', cityName: '厦门', count: 50 },
-  { cityCode: '310100', cityName: '上海', count: 150 },
+  { cityCode: '310100', cityName: '上海', count: 100 },
-  { cityCode: '420100', cityName: '武汉', count: 80 },
+  { cityCode: '420100', cityName: '武汉', count: 50 },
-  { cityCode: '610100', cityName: '西安', count: 60 },
+  { cityCode: '610100', cityName: '西安', count: 50 },
-  { cityCode: '410100', cityName: '郑州', count: 150 },
+  { cityCode: '410100', cityName: '郑州', count: 100 },
 ].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: 168 },
+  { value: 500, productSpecId: ProductSpecId.GroupBatchPublish500, label: '500', price: 188 },
-  { 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 },
 ];
 
@@ -146,7 +139,7 @@ export default function UserBatchPublish() {
   useEffect(() => {
     try {
       const cOptions: CityOption[] = cityValues.map(value => ({ value, label: value.cityName }));
-      const initCity = (cOptions.find(o => o.label === '重庆') || cOptions[0]).value;
+      const initCity = cOptions[0].value;
 
       setLoading(false);
       setCity(initCity);
@@ -163,7 +156,7 @@ 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>

src/constants/app.ts

@@ -24,7 +24,6 @@ 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 {
@@ -35,7 +34,6 @@ export enum OpenSource {
   UserPage = 'user_page',
   AnchorPage = 'anchor_page',
   MaterialViewPage = 'material_view_page',
-  GroupOwnerCertificate = 'group_owner_certificate',
 }
 
 export enum PageUrl {
@@ -76,10 +74,6 @@ 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,7 +10,4 @@ export enum CacheKey {
   LAST_SELECT_MY_JOB = '__last_select_my_job__',
   CLOSE_PARTNER_BANNER = '__close_partner_banner__',
   INVITE_CODE = '__invite_code__',
-  AGREEMENT_SIGNED = '__agreement_signed__',
-  CITY_CODES = '__city_codes__',
-  JOIN_GROUP_CARD_CLICKED = '__join_group_card_clicked__',
 }

src/constants/city.ts

@@ -5861,16 +5861,6 @@ export const CITY_INDEXES_LIST = [
 ];
 
 export const GROUP_CITY_INDEXES_LIST = [
-  {
-    letter: 'B',
-    data: [
-      {
-        cityCode: '110100',
-        cityName: '北京',
-        keyword: 'BEIJING北京',
-      },
-    ],
-  },
   {
     letter: 'C',
     data: [
@@ -5884,11 +5874,6 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '成都',
         keyword: 'CHENGDOU成都',
       },
-      {
-        cityCode: '430100',
-        cityName: '长沙',
-        keyword: 'CHANGSHA长沙',
-      },
     ],
   },
   {
@@ -5929,16 +5914,6 @@ export const GROUP_CITY_INDEXES_LIST = [
   {
     letter: 'H',
     data: [
-      {
-        cityCode: '330100',
-        cityName: '杭州',
-        keyword: 'HANGZHOU杭州',
-      },
-      {
-        cityCode: '230100',
-        cityName: '哈尔滨',
-        keyword: 'HAERBIN哈尔滨',
-      },
       {
         cityCode: '340100',
         cityName: '合肥',
@@ -5946,26 +5921,6 @@ 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: [
@@ -5984,11 +5939,6 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '青岛',
         keyword: 'QINGDAO青岛',
       },
-      {
-        cityCode: '350500',
-        cityName: '泉州',
-        keyword: 'QUANZHOU泉州',
-      },
     ],
   },
   {
@@ -5999,26 +5949,21 @@ 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温州',
+      },
     ],
   },
   {
@@ -6029,21 +5974,11 @@ 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: '武汉',
@@ -6059,11 +5994,6 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '西安',
         keyword: 'XIAN西安',
       },
-      {
-        cityCode: '350200',
-        cityName: '厦门',
-        keyword: 'XIAMEN厦门',
-      },
     ],
   },
   {
@@ -6074,11 +6004,6 @@ export const GROUP_CITY_INDEXES_LIST = [
         cityName: '郑州',
         keyword: 'ZHENGZHOU郑州',
       },
-      {
-        cityCode: '430200',
-        cityName: '株洲',
-        keyword: 'ZHUZHOU株洲',
-      },
     ],
   },
 ];

src/constants/group.ts

@@ -56,11 +56,5 @@ 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,7 +7,6 @@ export enum JobType {
   Jewelry = 'JEWELRY', // 珠宝
   Appliance = 'APPLIANCE', // 家电
   Furniture = 'FURNITURE', // 日用家具
-  OutdoorSports = 'OUTDOOR_SPORTS',
   PetFamily = 'PET_FAMILY', // 母婴宠物
   Luxury = 'LUXURY', // 奢品
   LocalLive = 'LOCAL_LIVE', // 本地生活
@@ -22,12 +21,6 @@ export enum EmployType {
   Part = 'PARTY_TIME',
 }
 
-export enum JobSourceType {
-  All = 'All',
-  VX = 'vx',
-  BL = 'bl',
-}
-
 export enum SortType {
   RECOMMEND = 'RECOMMEND',
   DISTANCE = 'DISTANCE',
@@ -73,12 +66,6 @@ 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]: '服饰',
@@ -88,7 +75,6 @@ export const JOB_TYPE_TITLE_MAP: { [key in JobType]: string } = {
   [JobType.Jewelry]: '珠宝',
   [JobType.Appliance]: '家电',
   [JobType.Furniture]: '日用家具',
-  [JobType.OutdoorSports]: '户外运动',
   [JobType.PetFamily]: '母婴宠物',
   [JobType.Luxury]: '奢品',
   [JobType.LocalLive]: '本地生活',
@@ -115,31 +101,16 @@ export const JOB_MANAGE_STATUS_TITLE_MAP = {
 
 export const JOB_PAGE_TABS = [
   {
-    type: JobSourceType.All,
+    type: EmployType.All,
-    title: JOB_SOURCE_TYPE_TITLE_MAP[JobSourceType.All],
+    title: EMPLOY_TYPE_TITLE_MAP[EmployType.All],
   },
   {
-    type: JobSourceType.BL,
+    type: EmployType.Part,
-    title: JOB_SOURCE_TYPE_TITLE_MAP[JobSourceType.BL],
+    title: EMPLOY_TYPE_TITLE_MAP[EmployType.Part],
-  },
-  // {
-  //   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],
   },
   {
-    value: EmployType.Part,
+    type: EmployType.Full,
-    label: EMPLOY_TYPE_TITLE_MAP[EmployType.Part],
+    title: EMPLOY_TYPE_TITLE_MAP[EmployType.Full],
-  },
-  {
-    value: EmployType.Full,
-    label: EMPLOY_TYPE_TITLE_MAP[EmployType.Full],
   },
 ];
 
@@ -175,7 +146,6 @@ 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 },
@@ -184,11 +154,6 @@ 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: '不限' },
@@ -209,8 +174,3 @@ 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',
-}

src/constants/material.ts

@@ -84,25 +84,14 @@ 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 = {

src/constants/partner.ts

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

src/constants/product.ts

@@ -27,20 +27,14 @@ 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/fragments/job/base/index.less

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

src/fragments/job/base/index.tsx

@@ -2,11 +2,10 @@ import { Image } from '@tarojs/components';
 import { NodesRef, useDidHide } from '@tarojs/taro';
 
 import { Tabs } from '@taroify/core';
-import { ArrowDown, ArrowUp } from '@taroify/icons';
+import { ArrowUp, ArrowDown } 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';
@@ -14,16 +13,7 @@ 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 {
+import { JOB_TABS, JobType, EmployType, ALL_SORT_TYPES, SORT_TYPE_TITLE_MAP, SortType } from '@/constants/job';
-  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';
@@ -34,11 +24,9 @@ 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;
 }
 
@@ -86,35 +74,20 @@ function ListWrapper(props: IJobListProps) {
 }
 
 function JobFragment(props: IProps) {
-  const {
+  const { cityCode, employType, sortType = SortType.RECOMMEND, coordinate, onClickCity, onClickSort } = props;
-    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(s => !s);
+    setShowSalarySelect(!showSalarySelect);
-  }, []);
+  }, [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);
@@ -122,15 +95,6 @@ function JobFragment(props: IProps) {
     setShowSalarySelect(false);
   }, []);
 
-  const handleSelectEmployType = useCallback(
-    (value?: EmployType) => {
-      console.log('哈哈哈', value);
-      setShowEmployTypeSelect(false);
-      onClickEmployType(value!);
-    },
-    [onClickEmployType]
-  );
-
   const onTypeChange = useCallback(
     value => {
       log('onTypeChange', value);
@@ -145,12 +109,6 @@ 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 />
@@ -181,7 +139,6 @@ function JobFragment(props: IProps) {
               sortType={sortType}
               latitude={latitude}
               longitude={longitude}
-              sourceType={sourceType}
               employType={employType}
               minSalary={salaryRange?.minSalary}
               maxSalary={salaryRange?.maxSalary}
@@ -200,15 +157,6 @@ 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/intention/index.tsx

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

src/fragments/profile/view/index.less

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

src/fragments/profile/view/index.tsx

@@ -17,7 +17,6 @@ import { navigateTo } from '@/utils/route';
 
 import './index.less';
 import onChangeEventDetail = SwiperProps.onChangeEventDetail;
-import { JoinGroupHint } from '@/components/join-group-hint';
 
 interface IProps {
   editable: boolean;
@@ -30,7 +29,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);
@@ -208,7 +207,6 @@ 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`}>
@@ -230,9 +228,7 @@ 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}>
+                <DevDiv className={`${PREFIX}__info-group__header__title`} OnDev={onDev}>{data.title}</DevDiv>
-                  {data.title}
-                </DevDiv>
               )}
               {editable && (
                 <div className={`${PREFIX}__info-group__header__edit`} onClick={() => handleEditGroupItem(data.type)}>

src/fragments/user/company/index.less

@@ -13,21 +13,6 @@
     .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 {
@@ -39,6 +24,4 @@
       color: @blHighlightColor;
     }
   }
-
-
 }

src/fragments/user/company/index.tsx

@@ -1,5 +1,3 @@
-import { Image } from '@tarojs/components';
-
 import { Cell } from '@taroify/core';
 import classNames from 'classnames';
 import { useCallback } from 'react';
@@ -7,6 +5,7 @@ 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';
 
@@ -19,6 +18,10 @@ 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]);
 
@@ -29,14 +32,7 @@ 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

@@ -1,10 +0,0 @@
-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

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

src/hooks/use-config.tsx

@@ -97,10 +97,6 @@ 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

@@ -1,13 +0,0 @@
-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/user-role-type.tsx

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

src/http/api.ts

@@ -1,6 +1,5 @@
-// export const DOMAIN = 'http://192.168.60.116:8082';
+// export const DOMAIN = 'http://192.168.60.148:8082';
-export const DOMAIN = process.env.BRAND === 'dev' ? 'https://dev.neighbourhood.cn' : 'https://neighbourhood.cn';
+export const DOMAIN = 'https://neighbourhood.cn';
-// export const DOMAIN = 'https://dev.neighbourhood.cn';
 export const BASE_URL = `${DOMAIN}/api`;
 
 export enum API {
@@ -79,21 +78,8 @@ export enum API {
   // partner
   PARTNER_QRCODE = '/user/getInviteQrCode',
   GET_INVITE_CODE = '/user/getUserInviteCode',
-  GET_INVITE_LIST = '/user/inviteUsers/list',
+  GET_INVITE_LIST = '/user/inviteUsers',
   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_OPERATOR = '/group/getAllGroup',
 }

src/http/constant.ts

@@ -26,7 +26,6 @@ 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,11 +52,7 @@
     font-size: 28px;
     line-height: 32px;
     color: @blColor;
-    gap: 20px;
 
-    &-item {
-      display: flex;
-    }
     .title {
       margin-right: 5px;
     }
@@ -65,17 +61,11 @@
     padding: 0 24px;
   }
   &__overlay-outer {
-    top: 72px;
+    top: 82px;
   }
 
   &__overlay-inner {
     width: 100%;
-    max-height: 100%;
-    overflow: hidden;
-    .bl-select__items-container {
-      max-height: calc(100vh - 610rpx);
-      overflow-y: auto;
-    }
   }
 
   &__tips-container {
@@ -100,23 +90,4 @@
     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,50 +1,36 @@
-import { Button, Image } from '@tarojs/components';
+import { Image } from '@tarojs/components';
 import Taro, { NodesRef, useDidShow, useLoad, useShareAppMessage } from '@tarojs/taro';
 
-import { Popup } from '@taroify/core';
+import { ArrowUp, ArrowDown } from '@taroify/icons';
-import { ArrowDown, ArrowUp } from '@taroify/icons';
 import classNames from 'classnames';
 import { isEqual } from 'lodash-es';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, 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, PageType, PageUrl, RoleType } from '@/constants/app';
+import { APP_TAB_BAR_ID, EventName, OpenSource, PageUrl } from '@/constants/app';
-import { EMPLOY_TYPE_TITLE_MAP, EmployType, JOB_TYPE_TITLE_MAP, JobType } from '@/constants/job';
+import { EmployType, JobManageStatus } from '@/constants/job';
-import {
+import { ALL_ANCHOR_SORT_TYPES, ANCHOR_SORT_TYPE_TITLE_MAP, AnchorSortType } from '@/constants/material';
-  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';
 import { requestUnreadMessageCount } from '@/utils/message';
-import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
+import { navigateTo } from '@/utils/route';
-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`;
@@ -87,24 +73,13 @@ 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 [moreFilters, setMoreFilters] = useState<IAnchorFilters>({});
+  const [filters, setFilters] = useState<IAnchorFilters>({ employType: EmployType.All });
-  const [gender, setGender] = useState<GenderType>(GenderType.All);
+  const [showFilter, setShowFilter] = useState<boolean>(false);
-  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,
@@ -115,8 +90,6 @@ export default function AnchorPage() {
   const handleChangeSelectJob = useCallback((select?: JobManageInfo) => {
     log('select job change', select);
     setSelectJob(select);
-    console.log('哈哈哈', !select);
-    setOpenPopup(!select);
     setLastSelectMyJobId(select?.id || '');
   }, []);
 
@@ -125,35 +98,20 @@ export default function AnchorPage() {
     [selectJob]
   );
 
-  const handleClickFilterSelect = (type: FilterType) => () => {
+  const handleClickSalarySelect = useCallback(() => {
-    setShowFilter(type === showFilter ? null : type);
+    setShowFilter(!showFilter);
-  };
+  }, [showFilter]);
 
-  const handleHideFilter = useCallback(() => setShowFilter(null), []);
+  const handleHideFilter = useCallback(() => setShowFilter(false), []);
 
   const handleFilterChange = useCallback(
     (newFilters: IAnchorFilters) => {
-      !isEqual(newFilters, moreFilters) && setMoreFilters(newFilters);
+      !isEqual(newFilters, filters) && setFilters(newFilters);
-      setShowFilter(null);
+      setShowFilter(false);
     },
-    [moreFilters]
+    [filters]
   );
 
-  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(
@@ -165,7 +123,7 @@ export default function AnchorPage() {
   );
 
   const handlePublishJobChange = useCallback(async () => {
-    const { jobResults = [] } = await requestJobManageList();
+    const { jobResults = [] } = await requestJobManageList({ status: JobManageStatus.Open });
     if (!selectJob) {
       // 之前没有开发中的通告，自动选中第一个开放中的通告
       handleChangeSelectJob(jobResults[0]);
@@ -181,10 +139,6 @@ 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);
@@ -210,16 +164,10 @@ export default function AnchorPage() {
   }, [location]);
 
   useLoad(async () => {
-    switchRoleType(RoleType.Company);
-
-    const query = getPageQuery();
-    getInviteCodeFromQueryAndUpdate(query);
-
     try {
-      const { jobResults = [] } = await requestJobManageList();
+      const { jobResults = [] } = await requestJobManageList({ status: JobManageStatus.Open });
       if (!jobResults.length) {
-        setOpenPopup(true);
+        Toast.info('当前是根据定位为您展示主播');
-        // Toast.info('当前是根据定位为您展示主播');
         return;
       }
       const lastSelectJobId = getLastSelectMyJobId();
@@ -233,27 +181,14 @@ export default function AnchorPage() {
     }
   });
 
-  Taro.showShareMenu({
-    withShareTicket: true,
-  });
-
   useShareAppMessage(() => {
-    return getCommonShareMessage({ inviteCode, title: '数万名优质主播等你来挑', path: PageUrl.Anchor });
+    return getCommonShareMessage(true, inviteCode);
   });
 
   useDidShow(() => requestUnreadMessageCount());
 
-  const filters = useMemo(
-    () => ({
-      ...moreFilters,
-      topCategory: topCategory === JobType.All ? undefined : topCategory,
-      gender: gender === -1 ? undefined : gender,
-      employType,
-    }),
-    [moreFilters, gender, employType, topCategory]
-  );
   return (
-    <HomePage type={PageType.Anchor}>
+    <HomePage>
       {!!loading && <PageLoading className={`${PREFIX}__loading`} />}
       <CustomNavigationBar className={`${PREFIX}__navigation-bar`}>
         {selectJob && <SwitchBar title={selectJob.title.substring(0, 4)} onClick={handleClickSwitch} />}
@@ -271,27 +206,13 @@ export default function AnchorPage() {
               </div>
             ))}
           </div>
-          <div className={classNames(`${PREFIX}__filter`)}>
+          <div className={classNames(`${PREFIX}__filter`)} onClick={handleClickSalarySelect}>
-            <div className={`${PREFIX}__filter-item`} onClick={handleClickFilterSelect(FilterType.gender)}>
+            <div className="title">筛选</div>
-              <div className="title">{gender === GenderType.All ? '性别' : GENDER_TYPE_TITLE_MAP[gender]}</div>
+            {showFilter ? <ArrowUp /> : <ArrowDown />}
-              {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 isBoss />
+          <PartnerBanner />
         </div>
         <ListWrapper
           filters={filters}
@@ -304,53 +225,14 @@ export default function AnchorPage() {
           className={LIST_CONTAINER_CLASS}
         />
         <Overlay
-          visible={showFilter === FilterType.gender}
+          visible={showFilter}
           onClickOuter={handleHideFilter}
           outerClassName={`${PREFIX}__overlay-outer`}
           innerClassName={`${PREFIX}__overlay-inner`}
         >
-          <GenderSelect value={gender} onSelect={handleChangeSelectGender} />
+          <AnchorPicker value={filters} onConfirm={handleFilterChange} />
-        </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,15 +6,14 @@ 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';
@@ -92,6 +91,7 @@ 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;
     }
-    navigateTo(PageUrl.JobPublish);
+    setShowPublish(true);
   }, [userInfo]);
 
   return (
@@ -124,6 +124,7 @@ 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,29 +1,21 @@
 import { BaseEventOrig, Button, ButtonProps, Image, InputProps } from '@tarojs/components';
 import Taro, { UploadTask } from '@tarojs/taro';
 
-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 { EventName, PageUrl } from '@/constants/app';
+import { 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';
@@ -31,7 +23,6 @@ import { uploadVideo } from '@/utils/video';
 
 import './index.less';
 
-
 const PREFIX = 'page-certification';
 const log = logWithPrefix(PREFIX);
 const needIdCard = false;
@@ -109,8 +100,6 @@ 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' });
@@ -144,29 +133,6 @@ 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 = {
@@ -191,14 +157,7 @@ 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('认证失败请重试');
@@ -214,7 +173,6 @@ 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('获取手机号失败');
       }
@@ -304,11 +262,6 @@ 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 { PageType, PageUrl } from '@/constants/app';
+import { 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 type={PageType.DEV}>
+    <HomePage>
       <div className={PREFIX}>
         {/* <div>{`最近一次的订单 ID: ${lastOrderNo}`}</div>
         <Button onClick={() => handleCreateOrder(OrderType.Group)} style={marginTopStyle} color="primary">

src/pages/give-vip/index.config.ts

@@ -1,3 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '赠送会员',
-});

src/pages/give-vip/index.less

@@ -1,130 +0,0 @@
-@import '@/styles/variables.less';
-@import '@/styles/common.less';
-
-.give-vip {
-  padding: 40px 24px 200px 24px;
-  &__hint {
-    font-size: 28px;
-    line-height: 48px;
-    color: @blColorG2;
-    gap: 12px;
-    .flex-row();
-    justify-content: center;
-  }
-  &__icon {
-    width: 65px;
-    height: 65px;
-  }
-  &__title {
-    margin-top: 24px;
-    font-weight: 500;
-    font-size: 40px;
-    line-height: 48px;
-    color: @blColor;
-    text-align: center;
-    flex: 0 1 auto;
-    gap: 12px;
-    .flex-row();
-    justify-content: center;
-    .highlight {
-      margin-left: -12px;
-      display: inline-block;
-      color: @blHighlightColor;
-    }
-  }
-  &__bg {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: -1;
-  }
-  &__info {
-    &-block {
-      margin-top: 48px;
-    }
-    &-title {
-      font-weight: 500;
-      font-size: 32px;
-      line-height: 32px;
-      color: #1d2129;
-      margin-bottom: 24px;
-    }
-    &-card {
-      box-sizing: border-box;
-      background: #ffffff;
-      border-radius: 24px;
-      padding: 32px;
-    }
-    &-body {
-      font-weight: 400;
-      font-size: 28px;
-      line-height: 40px;
-      color: #333333;
-      margin-bottom: 32px;
-    }
-    &-img {
-      width: 100%;
-      height: 614px;
-    }
-  }
-  &__footer {
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-    padding: 12px 32px;
-    box-shadow: 0px -4px 20px 0px #00000014;
-    box-sizing: border-box;
-    background: #ffffff;
-  }
-
-  &__footer-body {
-    .flex-row();
-    justify-content: center;
-  }
-  &__button {
-    .button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px;);
-    width: 400px;
-  }
-  &__coupon {
-    &-info {
-      position: relative;
-      margin-top: 32px;
-      padding: 24px;
-      box-sizing: border-box;
-      border-radius: 24px;
-
-      .flex-column();
-      justify-content: center;
-    }
-
-    &-title {
-      font-weight: 500;
-      font-size: 32px;
-      line-height: 48px;
-      color: @blHighlightColor;
-      margin-bottom: 8px;
-    }
-    &-intro {
-      font-size: 28px;
-      line-height: 40px;
-      margin-bottom: 12px;
-      color: @blColor;
-      gap: 4px;
-      .flex-row();
-      .highlight {
-        font-weight: 600;
-        font-size: 32px;
-        line-height: 56px;
-        color: @blHighlightColor;
-      }
-    }
-    &-valid {
-      font-size: 28px;
-      line-height: 40px;
-
-      color: @blColorG2;
-    }
-  }
-}

src/pages/give-vip/index.tsx

@@ -1,103 +0,0 @@
-import { Image, Button } from '@tarojs/components';
-import { useLoad } from '@tarojs/taro';
-
-import { Fragment, useCallback, useState } from 'react';
-
-import SafeBottomPadding from '@/components/safe-bottom-padding';
-import { PageUrl } from '@/constants/app';
-import { logWithPrefix } from '@/utils/common';
-import { claimMembershipCoupon, getCouponCodeFromQuery } from '@/utils/coupon';
-import { getPageQuery, switchTab } from '@/utils/route';
-import { formatTime } from '@/utils/time';
-import './index.less';
-
-const PREFIX = 'give-vip';
-const log = logWithPrefix(PREFIX);
-
-enum State {
-  PENDING,
-  SUCCESS,
-  FAILED,
-}
-export default function GiveVip() {
-  const [state, setState] = useState<State>(State.PENDING);
-  const [expireAt, setExpireAt] = useState('');
-  const [usedBefore, setUsedBefore] = useState(false);
-  const handleNavigate = useCallback(() => {
-    switchTab(PageUrl.Job);
-  }, []);
-
-  useLoad(() => {
-    const query = getPageQuery<{ d: string }>();
-    const code = getCouponCodeFromQuery(query);
-    claimMembershipCoupon(code!)
-      .then(res => {
-        setUsedBefore(res.usedBefore);
-        setExpireAt(res.usageExpireAt);
-        setState(Date.now() > new Date(res.usageExpireAt).getTime() ? State.FAILED : State.SUCCESS);
-      })
-      .catch(err => {
-        console.error(err);
-        setState(State.FAILED);
-      });
-  });
-
-  return (
-    <div className={PREFIX}>
-      {state === State.SUCCESS && (
-        <Fragment>
-          <div className={`${PREFIX}__title`}>
-            <Image src="https://publiccdn.neighbourhood.com.cn/img/partner-yes.svg" className={`${PREFIX}__icon`} />
-            <div>{usedBefore ? '宝子，你已经领过了，下周再来' : '宝子，播络会员领取成功'}</div>
-          </div>
-          <div className={`${PREFIX}__coupon-info`}>
-            <Image src="https://publiccdn.neighbourhood.com.cn/img/parnet-share-bg.png" className={`${PREFIX}__bg`} />
-            <div className={`${PREFIX}__coupon-title`}>播络日会员</div>
-            <div className={`${PREFIX}__coupon-intro`}>
-              会员有效期内可增加<div className="highlight">10次</div>报单机会
-            </div>
-            <div className={`${PREFIX}__coupon-valid`}>
-              有效期至：{formatTime(expireAt, 'YYYY/MM/DD HH:mm:ss', false)}
-            </div>
-          </div>
-        </Fragment>
-      )}
-      {state === State.FAILED && (
-        <Fragment>
-          <div className={`${PREFIX}__hint`}>
-            <Image
-              src="https://publiccdn.neighbourhood.com.cn/img/link-invalid.svg"
-              mode="aspectFit"
-              className={`${PREFIX}__icon`}
-            />
-            <div className={`${PREFIX}__hint-title`}>宝子，链接已失效</div>
-          </div>
-          <div className={`${PREFIX}__title`}>
-            请联系分享人<div className="highlight">再次分享</div>
-          </div>
-        </Fragment>
-      )}
-      <div className={`${PREFIX}__info-block`}>
-        <div className={`${PREFIX}__info-title`}>播络简介</div>
-        <div className={`${PREFIX}__info-card`}>
-          <div className={`${PREFIX}__info-body`}>
-            播络通告整理汇集了本地每日新增带货主播通告，方便大家及时找到高薪工作
-          </div>
-          <Image
-            className={`${PREFIX}__info-img`}
-            src="https://publiccdn.neighbourhood.com.cn/img/partner-share-coupon-img.png"
-            mode="heightFix"
-          />
-        </div>
-      </div>
-      <div className={`${PREFIX}__footer`}>
-        <div className={`${PREFIX}__footer-body`}>
-          <Button className={`${PREFIX}__button`} onClick={handleNavigate}>
-            立即使用
-          </Button>
-        </div>
-        <SafeBottomPadding />
-      </div>
-    </div>
-  );
-}

src/pages/group-delegate-publish/index.config.ts

@@ -1,3 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '群代发',
-});

src/pages/group-delegate-publish/index.tsx

@@ -1,12 +0,0 @@
-import UserBatchPublish from '@/components/user-batch-publish';
-import './index.less';
-
-const PREFIX = 'group-delegate-publish';
-
-export default function Partner() {
-  return (
-    <div className={PREFIX}>
-      <UserBatchPublish />
-    </div>
-  );
-}

src/pages/group-owner-certification/index.config.ts

@@ -1,4 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '群主认证',
-  enableShareAppMessage: true,
-});

src/pages/group-owner-certification/index.less

@@ -1,129 +0,0 @@
-@import '@/styles/common.less';
-@import '@/styles/variables.less';
-
-.group-owner-certification {
-  &__tabs {
-    --tabs-active-color: @blHighlightColor;
-    --tabs-nav-background-color: #fff;
-    --tabs-wrap-height: 98px;
-
-    > .taroify-tabs__wrap {
-      position: fixed;
-      width: 100vw;
-      top: 0;
-      left: 0;
-      z-index: 2;
-    }
-
-    > .taroify-tabs__content {
-      padding-top: var(--tabs-wrap-height);
-    }
-  }
-
-  &__main {
-    padding-left: 24px;
-    padding-right: 24px;
-    padding-top: 48px;
-    padding-bottom: calc(48px + constant(safe-area-inset-bottom));
-    padding-bottom: calc(48px + env(safe-area-inset-bottom));
-  }
-
-  &__block {
-    margin-bottom: 40px;
-  }
-
-  &__card {
-    background: #fff;
-    border-radius: 24px;
-    padding: 24px 32px;
-    margin-bottom: 48px;
-  }
-
-  &__bold {
-    font-weight: 500;
-    margin-bottom: 8px;
-  }
-
-  &__body {
-    font-weight: 400;
-    font-size: 28px;
-    line-height: 40px;
-    color: @blColor;
-
-    .highlight {
-      color: @blHighlightColor;
-    }
-
-    &.center {
-      text-align: center;
-    }
-  }
-
-  &__title {
-    margin-bottom: 24px;
-    font-weight: 500;
-    font-size: 32px;
-    line-height: 32px;
-
-    color: #1d2129;
-  }
-
-  &__share {
-    .button(@height: 72px; @width: 384px; @fontSize: 28px; @fontWeight: 400; @borderRadius: 44px; @highlight: 0);
-    margin-top: 32px;
-    margin-left: auto;
-    margin-right: auto;
-  }
-  &__lined-wrapper {
-    text-align: center;
-    margin-top: 48px;
-    margin-bottom: 24px;
-  }
-  &__lined-title {
-    text-align: center;
-    font-weight: 400;
-    font-size: 28px;
-    line-height: 40px;
-    color: #333333;
-    position: relative;
-    display: inline-block;
-
-    &:before {
-      content: '';
-      position: absolute;
-      left: -68px;
-      width: 56px;
-      height: 1px;
-      background: #ccc;
-      top: 50%;
-    }
-
-    &:after {
-      content: '';
-      position: absolute;
-      right: -68px;
-      width: 56px;
-      height: 1px;
-      background: #ccc;
-      top: 50%;
-    }
-  }
-  &__city-select {
-    background: #F7F7F7;
-    border-radius: 16px;
-    padding: 34px 32px;
-    font-weight: 400;
-    font-size: 32px;
-    line-height: 32px;
-    color: #333333;
-    display: flex;
-    justify-content: space-between;
-  }
-  &__qrcode {
-    width: 280px;
-    height: 280px;
-    background: #6F7686;
-    display: block;
-    margin: auto auto 24px;
-  }
-}

src/pages/group-owner-certification/index.tsx

@@ -1,130 +0,0 @@
-import { Button, Image } from '@tarojs/components';
-import Taro, { useShareAppMessage } from '@tarojs/taro';
-
-import { Tabs } from '@taroify/core';
-import { Arrow } from '@taroify/icons';
-import { useCallback, useEffect, useRef, useState } from 'react';
-
-import GroupCertificationList from '@/components/group-certification-list';
-import { EventName, OpenSource, PageUrl } from '@/constants/app';
-import { CITY_CODE_TO_NAME_MAP } from '@/constants/city';
-import useInviteCode from '@/hooks/use-invite-code';
-import useLocation from '@/hooks/use-location';
-import { StaffInfo } from '@/types/partner';
-import { generateGroupAuthCode, getStaffInfo } from '@/utils/partner';
-import { navigateTo } from '@/utils/route';
-import { getCommonShareMessage } from '@/utils/share';
-import './index.less';
-
-const PREFIX = 'group-owner-certification';
-
-export default function GroupOwnerCertification() {
-  const location = useLocation();
-  const inviteCode = useInviteCode();
-  const [cityCode, setCityCode] = useState<string>(location.cityCode);
-  const cityValuesChangedRef = useRef(false);
-  Taro.showShareMenu({
-    withShareTicket: true,
-  });
-  useShareAppMessage(async () => {
-    const { authCode } = await generateGroupAuthCode();
-    return getCommonShareMessage({
-      useCapture: false,
-      title: `我在认证群主，宝子帮我点击下 ${authCode}`,
-      inviteCode,
-      params: { authCode },
-      path: PageUrl.Job,
-      imageUrl: 'https://publiccdn.neighbourhood.com.cn/img/share-group-owner-certificate.png',
-    });
-  });
-
-  const handleClickCityMenu = useCallback(() => {
-    navigateTo(PageUrl.CitySearch, { city: cityCode, source: OpenSource.GroupOwnerCertificate });
-  }, [cityCode]);
-
-  const handleCityChange = useCallback(data => {
-    console.log('handleCityChange', data);
-    const { openSource, cityCode: cCode } = data;
-    if (openSource !== OpenSource.GroupOwnerCertificate) {
-      return;
-    }
-    cityValuesChangedRef.current = true;
-    setCityCode(cCode);
-  }, []);
-
-  useEffect(() => {
-    if (cityValuesChangedRef.current) {
-      return;
-    }
-    setCityCode(location.cityCode);
-  }, [location]);
-  useEffect(() => {
-    Taro.eventCenter.on(EventName.SELECT_CITY, handleCityChange);
-    return () => {
-      Taro.eventCenter.off(EventName.SELECT_CITY, handleCityChange);
-    };
-  }, [handleCityChange]);
-
-  const [staffInfo, setStaffInfo] = useState<StaffInfo | null>(null);
-  useEffect(() => {
-    getStaffInfo(cityCode)
-      .then(data => {
-        setStaffInfo(data);
-      })
-      .catch(() => {
-        setStaffInfo(null);
-      });
-  }, [cityCode]);
-
-  return (
-    <div className={PREFIX}>
-      <Tabs className={`${PREFIX}__tabs`}>
-        <Tabs.TabPane value={0} title="认证方法">
-          <div className={`${PREFIX}__main`}>
-            <div className={`${PREFIX}__block`}>
-              <div className={`${PREFIX}__title`}>第一步：拉运营入群</div>
-              <div className={`${PREFIX}__card`}>
-                <div className={`${PREFIX}__body`}>
-                  <div>拉播络城市运营进入你的带货主播群，</div>
-                  <div>请确认你是群主且是带货主播群，不然不要拉</div>
-                </div>
-                <div className={`${PREFIX}__lined-wrapper`}>
-                  <div className={`${PREFIX}__lined-title`}>选择城市，添加运营</div>
-                </div>
-                <div className={`${PREFIX}__city-select`} onClick={handleClickCityMenu}>
-                  {CITY_CODE_TO_NAME_MAP.get(cityCode)}
-                  <Arrow size={16} />
-                </div>
-                <div className={`${PREFIX}__lined-wrapper`}>
-                  <div className={`${PREFIX}__lined-title`}>长按并识别二维码添加运营</div>
-                </div>
-                {staffInfo && (
-                  <Image
-                    className={`${PREFIX}__qrcode`}
-                    src={staffInfo.staffQrCode}
-                    showMenuByLongpress
-                    mode="aspectFill"
-                  />
-                )}
-              </div>
-              <div className={`${PREFIX}__title`}>第二步</div>
-              <div className={`${PREFIX}__card`}>
-                <div className={`${PREFIX}__h1 ${PREFIX}__bold`}>点击以下按钮分享小程序到群，并在群里打开小程序</div>
-                <div className={`${PREFIX}__body`}>
-                  <div className="highlight">1次分享只能认证一个群，有多个群请分享多次，不可在微信聊天里直接转发；</div>
-                  <div>一般1天内完成，超时未完成认证请重新分享或者咨询运营</div>
-                </div>
-                <Button className={`${PREFIX}__share`} openType="share">
-                  分享小程序
-                </Button>
-              </div>
-            </div>
-          </div>
-        </Tabs.TabPane>
-        <Tabs.TabPane value={1} title="已认证的群">
-          <GroupCertificationList />
-        </Tabs.TabPane>
-      </Tabs>
-    </div>
-  );
-}

src/pages/group-v2/index.tsx

@@ -1,60 +1,39 @@
-import { useLoad, useShareAppMessage } from '@tarojs/taro';
+import { useShareAppMessage } from '@tarojs/taro';
 
 import { useCallback } from 'react';
 
 import HomePage from '@/components/home-page';
 import SearchCity from '@/components/search-city';
-import { PageType, PageUrl, RoleType } from '@/constants/app';
+import { GROUPS } from '@/constants/group';
-import useCityOperators from '@/hooks/use-city-operators';
 import useInviteCode from '@/hooks/use-invite-code';
-import { switchRoleType } from '@/utils/app';
 import { openCustomerServiceChat } from '@/utils/common';
 import { getCurrentCityCode } from '@/utils/location';
-import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
-import { getPageQuery } from '@/utils/route';
 import { getCommonShareMessage } from '@/utils/share';
-import { checkCityCode } from '@/utils/user';
 import './index.less';
 
 const PREFIX = 'group-v2-page';
 
 export default function GroupV2() {
   const inviteCode = useInviteCode();
-  const cityOperators = useCityOperators();
 
-  useLoad(() => {
+  useShareAppMessage(() => getCommonShareMessage(true, inviteCode));
-    switchRoleType(RoleType.Anchor);
 
-    const query = getPageQuery();
+  const handleSelectCity = useCallback(cityCode => {
-    getInviteCodeFromQueryAndUpdate(query);
+    const group = GROUPS.find(g => String(g.cityCode) === cityCode);
-  });
-
-  useShareAppMessage(() =>
-    getCommonShareMessage({ inviteCode, title: '邀请你加入本地主播求职招聘群', path: PageUrl.GroupV2 })
-  );
-
-  const handleSelectCity = useCallback(
-    cityCode => {
-      if (!checkCityCode(cityCode)) {
-        return;
-      }
-      const group = cityOperators.find(g => String(g.cityCode) === cityCode);
     if (group) {
-        openCustomerServiceChat(group.groupLink);
+      openCustomerServiceChat(group.serviceUrl);
     }
-    },
+  }, []);
-    [cityOperators]
-  );
 
   return (
-    <HomePage type={PageType.GroupV2}>
+    <HomePage>
       <div className={PREFIX}>
         <SearchCity
           onSelectCity={handleSelectCity}
           currentCity={getCurrentCityCode()}
           forGroup
           offset={72}
-          banner="点击城市加入本地主播招聘群，高薪职位早知道"
+          banner="点击城市加入本地通告群，高薪工作早知道"
         />
       </div>
     </HomePage>

src/pages/group/index.tsx

@@ -1,10 +1,9 @@
-import Taro, { useShareAppMessage } from '@tarojs/taro';
+import { useShareAppMessage } from '@tarojs/taro';
 
 import { Tabs } from '@taroify/core';
 import { useCallback, useState } from 'react';
 
 import HomePage from '@/components/home-page';
-import { PageType } from '@/constants/app';
 import { GroupType, GROUP_PAGE_TABS } from '@/constants/group';
 import GroupFragment from '@/fragments/group';
 import useNavigation from '@/hooks/use-navigation';
@@ -20,14 +19,10 @@ export default function Group() {
 
   const handleTypeChange = useCallback(value => setTabType(value), []);
 
-  Taro.showShareMenu({
-    withShareTicket: true,
-  });
-
   useShareAppMessage(() => getCommonShareMessage());
 
   return (
-    <HomePage type={PageType.Group}>
+    <HomePage>
       <Tabs
         swipeable
         value={tabType}

src/pages/job-detail/index.tsx

@@ -1,42 +1,33 @@
-import { Button, Image, Map, MapProps, Text } from '@tarojs/components';
+import { Map, MapProps, Text, Image, Button } from '@tarojs/components';
 import Taro, { useLoad, useShareAppMessage } from '@tarojs/taro';
 
-import { Dialog } from '@taroify/core';
 import React, { useCallback, useEffect, useState } from 'react';
 
 import { CertificationStatusIcon } from '@/components/certification-status';
 import CommonDialog from '@/components/common-dialog';
 import DevDiv from '@/components/dev-div';
 import JobRecommendList from '@/components/job-recommend-list';
-import { JoinGroupHint } from '@/components/join-group-hint';
 import LoginButton from '@/components/login-button';
+import MaterialGuide from '@/components/material-guide';
 import PageLoading from '@/components/page-loading';
-import { PrejobPopup } from '@/components/prejob-popup';
 import ProductJobDialog from '@/components/product-dialog/job';
-import CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
+import { RoleType, EventName, PageUrl } from '@/constants/app';
-import { EventName, PageUrl, RoleType } from '@/constants/app';
 import { CertificationStatusType } from '@/constants/company';
 import { CollectEventName, ReportEventId } from '@/constants/event';
-import { EMPLOY_TYPE_TITLE_MAP, GET_CONTACT_TYPE, JobManageStatus } from '@/constants/job';
+import { EMPLOY_TYPE_TITLE_MAP } from '@/constants/job';
-import { ProductType } from '@/constants/product';
 import useInviteCode from '@/hooks/use-invite-code';
 import useUserInfo from '@/hooks/use-user-info';
 import useRoleType from '@/hooks/user-role-type';
 import { RESPONSE_ERROR_CODE } from '@/http/constant';
 import { HttpError } from '@/http/error';
-import store from '@/store';
-import { cacheJobId } from '@/store/actions';
 import { JobDetails } from '@/types/job';
 import { IMaterialMessage } from '@/types/message';
-import { switchRoleType } from '@/utils/app';
 import { copy, logWithPrefix } from '@/utils/common';
 import { collectEvent, reportEvent } from '@/utils/event';
-import { getJobSalary, getJobTitle, postPublishJob, requestJobDetail } from '@/utils/job';
+import { getJobTitle, getJobSalary, postPublishJob, requestJobDetail } from '@/utils/job';
 import { calcDistance, isValidLocation } from '@/utils/location';
 import { requestProfileDetail } from '@/utils/material';
 import { isChatWithSelf, postCreateChat } from '@/utils/message';
-import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
-import { requestProductBalance, requestProductUseRecord } from '@/utils/product';
 import { getJumpUrl, getPageQuery, navigateTo } from '@/utils/route';
 import { getCommonShareMessage } from '@/utils/share';
 import { formatDate } from '@/utils/time';
@@ -82,31 +73,19 @@ const AnchorFooter = (props: { data: JobDetails }) => {
     reportEvent(ReportEventId.CLICK_JOB_CONTACT);
     try {
       const needCreateMaterial = await isNeedCreateMaterial();
-
-      if (data.sourcePlat !== 'bl') {
       if (needCreateMaterial) {
-          const result = await requestProductUseRecord(ProductType.VIP, { jobId: data.id });
-          if (!result) {
-            const [time, isPaidVip] = await requestProductBalance(ProductType.VIP);
-            if (time <= 0 || !isPaidVip) {
         setShowMaterialGuide(true);
         return;
       }
-          }
-        }
-      }
       if (data.isAuthed) {
         const toUserId = data.userId;
         if (isChatWithSelf(toUserId)) {
           Toast.error('不能与自己聊天');
           return;
         }
-        const chat = await postCreateChat(toUserId);
-        let materialMessage: null | IMaterialMessage = null;
-        if (!needCreateMaterial) {
         const profile = await requestProfileDetail();
-          if (profile) {
+        const chat = await postCreateChat(toUserId);
-            materialMessage = {
+        const materialMessage: IMaterialMessage = {
           id: profile.id,
           name: profile.name,
           age: profile.age,
@@ -116,14 +95,7 @@ const AnchorFooter = (props: { data: JobDetails }) => {
           gender: profile.gender,
           workedSecCategoryStr: profile.workedSecCategoryStr,
         };
-          }
+        navigateTo(PageUrl.MessageChat, { chatId: chat.chatId, material: materialMessage, jobId: data.id });
-        }
-        navigateTo(PageUrl.MessageChat, {
-          chatId: chat.chatId,
-          initText: !materialMessage,
-          material: materialMessage,
-          jobId: data.id,
-        });
       } else {
         setDialogVisible(true);
       }
@@ -138,15 +110,8 @@ const AnchorFooter = (props: { data: JobDetails }) => {
     }
   }, [data]);
 
-  const handleDialogHidden = useCallback(() => {
+  const handleDialogHidden = useCallback(() => setDialogVisible(false), []);
-    setDialogVisible(false);
+
-  }, []);
-  const handleConfirmPrejob = useCallback((type: GET_CONTACT_TYPE) => {
-    setShowMaterialGuide(false);
-    if (GET_CONTACT_TYPE.VIP === type) {
-      setDialogVisible(true);
-    }
-  }, []);
   return (
     <>
       <div className={`${PREFIX}__footer`}>
@@ -159,9 +124,7 @@ const AnchorFooter = (props: { data: JobDetails }) => {
       </div>
       <div>
         {dialogVisible && <ProductJobDialog data={data} onClose={handleDialogHidden} />}
-        {showMaterialGuide && (
+        {showMaterialGuide && <MaterialGuide onClose={() => setShowMaterialGuide(false)} />}
-          <PrejobPopup onCancel={() => setShowMaterialGuide(false)} onConfirm={handleConfirmPrejob} />
-        )}
         <CommonDialog
           content={errorTips}
           confirm="确定"
@@ -176,39 +139,25 @@ const AnchorFooter = (props: { data: JobDetails }) => {
 
 const CompanyFooter = (props: { data: JobDetails }) => {
   const { data } = props;
-  const [showBuy, setShowBuy] = useState(false);
-  const userInfo = useUserInfo();
 
   const handleClickEdit = useCallback(() => navigateTo(PageUrl.JobPublish, { jobId: data.id }), [data]);
 
   const handlePublishJob = useCallback(async () => {
     try {
-      if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
-        store.dispatch(cacheJobId(data.id));
-        navigateTo(PageUrl.CertificationStart);
-        return;
-      }
       Taro.showLoading();
       await postPublishJob(data.id);
       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: data.id, error: e.info?.() || e.message });
-      if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_FREE_BALANCE) {
+      if (errorCode === RESPONSE_ERROR_CODE.BOSS_VIP_EXPIRED) {
-        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);
+        Toast.error(e.message || '发布失败请重试', 3000);
       }
       console.error(e);
     }
@@ -220,19 +169,10 @@ const CompanyFooter = (props: { data: JobDetails }) => {
         <Button className={`${PREFIX}__share-button`} onClick={handleClickEdit}>
           编辑
         </Button>
-        <Button
+        <Button className={`${PREFIX}__contact-publisher`} onClick={handlePublishJob}>
-          disabled={data.status === JobManageStatus.Open}
-          className={`${PREFIX}__contact-publisher`}
-          onClick={handlePublishJob}
-        >
           发布通告
         </Button>
       </div>
-      <Dialog open={showBuy} onClose={() => setShowBuy(false)}>
-        <Dialog.Content>
-          <CompanyPublishJobBuy onNext={handlePublishJob} />
-        </Dialog.Content>
-      </Dialog>
     </>
   );
 };
@@ -278,17 +218,11 @@ export default function JobDetail() {
   }, []);
 
   useLoad(async () => {
-    const query = getPageQuery<Pick<JobDetails, 'id'> & { c: string; share: string }>();
+    const query = getPageQuery<Pick<JobDetails, 'id'>>();
-
-    if (query?.share === 'true') {
-      switchRoleType(RoleType.Anchor);
-    }
-    getInviteCodeFromQueryAndUpdate(query);
     const jobId = query?.id;
     if (!jobId) {
       return;
     }
-    Taro.eventCenter.trigger(EventName.VIEW_JOB_SUCCESS, jobId);
     try {
       const res = await requestJobDetail(jobId);
       setData(res);
@@ -297,14 +231,11 @@ export default function JobDetail() {
       Toast.error('出错了，请重试');
     }
   });
-  Taro.showShareMenu({
+
-    withShareTicket: true,
-  });
   useShareAppMessage(() => {
     if (!data) {
-      return getCommonShareMessage({ inviteCode });
+      return getCommonShareMessage(true, inviteCode);
     }
-
     return {
       title: getJobTitle(data) || '',
       path: getJumpUrl(PageUrl.JobDetail, { id: data.id, share: true, c: inviteCode }),
@@ -346,8 +277,6 @@ export default function JobDetail() {
           {data.companyName && <div className={`${PREFIX}__company`}>{`公司：${data.companyName}`}</div>}
         </div>
 
-        {!isOwner && <JoinGroupHint />}
-
         <div className={`${PREFIX}__content`}>
           <div className={`${PREFIX}__content-title`}>职位描述</div>
           <div className={`${PREFIX}__tags`}>

src/pages/job-publish/index.tsx

@@ -1,9 +1,8 @@
 import { BaseEventOrig, Button, InputProps } from '@tarojs/components';
 import Taro, { useLoad } from '@tarojs/taro';
 
-import { Dialog } from '@taroify/core';
 import classNames from 'classnames';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 import BlFormCell from '@/components/bl-form-cell';
 import BlFormInput from '@/components/bl-form-input';
@@ -13,30 +12,15 @@ import BlFormSelect from '@/components/bl-form-select';
 import BlSalaryInput, { BlSalaryValue } from '@/components/bl-salary-input';
 import { CityPickerPopup } from '@/components/city-picker';
 import PageLoading from '@/components/page-loading';
-import CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
 import SafeBottomPadding from '@/components/safe-bottom-padding';
 import { EventName, PageUrl } from '@/constants/app';
-import { CertificationStatusType } from '@/constants/company';
 import { CollectEventName } from '@/constants/event';
 import { EMPLOY_TYPE_TITLE_MAP, EmployType, JOB_TYPE_SELECT_OPTIONS, JobType } from '@/constants/job';
-import { ProductType } from '@/constants/product';
-import useUserInfo from '@/hooks/use-user-info';
-import store from '@/store';
-import { cacheJobId } from '@/store/actions';
 import { CreateJobInfo, JobDetails } from '@/types/job';
 import { logWithPrefix } from '@/utils/common';
 import { collectEvent } from '@/utils/event';
-import {
+import { postCloseJob, postCreateJob, postUpdateJob, requestJobDetail, isFullTimePriceRequired, isPartTimePriceRequired } from '@/utils/job';
-  postCloseJob,
-  postCreateJob,
-  postUpdateJob,
-  requestJobDetail,
-  isFullTimePriceRequired,
-  isPartTimePriceRequired,
-  postPublishJob,
-} from '@/utils/job';
 import { getCityValues } from '@/utils/location';
-import { requestProductBalance } from '@/utils/product';
 import { getPageQuery, navigateBack, navigateTo } from '@/utils/route';
 import Toast from '@/utils/toast';
 
@@ -107,9 +91,6 @@ export default function JobPublish() {
   const [city, setCity] = useState<string[] | undefined>();
   const [showCityPicker, setShowCityPicker] = useState(false);
   const [address, setAddress] = useState('');
-  const [showBuy, setShowBuy] = useState(false);
-  const createdJobIdRef = useRef('');
-  const userInfo = useUserInfo();
 
   const handleEmployTypeChange = useCallback((value: EmployType) => {
     setEmployType(value);
@@ -144,13 +125,6 @@ export default function JobPublish() {
     setAddress(value);
   }, []);
 
-  const refreshJobPublishList = useCallback(() => {
-    Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
-    setTimeout(() => {
-      Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
-    }, 300);
-  }, []);
-
   const handleClose = useCallback(async () => {
     if (!job) {
       Toast.error('数据出错请重试');
@@ -159,7 +133,7 @@ export default function JobPublish() {
     try {
       Taro.showLoading();
       await postCloseJob(job.id);
-      refreshJobPublishList();
+      Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
       navigateBack();
     } catch (e) {
       console.error('submit error', e);
@@ -168,9 +142,9 @@ export default function JobPublish() {
     } finally {
       Taro.hideLoading();
     }
-  }, [job, refreshJobPublishList]);
+  }, [job]);
 
-  const getCreateJobInfo = useCallback((): [CreateJobInfo, string[]] => {
+  const handleSubmit = useCallback(async () => {
     const cityCodes = city || [];
     const data: CreateJobInfo = {
       title,
@@ -186,11 +160,6 @@ export default function JobPublish() {
       highPriceForPartyTime: !isPartTimePriceRequired(employType) ? 0 : salary[3],
       address: address,
     };
-    return [data, cityCodes];
-  }, [address, category, city, describe, employType, salary, title]);
-
-  const handleSubmit = useCallback(async () => {
-    const [data, cityCodes] = getCreateJobInfo();
     const errMsg = isInvalidCreateJobInfo(data);
     if (errMsg) {
       Toast.info(errMsg);
@@ -209,48 +178,10 @@ export default function JobPublish() {
         await postUpdateJob(data);
         Taro.eventCenter.trigger(EventName.JOB_UPDATE, job!.id);
       } else {
-        const jobId = await postCreateJob(data);
+        await postCreateJob(data);
-        createdJobIdRef.current = jobId;
-        refreshJobPublishList();
-
-        if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
-          // 去认证
-          store.dispatch(cacheJobId(jobId));
-          navigateTo(PageUrl.CertificationStart);
-          Taro.hideLoading();
-          return;
       }
-
+      Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
-        const [time] = await requestProductBalance(ProductType.CompanyPublishJob);
+      await Toast.success(isUpdateJob ? '更新成功' : '创建成功', 1500, true);
-        if (time <= 0) {
-          // 付钱
-          setShowBuy(true);
-          Taro.hideLoading();
-          return;
-        }
-
-        await postPublishJob(jobId);
-      }
-      refreshJobPublishList();
-
-      await Toast.success(isUpdateJob ? '更新成功' : '创建并发布成功', 1500, true);
-      navigateBack();
-    } catch (e) {
-      createdJobIdRef.current = '';
-      console.error('submit error', e);
-      Toast.error('审核失败请重试');
-      collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
-    } finally {
-      Taro.hideLoading();
-    }
-  }, [getCreateJobInfo, isUpdate, job, userInfo.bossAuthStatus, refreshJobPublishList]);
-
-  const handleNext = useCallback(async () => {
-    Taro.showLoading();
-    try {
-      await postPublishJob(createdJobIdRef.current);
-      refreshJobPublishList();
-      await Toast.success('发布成功', 1500, true);
       navigateBack();
     } catch (e) {
       console.error('submit error', e);
@@ -259,12 +190,7 @@ export default function JobPublish() {
     } finally {
       Taro.hideLoading();
     }
-  }, [refreshJobPublishList]);
+  }, [isUpdate, job, title, employType, category, describe, city, salary, address]);
-
-  const handleClosePublishJob = useCallback(() => {
-    setShowBuy(false);
-    navigateBack(-1);
-  }, []);
 
   useEffect(() => {
     const callback = (d: string) => setDescribe(d);
@@ -357,7 +283,7 @@ export default function JobPublish() {
         <div className={`${PREFIX}__footer__buttons`}>
           {!isUpdate && (
             <Button className={`${PREFIX}__footer__button`} onClick={handleSubmit}>
-              创建并发布
+              创建
             </Button>
           )}
           {isUpdate && (
@@ -380,11 +306,6 @@ export default function JobPublish() {
           onConfirm={handleConfirmCityPicker}
           onCancel={() => setShowCityPicker(false)}
         />
-        <Dialog open={showBuy} onClose={handleClosePublishJob}>
-          <Dialog.Content>
-            <CompanyPublishJobBuy onNext={handleNext} />
-          </Dialog.Content>
-        </Dialog>
       </div>
     </div>
   );