实人认证

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

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

src/components/job-list/index.tsx

@@ -35,6 +35,7 @@ function JobList(props: IJobListProps) {
     visible = true,
     cityCode = 'ALL',
     category = JobType.All,
+    sourceType,
     employType = EmployType.All,
     sortType = SortType.RECOMMEND,
     isFollow = false,
@@ -114,6 +115,7 @@ function JobList(props: IJobListProps) {
       category,
       cityCode,
       employType,
+      sourceType,
       sortType,
       isFollow,
       isOwner,
@@ -128,6 +130,7 @@ function JobList(props: IJobListProps) {
   }, [
     category,
     cityCode,
+    sourceType,
     employType,
     sortType,
     isFollow,
@@ -176,7 +179,7 @@ function JobList(props: IJobListProps) {
       }
     };
     refresh();
-  }, [visible, cityCode, employType, sortType, keyWord, minSalary, maxSalary, blGroupId]);
+  }, [visible, cityCode, employType, sourceType, sortType, keyWord, minSalary, maxSalary, blGroupId]);
 
   // log('render', `hasMore: ${hasMore}, loadingMore: ${loadingMore}, refreshing: ${refreshing}`);
 

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

@@ -17,22 +17,25 @@ 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 group = GROUPS.find(g => String(g.cityCode) === cityCode);
   const [clicked, setClicked] = useState(!!Taro.getStorageSync(CacheKey.JOIN_GROUP_CARD_CLICKED));
   const handleClick = useCallback(() => {
-    if (!checkCityCode(cityCode)) {
+    if (group && !checkCityCode(cityCode)) {
       return;
     }
-    if (group) {
+    openCustomerServiceChat(group ? group.serviceUrl : DEFAULT_GROUP.serviceUrl);
-      openCustomerServiceChat(group.serviceUrl);
     Taro.setStorageSync(CacheKey.JOIN_GROUP_CARD_CLICKED, true);
     setClicked(true);
-    }
   }, [cityCode, group]);
-  if (!group || !validCityCode(cityCode) || clicked) {
+  if (!validCityCode(cityCode) || clicked) {
     return null;
   }
 
@@ -44,7 +47,9 @@ export function JoinGroupHint() {
         mode="aspectFit"
       />
       <div className={`${PREFIX}__left`}>
-        <div className={`${PREFIX}__left-title`}>{CITY_CODE_TO_NAME_MAP.get(cityCode)}主播招聘群</div>
+        <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`}>

src/components/prejob-popup/index.less

@@ -33,7 +33,7 @@
       align-items: center;
       justify-content: center;
 
-      &.share {
+      &.material {
         background: #feba00;
         > image {
           width: 40px;

src/components/prejob-popup/index.tsx

@@ -1,17 +1,17 @@
 import { Button, Image } from '@tarojs/components';
 
-import { Popup } from '@taroify/core';
+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 { hasShareToGetContact } from '@/utils/job';
 import { navigateTo } from '@/utils/route';
 
 import './index.less';
 
 interface IProps {
-  open: boolean;
   onCancel: () => void;
   onConfirm: (type: GET_CONTACT_TYPE) => void;
 }
@@ -20,11 +20,11 @@ const PREFIX = 'prejob-popup';
 
 const GET_CONTACT_TYPE_OPTIONS = [
   {
-    type: GET_CONTACT_TYPE.SHARE,
+    type: GET_CONTACT_TYPE.MATERIAL,
     icon: 'https://publiccdn.neighbourhood.com.cn/img/file.svg',
-    title: '完善资料',
+    title: '创建模卡（免费报单）',
-    desc: '转发给朋友可享推荐奖励',
+    desc: '免费报单，优先推荐给企业，机会更多',
-    btnText: '分享',
+    btnText: '创建',
   },
   {
     type: GET_CONTACT_TYPE.VIP,
@@ -33,34 +33,31 @@ const GET_CONTACT_TYPE_OPTIONS = [
     desc: '开通会员每天可查看10个',
     btnText: '开通',
   },
-  {
-    type: GET_CONTACT_TYPE.VIDEO,
-    icon: 'https://publiccdn.neighbourhood.com.cn/img/video.svg',
-    title: '观看视频',
-    desc: '观看6-30s广告即可免费查看',
-    btnText: '观看',
-  },
 ];
 
-export function PrejobPopup({ open, onCancel, onConfirm }: IProps) {
+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.SHARE) {
+    if (type === GET_CONTACT_TYPE.MATERIAL) {
-      navigateTo(PageUrl.PartnerShare);
+      navigateTo(PageUrl.MaterialUploadVideo);
-    } else {
       onConfirm(type);
     }
+    if (type === GET_CONTACT_TYPE.VIP) {
+      setOpenPopup(false);
+      setOpenDialog(true);
+    }
   };
+  const handleAfterBuy = useCallback(async () => {
+    onConfirm(GET_CONTACT_TYPE.VIP);
+  }, [onConfirm]);
   return (
-    <Popup rounded className={PREFIX} placement="bottom" open={open} onClose={onCancel}>
+    <Fragment>
+      <Popup rounded className={PREFIX} placement="bottom" open={openPopup} onClose={onCancel}>
         <div className={`${PREFIX}__content`}>
           <div className={`${PREFIX}__title`}>以下方式任选其一均可获取联系方式</div>
           <div className={`${PREFIX}__body`}>
             {GET_CONTACT_TYPE_OPTIONS.map(option => {
-            // 该方式只能用一次, 以后不再出现在选项中
-            if (option.type === GET_CONTACT_TYPE.SHARE && !hasShareToGetContact()) {
-              return null;
-            }
-
               return (
                 <div className={`${PREFIX}__item`} key={option.type}>
                   <div className={`${PREFIX}__item-icon ${option.type}`}>
@@ -82,5 +79,11 @@ export function PrejobPopup({ open, onCancel, onConfirm }: IProps) {
         </div>
         <SafeBottomPadding />
       </Popup>
+      <Dialog open={openDialog} onClose={onCancel}>
+        <Dialog.Content>
+          <JobBuy onConfirm={handleAfterBuy} buyOnly />
+        </Dialog.Content>
+      </Dialog>
+    </Fragment>
   );
 }

src/components/product-dialog/const.ts

@@ -14,7 +14,6 @@ export enum DialogStatus {
   JOB_UNABLE_UNLOCK = 'job_unable_unlock',
   // 通告解锁次数用完，购买界面
   JOB_BUY = 'job_buy',
-  PREACTION_JOB_BUY = 'preaction_job_buy',
   // 加群二维码
   GROUP_QR_CODE = 'group_qr_code',
   // 确定加群

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

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

src/components/product-dialog/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

@@ -3,24 +3,20 @@ import Taro from '@tarojs/taro';
 import { Dialog } from '@taroify/core';
 import { useCallback, useEffect, useRef, useState } from 'react';
 
-import { PrejobPopup } from '@/components/prejob-popup';
 import { DialogStatus, PREFIX } from '@/components/product-dialog/const';
 import JobBuy from '@/components/product-dialog/steps-ui/job-buy';
 import ContactCustomerService from '@/components/product-dialog/steps-ui/job-contact-customer';
 import ContactDirect from '@/components/product-dialog/steps-ui/job-contact-direct';
 import UnableUnlockContent from '@/components/product-dialog/steps-ui/job-unable';
-import { EventName } from '@/constants/app';
-import { GET_CONTACT_TYPE } from '@/constants/job';
 import { DeclarationType, ProductType } from '@/constants/product';
 import { JobDetails } from '@/types/job';
 import { ProductInfo } from '@/types/product';
 import { logWithPrefix } from '@/utils/common';
-import { getSkipPrejobAction, setSkipPrejobAction } from '@/utils/job';
 import {
-  requestAllBuyProduct,
-  requestProductBalance,
   requestProductUseRecord,
+  requestProductBalance,
   requestUseProduct,
+  requestAllBuyProduct,
 } from '@/utils/product';
 import Toast from '@/utils/toast';
 
@@ -37,33 +33,15 @@ const log = logWithPrefix('product-job-dialog');
 function ProductJobDialog(props: Omit<IProps, 'visible'>) {
   const { data, onClose } = props;
   const [status, setStatus] = useState<DialogStatus>(DialogStatus.LOADING);
-  const [showContact, setShowContact] = useState(false);
-  const [showPrejob, setShowPrejob] = useState(false);
   const [publisherAcctNo, setPublisherAcctNo] = useState<string>('');
-  const initRef = useRef<(skipPreAction?: boolean, skipRecordGet?: boolean) => void | Promise<void>>(() => {});
+  const initRef = useRef(() => {});
 
   const handleCloseDialog = useCallback(() => {
-    setShowContact(false);
     onClose();
   }, [onClose]);
 
-  const handleClosePrejob = useCallback(() => {
-    setShowPrejob(false);
-  }, []);
-
-  const handleConfirmPrejob = useCallback(async (type: GET_CONTACT_TYPE) => {
-    if (type === GET_CONTACT_TYPE.VIP) {
-      const allowBuy = await requestAllBuyProduct(PRODUCT_CODE);
-      setShowContact(true);
-      setShowPrejob(false);
-      setStatus(allowBuy ? DialogStatus.PREACTION_JOB_BUY : DialogStatus.JOB_UNABLE_UNLOCK);
-    } else if (type === GET_CONTACT_TYPE.VIDEO) {
-      Taro.eventCenter.trigger(EventName.SHOW_VIDEO_REWARD);
-    }
-  }, []);
-
   const handleAfterBuy = useCallback(async () => {
-    const time = await requestProductBalance(PRODUCT_CODE);
+    const [time] = await requestProductBalance(PRODUCT_CODE);
     if (time <= 0) {
       Toast.error('发生错误请重试');
       onClose();
@@ -71,8 +49,6 @@ function ProductJobDialog(props: Omit<IProps, 'visible'>) {
     }
     const productInfo = await requestUseProduct(PRODUCT_CODE, { jobId: data.id });
     const declarationTypeResult = productInfo.declarationTypeResult;
-    setShowContact(true);
-    setShowPrejob(false);
     if (declarationTypeResult?.type === DeclarationType.Direct && declarationTypeResult.publisherAcctNo) {
       setStatus(DialogStatus.JOB_CONTACT_DIRECT);
       setPublisherAcctNo(declarationTypeResult.publisherAcctNo);
@@ -86,9 +62,8 @@ function ProductJobDialog(props: Omit<IProps, 'visible'>) {
   }, [data]);
 
   useEffect(() => {
-    initRef.current = async (skipPreAction?: boolean, skipRecordGet?: boolean) => {
+    initRef.current = async () => {
       const handleContact = (declarationTypeResult?: ProductInfo['declarationTypeResult']) => {
-        setShowContact(true);
         if (declarationTypeResult?.type === DeclarationType.Direct && declarationTypeResult.publisherAcctNo) {
           setStatus(DialogStatus.JOB_CONTACT_DIRECT);
           setPublisherAcctNo(declarationTypeResult.publisherAcctNo);
@@ -102,34 +77,19 @@ function ProductJobDialog(props: Omit<IProps, 'visible'>) {
         //   setStatus(DialogStatus.JOB_CONTACT_CS);
         //   return;
         // }
-        if (!skipRecordGet) {
         const result = await requestProductUseRecord(PRODUCT_CODE, { jobId: data.id });
         log('requestProductUseRecord result', result);
         if (result) {
           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);
-          setShowContact(true);
           setStatus(allowBuy ? DialogStatus.JOB_BUY : DialogStatus.JOB_UNABLE_UNLOCK);
-        }
-        // 创建模卡之后可以直接解锁一次, 分享后解锁一次
-        else if (getSkipPrejobAction() || skipPreAction) {
-          const productInfo = await requestUseProduct(PRODUCT_CODE, { jobId: data.id });
-          setShowPrejob(false);
-          if (!skipPreAction) {
-            setSkipPrejobAction(false);
-          }
-          handleContact(productInfo.declarationTypeResult);
         } else {
-          setShowPrejob(true);
+          const productInfo = await requestUseProduct(PRODUCT_CODE, { jobId: data.id });
-          setStatus(DialogStatus.PRE_ACTION);
+          handleContact(productInfo.declarationTypeResult);
-
-          // const productInfo = await requestUseProduct(PRODUCT_CODE, { jobId: data.id });
-          // handleContact(productInfo.declarationTypeResult);
         }
       } catch (e) {
         Toast.error('出错了，请重试');
@@ -144,44 +104,21 @@ function ProductJobDialog(props: Omit<IProps, 'visible'>) {
     initRef.current();
   }, []);
 
-  useEffect(() => {
-    Taro.eventCenter.once(EventName.PRE_ACTION_SHARE_SUCCESS, () => {
-      initRef.current(true, true);
-    });
-    Taro.eventCenter.on(EventName.PRE_ACTION_VIDEO_SUCCESS, () => {
-      initRef.current(true, true);
-    });
-
-    return () => {
-      Taro.eventCenter.off(EventName.PRE_ACTION_SHARE_SUCCESS);
-      Taro.eventCenter.off(EventName.PRE_ACTION_VIDEO_SUCCESS);
-    };
-  }, []);
-
   if (status === DialogStatus.LOADING) {
     return null;
   }
 
   return (
-    <div>
+    <Dialog className={PREFIX} onClose={onClose} open>
-      <PrejobPopup open={showPrejob} onCancel={handleClosePrejob} onConfirm={handleConfirmPrejob} />
-      <Dialog className={PREFIX} onClose={onClose} open={showContact}>
       <Dialog.Content>
         {status === DialogStatus.JOB_CONTACT_CS && <ContactCustomerService onAfterConfirm={handleCloseDialog} />}
         {status === DialogStatus.JOB_CONTACT_DIRECT && (
-            <ContactDirect
+          <ContactDirect publisherAcctNo={publisherAcctNo} onAfterConfirm={handleCloseDialog} onReport={handleReport} />
-              publisherAcctNo={publisherAcctNo}
-              onAfterConfirm={handleCloseDialog}
-              onReport={handleReport}
-            />
-          )}
-          {(status === DialogStatus.JOB_BUY || status === DialogStatus.PREACTION_JOB_BUY) && (
-            <JobBuy onConfirm={handleAfterBuy} justBuy={status === DialogStatus.PREACTION_JOB_BUY} />
         )}
+        {status === DialogStatus.JOB_BUY && <JobBuy onConfirm={handleAfterBuy} />}
         {status === DialogStatus.JOB_UNABLE_UNLOCK && <UnableUnlockContent onConfirm={handleCloseDialog} />}
       </Dialog.Content>
     </Dialog>
-    </div>
   );
 }
 

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

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

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

@@ -31,48 +31,48 @@ interface Item {
 }
 
 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_1,
+    id: ProductSpecId.BOSS_VIP_NEW_2,
-    title: '展示一周',
+    title: '推荐一月',
     price: '480播豆',
     amt: 48,
     badge: '限时体验',
     contents: [
-      { content: '-1个通告' },
+      { content: '-通告每日优先展示' },
       { content: '-每天可查看20个主播详情' },
-      { content: '-每天可自主联系10个主播' },
+      { content: '-每天可主动联系10个主播', highlight: true },
-      // { 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: '2680播豆',
+    price: '960播豆',
-  //   amt: 268,
+    amt: 96,
-  //   badge: '7折',
+    badge: '6.7折',
-  //   contents: [
+    contents: [
-  //     { content: '-1个通告' },
+      { content: '-通告每日优先展示' },
-  //     { content: '-每天可查看20个主播详情' },
+      { content: '-每天可查看20个主播详情' },
-  //     { content: '-每天可自主联系10个主播' },
+      { content: '-每天可主动联系10个主播' },
       // { content: '-播络可代为联系60个主播（高成功率）', highlight: true },
-  //     { content: '-有效期3个月' },
+      { content: '-有效期一个季度' },
-  //   ],
+    ],
-  // },
+  },
 ];
 
 const subscribe = async () => {

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

@@ -2,7 +2,7 @@ import Taro from '@tarojs/taro';
 
 import { Button } from '@taroify/core';
 import classNames from 'classnames';
-import { Fragment, useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 import Badge from '@/components/badge';
 import { PREFIX } from '@/components/product-dialog/const';
@@ -16,7 +16,7 @@ import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
 import Toast from '@/utils/toast';
 
 interface IProps {
-  justBuy?: boolean;
+  buyOnly?: boolean;
   onConfirm: () => void;
 }
 
@@ -24,29 +24,32 @@ interface Item {
   id: ProductSpecId;
   title: string;
   content: string;
+  buyOnlyContent?: string;
   price: string;
   amt: number;
   badge?: string;
 }
 
 const LIST: Item[] = [
-  { id: ProductSpecId.DailyVIP, title: '日会员', content: '1天内免广告', price: '60播豆', amt: 6, badge: '限时体验' },
+  { id: ProductSpecId.WeeklyVIP, title: '非会员', content: '每日2次', price: '免费', amt: 0 },
+  {
+    id: ProductSpecId.DailyVIP,
+    title: '日会员',
+    content: '每日+10次',
+    buyOnlyContent: '每日12次',
+    price: '60播豆',
+    amt: 6,
+    badge: '限时体验',
+  },
   {
     id: ProductSpecId.WeeklyVIP,
     title: '周会员',
-    content: '7天内免广告',
+    content: '每日+10次',
+    buyOnlyContent: '每日12次',
     price: '180播豆',
     amt: 18,
-    badge: '4.2折',
+    badge: ' 超值',
   },
-  // {
-  //   id: ProductSpecId.NewMonthlyVIP,
-  //   title: '月会员',
-  //   content: '30天内免广告',
-  //   price: '300播豆',
-  //   amt: 30,
-  //   badge: '1.6折',
-  // },
 ];
 
 const log = logWithPrefix('job-buy');
@@ -63,7 +66,7 @@ const subscribe = async () => {
 };
 
 export default function JobBuy(props: IProps) {
-  const { onConfirm } = props;
+  const { onConfirm, buyOnly } = props;
   const [selectItem, setSelectItem] = useState(LIST[1]);
 
   const handleClickItem = useCallback((newSelectItem: Item) => setSelectItem(newSelectItem), []);
@@ -107,30 +110,30 @@ export default function JobBuy(props: IProps) {
 
   return (
     <div className={`${PREFIX}__job-buy`}>
-      <div className={`${PREFIX}__job-buy__header`}>
+      {buyOnly ? (
-        {props.justBuy ? (
+        <div className={`${PREFIX}__job-buy__header`}>开通播络会员即可直接查看联系方式</div>
-          <div>开通播络会员即可直接查看联系方式</div>
       ) : (
-          <Fragment>
+        <div className={`${PREFIX}__job-buy__header`}>
           <div>今日通告对接次数</div>
           <div className="highlight">已用完</div>
-          </Fragment>
-        )}
         </div>
-      <div className={`${PREFIX}__job-buy__describe`}>
+      )}
-        {props.justBuy ? (
+      {buyOnly ? (
-          <div>每天可查看10个联系方式</div>
+        <div className={`${PREFIX}__job-buy__describe`}>每天可获取12个联系方式</div>
       ) : (
-          <Fragment>
+        <div className={`${PREFIX}__job-buy__describe`}>
           <div>请</div>
           <div className="highlight">明日</div>
-            <div>再来</div>
+          <div>再来 或 </div>
           <div className="highlight">升级会员</div>
-          </Fragment>
-        )}
         </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`, {
@@ -139,12 +142,15 @@ 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 })}>{item.title}</div>
+              <div className={classNames(`${PREFIX}__job-buy__item__title`, { free: item.amt === 0 })}>
-            <div className={`${PREFIX}__job-buy__item__content`}>{item.content}</div>
+                {item.title}
+              </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>
       <Button className={`${PREFIX}__job-buy__button`} onClick={handleBuy}>
         {`支付 ${selectItem.amt} 元`}

src/constants/app.ts

@@ -24,10 +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',
-  PRE_ACTION_SHARE_SUCCESS = 'pre_action_share_success',
-  PRE_ACTION_VIDEO_SUCCESS = 'pre_action_video_success',
-  PRE_ACTION_VIDEO_ERROR = 'pre_action_video_error',
-  SHOW_VIDEO_REWARD = 'show_video_reward',
 }
 
 export enum OpenSource {
@@ -79,7 +75,6 @@ export enum PageUrl {
   Partner = 'pages/partner/index',
   WithdrawRecord = 'pages/withdraw-record/index',
   GroupDelegatePublish = 'pages/group-delegate-publish/index',
-  PartnerShare = 'pages/partner-share/index',
 }
 
 export enum PluginUrl {

src/constants/cache-key.ts

@@ -13,7 +13,4 @@ export enum CacheKey {
   AGREEMENT_SIGNED = '__agreement_signed__',
   CITY_CODES = '__city_codes__',
   JOIN_GROUP_CARD_CLICKED = '__join_group_card_clicked__',
-  SHARE_TO_GET_JOB_CONTACT = '__share_to_get_job_contract__',
-  SHARE_TO_GET_ANCHOR_CONTACT = '__share_to_get_anchor_contract__',
-  SKIP_PREACTION = '__skip_preaction__',
 }

src/constants/job.ts

@@ -21,6 +21,12 @@ export enum EmployType {
   Part = 'PARTY_TIME',
 }
 
+export enum JobSourceType {
+  All = 'All',
+  VX = 'vx',
+  BL = 'bl',
+}
+
 export enum SortType {
   RECOMMEND = 'RECOMMEND',
   DISTANCE = 'DISTANCE',
@@ -66,6 +72,12 @@ export const EMPLOY_TYPE_TITLE_MAP = {
   [EmployType.Full]: '全职',
 };
 
+export const JOB_SOURCE_TYPE_TITLE_MAP = {
+  [JobSourceType.All]: '全部',
+  [JobSourceType.BL]: '认证通告',
+  [JobSourceType.VX]: '群通告',
+};
+
 export const JOB_TYPE_TITLE_MAP: { [key in JobType]: string } = {
   [JobType.All]: '全部',
   [JobType.Finery]: '服饰',
@@ -101,16 +113,31 @@ export const JOB_MANAGE_STATUS_TITLE_MAP = {
 
 export const JOB_PAGE_TABS = [
   {
-    type: EmployType.All,
+    type: JobSourceType.All,
-    title: EMPLOY_TYPE_TITLE_MAP[EmployType.All],
+    title: JOB_SOURCE_TYPE_TITLE_MAP[JobSourceType.All],
   },
   {
-    type: EmployType.Part,
+    type: JobSourceType.BL,
-    title: EMPLOY_TYPE_TITLE_MAP[EmployType.Part],
+    title: JOB_SOURCE_TYPE_TITLE_MAP[JobSourceType.BL],
   },
   {
-    type: EmployType.Full,
+    type: JobSourceType.VX,
-    title: EMPLOY_TYPE_TITLE_MAP[EmployType.Full],
+    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,
+    label: EMPLOY_TYPE_TITLE_MAP[EmployType.Part],
+  },
+  {
+    value: EmployType.Full,
+    label: EMPLOY_TYPE_TITLE_MAP[EmployType.Full],
   },
 ];
 
@@ -176,7 +203,6 @@ export const PART_PRICE_OPTIONS = PART_EMPLOY_SALARY_OPTIONS.filter(o => !!o.val
 export const FULL_PRICE_OPTIONS = FULL_EMPLOY_SALARY_OPTIONS.filter(o => !!o.value);
 
 export enum GET_CONTACT_TYPE {
-  SHARE = 'share',
   VIP = 'vip',
-  VIDEO = 'video',
+  MATERIAL = 'material',
 }

src/fragments/job/base/index.less

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

src/fragments/job/base/index.tsx

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

src/fragments/profile/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));
 };
 

src/fragments/profile/view/index.tsx

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

src/fragments/user/company/index.tsx

@@ -5,7 +5,6 @@ import { useCallback } from 'react';
 import CertificationStatus from '@/components/certification-status';
 import WechatCell from '@/components/wx-cell';
 import { PageUrl } from '@/constants/app';
-import { CertificationStatusType } from '@/constants/company';
 import useUserInfo from '@/hooks/use-user-info';
 import { navigateTo } from '@/utils/route';
 
@@ -18,10 +17,6 @@ export default function CompanyFragment() {
   // const [showPublish, setShowPublish] = useState(false);
 
   const handlePublishJob = useCallback(async () => {
-    if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
-      navigateTo(PageUrl.CertificationStart);
-      return;
-    }
     navigateTo(PageUrl.CertificationManage);
   }, [userInfo]);
 

src/hooks/use-cached-job.tsx

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

src/hooks/use-config.tsx

@@ -48,7 +48,7 @@ const CompanyTabs: TabItemType[] = [
   {
     type: PageType.BatchPublish,
     pagePath: PageUrl.UserBatchPublish,
-    text: '主播群',
+    text: '代招代发',
   },
 ];
 
@@ -98,7 +98,6 @@ export const APP_CONFIG: AppConfigType = {
     PageUrl.Partner,
     PageUrl.WithdrawRecord,
     PageUrl.GroupDelegatePublish,
-    PageUrl.PartnerShare,
     // PageUrl.DevDebug,
   ],
   window: {

src/http/api.ts

@@ -1,4 +1,4 @@
-// export const DOMAIN = 'http://192.168.60.148:8082';
+// export const DOMAIN = 'http://192.168.60.191:8082';
 export const DOMAIN = 'https://neighbourhood.cn';
 export const BASE_URL = `${DOMAIN}/api`;
 

src/http/constant.ts

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

src/pages/anchor/index.less

@@ -90,4 +90,25 @@
     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,6 +1,7 @@
-import { Image } from '@tarojs/components';
+import { Button, Image } from '@tarojs/components';
 import Taro, { NodesRef, useDidShow, useLoad, useShareAppMessage } from '@tarojs/taro';
 
+import { Popup } from '@taroify/core';
 import { ArrowDown, ArrowUp } from '@taroify/icons';
 import classNames from 'classnames';
 import { isEqual } from 'lodash-es';
@@ -13,9 +14,10 @@ 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 { EmployType, JobManageStatus } from '@/constants/job';
+import { EmployType } from '@/constants/job';
 import { ALL_ANCHOR_SORT_TYPES, ANCHOR_SORT_TYPE_TITLE_MAP, AnchorSortType } from '@/constants/material';
 import useInviteCode from '@/hooks/use-invite-code';
 import useListHeight, { IUseListHeightProps } from '@/hooks/use-list-height';
@@ -32,6 +34,7 @@ import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
 import { getPageQuery, navigateTo } from '@/utils/route';
 import { getCommonShareMessage } from '@/utils/share';
 import Toast from '@/utils/toast';
+
 import './index.less';
 
 const PREFIX = 'page-anchor';
@@ -82,6 +85,7 @@ export default function AnchorPage() {
   const [filters, setFilters] = useState<IAnchorFilters>({ employType: EmployType.All });
   const [showFilter, setShowFilter] = useState<boolean>(false);
   const [sortType, setSortType] = useState<AnchorSortType>(AnchorSortType.Active);
+  const [openPopup, setOpenPopup] = useState<boolean>(false);
   const [coordinate, setCoordinate] = useState<Coordinate>({
     latitude: location.latitude,
     longitude: location.longitude,
@@ -92,6 +96,8 @@ 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,7 +131,7 @@ export default function AnchorPage() {
   );
 
   const handlePublishJobChange = useCallback(async () => {
-    const { jobResults = [] } = await requestJobManageList({ status: JobManageStatus.Open });
+    const { jobResults = [] } = await requestJobManageList();
     if (!selectJob) {
       // 之前没有开发中的通告，自动选中第一个开放中的通告
       handleChangeSelectJob(jobResults[0]);
@@ -141,6 +147,10 @@ export default function AnchorPage() {
     }
   }, [selectJob, handleChangeSelectJob]);
 
+  const handleGoCreate = useCallback(() => {
+    navigateTo(PageUrl.JobPublish);
+  }, []);
+
   useEffect(() => {
     Taro.eventCenter.on(EventName.SELECT_MY_PUBLISH_JOB, handleJobChange);
     Taro.eventCenter.on(EventName.COMPANY_JOB_PUBLISH_CHANGED, handlePublishJobChange);
@@ -170,12 +180,12 @@ export default function AnchorPage() {
 
     const query = getPageQuery();
     getInviteCodeFromQueryAndUpdate(query);
-    console.log('哈哈哈 useLoad');
 
     try {
-      const { jobResults = [] } = await requestJobManageList({ status: JobManageStatus.Open });
+      const { jobResults = [] } = await requestJobManageList();
       if (!jobResults.length) {
-        Toast.info('当前是根据定位为您展示主播');
+        setOpenPopup(true);
+        // Toast.info('当前是根据定位为您展示主播');
         return;
       }
       const lastSelectJobId = getLastSelectMyJobId();
@@ -241,6 +251,21 @@ export default function AnchorPage() {
           <AnchorPicker value={filters} onConfirm={handleFilterChange} />
         </Overlay>
       </div>
+      <Popup
+        rounded
+        open={openPopup}
+        placement="bottom"
+        className={`${PREFIX}__popup`}
+        onClose={() => setOpenPopup(false)}
+      >
+        <div className={`${PREFIX}__popup-content`}>
+          <div className={`${PREFIX}__popup-title`}>创建通告后可根据位置展示主播</div>
+          <Button className={`${PREFIX}__popup-confirm`} onClick={handleGoCreate}>
+            去创建
+          </Button>
+        </div>
+        <SafeBottomPadding />
+      </Popup>
     </HomePage>
   );
 }

src/pages/certification-manage/index.tsx

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

src/pages/certification/index.tsx

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

src/pages/job-detail/index.tsx

@@ -1,7 +1,7 @@
-import { Map, MapProps, Text, Image, Button } from '@tarojs/components';
+import { Button, Image, Map, MapProps, Text } from '@tarojs/components';
 import Taro, { useLoad, useShareAppMessage } from '@tarojs/taro';
 
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 
 import { CertificationStatusIcon } from '@/components/certification-status';
 import CommonDialog from '@/components/common-dialog';
@@ -9,13 +9,13 @@ 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 { 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 } from '@/constants/job';
+import { EMPLOY_TYPE_TITLE_MAP, GET_CONTACT_TYPE, JobManageStatus } from '@/constants/job';
 import useInviteCode from '@/hooks/use-invite-code';
 import useUserInfo from '@/hooks/use-user-info';
 import useRoleType from '@/hooks/user-role-type';
@@ -26,7 +26,7 @@ import { IMaterialMessage } from '@/types/message';
 import { switchRoleType } from '@/utils/app';
 import { copy, logWithPrefix } from '@/utils/common';
 import { collectEvent, reportEvent } from '@/utils/event';
-import { getJobTitle, getJobSalary, postPublishJob, requestJobDetail } from '@/utils/job';
+import { getJobSalary, getJobTitle, postPublishJob, requestJobDetail } from '@/utils/job';
 import { calcDistance, isValidLocation } from '@/utils/location';
 import { requestProfileDetail } from '@/utils/material';
 import { isChatWithSelf, postCreateChat } from '@/utils/message';
@@ -38,6 +38,12 @@ import Toast from '@/utils/toast';
 import { isNeedCreateMaterial } from '@/utils/user';
 
 import './index.less';
+import { Dialog } from '@taroify/core';
+import CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
+import { requestProductBalance } from '@/utils/product';
+import { ProductType } from '@/constants/product';
+import store from '@/store';
+import { cacheJobId } from '@/store/actions';
 
 const PREFIX = 'job-detail';
 const log = logWithPrefix(PREFIX);
@@ -76,19 +82,27 @@ const AnchorFooter = (props: { data: JobDetails }) => {
     reportEvent(ReportEventId.CLICK_JOB_CONTACT);
     try {
       const needCreateMaterial = await isNeedCreateMaterial();
+
+      if (data.sourcePlat !== 'bl') {
         if (needCreateMaterial) {
+          const [time] = await requestProductBalance(ProductType.VIP);
+          if (time <= 0) {
             setShowMaterialGuide(true);
             return;
           }
+        }
+      }
       if (data.isAuthed) {
         const toUserId = data.userId;
         if (isChatWithSelf(toUserId)) {
           Toast.error('不能与自己聊天');
           return;
         }
-        const profile = await requestProfileDetail();
         const chat = await postCreateChat(toUserId);
-        const materialMessage: IMaterialMessage = {
+        let materialMessage: null | IMaterialMessage = null;
+        if (!needCreateMaterial) {
+          const profile = await requestProfileDetail();
+          materialMessage = {
             id: profile.id,
             name: profile.name,
             age: profile.age,
@@ -98,7 +112,13 @@ 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);
       }
@@ -113,7 +133,15 @@ const AnchorFooter = (props: { data: JobDetails }) => {
     }
   }, [data]);
 
-  const handleDialogHidden = useCallback(() => setDialogVisible(false), []);
+  const handleDialogHidden = useCallback(() => {
+    setDialogVisible(false);
+  }, []);
+  const handleConfirmPrejob = useCallback((type: GET_CONTACT_TYPE) => {
+    setShowMaterialGuide(false);
+    if (GET_CONTACT_TYPE.VIP === type) {
+      setDialogVisible(true);
+    }
+  }, []);
   return (
     <>
       <div className={`${PREFIX}__footer`}>
@@ -126,7 +154,9 @@ const AnchorFooter = (props: { data: JobDetails }) => {
       </div>
       <div>
         {dialogVisible && <ProductJobDialog data={data} onClose={handleDialogHidden} />}
-        {showMaterialGuide && <MaterialGuide onClose={() => setShowMaterialGuide(false)} />}
+        {showMaterialGuide && (
+          <PrejobPopup onCancel={() => setShowMaterialGuide(false)} onConfirm={handleConfirmPrejob} />
+        )}
         <CommonDialog
           content={errorTips}
           confirm="确定"
@@ -141,25 +171,37 @@ 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.BOSS_VIP_EXPIRED) {
+      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(e.message || '发布失败请重试', 3000);
+        Toast.error(errorMsg || '发布失败请重试', 3000);
       }
       console.error(e);
     }
@@ -171,10 +213,19 @@ const CompanyFooter = (props: { data: JobDetails }) => {
         <Button className={`${PREFIX}__share-button`} onClick={handleClickEdit}>
           编辑
         </Button>
-        <Button className={`${PREFIX}__contact-publisher`} onClick={handlePublishJob}>
+        <Button
+          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>
     </>
   );
 };
@@ -183,7 +234,6 @@ export default function JobDetail() {
   const roleType = useRoleType();
   const userInfo = useUserInfo();
   const [data, setData] = useState<JobDetails | null>(null);
-  const videoRef = useRef<Taro.RewardedVideoAd | null>(null);
   const isOwner = roleType === RoleType.Company && userInfo.userId === data?.userId;
   const inviteCode = useInviteCode();
 
@@ -220,60 +270,12 @@ export default function JobDetail() {
     };
   }, []);
 
-  useEffect(() => {
-    const handleLoad = () => {
-      log('视频奖励加载成功');
-    };
-    const handleError = err => {
-      Taro.eventCenter.trigger(EventName.PRE_ACTION_VIDEO_ERROR);
-      log('视频奖励加载失败', err);
-    };
-    const handleClose = res => {
-      if (res.isEnded) {
-        Taro.eventCenter.trigger(EventName.PRE_ACTION_VIDEO_SUCCESS);
-      } else {
-        Toast.info('请完整观看广告以获得奖励');
-      }
-    };
-    const handleShowVideo = async () => {
-      if (videoRef.current) {
-        try {
-          await videoRef.current.show();
-        } catch (error) {
-          Taro.eventCenter.trigger(EventName.PRE_ACTION_VIDEO_ERROR);
-          Toast.info('广告奖励加载失败，请重试');
-          log('激励视频显示失败');
-        }
-      } else {
-        Taro.eventCenter.trigger(EventName.PRE_ACTION_VIDEO_ERROR);
-        Toast.info('广告奖励加载失败，请重试');
-        log('激励视频加载&显示失败');
-      }
-    };
-    videoRef.current = Taro.createRewardedVideoAd({
-      adUnitId: 'adunit-ca879f574edfeb33',
-    });
-    videoRef.current.onLoad(handleLoad);
-    videoRef.current.onClose(handleClose);
-    videoRef.current.onError(handleError);
-
-    videoRef.current.load();
-    Taro.eventCenter.on(EventName.SHOW_VIDEO_REWARD, handleShowVideo);
-
-    return () => {
-      if (videoRef.current) {
-        videoRef.current.offLoad(handleLoad);
-        videoRef.current.offError(handleError);
-        videoRef.current.offClose(handleClose);
-      }
-      Taro.eventCenter.off(EventName.SHOW_VIDEO_REWARD);
-    };
-  }, []);
-
   useLoad(async () => {
-    switchRoleType(RoleType.Anchor);
+    const query = getPageQuery<Pick<JobDetails, 'id'> & { c: string; share: string }>();
 
-    const query = getPageQuery<Pick<JobDetails, 'id'> & { c: string }>();
+    if (query?.share === 'true') {
+      switchRoleType(RoleType.Anchor);
+    }
     getInviteCodeFromQueryAndUpdate(query);
     const jobId = query?.id;
     if (!jobId) {

src/pages/job-publish/index.tsx

@@ -1,8 +1,9 @@
 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, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 
 import BlFormCell from '@/components/bl-form-cell';
 import BlFormInput from '@/components/bl-form-input';
@@ -12,15 +13,30 @@ 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 { postCloseJob, postCreateJob, postUpdateJob, requestJobDetail, isFullTimePriceRequired, isPartTimePriceRequired } from '@/utils/job';
+import {
+  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';
 
@@ -91,6 +107,9 @@ 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,7 +163,7 @@ export default function JobPublish() {
     }
   }, [job]);
 
-  const handleSubmit = useCallback(async () => {
+  const getCreateJobInfo = useCallback((): [CreateJobInfo, string[]] => {
     const cityCodes = city || [];
     const data: CreateJobInfo = {
       title,
@@ -160,6 +179,11 @@ 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);
@@ -178,10 +202,47 @@ export default function JobPublish() {
         await postUpdateJob(data);
         Taro.eventCenter.trigger(EventName.JOB_UPDATE, job!.id);
       } else {
-        await postCreateJob(data);
+        const jobId = await postCreateJob(data);
+        createdJobIdRef.current = jobId;
+        Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
+
+        if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
+          // 去认证
+          store.dispatch(cacheJobId(jobId));
+          navigateTo(PageUrl.CertificationStart);
+          Taro.hideLoading();
+          return;
+        }
+
+        const [time] = await requestProductBalance(ProductType.CompanyPublishJob);
+        if (time <= 0) {
+          // 付钱
+          setShowBuy(true);
+          Taro.hideLoading();
+          return;
+        }
+
+        await postPublishJob(jobId);
       }
       Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
-      await Toast.success(isUpdateJob ? '更新成功' : '创建成功', 1500, true);
+      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]);
+
+  const handleNext = useCallback(async () => {
+    Taro.showLoading();
+    try {
+      await postPublishJob(createdJobIdRef.current);
+      Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
+      await Toast.success('发布成功', 1500, true);
       navigateBack();
     } catch (e) {
       console.error('submit error', e);
@@ -190,7 +251,12 @@ export default function JobPublish() {
     } finally {
       Taro.hideLoading();
     }
-  }, [isUpdate, job, title, employType, category, describe, city, salary, address]);
+  }, []);
+
+  const handleClosePublishJob = useCallback(() => {
+    setShowBuy(false);
+    navigateBack(-1);
+  }, []);
 
   useEffect(() => {
     const callback = (d: string) => setDescribe(d);
@@ -283,7 +349,7 @@ export default function JobPublish() {
         <div className={`${PREFIX}__footer__buttons`}>
           {!isUpdate && (
             <Button className={`${PREFIX}__footer__button`} onClick={handleSubmit}>
-              创建
+              创建并发布
             </Button>
           )}
           {isUpdate && (
@@ -306,6 +372,11 @@ export default function JobPublish() {
           onConfirm={handleConfirmCityPicker}
           onCancel={() => setShowCityPicker(false)}
         />
+        <Dialog open={showBuy} onClose={handleClosePublishJob}>
+          <Dialog.Content>
+            <CompanyPublishJobBuy onNext={handleNext} />
+          </Dialog.Content>
+        </Dialog>
       </div>
     </div>
   );

src/pages/job-search/index.tsx

@@ -150,7 +150,7 @@ export default function JobSearch() {
       <SearchInput
         focus={focus}
         value={value}
-        placeholder="你想搜什么"
+        placeholder="可以试试地区 品类"
         searchAction={searchAction}
         className={`${PREFIX}__search`}
         onClear={handleSearchClear}

src/pages/job-select-my-publish/index.tsx

@@ -6,7 +6,6 @@ import classNames from 'classnames';
 import { useCallback, useState } from 'react';
 
 import { EventName, OpenSource } from '@/constants/app';
-import { JobManageStatus } from '@/constants/job';
 import { JobManageInfo } from '@/types/job';
 import { getJobLocation, requestJobManageList } from '@/utils/job';
 import { getPageQuery, navigateBack } from '@/utils/route';
@@ -34,7 +33,7 @@ export default function JobSelectMyPublish() {
     const query = getPageQuery<{ id: string; source: OpenSource }>();
     query?.id && setJobId(query.id);
     try {
-      const res = await requestJobManageList({ status: JobManageStatus.Open });
+      const res = await requestJobManageList();
       setList(res.jobResults);
       setSource(query.source);
     } catch (e) {

src/pages/job/index.tsx

@@ -3,11 +3,11 @@ import Taro, { useDidShow, useLoad, useShareAppMessage } from '@tarojs/taro';
 import { Tabs } from '@taroify/core';
 import { useCallback, useEffect, useRef, useState } from 'react';
 
+import { AgreementPopup } from '@/components/agreement-popup';
 import HomePage from '@/components/home-page';
-import { LoginGuide } from '@/components/login-guide';
 import MaterialGuide from '@/components/material-guide';
 import { EventName, OpenSource, PageType, PageUrl, RoleType } from '@/constants/app';
-import { EmployType, JOB_PAGE_TABS, SortType } from '@/constants/job';
+import { EmployType, JOB_PAGE_TABS, JobSourceType, SortType } from '@/constants/job';
 import JobFragment from '@/fragments/job/base';
 import useInviteCode from '@/hooks/use-invite-code';
 import useLocation from '@/hooks/use-location';
@@ -21,8 +21,7 @@ import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
 import { getJumpUrl, getPageQuery, navigateTo } from '@/utils/route';
 import { getCommonShareMessage } from '@/utils/share';
 import Toast from '@/utils/toast';
-import { isNeedCreateMaterial } from '@/utils/user';
+import { getAgreementSigned, setAgreementSigned } from '@/utils/user';
-
 import './index.less';
 
 const PREFIX = 'job';
@@ -32,7 +31,8 @@ export default function Job() {
   const location = useLocation();
   const { barHeight, statusBarHeight } = useNavigation();
   const inviteCode = useInviteCode();
-  const [tabType, setTabType] = useState<EmployType>(EmployType.All);
+  const [tabType, setTabType] = useState<JobSourceType>(JobSourceType.All);
+  const [employType, setEmployType] = useState<EmployType>(EmployType.All);
   const [sortType, setSortType] = useState<SortType>(SortType.RECOMMEND);
   const [cityCode, setCityCode] = useState<string>(location.cityCode);
   const [coordinate, setCoordinate] = useState<Coordinate>({
@@ -40,9 +40,19 @@ export default function Job() {
     longitude: location.longitude,
   });
   const [showMaterialGuide, setShowMaterialGuide] = useState(false);
-  const [showAuthorize, setShowAuthorize] = useState(false);
   const cityValuesChangedRef = useRef(false);
+  const [openAgreementPopup, setAgreementPopupOpen] = useState(typeof getAgreementSigned() !== 'boolean');
 
+  const getLocation = async () => {
+    if (await isNotNeedAuthorizeLocation()) {
+      log('not need authorize location');
+      requestLocation();
+    } else {
+      log('show authorize location dialog');
+      // setShowAuthorize(true);
+      requestLocation(true);
+    }
+  };
   const handleTypeChange = useCallback(value => setTabType(value), []);
 
   const handleClickCity = useCallback(
@@ -50,6 +60,10 @@ export default function Job() {
     [cityCode]
   );
 
+  const handleClickEmployType = useCallback(type => {
+    setEmployType(type);
+  }, []);
+
   const handleClickSortType = useCallback(
     async (type: SortType) => {
       if (type === SortType.DISTANCE && (!location.latitude || !location.longitude)) {
@@ -76,12 +90,19 @@ export default function Job() {
     setCityCode(code);
   }, []);
 
-  const handleAfterBindPhone = useCallback(async () => {
+  const handleCancelAgreementPopup = () => {
-    if (await isNeedCreateMaterial()) {
+    setAgreementPopupOpen(false);
-      setShowMaterialGuide(true);
+    setAgreementSigned(false);
-    }
-  }, []);
 
+    getLocation();
+  };
+
+  const handleConfirmAgreementPopup = () => {
+    setAgreementPopupOpen(false);
+    setAgreementSigned(true);
+
+    getLocation();
+  };
   useEffect(() => {
     Taro.eventCenter.on(EventName.SELECT_CITY, handleCityChange);
     return () => {
@@ -104,13 +125,8 @@ export default function Job() {
       setSortType(type);
     }
     getInviteCodeFromQueryAndUpdate(query);
-    if (await isNotNeedAuthorizeLocation()) {
+    if (!openAgreementPopup) {
-      log('not need authorize location');
+      getLocation();
-      requestLocation();
-    } else {
-      log('show authorize location dialog');
-      setShowAuthorize(true);
-      requestLocation(true);
     }
   });
 
@@ -140,8 +156,10 @@ export default function Job() {
             <JobFragment
               cityCode={cityCode}
               sortType={sortType}
-              employType={tab.type}
+              sourceType={tab.type}
+              employType={employType}
               coordinate={coordinate}
+              onClickEmployType={handleClickEmployType}
               onClickCity={handleClickCity}
               onClickSort={handleClickSortType}
             />
@@ -149,8 +167,12 @@ export default function Job() {
         ))}
       </Tabs>
       <div>
-        <LoginGuide disabled={showAuthorize} onAfterBind={handleAfterBindPhone} />
         {showMaterialGuide && <MaterialGuide onClose={() => setShowMaterialGuide(false)} />}
+        <AgreementPopup
+          open={openAgreementPopup}
+          onCancel={handleCancelAgreementPopup}
+          onConfirm={handleConfirmAgreementPopup}
+        />
       </div>
     </HomePage>
   );

src/pages/material-create-profile/index.tsx

@@ -15,7 +15,7 @@ import useLocation from '@/hooks/use-location';
 import { MaterialProfile } from '@/types/material';
 import { logWithPrefix } from '@/utils/common';
 import { collectEvent } from '@/utils/event';
-import { isFullTimePriceRequired, isPartTimePriceRequired, setSkipPrejobAction } from '@/utils/job';
+import { isFullTimePriceRequired, isPartTimePriceRequired } from '@/utils/job';
 import { updateProfile, subscribeMaterialMessage } from '@/utils/material';
 import { navigateBack } from '@/utils/route';
 import Toast from '@/utils/toast';
@@ -110,7 +110,6 @@ export default function MaterialCreateProfile() {
         // 发起订阅不能在异步任务中，保证是第一个
         await Promise.all([subscribeMaterialMessage(), updateProfile(data)]);
       }
-      setSkipPrejobAction();
       Taro.eventCenter.trigger(EventName.CREATE_PROFILE);
       nextType ? setGroupType(nextType) : navigateBack(2);
     } catch (e) {

src/pages/material-upload-video/index.tsx

@@ -190,7 +190,7 @@ export default function MaterialUploadVideo() {
             onTitleChange={(newTitle: string) => handleTitleChange(video, newTitle)}
           />
         ))}
-        {videoList.length < 6 && <MaterialVideoCard videoInfo={TEMP_DATA} onClickUpload={handleClickUpload} isTemp />}
+        {videoList.length < 10 && <MaterialVideoCard videoInfo={TEMP_DATA} onClickUpload={handleClickUpload} isTemp />}
       </div>
       <SafeBottomPadding />
       <div className={`${PREFIX}__footer`}>

src/pages/material-view/index.tsx

@@ -1,13 +1,16 @@
 import { Button } from '@tarojs/components';
 import Taro, { useLoad, useShareAppMessage } from '@tarojs/taro';
 
+import { Dialog } from '@taroify/core';
 import { useCallback, useEffect, useState } from 'react';
 
 import CommonDialog from '@/components/common-dialog';
 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, OpenSource, PageUrl, RoleType } from '@/constants/app';
 import { CollectEventName } from '@/constants/event';
+import { JobManageStatus } from '@/constants/job';
 import { MaterialViewSource } from '@/constants/material';
 import ProfileViewFragment from '@/fragments/profile/view';
 import useInviteCode from '@/hooks/use-invite-code';
@@ -19,13 +22,17 @@ import { IJobMessage } from '@/types/message';
 import { switchRoleType } from '@/utils/app';
 import { copy } from '@/utils/common';
 import { collectEvent } from '@/utils/event';
-import { requestHasPublishedJob, requestJobDetail } from '@/utils/job';
+import { postPublishJob, requestHasPublishedJob, requestJobDetail } from '@/utils/job';
 import { getMaterialShareMessage, requestReadProfile, requestShareProfile } from '@/utils/material';
 import { isChatWithSelf, postCreateChat } from '@/utils/message';
 import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
 import { getPageQuery, navigateBack, navigateTo, redirectTo } from '@/utils/route';
 import Toast from '@/utils/toast';
 import './index.less';
+import useUserInfo from '@/hooks/use-user-info';
+import { CertificationStatusType } from '@/constants/company';
+import store from '@/store';
+import { cacheJobId } from '@/store/actions';
 
 const PREFIX = 'page-material-view';
 
@@ -67,15 +74,17 @@ export default function MaterialViewPage() {
   const [jobId, setJobId] = useState<string>();
   const [errorTips, setErrorTips] = useState<string>('');
   const [publishDialogVisible, setPublishDialogVisible] = useState(false);
-  const [certificationDialogVisible, setCertificationDialogVisible] = useState(false);
   const [noTimeDialogVisible, setNoTimeDialogVisible] = useState(false);
   const [noVipLimitVisible, setNoVipLimitVisible] = useState(false);
   const [vipExpiredVisible, setVipExpiredVisible] = useState(false);
   const inviteCode = useInviteCode();
+  const [showBuy, setShowBuy] = useState(false);
+  const userInfo = useUserInfo();
 
   const onDev = useCallback(async () => profile && copy(profile.userId), [profile]);
 
   const handleClickContact = useCallback(async () => {
+    setShowBuy(false);
     if (!profile) {
       return;
     }
@@ -87,6 +96,16 @@ export default function MaterialViewPage() {
           return;
         }
         const jobDetail = await requestJobDetail(jobId);
+        if (jobDetail.status !== JobManageStatus.Open) {
+          if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
+            store.dispatch(cacheJobId(jobId));
+            navigateTo(PageUrl.CertificationStart);
+            return;
+          }
+
+          setShowBuy(true);
+          return;
+        }
         const chat = await postCreateChat(toUserId);
         const jobMessage: IJobMessage = {
           id: jobDetail.id,
@@ -116,7 +135,16 @@ export default function MaterialViewPage() {
       }
     }
   }, [profile, jobId]);
-
+  const handleNext = useCallback(async () => {
+    setShowBuy(false);
+    try {
+      await postPublishJob(jobId!);
+      await handleClickContact();
+    } catch (e) {
+      Toast.error('通告发布失败');
+      collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
+    }
+  }, [handleClickContact, jobId]);
   const handleClickNoViewTimes = useCallback(() => {
     setNoTimeDialogVisible(false);
     navigateBack();
@@ -127,11 +155,6 @@ export default function MaterialViewPage() {
     redirectTo(PageUrl.CertificationManage);
   }, []);
 
-  const handleClickGoCertification = useCallback(() => {
-    setCertificationDialogVisible(false);
-    redirectTo(PageUrl.CertificationStart);
-  }, []);
-
   useEffect(() => {
     const callback = (select: JobManageInfo, source: OpenSource) =>
       source === OpenSource.MaterialViewPage && setJobId(select.id);
@@ -162,9 +185,7 @@ export default function MaterialViewPage() {
       const errorCode = e.errorCode;
       collectEvent(CollectEventName.VIEW_MATERIAL_FAILED, { context, error: e.info?.() || e.message });
       console.error(e);
-      if (errorCode === RESPONSE_ERROR_CODE.BOSS_NOT_AUTH) {
+      if (errorCode === RESPONSE_ERROR_CODE.NO_PUBLISHED_JOB) {
-        setCertificationDialogVisible(true);
-      } else if (errorCode === RESPONSE_ERROR_CODE.NO_PUBLISHED_JOB) {
         setPublishDialogVisible(true);
       } else if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_BALANCE) {
         setNoTimeDialogVisible(true);
@@ -179,7 +200,7 @@ export default function MaterialViewPage() {
   });
 
   useShareAppMessage(async () => {
-    const shareMessage = await getMaterialShareMessage(profile, true, inviteCode);
+    const shareMessage = await getMaterialShareMessage(profile, true, inviteCode, jobId);
     return shareMessage as BL.Anything;
   });
 
@@ -187,13 +208,6 @@ export default function MaterialViewPage() {
     return (
       <>
         <PageLoading />
-        <CommonDialog
-          content="要查看主播详情，请先完成实人认证"
-          confirm="去认证"
-          visible={certificationDialogVisible}
-          onClose={() => setCertificationDialogVisible(false)}
-          onClick={handleClickGoCertification}
-        />
         <CommonDialog
           content="请先发布一个认证通告"
           confirm="去发布"
@@ -260,6 +274,11 @@ export default function MaterialViewPage() {
           onClose={() => setErrorTips('')}
           onClick={() => setErrorTips('')}
         />
+        <Dialog open={showBuy} onClose={() => setShowBuy(false)}>
+          <Dialog.Content>
+            <CompanyPublishJobBuy onNext={handleNext} />
+          </Dialog.Content>
+        </Dialog>
       </div>
     </div>
   );

src/pages/message-chat/index.tsx

@@ -72,6 +72,7 @@ interface ILoadProps {
   chatId: string;
   jobId?: string;
   job?: string;
+  initText?: boolean;
   material?: string;
 }
 
@@ -90,6 +91,7 @@ export default function MessageChat() {
   const [input, setInput] = useState('');
   const [showMore, setShowMore] = useState(false);
   const [chat, setChat] = useState<IChatInfo | null>(null);
+  const [initText, setInitText] = useState('');
   const [reject, setReject] = useState<boolean>(false);
   const [receiver, setReceiver] = useState<IChatUser | null>(null);
   const [messages, setMessages] = useState<IChatMessage[]>([]);
@@ -100,7 +102,7 @@ export default function MessageChat() {
   const [material, setMaterial] = useState<IMaterialMessage>();
   const [scrollItemId, setScrollItemId] = useState<string>();
   const scrollToLowerRef = useRef(false);
-  const autoSendRef = useRef({ sendJob: false, sendMaterial: false });
+  const autoSendRef = useRef({ sendJob: false, sendMaterial: false, sendText: false });
   const loadMoreRef = useRef(async (chatId: string, currentMessages: IChatMessage[], forceScroll?: boolean) => {
     try {
       const lastMsgId = last(currentMessages)?.msgId;
@@ -167,6 +169,9 @@ export default function MessageChat() {
         ) {
           tips = '今日申请交换联系方式次数已用完，当前每日限制为5次';
           duration = 3000;
+        } else if (errorCode === RESPONSE_ERROR_CODE.CHAT_MSG_SEND_NOT_ALLOW) {
+          tips = '账号已在另一台设备上切换身份，本条消息未发送成功，请在本设备重新切换身份后，再发送消息';
+          duration = 5000;
         }
         tips.length > 7 ? Toast.info(tips, duration) : Toast.error(tips, duration);
       }
@@ -275,7 +280,11 @@ export default function MessageChat() {
     }
     job && handleSendJobMessage();
     material && handleSendMaterialMessage();
-  }, [chat, job, material, handleSendJobMessage, handleSendMaterialMessage]);
+    if (initText && !autoSendRef.current.sendText) {
+      autoSendRef.current.sendText = true;
+      handleSendMessage({ type: MessageType.Text, content: '你好，想了解下这个岗位' });
+    }
+  }, [chat, job, material, handleSendJobMessage, handleSendMaterialMessage, initText, handleSendMessage]);
 
   useLoad(async () => {
     const query = getPageQuery<ILoadProps>();
@@ -306,6 +315,9 @@ export default function MessageChat() {
       setScrollItemId(getScrollItemId(last(chatDetail.messages)?.msgId));
       parseJob && setJob(parseJob);
       parseMaterial && setMaterial(parseMaterial);
+      if (!parseMaterial && query.initText && watchType === ChatWatchType.AnchorReject) {
+        setInitText('你好，想了解下这个岗位');
+      }
       Taro.setNavigationBarTitle({ title: toUserInfo.nickName });
       setReceiver(toUserInfo);
       setReject(!watchStatus);

src/pages/partner-share/index.config.ts

@@ -1,3 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '分享',
-});

src/pages/partner-share/index.less

@@ -1,57 +0,0 @@
-@import '@/styles/common.less';
-@import '@/styles/variables.less';
-
-page {
-  background: #fff;
-}
-
-.partner-share {
-  padding-top: 175px;
-  &__money {
-    width: 140px;
-    height: 140px;
-    margin-bottom: 35px;
-  }
-  &__header {
-    .flex-column();
-    justify-content: center;
-    font-weight: 500;
-    font-size: 48px;
-    line-height: 48px;
-    color: #333333;
-  }
-
-  &__body {
-    padding-top: 86px;
-    .flex-column();
-  }
-
-  &__item {
-    .flex-row();
-    margin-top: 72px;
-    font-weight: 500;
-    font-size: 32px;
-    line-height: 48px;
-    width: 640px;
-
-    color: #000000;
-    .highlight {
-      color: @blHighlightColor;
-      font-weight: 400;
-      padding-left: 8px;
-      display: inline-block;
-    }
-
-
-  }
-  &__no {
-    width: 74px;
-    height: 46px;
-    margin-right: 21px;
-    vertical-align: middle;
-  }
-  &__btn {
-    .button(@width: 360px; @height: 72px;);
-    margin-top: 150px;
-  }
-}

src/pages/partner-share/index.tsx

@@ -1,61 +0,0 @@
-import { Button, Image } from '@tarojs/components';
-import Taro, { useDidShow, useShareAppMessage } from '@tarojs/taro';
-
-import { EventName } from '@/constants/app';
-import useInviteCode from '@/hooks/use-invite-code';
-import { hasShareToGetContact, setShareToGetContact } from '@/utils/job';
-import { navigateBack } from '@/utils/route';
-import { getCommonShareMessage } from '@/utils/share';
-
-import './index.less';
-
-const PREFIX = 'partner-share';
-
-export default function Partner() {
-  const inviteCode = useInviteCode();
-  useDidShow(() => {
-    if (!hasShareToGetContact()) {
-      Taro.eventCenter.trigger(EventName.PRE_ACTION_SHARE_SUCCESS);
-      navigateBack(-1);
-    }
-  });
-  useShareAppMessage(() => {
-    setShareToGetContact();
-    console.log('Partner inviteCode', inviteCode);
-    return getCommonShareMessage({ useCapture: false, inviteCode });
-  });
-
-  return (
-    <div className={PREFIX}>
-      <div className={`${PREFIX}__header`}>
-        <Image
-          src="https://publiccdn.neighbourhood.com.cn/img/money.png"
-          mode="aspectFit"
-          className={`${PREFIX}__money`}
-        />
-        <div>分享可获3重收益</div>
-      </div>
-      <div className={`${PREFIX}__body`}>
-        <div className={`${PREFIX}__item`}>
-          <Image src="https://publiccdn.neighbourhood.com.cn/img/01.svg" mode="aspectFit" className={`${PREFIX}__no`} />
-          <div>
-            直接获得被邀请人支付金额<div className="highlight">20%</div>
-          </div>
-        </div>
-        <div className={`${PREFIX}__item`}>
-          <Image src="https://publiccdn.neighbourhood.com.cn/img/02.svg" mode="aspectFit" className={`${PREFIX}__no`} />
-          <div>邀请的主播被企业开聊，即可获得分润</div>
-        </div>
-        <div className={`${PREFIX}__item`}>
-          <Image src="https://publiccdn.neighbourhood.com.cn/img/03.svg" mode="aspectFit" className={`${PREFIX}__no`} />
-          <div>
-            获得被邀请人再邀请他人收益的<div className="highlight">5%</div>
-          </div>
-        </div>
-        <Button className={`${PREFIX}__btn`} openType="share">
-          立即分享
-        </Button>
-      </div>
-    </div>
-  );
-}

src/pages/start/index.tsx

@@ -1,88 +1,94 @@
 import { Image } from '@tarojs/components';
 import { useLoad } from '@tarojs/taro';
 
-import { useState } from 'react';
+// import { useEffect, useState } from 'react';
-
+// import { AgreementPopup } from '@/components/agreement-popup';
-import { AgreementPopup } from '@/components/agreement-popup';
+// import Slogan from '@/components/slogan';
-import Slogan from '@/components/slogan';
+// import { PageUrl, RoleType } from '@/constants/app';
-import { PageUrl, RoleType } from '@/constants/app';
+// import { ANCHOR_TAB_LIST, COMPANY_TAB_LIST } from '@/hooks/use-config';
-import { ANCHOR_TAB_LIST, COMPANY_TAB_LIST } from '@/hooks/use-config';
+// import store from '@/store';
-import store from '@/store';
+// import { changeHomePage } from '@/store/actions';
-import { changeHomePage } from '@/store/actions';
+import { RoleType } from '@/constants/app';
 import { getRoleType, switchDefaultTab, switchRoleType } from '@/utils/app';
-import { switchTab } from '@/utils/route';
+// import { switchTab } from '@/utils/route';
-import { getAgreementSigned, setAgreementSigned } from '@/utils/user';
+// import { getAgreementSigned, setAgreementSigned } from '@/utils/user';
 import './index.less';
 
 const PREFIX = 'page-start';
 
 export default function Start() {
-  const [open, setOpen] = useState(typeof getAgreementSigned() !== 'boolean');
+  // const [open, setOpen] = useState(typeof getAgreementSigned() !== 'boolean');
   const mode = getRoleType();
   useLoad(() => {
+    if (!mode) {
+      switchRoleType(RoleType.Anchor).then(() => {
         switchDefaultTab();
       });
-  const handleAnchor = async () => {
+    } else {
-    await switchRoleType(RoleType.Anchor);
+      switchDefaultTab();
-    store.dispatch(changeHomePage(ANCHOR_TAB_LIST[0].type));
+    }
-    await switchTab(ANCHOR_TAB_LIST[0].pagePath as PageUrl);
+  });
-  };
+  // const handleAnchor = async () => {
+  //   await switchRoleType(RoleType.Anchor);
+  //   store.dispatch(changeHomePage(ANCHOR_TAB_LIST[0].type));
+  //   await switchTab(ANCHOR_TAB_LIST[0].pagePath as PageUrl);
+  // };
 
-  const handleCompany = async () => {
+  // const handleCompany = async () => {
-    await switchRoleType(RoleType.Company);
+  //   await switchRoleType(RoleType.Company);
-    store.dispatch(changeHomePage(COMPANY_TAB_LIST[0].type));
+  //   store.dispatch(changeHomePage(COMPANY_TAB_LIST[0].type));
-    await switchTab(COMPANY_TAB_LIST[0].pagePath as PageUrl);
+  //   await switchTab(COMPANY_TAB_LIST[0].pagePath as PageUrl);
-  };
+  // };
 
-  const handleCancel = () => {
+  // const handleCancel = () => {
-    setOpen(false);
+  //   setOpen(false);
-    setAgreementSigned(false);
+  //   setAgreementSigned(false);
-  };
+  // };
-
+  //
-  const handleConfirm = () => {
+  // const handleConfirm = () => {
-    setOpen(false);
+  //   setOpen(false);
-    setAgreementSigned(true);
+  //   setAgreementSigned(true);
-  };
+  // };
   return (
-    <div className={`${PREFIX} ${mode ? '' : 'color-bg'}`}>
+    <div className={`${PREFIX}`}>
-      {mode && (
+      {/*{mode && (*/}
       <div className={`${PREFIX}__app`}>
         <Image className={`${PREFIX}__icon`} mode="aspectFit" src={require('@/statics/svg/slogan.svg')} />
         <div className={`${PREFIX}__text`}>每天推荐海量高薪通告 </div>
       </div>
-      )}
+      {/*)}*/}
       {!mode && (
         <>
-          <div className={`${PREFIX}__role-app`}>
+          {/*<div className={`${PREFIX}__role-app`}>*/}
-            <div className={`${PREFIX}__greet`}>Hi，很高兴见到你</div>
+          {/*  <div className={`${PREFIX}__greet`}>Hi，很高兴见到你</div>*/}
-            <div className={`${PREFIX}__title`}>请选择您的身份</div>
+          {/*  <div className={`${PREFIX}__title`}>请选择您的身份</div>*/}
-            <div className={`${PREFIX}__card`} onClick={handleAnchor}>
+          {/*  <div className={`${PREFIX}__card`} onClick={handleAnchor}>*/}
-              <Image
+          {/*    <Image*/}
-                className={`${PREFIX}__avatar anchor`}
+          {/*      className={`${PREFIX}__avatar anchor`}*/}
-                src="https://publiccdn.neighbourhood.com.cn/img/avatar_f.png"
+          {/*      src="https://publiccdn.neighbourhood.com.cn/img/avatar_f.png"*/}
-                mode="aspectFill"
+          {/*      mode="aspectFill"*/}
-              />
+          {/*    />*/}
-              <div className={`${PREFIX}__content`}>
+          {/*    <div className={`${PREFIX}__content`}>*/}
-                <div className="title">我是主播</div>
+          {/*      <div className="title">我是主播</div>*/}
-                <div className="desc">我要找工作</div>
+          {/*      <div className="desc">我要找工作</div>*/}
-              </div>
+          {/*    </div>*/}
-              <Image src={require('@/statics/svg/arrow-right.svg')} mode="aspectFill" className={`${PREFIX}__arrow`} />
+          {/*    <Image src={require('@/statics/svg/arrow-right.svg')} mode="aspectFill" className={`${PREFIX}__arrow`} />*/}
-            </div>
+          {/*  </div>*/}
-            <div className={`${PREFIX}__card`} onClick={handleCompany}>
+          {/*  <div className={`${PREFIX}__card`} onClick={handleCompany}>*/}
-              <Image
+          {/*    <Image*/}
-                className={`${PREFIX}__avatar company`}
+          {/*      className={`${PREFIX}__avatar company`}*/}
-                src="https://publiccdn.neighbourhood.com.cn/img/avatar_m.png"
+          {/*      src="https://publiccdn.neighbourhood.com.cn/img/avatar_m.png"*/}
-                mode="aspectFill"
+          {/*      mode="aspectFill"*/}
-              />
+          {/*    />*/}
-              <div className={`${PREFIX}__content`}>
+          {/*    <div className={`${PREFIX}__content`}>*/}
-                <div className="title">我是企业</div>
+          {/*      <div className="title">我是企业</div>*/}
-                <div className="desc">我要招主播</div>
+          {/*      <div className="desc">我要招主播</div>*/}
-              </div>
+          {/*    </div>*/}
-              <Image src={require('@/statics/svg/arrow-right.svg')} mode="aspectFill" className={`${PREFIX}__arrow`} />
+          {/*    <Image src={require('@/statics/svg/arrow-right.svg')} mode="aspectFill" className={`${PREFIX}__arrow`} />*/}
-            </div>
+          {/*  </div>*/}
-          </div>
+          {/*</div>*/}
-          <Slogan />
+          {/*<Slogan />*/}
-          <AgreementPopup open={open} onCancel={handleCancel} onConfirm={handleConfirm} />
+          {/*<AgreementPopup open={open} onCancel={handleCancel} onConfirm={handleConfirm} />*/}
         </>
       )}
     </div>

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

@@ -21,9 +21,9 @@
       padding-top: var(--tabs-wrap-height);
     }
 
-    .taroify-tabs__nav .taroify-tabs__tab:nth-child(2) .taroify-badge-wrapper {
+    //.taroify-tabs__nav .taroify-tabs__tab:nth-child(2) .taroify-badge-wrapper {
-      left: 18px;
+    //  left: 18px;
-    }
+    //}
   }
 
   &__star {

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

@@ -106,7 +106,7 @@ export default function BizService() {
             title={
               <>
                 主播群
-                <Image src={require('@/statics/svg/star.svg')} className={`${PREFIX}__star`} />
+                {/*<Image src={require('@/statics/svg/star.svg')} className={`${PREFIX}__star`} />*/}
               </>
             }
           >

src/store/actions/index.ts

@@ -1,3 +1,4 @@
 export * from './app';
 export * from './user';
 export * from './message';
+export * from './job';

src/store/actions/job.ts

@@ -0,0 +1,5 @@
+import { SET_JOB_ID } from '../constants';
+
+export const cacheJobId = (value: string) => ({ type: SET_JOB_ID, value });
+
+export const clearCachedJobId = () => ({ type: SET_JOB_ID, value: null });

src/store/constants.ts

@@ -5,3 +5,4 @@ export const SET_USER_INFO = 'SET_USER_INFO';
 export const SET_BIND_PHONE = 'SET_BIND_PHONE';
 export const SET_USER_MESSAGE = 'SET_USER_MESSAGE';
 export const SET_INVITE_CODE = 'SET_INVITE_CODE';
+export const SET_JOB_ID = 'SET_JOB_ID';

src/store/reducers/index.ts

@@ -1,6 +1,7 @@
 import { combineReducers } from 'redux';
 
 import appState from './app';
+import jobInfo from './job';
 import message from './message';
 import partnerInfo from './partner';
 import userInfo from './user';
@@ -10,4 +11,5 @@ export default combineReducers({
   userInfo,
   message,
   partnerInfo,
+  jobInfo,
 });

src/store/reducers/job.ts

@@ -0,0 +1,15 @@
+import { Action } from 'redux';
+
+import { SET_JOB_ID } from '../constants';
+
+const jobInfo = (state: Partial<string | null> = null, action: Action): Partial<string | null> => {
+  const { type, value } = action as BL.Anything;
+  switch (type) {
+    case SET_JOB_ID:
+      return value;
+    default:
+      return state;
+  }
+};
+
+export default jobInfo;

src/store/selector/job.ts

@@ -0,0 +1,3 @@
+import { IState } from '@/types/store';
+
+export const selectCreatedJob = (state: IState) => state.jobInfo;

src/types/job.ts

@@ -1,4 +1,4 @@
-import { JobType, EmployType, SortType, UserJobType, JobManageStatus } from '@/constants/job';
+import { JobType, EmployType, SortType, UserJobType, JobManageStatus, JobSourceType } from '@/constants/job';
 import { DeclarationType } from '@/constants/product';
 import type { IPaginationRequest, IPaginationResponse } from '@/types/common';
 import { LocationInfo } from '@/types/location';
@@ -49,6 +49,8 @@ export type JobDetails = JobInfo &
     declarationType: DeclarationType; // 报单类型
     userId: string; // 发布人的 userId
     verifyFailReason?: string; // 审核不通过的原因
+    sourcePlat?: string;
+    status: JobManageStatus
   };
 
 export interface JobManageInfo {
@@ -82,6 +84,7 @@ export interface GetJobsRequest extends IPaginationRequest {
   minSalary?: number;
   maxSalary?: number;
   blGroupId?: string; // 播络群 id
+  sourceType?: JobSourceType;
 }
 
 // 获取通告列表响应接口

src/types/product.ts

@@ -13,6 +13,7 @@ export interface ProductInfo {
   balance: number;
   created: number;
   updated: number;
+  isPaidVip?: boolean;
   // 报单类型信息,只有 use 接口返回值才有
   declarationTypeResult?: DeclarationTypeResult;
 }

src/types/store.ts

@@ -10,6 +10,7 @@ export interface IState {
   userInfo: UserInfo;
   message: UserMessage;
   partnerInfo: PartnerInfo;
+  jobInfo: string | null;
 }
 
 export interface AppState {

src/utils/job.ts

@@ -2,7 +2,7 @@ import Taro from '@tarojs/taro';
 
 import { CacheKey } from '@/constants/cache-key';
 import { CollectEventName } from '@/constants/event';
-import { EmployType, JobManageStatus, UserJobType } from '@/constants/job';
+import { EmployType, JobManageStatus, JobSourceType, UserJobType } from '@/constants/job';
 import http from '@/http';
 import { API } from '@/http/api';
 import store from '@/store';
@@ -80,6 +80,7 @@ async function requestMyBrowsedJobList(data: GetUserJobRequest) {
 
 export async function requestJobList(data: GetJobsRequest = {}) {
   const isGetMyJob = data.isOwner || data.isFollow;
+  data.sourceType = data.sourceType === JobSourceType.All ? undefined : data.sourceType;
   const url = isGetMyJob ? API.GET_MY_JOB_LIST_V2 : API.GET_JOB_LIST;
   return await http.post<GetJobsResponse>(url, { data });
 }
@@ -116,8 +117,9 @@ export async function requestHasPublishedJob() {
   return data.jobResults.length > 0;
 }
 
-export function postCreateJob(data: CreateJobInfo) {
+export async function postCreateJob(data: CreateJobInfo): Promise<string> {
-  return http.post(API.CREATE_JOB, { data });
+  const jobId = await http.post(API.CREATE_JOB, { data });
+  return jobId;
 }
 
 export function postUpdateJob(data: CreateJobInfo) {
@@ -131,19 +133,3 @@ export function postPublishJob(jobId: string) {
 export function postCloseJob(jobId: string) {
   return http.post(API.CLOSE_JOB, { data: { jobId }, contentType: 'application/x-www-form-urlencoded' });
 }
-
-export function setSkipPrejobAction(skip = true) {
-  Taro.setStorageSync(CacheKey.SKIP_PREACTION, skip);
-}
-
-export function getSkipPrejobAction() {
-  return !!Taro.getStorageSync(CacheKey.SKIP_PREACTION);
-}
-
-export function setShareToGetContact(job = true) {
-  Taro.setStorageSync(job ? CacheKey.SHARE_TO_GET_JOB_CONTACT : CacheKey.SHARE_TO_GET_ANCHOR_CONTACT, true);
-}
-
-export function hasShareToGetContact(job = true) {
-  return !Taro.getStorageSync(job ? CacheKey.SHARE_TO_GET_JOB_CONTACT : CacheKey.SHARE_TO_GET_ANCHOR_CONTACT);
-}

src/utils/material.ts

@@ -89,9 +89,9 @@ export const requestReadProfile = async (data: GetReadProfileRequest) => {
   return http.post<MaterialProfile>(API.READ_PROFILE, { data });
 };
 
-export const requestProfileShareCode = async (resumeId: string) => {
+export const requestProfileShareCode = async (resumeId: string, jobId?: string) => {
   return http.post<MaterialProfile>(API.GET_PROFILE_SHARE_CODE, {
-    data: { resumeId },
+    data: { resumeId, jobId },
     contentType: 'application/x-www-form-urlencoded',
   });
 };
@@ -142,14 +142,15 @@ export const requestAnchorList = async (data: GetAnchorListRequest) => {
 export const getMaterialShareMessage = async (
   profile?: MaterialProfile | null,
   needShareCode: boolean = true,
-  inviteCode?: string
+  inviteCode?: string,
+  jobId?: string
 ) => {
   if (!profile) {
     return null;
   }
   try {
     const { id, name = '', workedSecCategoryStr } = profile;
-    const shareCode = needShareCode ? await requestProfileShareCode(id) : undefined;
+    const shareCode = needShareCode ? await requestProfileShareCode(id, jobId) : undefined;
     const title = `${name} ${workedSecCategoryStr ? `播过 ${workedSecCategoryStr}` : ''}`.trim();
     return {
       title,

src/utils/product.ts

@@ -2,14 +2,14 @@ import Taro from '@tarojs/taro';
 
 import { ProductType, QrCodeType } from '@/constants/product';
 import http from '@/http';
-import { API, DOMAIN } from '@/http/api';
+import { API } from '@/http/api';
 import {
   ProductInfo,
   GetProductDetailRequest,
   GetProductIsUnlockRequest,
   PostUseProductRequest,
   GetProductIsUnlockResponse,
-  CustomerServiceInfo,
+  // CustomerServiceInfo,
   CreatePayInfoRequest,
   CreatePayInfoResponse,
   CreatePayOrderParams,
@@ -54,13 +54,13 @@ export async function requestUseProduct(
 }
 
 // 获取某个产品的剩余解锁次数
-export async function requestProductBalance(productCode: ProductType) {
+export async function requestProductBalance(productCode: ProductType): Promise<[number, boolean | undefined]> {
   const data: GetProductDetailRequest = { productCode, userId: getUserId() };
-  const { balance } = await http.post<ProductInfo>(API.GET_PRODUCT_DETAIL, {
+  const { balance, isPaidVip } = await http.post<ProductInfo>(API.GET_PRODUCT_DETAIL, {
     data,
     contentType: 'application/x-www-form-urlencoded',
   });
-  return balance;
+  return [balance, isPaidVip];
 }
 
 // 是否可以购买某一个产品
@@ -74,7 +74,7 @@ export async function requestAllBuyProduct(productCode: ProductType) {
 }
 
 export async function requestCsQrCode(_type: QrCodeType) {
-  const result = await http.post<CustomerServiceInfo>(API.CS_QR_CODE);
+  // const result = await http.post<CustomerServiceInfo>(API.CS_QR_CODE);
   return 'https://publiccdn.neighbourhood.com.cn/img/bzQrcode.jpg';
   // return `${DOMAIN}/${result.vxQrCode}`;
 }