feat: ps

Feat/3.7/invite members

src/app.tsx

@@ -15,6 +15,29 @@ import { requestUserInfo, updateLastLoginTime } from '@/utils/user';
 import './app.less';
 
 function App({ children }: PropsWithChildren<BL.Anything>) {
+  const checkBasicUpdate = () => {
+    if (process.env.TARO_ENV !== 'weapp' || !Taro.canIUse('getUpdateManager')) {
+      return;
+    }
+    const manager = Taro.getUpdateManager();
+    manager.onCheckForUpdate(res => {
+      console.log('onCheckForUpdate', res);
+    });
+
+    // 新版本下载完成
+    manager.onUpdateReady(() => {
+      Taro.showModal({
+        title: '更新提示',
+        content: '新版本已经准备好，是否重启应用？',
+        success: function (res) {
+          if (res.confirm) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+            manager.applyUpdate();
+          }
+        },
+      });
+    });
+  };
   useLaunch(async ({ query }) => {
     console.log('App launched.');
     await http.init(getInviteCodeFromQuery(query));
@@ -30,6 +53,7 @@ function App({ children }: PropsWithChildren<BL.Anything>) {
   });
 
   useDidShow(options => {
+    checkBasicUpdate();
     requestCityConfigs();
 
     console.log(options);

src/components/invite-operations-banner/index.less

@@ -0,0 +1,22 @@
+@import '@/styles/variables.less';
+@import '@/styles/common.less';
+
+.invite-operations-fragment-banner {
+  width: 100%;
+  height: 90px;
+  position: relative;
+  margin-bottom: 24px;
+
+  &__image {
+    width: 100%;
+    height: 100%;
+  }
+  
+  &__close {
+    width: 64px;
+    height: 38px;
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+}

src/components/invite-operations-banner/index.tsx

@@ -0,0 +1,40 @@
+import { Image } from '@tarojs/components';
+
+import { useCallback, useState } from 'react';
+
+import { PageUrl } from '@/constants/app';
+import { getPartnerBannerClose, setPartnerBannerClose } from '@/utils/partner';
+import { navigateTo } from '@/utils/route';
+import './index.less';
+
+const PREFIX = 'invite-operations-fragment-banner';
+
+export default function InviteOperationsBanner() {
+  const [bannerClose, setBannerClose] = useState<boolean>(getPartnerBannerClose());
+
+  const handlePartnerBannerClose = useCallback(e => {
+    e.preventDefault();
+    e.stopPropagation();
+    setBannerClose(true);
+    setPartnerBannerClose();
+  }, []);
+
+  const handleClick = useCallback(async () => {
+    navigateTo(PageUrl.InviteOperations);
+  }, []);
+
+  if (bannerClose) {
+    return null;
+  }
+
+  return (
+    <div className={PREFIX} onClick={handleClick}>
+      <Image
+        className={`${PREFIX}__image`}
+        src="https://publiccdn.neighbourhood.com.cn/img/invite-operations-banner.png"
+        mode="scaleToFill"
+      />
+      <div className={`${PREFIX}__close`} onClick={handlePartnerBannerClose} />
+    </div>
+  );
+}

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

@@ -2,11 +2,12 @@ import { Image } from '@tarojs/components';
 
 import { Arrow } from '@taroify/icons';
 import classNames from 'classnames';
-import React, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 
-import { cityValues } from '@/components/user-batch-publish';
+// import { cityValues } from '@/components/user-batch-publish';
 import { PageUrl } from '@/constants/app';
 import { JOB_MANAGE_STATUS_TITLE_MAP, JobManageStatus } from '@/constants/job';
+import useCityOperators from '@/hooks/use-city-operators';
 import { JobManageInfo } from '@/types/job';
 import { getJobLocation } from '@/utils/job';
 import { navigateTo } from '@/utils/route';
@@ -30,6 +31,9 @@ const STATUS_CLASS_MAP = {
 };
 
 function GoBatchTag({ cityCode, jobId }: { cityCode: string; jobId: JobManageInfo['id'] }) {
+  const cityOperators = useCityOperators();
+  const availableCities = useMemo(() => cityOperators.filter(c => c.sendCount), [cityOperators]);
+
   const handleClick = useCallback(
     e => {
       e.preventDefault();
@@ -38,7 +42,7 @@ function GoBatchTag({ cityCode, jobId }: { cityCode: string; jobId: JobManageInf
     },
     [cityCode, jobId]
   );
-  if (!cityValues.find(c => c.cityCode === cityCode)) {
+  if (!availableCities.find(c => c.cityCode === cityCode)) {
     return null;
   }
   return (

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

@@ -1,2 +1,28 @@
 @import '@/styles/common.less';
 @import '@/styles/variables.less';
+
+.job-manage-list {
+  &__empty-tips {
+    width: 100%;
+    height: 100vh;
+    padding-top: 218px;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    position: absolute;
+
+    &__icon {
+      width: 386px;
+      height: 278px;
+    }
+
+    &__describe {
+      font-size: 28px;
+      font-weight: 500;
+      line-height: 40px;
+      color: @blColor;
+      margin-top: 50px;
+    }
+  }
+}

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

@@ -1,3 +1,4 @@
+import { Image } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
 import { List, PullRefresh } from '@taroify/core';
@@ -28,7 +29,15 @@ const FIRST_PAGE = 0;
 const PAGE_SIZE = 40;
 const PREFIX = 'job-manage-list';
 const log = logWithPrefix(PREFIX);
-
+const EmptyTips = (props: { className?: string; height?: number }) => {
+  const { className, height } = props;
+  return (
+    <div className={classNames(`${PREFIX}__empty-tips`, className)} style={height ? { height } : undefined}>
+      <Image className={`${PREFIX}__empty-tips__icon`} src={require('@/statics/svg/empty-box.svg')} mode="aspectFit" />
+      <div className={`${PREFIX}__empty-tips__describe`}>当前还没有通告</div>
+    </div>
+  );
+};
 function JobManageList(props: IJobManageListProps) {
   const { className, listHeight, refreshDisabled, visible = true, status, onListEmpty } = props;
   const [refreshing, setRefreshing] = useState(false);
@@ -151,6 +160,8 @@ function JobManageList(props: IJobManageListProps) {
       onRefresh={handleRefresh}
       disabled={refreshDisabled}
     >
+      {Boolean(!dataList.length) && <EmptyTips className={className} height={listHeight} />}
+
       <List
         hasMore={hasMore}
         onLoad={handleLoadMore}

src/components/login-button/index.tsx

@@ -6,7 +6,7 @@ import { useCallback, useState } from 'react';
 import { AgreementPopup } from '@/components/agreement-popup';
 import LoginDialog from '@/components/login-dialog';
 import useUserInfo from '@/hooks/use-user-info';
-import { getAgreementSigned, isNeedLogin, setAgreementSigned } from '@/utils/user';
+import { getAgreementSigned, isNeedLogin, requestUserInfo, setAgreementSigned } from '@/utils/user';
 
 import './index.less';
 
@@ -18,13 +18,15 @@ export enum BindPhoneStatus {
 
 export interface ILoginButtonProps extends ButtonProps {
   needPhone?: boolean;
+  needRefresh?: boolean;
+  onRefresh?: (() => void) | (() => Promise<void>);
   needAssignment?: boolean;
 }
 
 const PREFIX = 'login-button';
 
 function LoginButton(props: ILoginButtonProps) {
-  const { className, children, needPhone, onClick, ...otherProps } = props;
+  const { className, children, needPhone, onRefresh, onClick, needRefresh, ...otherProps } = props;
   const userInfo = useUserInfo();
   const [loginVisible, setLoginVisible] = useState(false);
   const [assignVisible, setAssignVisible] = useState(false);
@@ -68,11 +70,15 @@ function LoginButton(props: ILoginButtonProps) {
   }, []);
 
   const handleLoginSuccess = useCallback(
-    e => {
+    async e => {
       setLoginVisible(false);
+      if (needRefresh) {
+        requestUserInfo();
+        onRefresh && (await onRefresh());
+      }
       onClick?.(e);
     },
-    [onClick]
+    [needRefresh, onClick]
   );
 
   return (

src/components/partner-intro/index.tsx

@@ -146,25 +146,6 @@ export default function PartnerIntro() {
           </Swiper>
         </div>
 
-        <div className={`${PREFIX}__block`}>
-          <div className={`${PREFIX}__title`}>
-            群主认证
-            <div className={`${PREFIX}__recommend`}>
-              <GoodJob />
-              强烈推荐
-            </div>
-          </div>
-          <div className={`${PREFIX}__card ${PREFIX}__special`}>
-            <div className={`${PREFIX}__body`}>
-              <div className="center">
-                完成群主认证后，群成员通过该群访问任何人分享的播络小程序进行注册，你都能获得分成
-              </div>
-            </div>
-            <Button className={`${PREFIX}__service`} onClick={handleConfirm}>
-              立即认证
-            </Button>
-          </div>
-        </div>
         <div className={`${PREFIX}__block`}>
           <div className={`${PREFIX}__title`}>3重收益</div>
           <div className={`${PREFIX}__card`}>
@@ -194,6 +175,25 @@ export default function PartnerIntro() {
             </div>
           </div>
         </div>
+        <div className={`${PREFIX}__block`}>
+          <div className={`${PREFIX}__title`}>
+            群主认证
+            <div className={`${PREFIX}__recommend`}>
+              <GoodJob />
+              强烈推荐
+            </div>
+          </div>
+          <div className={`${PREFIX}__card ${PREFIX}__special`}>
+            <div className={`${PREFIX}__body`}>
+              <div className="center">
+                完成群主认证后，群成员通过该群访问任何人分享的播络小程序进行注册，你都能获得分成
+              </div>
+            </div>
+            <Button className={`${PREFIX}__service`} onClick={handleConfirm}>
+              立即认证
+            </Button>
+          </div>
+        </div>
         <div className={`${PREFIX}__block`}>
           <div className={`${PREFIX}__title`}>交流群</div>
           <div className={`${PREFIX}__card  ${PREFIX}__special`}>

src/components/prejob-popup/index.less

@@ -12,6 +12,11 @@
     line-height: 48px;
     margin-bottom: 31px;
     text-align: center;
+
+    .highlight {
+      color: @blHighlightColor;
+      display: inline;
+    }
   }
 
   &__body {

src/components/prejob-popup/index.tsx

@@ -1,18 +1,23 @@
 import { Button, Image } from '@tarojs/components';
+import Taro from '@tarojs/taro';
 
-import { Popup, Dialog } from '@taroify/core';
+import { Dialog, Popup } from '@taroify/core';
 import { Fragment, useCallback, useState } from 'react';
 
+import LoginButton from '@/components/login-button';
 import JobBuy from '@/components/product-dialog/steps-ui/job-buy';
 import SafeBottomPadding from '@/components/safe-bottom-padding';
 import { PageUrl } from '@/constants/app';
+import { CacheKey } from '@/constants/cache-key';
 import { GET_CONTACT_TYPE } from '@/constants/job';
-import { navigateTo } from '@/utils/route';
+import { navigateTo, switchTab } from '@/utils/route';
-
 import './index.less';
 
 interface IProps {
   onCancel: () => void;
+  onRefresh: () => void;
+  needLogin?: boolean;
+  isCreateResume?: boolean;
   onConfirm: (type: GET_CONTACT_TYPE) => void;
 }
 
@@ -22,31 +27,57 @@ const GET_CONTACT_TYPE_OPTIONS = [
   {
     type: GET_CONTACT_TYPE.MATERIAL,
     icon: 'https://publiccdn.neighbourhood.com.cn/img/file.svg',
-    title: '创建模卡（免费报单）',
+    title: '创建模卡（送会员）',
-    desc: '免费报单，优先推荐给企业，机会更多',
+    desc: '送日会员，优先推荐给企业，机会更多',
     btnText: '创建',
+    needLogin: true,
   },
   {
     type: GET_CONTACT_TYPE.VIP,
     icon: 'https://publiccdn.neighbourhood.com.cn/img/diamond.svg',
     title: '播络会员',
-    desc: '开通会员每天可查看10个',
+    desc: '开通会员每天免费查看',
     btnText: '开通',
   },
+  // {
+  //   type: GET_CONTACT_TYPE.GROUP,
+  //   icon: 'https://publiccdn.neighbourhood.com.cn/img/group-avatar.png',
+  //   title: '进群领会员（免费报单）',
+  //   desc: '群内定期发放会员，免费报单',
+  //   btnText: '进群',
+  // },
+  {
+    type: GET_CONTACT_TYPE.INVITE,
+    icon: 'https://publiccdn.neighbourhood.com.cn/img/invite-operations.png',
+    title: '邀请运营进群（送会员）',
+    desc: '每邀请进一个主播群送一个日会员',
+    btnText: '邀请',
+  },
 ];
 
-export function PrejobPopup({ onCancel, onConfirm }: IProps) {
+export function PrejobPopup({ onCancel, isCreateResume, onConfirm, onRefresh }: IProps) {
   const [openPopup, setOpenPopup] = useState(true);
   const [openDialog, setOpenDialog] = useState(false);
+  const [clicked, setClicked] = useState(!!Taro.getStorageSync(CacheKey.JOIN_GROUP_POPUP_CLICKED));
   const handleClick = (type: GET_CONTACT_TYPE) => () => {
     if (type === GET_CONTACT_TYPE.MATERIAL) {
       navigateTo(PageUrl.MaterialUploadVideo);
       onConfirm(type);
     }
+    if (type === GET_CONTACT_TYPE.INVITE) {
+      navigateTo(PageUrl.InviteOperations);
+      onConfirm(type);
+    }
     if (type === GET_CONTACT_TYPE.VIP) {
       setOpenPopup(false);
       setOpenDialog(true);
     }
+    if (type === GET_CONTACT_TYPE.GROUP) {
+      Taro.setStorageSync(CacheKey.JOIN_GROUP_POPUP_CLICKED, true);
+      setClicked(true);
+      switchTab(PageUrl.GroupV2);
+      onConfirm(type);
+    }
   };
   const handleAfterBuy = useCallback(async () => {
     onConfirm(GET_CONTACT_TYPE.VIP);
@@ -55,9 +86,15 @@ export function PrejobPopup({ onCancel, onConfirm }: IProps) {
     <Fragment>
       <Popup rounded className={PREFIX} placement="bottom" open={openPopup} onClose={onCancel}>
         <div className={`${PREFIX}__content`}>
-          <div className={`${PREFIX}__title`}>以下方式任选其一均可获取联系方式</div>
+          <div className={`${PREFIX}__title`}>
+            <div className="highlight">今日</div>免费次数已用完，请<div className="highlight">明日</div>
+            再来或选择以下方式
+          </div>
           <div className={`${PREFIX}__body`}>
             {GET_CONTACT_TYPE_OPTIONS.map(option => {
+              if (clicked && option.type === GET_CONTACT_TYPE.GROUP) {
+                return;
+              }
               return (
                 <div className={`${PREFIX}__item`} key={option.type}>
                   <div className={`${PREFIX}__item-icon ${option.type}`}>
@@ -68,9 +105,20 @@ export function PrejobPopup({ onCancel, onConfirm }: IProps) {
                     <div className="desc">{option.desc}</div>
                   </div>
                   <div className={`${PREFIX}__item-action`}>
+                    {option.needLogin ? (
+                      <LoginButton
+                        needRefresh
+                        onRefresh={onRefresh}
+                        className={`${PREFIX}__btn`}
+                        onClick={handleClick(option.type)}
+                      >
+                        {option.btnText}
+                      </LoginButton>
+                    ) : (
                       <Button className={`${PREFIX}__btn`} onClick={handleClick(option.type)}>
                         {option.btnText}
                       </Button>
+                    )}
                   </div>
                 </div>
               );
@@ -81,7 +129,7 @@ export function PrejobPopup({ onCancel, onConfirm }: IProps) {
       </Popup>
       <Dialog open={openDialog} onClose={onCancel}>
         <Dialog.Content>
-          <JobBuy onConfirm={handleAfterBuy} buyOnly />
+          <JobBuy onConfirm={handleAfterBuy} isCreateResume={isCreateResume} />
         </Dialog.Content>
       </Dialog>
     </Fragment>

src/components/product-dialog/index.less

@@ -2,7 +2,6 @@
 @import '@/styles/variables.less';
 
 .product-dialog {
-
   .layout() {
     display: flex;
     flex-direction: column;
@@ -31,7 +30,7 @@
     font-weight: 500;
     line-height: 72px;
     border-radius: 44px;
-    color: #FFFFFF;
+    color: #ffffff;
     background: @blHighlightColor;
     margin-top: 40px;
   }
@@ -42,7 +41,7 @@
     font-size: 24px;
     line-height: 48px;
     color: @blHighlightColor;
-    background: #6D3DF514;
+    background: #6d3df514;
     border-radius: 8px;
     padding: 32px 72px;
     margin-top: 40px;
@@ -73,7 +72,7 @@
 
     &__describe {
       .describe-font();
-      margin-top: 24px
+      margin-top: 24px;
     }
 
     &__content {
@@ -173,8 +172,8 @@
       }
 
       &.disabled {
-        border-color: #E0E0E0;
+        border-color: #e0e0e0;
-        background: #F7F7F7;
+        background: #f7f7f7;
       }
 
       &.selected {
@@ -237,9 +236,7 @@
         color: @blHighlightColor;
         display: inline;
       }
-
     }
-
   }
 
   // ============================================= 群 ================================================= //
@@ -323,7 +320,7 @@
     line-height: 36px;
     text-align: center;
     border-radius: 50%;
-    border: 2px solid #E0E0E0;
+    border: 2px solid #e0e0e0;
   }
 
   &__qr-code__step-title {
@@ -338,7 +335,7 @@
     position: relative;
     width: 2px;
     height: 40px;
-    background: #E0E0E0;
+    background: #e0e0e0;
     margin: 4px 0;
     margin-left: 18px;
   }
@@ -365,7 +362,7 @@
     .divider {
       width: 540px;
       height: 1px;
-      background: #E0E0E0;
+      background: #e0e0e0;
       margin: 40px 0;
     }
 
@@ -417,7 +414,7 @@
     margin-top: 40px;
 
     .highlight {
-      color: @blHighlightColor
+      color: @blHighlightColor;
     }
   }
 
@@ -523,7 +520,6 @@
     .button();
   }
 
-
   // ============================================= 发布通告的企业会员 ================================================= //
   &__publish-job-buy__header {
     .header-font();
@@ -576,21 +572,21 @@
 
     &__item {
       position: relative;
-      width: 230px;
+      width: 182px;
       height: 156px;
       .flex-column();
       justify-content: center;
       border: 2px solid @blHighlightColor;
       border-radius: 8px;
-      margin-right: 24px;
+      margin-right: 15px;
 
       &:last-child {
         margin-right: 0;
       }
 
       &.disabled {
-        border-color: #E0E0E0;
+        border-color: #e0e0e0;
-        background: #F7F7F7;
+        background: #f7f7f7;
       }
 
       &.selected {
@@ -635,11 +631,11 @@
       }
 
       &__left-line {
-        background: linear-gradient(270deg, #E0E0E0 0%, #FFFFFF 100%);
+        background: linear-gradient(270deg, #e0e0e0 0%, #ffffff 100%);
       }
 
       &__right-line {
-        background: linear-gradient(90deg, #E0E0E0 0%, #FFFFFF 100%);
+        background: linear-gradient(90deg, #e0e0e0 0%, #ffffff 100%);
       }
 
       &__title {
@@ -680,5 +676,4 @@
       margin-top: 32px;
     }
   }
-
 }

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

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

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

@@ -2,16 +2,23 @@ import Taro from '@tarojs/taro';
 
 import { Button } from '@taroify/core';
 import classNames from 'classnames';
-import { useCallback, useEffect, useState } from 'react';
+import { Fragment, useCallback, useEffect, useState } from 'react';
 
 import Badge from '@/components/badge';
 import { PREFIX } from '@/components/product-dialog/const';
 import { CollectEventName, ReportEventId } from '@/constants/event';
 import { OrderStatus, OrderType, ProductSpecId, ProductType } from '@/constants/product';
 import { SubscribeTempId } from '@/constants/subscribe';
+import { ProductSpecResult } from '@/types/product';
 import { logWithPrefix } from '@/utils/common';
 import { collectEvent, reportEvent } from '@/utils/event';
-import { getOrderPrice, isCancelPay, requestCreatePayInfo, requestOrderInfo, requestPayment } from '@/utils/product';
+import {
+  isCancelPay,
+  requestCreatePayInfo,
+  requestOrderInfo,
+  requestPayment,
+  requestProductTypeList,
+} from '@/utils/product';
 import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
 import Toast from '@/utils/toast';
 
@@ -82,22 +89,35 @@ const subscribe = async () => {
   postSubscribe(TEMP_IDS, successIds);
 };
 
+const getJsonContent = (jsonString: string) => {
+  try {
+    return JSON.parse(jsonString);
+  } catch (e) {
+    return [];
+  }
+};
+
 export default function CompanyPublishJobBuy(props: IProps) {
   const { onNext } = props;
-  const [selectItem, setSelectItem] = useState(LIST[0]);
+  const [productList, setProductList] = useState<ProductSpecResult[]>([]);
+  const [selectItem, setSelectItem] = useState<ProductSpecResult | undefined>();
 
-  const handleClickItem = useCallback((newSelectItem: Item) => setSelectItem(newSelectItem), []);
+  const handleClickItem = useCallback((newSelectItem: ProductSpecResult) => setSelectItem(newSelectItem), []);
 
   const handleBuy = useCallback(async () => {
     log('handleBuy');
     reportEvent(ReportEventId.CLICK_PAY_PUBLISH_JOB);
+    if (!selectItem) {
+      Toast.error('请选择购买的产品');
+      return;
+    }
     try {
       Taro.showLoading();
       const { payOrderNo, createPayInfo } = await requestCreatePayInfo({
         type: OrderType.CompanyVip,
-        amt: getOrderPrice(selectItem.amt),
+        amt: selectItem.payPrice,
         productCode: ProductType.BOSS_VIP_NEW,
-        productSpecId: selectItem.id,
+        productSpecId: selectItem.productSpecId,
       });
       log('handleBuy payInfo', payOrderNo, createPayInfo);
       await requestPayment({
@@ -121,8 +141,14 @@ export default function CompanyPublishJobBuy(props: IProps) {
       log('handleBuy error', e);
     }
   }, [selectItem, onNext]);
+  const handleGetProductInfo = useCallback(async () => {
+    const result = await requestProductTypeList(ProductType.BOSS_VIP_NEW);
+    setProductList(result);
+    setSelectItem(result[0]);
+  }, []);
 
   useEffect(() => {
+    handleGetProductInfo();
     collectEvent(CollectEventName.CREATE_ORDER_VIEW, { orderType: OrderType.BossVip, source: 'user-page' });
   }, []);
 
@@ -130,19 +156,21 @@ export default function CompanyPublishJobBuy(props: IProps) {
     <div className={`${PREFIX}__company-publish-job-buy`}>
       <div className={`${PREFIX}__company-publish-job-buy__header`}>发认证通告限时折扣</div>
       <div className={`${PREFIX}__company-publish-job-buy__price-container`}>
-        {LIST.map(item => (
+        {productList.map(item => (
           <div
-            key={item.price}
+            key={item.payPrice}
             className={classNames(`${PREFIX}__company-publish-job-buy__item`, {
-              selected: item.amt === selectItem.amt,
+              selected: selectItem && item.id === selectItem.id,
-              disabled: item.amt === 0,
+              disabled: item.payPrice === 0,
             })}
-            onClick={item.amt === 0 ? undefined : () => handleClickItem(item)}
+            onClick={item.payPrice === 0 ? undefined : () => handleClickItem(item)}
+          >
+            <div
+              className={classNames(`${PREFIX}__company-publish-job-buy__item__title`, { free: item.payPrice === 0 })}
             >
-            <div className={classNames(`${PREFIX}__company-publish-job-buy__item__title`, { free: item.amt === 0 })}>
               {item.title}
             </div>
-            <div className={`${PREFIX}__company-publish-job-buy__item__price`}>{item.price}</div>
+            <div className={`${PREFIX}__company-publish-job-buy__item__price`}>{item.priceText}</div>
             {item.badge && <Badge className={`${PREFIX}__company-publish-job-buy__item__badge`} text={item.badge} />}
           </div>
         ))}
@@ -152,8 +180,10 @@ export default function CompanyPublishJobBuy(props: IProps) {
         <div className={`${PREFIX}__company-publish-job-buy__divider__title`}>包含</div>
         <div className={`${PREFIX}__company-publish-job-buy__divider__right-line`} />
       </div>
+      {selectItem && (
+        <Fragment>
           <div className={`${PREFIX}__company-publish-job-buy__contents`}>
-        {selectItem.contents.map(i => (
+            {getJsonContent(selectItem.contentsJson).map(i => (
               <div
                 className={classNames(`${PREFIX}__company-publish-job-buy__content`, { highlight: i.highlight })}
                 key={i.content}
@@ -164,8 +194,10 @@ export default function CompanyPublishJobBuy(props: IProps) {
             ))}
           </div>
           <Button className={`${PREFIX}__company-publish-job-buy__button`} onClick={handleBuy}>
-        {`支付${selectItem.amt}元`}
+            {`支付${selectItem.showPrice}元`}
           </Button>
+        </Fragment>
+      )}
     </div>
   );
 }

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

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

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

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

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

@@ -2,7 +2,7 @@ import { Button } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
 import { Cell, Dialog } from '@taroify/core';
-import { Fragment, useCallback, useEffect, useState } from 'react';
+import { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
 
 import PageLoading from '@/components/page-loading';
 import { PublishJobQrCodeDialog } from '@/components/product-dialog/publish-job';
@@ -11,9 +11,10 @@ import SafeBottomPadding from '@/components/safe-bottom-padding';
 import { ISelectOption, PopupSelect } from '@/components/select';
 import { PageUrl } from '@/constants/app';
 import { JobManageStatus } from '@/constants/job';
-import { OrderStatus, OrderType, ProductSpecId, ProductType } from '@/constants/product';
+import { OrderStatus, OrderType, ProductType } from '@/constants/product';
+import useCityOperators from '@/hooks/use-city-operators';
 import { usePublishJob } from '@/hooks/use-publish-job';
-import { BatchPublishGroup } from '@/types/group';
+import { CityConfigListItem } from '@/types/location';
 import { logWithPrefix } from '@/utils/common';
 import { requestJobDetail } from '@/utils/job';
 import {
@@ -28,65 +29,29 @@ import { navigateTo } from '@/utils/route';
 import Toast from '@/utils/toast';
 import './index.less';
 
-interface CityValue extends BatchPublishGroup {
+interface CityOption extends ISelectOption<CityConfigListItem> {
-  cityName: string;
+  value: CityConfigListItem;
-}
-
-interface CityOption extends ISelectOption<CityValue> {
-  value: CityValue;
 }
 
 const PREFIX = 'user-batch-publish';
 const log = logWithPrefix(PREFIX);
-export const cityValues: CityValue[] = [
-  { cityCode: '440100', cityName: '广州', count: 800 },
-  { cityCode: '440300', cityName: '深圳', count: 100 },
-  { cityCode: '330100', cityName: '杭州', count: 750 },
-  { cityCode: '110100', cityName: '北京', count: 150 },
-  { cityCode: '510100', cityName: '成都', count: 100 },
-  { cityCode: '500100', cityName: '重庆', count: 50 },
-  { cityCode: '430100', cityName: '长沙', count: 50 },
-  { cityCode: '350200', cityName: '厦门', count: 50 },
-  { cityCode: '310100', cityName: '上海', count: 150 },
-  { cityCode: '420100', cityName: '武汉', count: 80 },
-  { cityCode: '610100', cityName: '西安', count: 60 },
-  { cityCode: '410100', cityName: '郑州', count: 150 },
-].sort((a, b) => b.count - a.count);
-const MIN_GROUP_SIZE = 20;
-const GROUP_OPTIONS = [
-  { value: MIN_GROUP_SIZE, productSpecId: ProductSpecId.GroupBatchPublish20, label: '20', price: 18 },
-  { value: 50, productSpecId: ProductSpecId.GroupBatchPublish50, label: '50', price: 40 },
-  { value: 60, productSpecId: ProductSpecId.GroupBatchPublish60, label: '60', price: 48 },
-  { value: 80, productSpecId: ProductSpecId.GroupBatchPublish80, label: '80', price: 58 },
-  { value: 100, productSpecId: ProductSpecId.GroupBatchPublish100, label: '100', price: 68 },
-  { value: 150, productSpecId: ProductSpecId.GroupBatchPublish150, label: '150', price: 98 },
-  { value: 300, productSpecId: ProductSpecId.GroupBatchPublish300, label: '300', price: 128 },
-  { value: 500, productSpecId: ProductSpecId.GroupBatchPublish500, label: '500', price: 168 },
-  { value: 750, productSpecId: ProductSpecId.GroupBatchPublish750, label: '750', price: 188 },
-  { value: 800, productSpecId: ProductSpecId.GroupBatchPublish800, label: '800', price: 198 },
-  { value: 1000, productSpecId: ProductSpecId.GroupBatchPublish1000, label: '1000', price: 288 },
-];
 
-const calcPrice = (city: CityValue | null) => {
-  if (!city) {
-    return {};
-  }
-  const { count } = city;
-  const originalPrice = count * 1;
-  const price = GROUP_OPTIONS.find(o => o.value === count)?.price || 18;
-  const productSpecId = GROUP_OPTIONS.find(o => o.value === count)?.productSpecId || ProductSpecId.GroupBatchPublish20;
-  return { price, originalPrice, productSpecId };
-};
-const cityOptions: CityOption[] = cityValues.map(value => ({ value, label: value.cityName }));
 export default function UserBatchPublish({ cityCode, jobId }: { cityCode?: string; jobId?: string }) {
   const [loading, setLoading] = useState(true);
   const [showQrCode, setShowQrCode] = useState(false);
   const [selectable, setSelectable] = useState(false);
   const [showCitySelect, setShowCitySelect] = useState(false);
-  const [city, setCity] = useState<CityOption['value'] | null>(null);
+  const [city, setCity] = useState<CityConfigListItem | null>(null);
-  const { price, originalPrice, productSpecId } = calcPrice(city);
   const [showPublishJob, setShowPublishJob] = useState(false);
 
+  const cityOperators = useCityOperators();
+
+  const availableCities = useMemo(() => cityOperators.filter(c => c.sendCount), [cityOperators]);
+  const cityOptions: CityOption[] = useMemo(
+    () => availableCities.map(value => ({ value, label: value.cityName })),
+    [availableCities]
+  );
+
   const [showBuy, setShowBuy, handlePublishJob] = usePublishJob(jobId);
   const handleClickCity = useCallback(() => setShowCitySelect(true), []);
 
@@ -102,7 +67,7 @@ export default function UserBatchPublish({ cityCode, jobId }: { cityCode?: strin
     //   setShowQrCode(true);
     //   return;
     // }
-    if (!price || !productSpecId) {
+    if (!city || !city.payPrice || !city.showPrice || !city.sendCount || !city.productSpecId) {
       return;
     }
     try {
@@ -127,10 +92,10 @@ export default function UserBatchPublish({ cityCode, jobId }: { cityCode?: strin
 
       const { payOrderNo, createPayInfo } = await requestCreatePayInfo({
         type: OrderType.GroupBatchPublish,
-        amt: getOrderPrice(price),
+        amt: city.payPrice,
         // amt: 1,
         productCode: ProductType.GroupBatchPublish,
-        productSpecId: productSpecId,
+        productSpecId: city.productSpecId,
       });
       log('handleBuy payInfo', payOrderNo, createPayInfo);
       await requestPayment({
@@ -152,14 +117,14 @@ export default function UserBatchPublish({ cityCode, jobId }: { cityCode?: strin
       Toast.error(isCancelPay(e) ? '取消购买' : '购买失败请重试');
       log('handleBuy error', e);
     }
-  }, [jobId, price, productSpecId]);
+  }, [cityCode, jobId, city]);
 
   useEffect(() => {
-    // if (!cityCode) {
+    if (!availableCities.length) {
-    //   return;
+      return;
-    // }
+    }
     try {
-      const initCity = cityCode ? cityValues.find(o => o.cityCode === cityCode) : cityValues[0];
+      const initCity = cityCode ? availableCities.find(o => o.cityCode === cityCode) : availableCities[0];
 
       setSelectable(!cityCode);
 
@@ -172,7 +137,7 @@ export default function UserBatchPublish({ cityCode, jobId }: { cityCode?: strin
     } catch (e) {
       Toast.error('加载失败请重试');
     }
-  }, [cityCode]);
+  }, [availableCities, cityCode]);
 
   if (loading) {
     return <PageLoading />;
@@ -203,11 +168,13 @@ export default function UserBatchPublish({ cityCode, jobId }: { cityCode?: strin
             查看该城市合作群列表
           </div>
           <div className={`${PREFIX}__title`}>可购买群数</div>
-          <Cell align="center" className={`${PREFIX}__cell`} title={city?.count} />
+          <Cell align="center" className={`${PREFIX}__cell`} title={city?.sendCount} />
           <div className={`${PREFIX}__title`}>服务费用</div>
           <div className={`${PREFIX}__cost-describe`}>
-            <div className={`${PREFIX}__cost-describe__price`}>{`${price}元`}</div>
+            <div className={`${PREFIX}__cost-describe__price`}>{`${city?.showPrice}元`}</div>
-            <div className={`${PREFIX}__cost-describe__original_price`}>{`原价：${originalPrice}元`}</div>
+            <div
+              className={`${PREFIX}__cost-describe__original_price`}
+            >{`原价：${city?.originalPrice || city?.sendCount}元`}</div>
           </div>
 
           <Button className={`${PREFIX}__buy-button`} onClick={handleClickBuy}>

src/constants/app.ts

@@ -17,6 +17,7 @@ export enum EventName {
   ADD_GROUP = 'add_group',
   SELECT_CITY = 'select_city',
   CREATE_PROFILE = 'create_profile',
+  READ_CONTACT = 'read_contact',
   UPDATE_PROFILE = 'update_profile',
   EDIT_JOB_DESCRIBE = 'edit_job_describe',
   JOB_UPDATE = 'job_update',
@@ -36,6 +37,7 @@ export enum OpenSource {
   AnchorPage = 'anchor_page',
   MaterialViewPage = 'material_view_page',
   GroupOwnerCertificate = 'group_owner_certificate',
+  InviteOperations = 'invite_operations',
 }
 
 export enum PageUrl {
@@ -81,6 +83,8 @@ export enum PageUrl {
   GiveVip = 'pages/give-vip/index',
   GroupOwnerCertificate = 'pages/group-owner-certification/index',
   PartnerShareVip = 'pages/partner-share-vip/index',
+  InviteOperations = 'pages/invite-operations/index',
+  GroupDetail = 'pages/group-detail/index',
 }
 
 export enum PluginUrl {

src/constants/cache-key.ts

@@ -13,4 +13,5 @@ export enum CacheKey {
   AGREEMENT_SIGNED = '__agreement_signed__',
   CITY_CODES = '__city_codes__',
   JOIN_GROUP_CARD_CLICKED = '__join_group_card_clicked__',
+  JOIN_GROUP_POPUP_CLICKED = '__join_group_popup_clicked__',
 }

src/constants/job.ts

@@ -213,4 +213,6 @@ export const FULL_PRICE_OPTIONS = FULL_EMPLOY_SALARY_OPTIONS.filter(o => !!o.val
 export enum GET_CONTACT_TYPE {
   VIP = 'vip',
   MATERIAL = 'material',
+  GROUP = 'group',
+  INVITE = 'invite',
 }

src/constants/product.ts

@@ -36,7 +36,10 @@ export enum ProductSpecId {
   GroupBatchPublish60 = 'GROUP_BATCH_PUSH_60',
   GroupBatchPublish80 = 'GROUP_BATCH_PUSH_80',
   GroupBatchPublish100 = 'GROUP_BATCH_PUSH_100',
+  GroupBatchPublish120 = 'GROUP_BATCH_PUSH_120',
   GroupBatchPublish150 = 'GROUP_BATCH_PUSH_150',
+  GroupBatchPublish200 = 'GROUP_BATCH_PUSH_200',
+  GroupBatchPublish250 = 'GROUP_BATCH_PUSH_250',
   GroupBatchPublish300 = 'GROUP_BATCH_PUSH_300',
   GroupBatchPublish500 = 'GROUP_BATCH_PUSH_500',
   GroupBatchPublish750 = 'GROUP_BATCH_PUSH_750',

src/fragments/job/base/index.tsx

@@ -9,7 +9,7 @@ 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';
+// import PartnerBanner from '@/components/partner-banner';
 import SalarySelect from '@/components/salary-select';
 import SearchInput from '@/components/search';
 import { APP_TAB_BAR_ID, PageUrl } from '@/constants/app';
@@ -30,6 +30,7 @@ import { Coordinate } from '@/types/location';
 import { logWithPrefix } from '@/utils/common';
 import { navigateTo } from '@/utils/route';
 import './index.less';
+import InviteOperationsBanner from '@/components/invite-operations-banner';
 
 interface IProps {
   cityCode: string;
@@ -173,7 +174,8 @@ function JobFragment(props: IProps) {
       <Tabs className={`${PREFIX}__type-tabs`} value={tabType} onChange={onTypeChange}>
         {JOB_TABS.map(tab => (
           <Tabs.TabPane title={tab.title} key={tab.type} value={tab.type}>
-            <PartnerBanner />
+            {/*<PartnerBanner />*/}
+            <InviteOperationsBanner />
             <ListWrapper
               category={tab.type}
               cityCode={cityCode}

src/fragments/user/anchor/index.less

@@ -17,4 +17,25 @@
     border-radius: 16px;
     margin-top: 24px;
   }
+
+  &__recommend {
+    display: inline-flex;
+    line-height: 36px;
+    padding: 0 8px;
+    height: 36px;
+    background: rgb(255, 80, 81);
+    border-radius: 4px;
+    font-size: 24px;
+    color: #fff;
+    align-items: center;
+    gap: 6px;
+    position: absolute;
+    left: 208px;
+    top: 8px;
+    width: 128px;
+
+    &-cell {
+      position: relative;
+    }
+  }
 }

src/fragments/user/anchor/index.tsx

@@ -1,6 +1,7 @@
 import { Image } from '@tarojs/components';
 
 import { Cell } from '@taroify/core';
+import { GoodJob } from '@taroify/icons';
 import { useCallback } from 'react';
 
 import MaterialCard from '@/components/material-card';
@@ -18,6 +19,8 @@ export default function AnchorFragment() {
 
   const handleClickSwitch = useCallback(() => switchRoleType(RoleType.Company), []);
 
+  const handleClickInviteOperations = useCallback(() => navigateTo(PageUrl.InviteOperations), []);
+
   return (
     <div className={PREFIX}>
       <MaterialCard />
@@ -29,6 +32,21 @@ export default function AnchorFragment() {
         className={`${PREFIX}__cell`}
         onClick={handleClickMyDeclaration}
       />
+      <Cell
+        isLink
+        align="center"
+        title={
+          <div className={`${PREFIX}__recommend-cell`}>
+            免费领主播会员
+            <div className={`${PREFIX}__recommend`}>
+              <GoodJob />
+              强烈推荐
+            </div>
+          </div>
+        }
+        className={`${PREFIX}__cell`}
+        onClick={handleClickInviteOperations}
+      />
       <Image
         mode="widthFix"
         className={`${PREFIX}__switch-to-company`}

src/fragments/user/company/index.less

@@ -40,5 +40,24 @@
     }
   }
 
+  &__recommend {
+    display: inline-flex;
+    line-height: 36px;
+    padding: 0 8px;
+    height: 36px;
+    background: rgb(255, 80, 81);
+    border-radius: 4px;
+    font-size: 24px;
+    color: #fff;
+    align-items: center;
+    gap: 6px;
+    position: absolute;
+    left: 208px;
+    top: 8px;
+    width: 128px;
 
+    &-cell {
+      position: relative;
+    }
+  }
 }

src/fragments/user/company/index.tsx

@@ -1,6 +1,7 @@
 import { Image } from '@tarojs/components';
 
 import { Cell } from '@taroify/core';
+import { GoodJob } from '@taroify/icons';
 import classNames from 'classnames';
 import { useCallback } from 'react';
 
@@ -22,10 +23,27 @@ export default function CompanyFragment() {
     navigateTo(PageUrl.CertificationManage);
   }, [userInfo]);
 
+  const handleClickInviteOperations = useCallback(() => navigateTo(PageUrl.InviteOperations, { company: 1 }), []);
+
   return (
     <div className={PREFIX}>
       <CertificationStatus className={`${PREFIX}__cell`} />
       <WechatCell className={`${PREFIX}__cell`} />
+      <Cell
+        isLink
+        align="center"
+        title={
+          <div className={`${PREFIX}__recommend-cell`}>
+            免费领企业会员
+            <div className={`${PREFIX}__recommend`}>
+              <GoodJob />
+              强烈推荐
+            </div>
+          </div>
+        }
+        className={`${PREFIX}__cell`}
+        onClick={handleClickInviteOperations}
+      />
       <Cell
         isLink
         align="center"
@@ -34,7 +52,7 @@ export default function CompanyFragment() {
             <div className={`${PREFIX}__cell-icon`}>
               <Image src="https://publiccdn.neighbourhood.com.cn/img/lightning.svg" />
             </div>
-            发布急招通告，优先展示
+            发布急招主播岗位
           </div>
         }
         className={classNames(`${PREFIX}__cell`, `${PREFIX}__go-publish-cell`)}

src/hooks/use-config.tsx

@@ -48,7 +48,7 @@ const CompanyTabs: TabItemType[] = [
   {
     type: PageType.BatchPublish,
     pagePath: PageUrl.UserBatchPublish,
-    text: '代发代招',
+    text: '群代发',
   },
 ];
 
@@ -101,7 +101,9 @@ export const APP_CONFIG: AppConfigType = {
     PageUrl.GiveVip,
     PageUrl.GroupOwnerCertificate,
     PageUrl.PartnerShareVip,
+    PageUrl.InviteOperations,
     PageUrl.AccelerateDelegatePublish,
+    PageUrl.GroupDetail,
     // PageUrl.DevDebug,
   ],
   window: {

src/hooks/use-publish-job.ts

@@ -25,32 +25,34 @@ export const usePublishJob = (jobId?: string): [boolean, Dispatch<SetStateAction
     }
 
     try {
-      if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
-        store.dispatch(cacheJobId(jobId));
-        navigateTo(PageUrl.CertificationStart);
-        return;
-      }
       Taro.showLoading();
       await postPublishJob(jobId);
       Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
       setShowBuy(false);
       Toast.success('发布成功');
       Taro.hideLoading();
+
+      if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
+        console.log('哈哈哈', jobId);
+        store.dispatch(cacheJobId(jobId));
+        navigateTo(PageUrl.CertificationStart);
+      }
     } catch (error) {
       Taro.hideLoading();
       const e = error as HttpError;
       const errorCode = e.errorCode;
-      const errorMsg = e.info?.() || e.message;
+      const errorMsg = e.errorMsg || e.info?.() || e.message;
-      collectEvent(CollectEventName.PUBLISH_OPEN_JOB_FAILED, { jobId, error: e.info?.() || e.message });
+      collectEvent(CollectEventName.PUBLISH_OPEN_JOB_FAILED, { jobId, error: errorMsg });
-      if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_FREE_BALANCE) {
+      if (
+        errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_FREE_BALANCE ||
+        errorCode === RESPONSE_ERROR_CODE.BOSS_VIP_EXPIRED
+      ) {
         setShowBuy(true);
       } else if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_BALANCE) {
         Toast.info('您购买的产品已耗尽使用次数');
         setShowBuy(true);
-      } else if (errorCode === RESPONSE_ERROR_CODE.BOSS_VIP_EXPIRED) {
-        Toast.info('该通告已到期，请创建新通告', 3000);
       } else {
-        Toast.error(errorMsg || '发布失败请重试', 3000);
+        Toast.info(errorMsg || '发布失败请重试', 3000);
       }
       console.error(e);
     }

src/http/api.ts

@@ -41,6 +41,8 @@ export enum API {
   PRODUCT_USE_RECORD = '/product/getProductUseRecord', // 查询某个产品是否已经解锁
   USE_PRODUCT = '/product/use', // 使用某个产品扣费/次数
   ALLOW_BUY_PRODUCT = '/product/allowBuyProduct', // 是否可以购买某个产品
+  LIST_PRODUCT_TYPE = '/product/listByType/{productType}',
+
   CS_QR_CODE = '/customerService/get', // 客服微信二维码
   CREATE_PAY_ORDER = '/payOrder/create', // 创建支付订单
   GET_PAY_ORDER = '/payOrder/get', // 订单查询

src/http/constant.ts

@@ -27,6 +27,7 @@ export enum RESPONSE_ERROR_CODE {
   INSUFFICIENT_FREE_BALANCE = 'INSUFFICIENT_FREE_BALANCE', // 免费查看次数(未购买会员)超限
   BOSS_VIP_EXPIRED = 'BOSS_VIP_EXPIRED', // 会员过期
   CHAT_MSG_SEND_NOT_ALLOW = 'CHAT_MSG_SEND_NOT_ALLOW',
+  JOB_EXIST_ONE_PUBLISHED = 'JOB_EXIST_ONE_PUBLISHED',
 }
 
 export const RESPONSE_ERROR_INFO: { [key in RESPONSE_ERROR_CODE]?: string } = {

src/pages/certification-manage/index.less

@@ -24,28 +24,6 @@
     }
   }
 
-  &__empty-tips {
-    width: 100%;
-    height: 100vh;
-    padding-top: 218px;
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    &__icon {
-      width: 386px;
-      height: 278px;
-    }
-
-    &__describe {
-      font-size: 28px;
-      font-weight: 500;
-      line-height: 40px;
-      color: @blColor;
-      margin-top: 50px;
-    }
-  }
 
   &__footer {
     width: 100%;

src/pages/certification-manage/index.tsx

@@ -1,9 +1,8 @@
-import { Button, Image } from '@tarojs/components';
+import { Button } from '@tarojs/components';
 import { NodesRef } from '@tarojs/taro';
 
 import { Tabs } from '@taroify/core';
-import classNames from 'classnames';
+import { useCallback, useState } from 'react';
-import { useCallback, useEffect, useState } from 'react';
 
 import JobManageList, { IJobManageListProps } from '@/components/job-manage-list';
 import SafeBottomPadding from '@/components/safe-bottom-padding';
@@ -57,35 +56,8 @@ const tab2Status = (tabType: JobManageType) => {
   }
 };
 
-const EmptyTips = (props: { className?: string; height?: number }) => {
-  const { className, height } = props;
-  return (
-    <div className={classNames(`${PREFIX}__empty-tips`, className)} style={height ? { height } : undefined}>
-      <Image className={`${PREFIX}__empty-tips__icon`} src={require('@/statics/svg/empty-box.svg')} mode="aspectFit" />
-      <div className={`${PREFIX}__empty-tips__describe`}>当前还没有通告</div>
-    </div>
-  );
-};
-
 function ListWrapper(props: IJobManageListProps) {
-  const { className, listHeight, visible } = props;
+  return <JobManageList {...props} />;
-  const [isEmpty, setIsEmpty] = useState(false);
-
-  const handleListEmpty = useCallback(() => {
-    setIsEmpty(true);
-  }, []);
-
-  useEffect(() => {
-    if (visible) {
-      setIsEmpty(false);
-    }
-  }, [visible]);
-
-  if (isEmpty) {
-    return <EmptyTips className={className} height={listHeight} />;
-  }
-
-  return <JobManageList {...props} onListEmpty={handleListEmpty} />;
 }
 
 export default function CertificationManage() {

src/pages/certification/index.tsx

@@ -30,7 +30,7 @@ import { dispatchUpdateUser, requestUserInfo } from '@/utils/user';
 import { uploadVideo } from '@/utils/video';
 
 import './index.less';
-
+import { RESPONSE_ERROR_CODE } from '@/http/constant';
 
 const PREFIX = 'page-certification';
 const log = logWithPrefix(PREFIX);
@@ -152,14 +152,20 @@ export default function Certification() {
   const handlePublishJob = useCallback(async () => {
     try {
       Taro.showLoading();
+      console.log('哈哈哈', cachedJobId);
       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);
+      console.error('submit error', e.errorCode, e.errorMsg);
+      console.dir(e);
+      if (e.errorCode === RESPONSE_ERROR_CODE.JOB_EXIST_ONE_PUBLISHED) {
+        Toast.info(e.errorMsg || e.errorCode, 3000);
+      } else {
         Toast.error('通告发布失败');
+      }
       collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
       redirectTo(PageUrl.CertificationManage);
     } finally {

src/pages/give-vip/index.tsx

@@ -5,14 +5,12 @@ import { Fragment, useCallback, useState } from 'react';
 
 import SafeBottomPadding from '@/components/safe-bottom-padding';
 import { PageUrl } from '@/constants/app';
-import { logWithPrefix } from '@/utils/common';
 import { claimMembershipCoupon, getCouponCodeFromQuery } from '@/utils/coupon';
 import { getPageQuery, switchTab } from '@/utils/route';
 import { formatTime } from '@/utils/time';
 import './index.less';
 
 const PREFIX = 'give-vip';
-const log = logWithPrefix(PREFIX);
 
 enum State {
   PENDING,

src/pages/group-detail/index.config.ts

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '邀请运营',
+});

src/pages/group-detail/index.less

@@ -0,0 +1,70 @@
+@import '@/styles/variables.less';
+@import '@/styles/common.less';
+
+.group-detail {
+  padding: 24px;
+  &__card {
+    padding: 32px;
+    background: #fff;
+    border-radius: 24px;
+    .flex-column();
+  }
+  &__city-name {
+    background: #f7f7f7;
+    border-radius: 16px;
+    height: 100px;
+    line-height: 100px;
+    color: #6d3df5;
+    font-size: 32px;
+    width: 100%;
+    margin-bottom: 48px;
+    text-align: center;
+  }
+  &__lined-wrapper {
+    text-align: center;
+    margin-bottom: 20px;
+  }
+  &__lined-title {
+    text-align: center;
+    font-weight: 500;
+    font-size: 32px;
+    line-height: 48px;
+    color: #333333;
+    position: relative;
+    display: inline-block;
+
+    &:before {
+      content: '';
+      position: absolute;
+      left: -72px;
+      width: 56px;
+      height: 1px;
+      background: #ccc;
+      top: 50%;
+    }
+
+    &:after {
+      content: '';
+      position: absolute;
+      right: -72px;
+      width: 56px;
+      height: 1px;
+      background: #ccc;
+      top: 50%;
+    }
+  }
+  &__text {
+    font-size: 28px;
+    line-height: 40px;
+    color: #333333;
+margin-bottom: 24px;
+
+  }
+  &__qrcode {
+    width: 280px;
+    height: 280px;
+    background: #6f7686;
+    display: block;
+    margin: auto auto 24px;
+  }
+}

src/pages/group-detail/index.tsx

@@ -0,0 +1,49 @@
+import { Image } from '@tarojs/components';
+import { useLoad } from '@tarojs/taro';
+
+import { Fragment, useMemo, useState } from 'react';
+
+import useCityOperators from '@/hooks/use-city-operators';
+import { getPageQuery } from '@/utils/route';
+import './index.less';
+
+const PREFIX = 'group-detail';
+
+export default function GroupDetail() {
+  const cityOperators = useCityOperators();
+  const [cityCode, setCityCode] = useState('');
+
+  useLoad(() => {
+    const query = getPageQuery<{ cityCode: string }>();
+    setCityCode(String(query.cityCode));
+  });
+
+  const operator = useMemo(() => {
+    if (cityOperators.length && cityCode) {
+      return cityOperators.find(it => String(it.cityCode) === cityCode);
+    }
+    return undefined;
+  }, [cityCode, cityOperators]);
+
+  return (
+    <div className={PREFIX}>
+      <div className={`${PREFIX}__card`}>
+        <div className={`${PREFIX}__lined-wrapper`}>
+          <div className={`${PREFIX}__lined-title`}>当前所选城市</div>
+        </div>
+        <div className={`${PREFIX}__city-name`}>{operator?.cityName}</div>
+        {operator && operator.groupQrCode ? (
+          <Fragment>
+            <div className={`${PREFIX}__text`}>长按并识别二维码，邀你进主播通告群</div>
+            <Image
+              className={`${PREFIX}__qrcode`}
+              src={operator?.contactQrCode}
+              showMenuByLongpress
+              mode="aspectFill"
+            />
+          </Fragment>
+        ) : null}
+      </div>
+    </div>
+  );
+}

src/pages/group-v2/index.tsx

@@ -8,10 +8,9 @@ import { PageType, PageUrl, RoleType } from '@/constants/app';
 import useCityOperators from '@/hooks/use-city-operators';
 import useInviteCode from '@/hooks/use-invite-code';
 import { switchRoleType } from '@/utils/app';
-import { openCustomerServiceChat } from '@/utils/common';
 import { getCurrentCityCode } from '@/utils/location';
 import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
-import { getPageQuery } from '@/utils/route';
+import { getPageQuery, navigateTo } from '@/utils/route';
 import { getCommonShareMessage } from '@/utils/share';
 import { checkCityCode } from '@/utils/user';
 import './index.less';
@@ -38,10 +37,11 @@ export default function GroupV2() {
       if (!checkCityCode(cityCode)) {
         return;
       }
-      const group = cityOperators.find(g => String(g.cityCode) === cityCode);
+      navigateTo(PageUrl.GroupDetail, { cityCode });
-      if (group) {
+      // const group = cityOperators.find(g => String(g.cityCode) === cityCode);
-        openCustomerServiceChat(group.groupLink);
+      // if (group) {
-      }
+      //   openCustomerServiceChat(group.groupLink);
+      // }
     },
     [cityOperators]
   );

src/pages/invite-operations/index.config.ts

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '邀请运营',
+});

src/pages/invite-operations/index.less

@@ -0,0 +1,156 @@
+@import '@/styles/variables.less';
+@import '@/styles/common.less';
+
+.invite-operations {
+  &__main {
+    padding-left: 24px;
+    padding-right: 24px;
+    position: relative;
+  }
+
+  &__block {
+    margin-bottom: 12px;
+    position: relative;
+  }
+
+  &__card {
+    background: #fff;
+    border-radius: 24px;
+    padding: 32px;
+    position: relative;
+  }
+
+  &__edging {
+    position: absolute;
+    font-weight: 400;
+    font-size: 26px;
+    line-height: 28px;
+    color: #946724;
+    padding: 18px 24px;
+    background: #FFF4F0;
+    border-radius:0 0 24px 24px;
+    bottom: 0;
+    left: 0;
+    right: 0;
+  }
+
+  &__lined-wrapper {
+    text-align: center;
+    margin-top: 40px;
+  }
+  &__lined-title {
+    text-align: center;
+    font-weight: 400;
+    font-size: 28px;
+    line-height: 40px;
+    color: #333333;
+    position: relative;
+    display: inline-block;
+
+    &:before {
+      content: '';
+      position: absolute;
+      left: -68px;
+      width: 56px;
+      height: 1px;
+      background: #ccc;
+      top: 50%;
+    }
+
+    &:after {
+      content: '';
+      position: absolute;
+      right: -68px;
+      width: 56px;
+      height: 1px;
+      background: #ccc;
+      top: 50%;
+    }
+  }
+
+
+  &__h1 {
+    font-weight: 500;
+    font-size: 32px;
+    line-height: 40px;
+    color: #1d2129;
+    margin-bottom: 16px;
+    margin-top: 32px;
+    position: relative;
+    z-index: 0;
+
+    &:first-child {
+      margin-top: 0;
+    }
+
+    &.center {
+      text-align: center;
+    }
+
+    .highlight {
+      color: @blHighlightColor;
+      display: inline-block;
+    }
+  }
+
+  &__body {
+    font-weight: 400;
+    font-size: 28px;
+    line-height: 40px;
+    color: @blColor;
+  }
+
+  &__title {
+    margin-bottom: 24px;
+    font-weight: 500;
+    font-size: 32px;
+    line-height: 32px;
+    color: #1d2129;
+
+    &:before {
+      left: -138px;
+      width: 120px;
+    }
+
+    &:after {
+      right: -138px;
+      width: 120px;
+    }
+  }
+
+  &__copy {
+    .button(@height: 72px; @width: 384px; @fontSize: 28px; @fontWeight: 400; @borderRadius: 44px; @highlight: 0);
+    margin-top: 32px;
+  }
+
+  &__city-select {
+    background: #F7F7F7;
+    border-radius: 16px;
+    padding: 34px 32px;
+    font-weight: 400;
+    font-size: 32px;
+    margin-top: 24px;
+    line-height: 32px;
+    color: #333333;
+    display: flex;
+    justify-content: space-between;
+  }
+  &__qrcode {
+    width: 280px;
+    height: 280px;
+    background: #6F7686;
+    display: block;
+    margin: auto auto 24px;
+  }
+
+  &__action-block {
+    background: #F7F7F7;
+    border-radius: 16px;
+    padding: 32px 0;
+    .flex-column();
+    text-align: center;
+    color: @blHighlightColor;
+    font-size: 28px;
+    font-weight: 400;
+  }
+}

src/pages/invite-operations/index.tsx

@@ -0,0 +1,139 @@
+import { Button, Image } from '@tarojs/components';
+import Taro, { useLoad } from '@tarojs/taro';
+
+import { Arrow } from '@taroify/icons';
+import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+import { EventName, OpenSource, PageUrl } from '@/constants/app';
+import { CITY_CODE_TO_NAME_MAP } from '@/constants/city';
+import useLocation from '@/hooks/use-location';
+import useUserInfo from '@/hooks/use-user-info';
+import { StaffInfo } from '@/types/partner';
+import { copy } from '@/utils/common';
+import { getStaffInfo } from '@/utils/partner';
+import { getPageQuery, navigateTo } from '@/utils/route';
+import './index.less';
+
+const PREFIX = 'invite-operations';
+
+export default function InviteOperations() {
+  const location = useLocation();
+  const userInfo = useUserInfo();
+  const [cityCode, setCityCode] = useState<string>();
+  const [staffInfo, setStaffInfo] = useState<StaffInfo | null>(null);
+  const [isCompany, setIsCompany] = useState<boolean | null>(null);
+
+  const copyText = useMemo(() => {
+    return isCompany
+      ? `我的播络ID是：${userInfo.userId}，邀你进主播群【企业】`
+      : `我的播络ID是：${userInfo.userId}，邀你进群`;
+  }, [userInfo.userId, isCompany]);
+
+  const handleClickCityMenu = useCallback(() => {
+    navigateTo(PageUrl.CitySearch, { city: cityCode || location.cityCode, source: OpenSource.InviteOperations });
+  }, [cityCode, location.cityCode]);
+
+  const handleCityChange = useCallback(data => {
+    console.log('handleCityChange', data);
+    const { openSource, cityCode: cCode } = data;
+    if (openSource !== OpenSource.InviteOperations) {
+      return;
+    }
+    setCityCode(cCode);
+  }, []);
+
+  const handleCopy = useCallback(() => {
+    copy(copyText);
+  }, [copyText]);
+
+  useEffect(() => {
+    Taro.eventCenter.on(EventName.SELECT_CITY, handleCityChange);
+    return () => {
+      Taro.eventCenter.off(EventName.SELECT_CITY, handleCityChange);
+    };
+  }, [handleCityChange]);
+
+  const useCopyRef = useRef(false);
+
+  useEffect(() => {
+    if (!userInfo.userId) return;
+    if (isCompany === null) return;
+    if (useCopyRef.current) return;
+    handleCopy();
+    useCopyRef.current = true;
+  }, [handleCopy, isCompany, userInfo.userId]);
+
+  useEffect(() => {
+    if (!cityCode) return;
+
+    getStaffInfo(cityCode)
+      .then(data => {
+        setStaffInfo(data);
+      })
+      .catch(() => {
+        setStaffInfo(null);
+      });
+  }, [cityCode]);
+
+  useLoad(async () => {
+    const query = getPageQuery<{ company: number }>();
+    setIsCompany(typeof query.company !== 'undefined');
+  });
+
+  return (
+    <div className={PREFIX}>
+      <div className={`${PREFIX}__main`}>
+        <div className={`${PREFIX}__block`}>
+          <div className={`${PREFIX}__lined-wrapper`}>
+            <div className={`${PREFIX}__lined-title ${PREFIX}__title`}>活动说明</div>
+          </div>
+          <div className={`${PREFIX}__card`}>
+            <div className={`${PREFIX}__h1 center`}>邀请播络运营进带货主播群</div>
+            <div className={`${PREFIX}__h1 center`} style={{ paddingBottom: `48rpx` }}>
+              {isCompany ? '每邀请进10个群送一个企业月会员' : '每邀请进一个群送一个日会员'}
+            </div>
+            <div className={`${PREFIX}__edging`}>注：只能邀请带货主播群，请勿邀请其他群</div>
+          </div>
+        </div>
+        <div className={`${PREFIX}__block`}>
+          <div className={`${PREFIX}__lined-wrapper`}>
+            <div className={`${PREFIX}__lined-title ${PREFIX}__title`}>邀请方法</div>
+          </div>
+          <div className={`${PREFIX}__card`}>
+            <div className={`${PREFIX}__body`}>
+              <div className={`${PREFIX}__h1`}>
+                加运营为好友并将以下信息 <div className="highlight">粘贴发送给运营</div>
+              </div>
+              <div className={`${PREFIX}__action-block`}>
+                <div>{copyText}</div>
+                <Button className={`${PREFIX}__copy`} onClick={handleCopy}>
+                  复制
+                </Button>
+              </div>
+              <div className={`${PREFIX}__lined-wrapper`}>
+                <div className={`${PREFIX}__lined-title`}>选择城市，添加运营</div>
+              </div>
+              <div className={`${PREFIX}__city-select`} onClick={handleClickCityMenu}>
+                {cityCode ? CITY_CODE_TO_NAME_MAP.get(cityCode) : '请选择城市'}
+                <Arrow size={16} />
+              </div>
+              {staffInfo && (
+                <Fragment>
+                  <div className={`${PREFIX}__lined-wrapper`}>
+                    <div className={`${PREFIX}__lined-title`}>长按并识别二维码添加运营</div>
+                  </div>
+                  <Image
+                    className={`${PREFIX}__qrcode`}
+                    src={staffInfo.staffQrCode}
+                    showMenuByLongpress
+                    mode="aspectFill"
+                  />
+                </Fragment>
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

src/pages/job-detail/index.less

@@ -269,6 +269,21 @@
     flex: 2 2;
     .button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px;);
     margin-left: 32px;
+    position: relative;
+    overflow: visible;
+
+    &-tag {
+      position: absolute;
+      right: 8px;
+      top: -12px;
+      font-weight: 400;
+      font-size: 24px;
+      line-height: 32px;
+      color: #FFFFFF;
+      padding: 2px 8px;
+      background: #FF5051;
+      border-radius: 20px 24px 24px 0px;
+    }
   }
 
 }

src/pages/job-detail/index.tsx

@@ -9,10 +9,9 @@ import CommonDialog from '@/components/common-dialog';
 import DevDiv from '@/components/dev-div';
 import JobRecommendList from '@/components/job-recommend-list';
 import { JoinGroupHint } from '@/components/join-group-hint';
-import LoginButton from '@/components/login-button';
 import PageLoading from '@/components/page-loading';
 import { PrejobPopup } from '@/components/prejob-popup';
-import ProductJobDialog from '@/components/product-dialog/job';
+import ProductJobContactDialog from '@/components/product-dialog/job-contact';
 import CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
 import { EventName, PageUrl, RoleType } from '@/constants/app';
 import { CertificationStatusType } from '@/constants/company';
@@ -27,6 +26,7 @@ import { RESPONSE_ERROR_CODE } from '@/http/constant';
 import { HttpError } from '@/http/error';
 import { JobDetails } from '@/types/job';
 import { IMaterialMessage } from '@/types/message';
+import { GetProductIsUnlockResponse, ProductInfo } from '@/types/product';
 import { switchRoleType } from '@/utils/app';
 import { copy, logWithPrefix } from '@/utils/common';
 import { reportEvent } from '@/utils/event';
@@ -40,8 +40,6 @@ import { getJumpUrl, getPageQuery, navigateTo } from '@/utils/route';
 import { getCommonShareMessage } from '@/utils/share';
 import { formatDate } from '@/utils/time';
 import Toast from '@/utils/toast';
-import { isNeedCreateMaterial } from '@/utils/user';
-
 import './index.less';
 
 const PREFIX = 'job-detail';
@@ -70,8 +68,28 @@ const getMapCallout = (data: JobDetails): MapProps.callout | undefined => {
 const AnchorFooter = (props: { data: JobDetails }) => {
   const { data } = props;
   const [errorTips, setErrorTips] = useState<string>('');
-  const [dialogVisible, setDialogVisible] = useState(false);
+  const [showJobContactDialog, setShowJobContactDialog] = useState(false);
   const [showMaterialGuide, setShowMaterialGuide] = useState(false);
+  const [productInfo, setProductInfo] = useState<undefined | ProductInfo>();
+  const [productRecord, setProductRecord] = useState<undefined | GetProductIsUnlockResponse>();
+
+  const getProductRecord = useCallback(async () => {
+    const result = await requestProductUseRecord(ProductType.VIP, { jobId: data.id });
+    setProductRecord(result);
+  }, [data.id]);
+
+  const getProductBalance = useCallback(async (loading?: boolean) => {
+    if (loading) {
+      Taro.showLoading();
+    }
+    const [, resp] = await requestProductBalance(ProductType.VIP);
+    setProductInfo(resp);
+    console.log(resp);
+    if (loading) {
+      Taro.hideLoading();
+    }
+    return resp;
+  }, []);
 
   const handleClickContact = useCallback(async () => {
     log('handleClickContact');
@@ -79,21 +97,8 @@ const AnchorFooter = (props: { data: JobDetails }) => {
       return;
     }
     reportEvent(ReportEventId.CLICK_JOB_CONTACT);
-    try {
-      const needCreateMaterial = await isNeedCreateMaterial();
 
-      if (data.sourcePlat !== 'bl') {
+    try {
-        if (needCreateMaterial) {
-          const result = await requestProductUseRecord(ProductType.VIP, { jobId: data.id });
-          if (!result) {
-            const [time, isPaidVip] = await requestProductBalance(ProductType.VIP);
-            if (time <= 0 || !isPaidVip) {
-              setShowMaterialGuide(true);
-              return;
-            }
-          }
-        }
-      }
       if (data.isAuthed) {
         const toUserId = data.userId;
         if (isChatWithSelf(toUserId)) {
@@ -102,7 +107,7 @@ const AnchorFooter = (props: { data: JobDetails }) => {
         }
         const chat = await postCreateChat(toUserId);
         let materialMessage: null | IMaterialMessage = null;
-        if (!needCreateMaterial) {
+        if (!!productInfo?.isCreateResume) {
           const profile = await requestProfileDetail();
           if (profile) {
             materialMessage = {
@@ -124,7 +129,13 @@ const AnchorFooter = (props: { data: JobDetails }) => {
           jobId: data.id,
         });
       } else {
-        setDialogVisible(true);
+        // Show material guide if no resume and no VIP and no free balance
+        if (!productRecord && !productInfo?.isCreateResume && !productInfo?.isPaidVip && !productInfo?.freeBalance) {
+          setShowMaterialGuide(true);
+          return;
+        }
+        // Open integrated dialog - it handles buy + contact internally
+        setShowJobContactDialog(true);
       }
     } catch (error) {
       const e = error as HttpError;
@@ -135,31 +146,93 @@ const AnchorFooter = (props: { data: JobDetails }) => {
         Toast.error('请求失败请重试');
       }
     }
-  }, [data]);
+  }, [data, productInfo?.freeBalance, productInfo?.isCreateResume, productInfo?.isPaidVip, productRecord]);
 
-  const handleDialogHidden = useCallback(() => {
+  const handleDialogClose = useCallback(() => {
-    setDialogVisible(false);
+    setShowJobContactDialog(false);
-  }, []);
+    // Refresh data after dialog closes
-  const handleConfirmPrejob = useCallback((type: GET_CONTACT_TYPE) => {
+    getProductRecord();
+  }, [getProductRecord]);
+
+  const handleConfirmPrejob = useCallback(
+    (type: GET_CONTACT_TYPE) => {
       setShowMaterialGuide(false);
       if (GET_CONTACT_TYPE.VIP === type) {
-      setDialogVisible(true);
+        getProductBalance().then(() => {
+          setShowJobContactDialog(true);
+        });
       }
-  }, []);
+    },
+    [getProductBalance]
+  );
+
+  // const unAuthedButtonText = useMemo(() => {
+  //   if (haveSeen) {
+  //     return '查看联系方式';
+  //   }
+  //
+  //   if (productInfo?.isPaidVip) {
+  //     return '您是会员，可直接查看';
+  //   }
+  //
+  //   if (productInfo?.freeBalance) {
+  //     return `还剩${productInfo.freeBalance}次查看次数`;
+  //   }
+  //
+  //   return productInfo?.isCreateResume? '升级会员即可查看': '创建模卡，免费查看';
+  // }, [productInfo, haveSeen]);
+
+  const handleRefresh = useCallback(async () => {
+    await getProductBalance(true);
+  }, [getProductBalance]);
+
+  useEffect(() => {
+    Taro.eventCenter.on(EventName.CREATE_PROFILE, getProductBalance);
+    return () => {
+      Taro.eventCenter.off(EventName.CREATE_PROFILE);
+    };
+  }, [getProductBalance]);
+
+  useEffect(() => {
+    getProductBalance();
+  }, [getProductBalance]);
+
+  useEffect(() => {
+    getProductRecord();
+  }, [getProductRecord]);
+
   return (
     <>
       <div className={`${PREFIX}__footer`}>
         <Button className={`${PREFIX}__share-button`} openType="share">
           分享
         </Button>
-        <LoginButton className={`${PREFIX}__contact-publisher`} onClick={handleClickContact}>
+        <Button className={`${PREFIX}__contact-publisher`} onClick={handleClickContact}>
-          {data.isAuthed ? '在线沟通' : '立即联系'}
+          {data.isAuthed ? '在线沟通' : '查看联系方式'}
-        </LoginButton>
+          {!productRecord && (data.isAuthed || productInfo?.content) ? (
+            <div className={`${PREFIX}__contact-publisher-tag`}>
+              {data.isAuthed ? '急招岗位可免费查看' : productInfo?.content}
+            </div>
+          ) : null}
+        </Button>
       </div>
       <div>
-        {dialogVisible && <ProductJobDialog data={data} onClose={handleDialogHidden} />}
+        {showJobContactDialog && (
+          <ProductJobContactDialog
+            data={data}
+            productRecord={productRecord}
+            productInfo={productInfo}
+            onRefreshBalance={getProductBalance}
+            onClose={handleDialogClose}
+          />
+        )}
         {showMaterialGuide && (
-          <PrejobPopup onCancel={() => setShowMaterialGuide(false)} onConfirm={handleConfirmPrejob} />
+          <PrejobPopup
+            isCreateResume={productInfo?.isCreateResume}
+            onCancel={() => setShowMaterialGuide(false)}
+            onConfirm={handleConfirmPrejob}
+            onRefresh={handleRefresh}
+          />
         )}
         <CommonDialog
           content={errorTips}

src/pages/job-publish/index.tsx

@@ -41,6 +41,7 @@ import { getPageQuery, navigateBack, navigateTo } from '@/utils/route';
 import Toast from '@/utils/toast';
 
 import './index.less';
+import { RESPONSE_ERROR_CODE } from '@/http/constant';
 
 const PREFIX = 'page-job-publish';
 const log = logWithPrefix(PREFIX);
@@ -145,6 +146,7 @@ export default function JobPublish() {
   }, []);
 
   const refreshJobPublishList = useCallback(() => {
+    console.log('哈哈哈哈触发 refresh job publish list');
     Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
     setTimeout(() => {
       Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
@@ -213,13 +215,13 @@ export default function JobPublish() {
         createdJobIdRef.current = jobId;
         refreshJobPublishList();
 
-        if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
+        // if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
-          // 去认证
+        //   // 去认证
-          store.dispatch(cacheJobId(jobId));
+        //   store.dispatch(cacheJobId(jobId));
-          navigateTo(PageUrl.CertificationStart);
+        //   navigateTo(PageUrl.CertificationStart);
-          Taro.hideLoading();
+        //   Taro.hideLoading();
-          return;
+        //   return;
-        }
+        // }
 
         const [time] = await requestProductBalance(ProductType.CompanyPublishJob);
         if (time <= 0) {
@@ -237,29 +239,48 @@ export default function JobPublish() {
       navigateBack();
     } catch (e) {
       createdJobIdRef.current = '';
-      console.error('submit error', e);
+      console.error('submit error', e.errorCode, e.errorMsg);
+      console.dir(e);
+      if (e.errorCode === RESPONSE_ERROR_CODE.JOB_EXIST_ONE_PUBLISHED) {
+        Toast.info(e.errorMsg || e.errorCode, 3000);
+      } else {
         Toast.error('审核失败请重试');
+      }
       collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
     } finally {
       Taro.hideLoading();
     }
-  }, [getCreateJobInfo, isUpdate, job, userInfo.bossAuthStatus, refreshJobPublishList]);
+  }, [getCreateJobInfo, isUpdate, job, refreshJobPublishList]);
 
   const handleNext = useCallback(async () => {
     Taro.showLoading();
+
+    if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
+      // 去认证
+      store.dispatch(cacheJobId(createdJobIdRef.current));
+      navigateTo(PageUrl.CertificationStart);
+      Taro.hideLoading();
+      return;
+    }
+
     try {
       await postPublishJob(createdJobIdRef.current);
       refreshJobPublishList();
       await Toast.success('发布成功', 1500, true);
       navigateBack();
     } catch (e) {
-      console.error('submit error', e);
+      console.error('submit error', e.errorCode, e.errorMsg);
+      console.dir(e);
+      if (e.errorCode === RESPONSE_ERROR_CODE.JOB_EXIST_ONE_PUBLISHED) {
+        Toast.info(e.errorMsg || e.errorCode, 3000);
+      } else {
         Toast.error('审核失败请重试');
+      }
       collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
     } finally {
       Taro.hideLoading();
     }
-  }, [refreshJobPublishList]);
+  }, [refreshJobPublishList, userInfo.bossAuthStatus]);
 
   const handleClosePublishJob = useCallback(() => {
     setShowBuy(false);

src/pages/job/index.tsx

@@ -19,7 +19,7 @@ import { logWithPrefix } from '@/utils/common';
 import { getWxLocation, isNotNeedAuthorizeLocation, requestLocation } from '@/utils/location';
 import { requestUnreadMessageCount } from '@/utils/message';
 import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
-import { getJumpUrl, getPageQuery, navigateTo } from '@/utils/route';
+import { getPageQuery, navigateTo } from '@/utils/route';
 import { getCommonShareMessage } from '@/utils/share';
 import Toast from '@/utils/toast';
 import { getAgreementSigned, setAgreementSigned } from '@/utils/user';
@@ -138,13 +138,12 @@ export default function Job() {
   });
 
   useShareAppMessage(() => {
-    if (sortType === SortType.CREATE_TIME) {
+    return getCommonShareMessage({
-      return {
+      inviteCode,
-        title: '这里有今日全城新增通告，快来看看',
+      path: PageUrl.Job,
-        path: getJumpUrl(PageUrl.Job, { sortType, c: inviteCode }),
+      params: sortType === SortType.CREATE_TIME ? { sortType } : {},
-      };
+      title: sortType === SortType.CREATE_TIME ? '今日春节岗位已更新，快来看看' : '',
-    }
+    });
-    return getCommonShareMessage({ inviteCode, path: PageUrl.Job });
   });
 
   return (

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

@@ -21,7 +21,24 @@
   }
 
   &__video-list {
-    margin-top: 16px;
+    margin-top: 25px;
+  }
+
+  &__hint {
+    line-height: 64px;
+    height: 64px;
+    background: #fff4f0;
+    border-radius: 24px 24px 0px 0px;
+    padding: 0 24px;
+    font-weight: 400;
+    font-size: 26px;
+    color: #946724;
+
+    + .material-video-card {
+      margin-top: 0;
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+    }
   }
 
   &__footer {
@@ -29,7 +46,7 @@
     left: 24px;
     right: 24px;
     bottom: 0;
-    background: #F5F6FA;
+    background: #f5f6fa;
   }
 
   &__submit-btn {

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

@@ -181,6 +181,7 @@ export default function MaterialUploadVideo() {
         <div className={`${PREFIX}__header-tips`}>录屏是企业最关注的资料，建议提供多个风格和品类</div>
       </div>
       <div className={`${PREFIX}__video-list`}>
+        <div className={`${PREFIX}__hint`}>注：请勿乱传，也不要上传简历，会被封号</div>
         {videoList.map(video => (
           <MaterialVideoCard
             key={video.coverUrl}

src/pages/material-view/index.tsx

@@ -97,11 +97,11 @@ export default function MaterialViewPage() {
         }
         const jobDetail = await requestJobDetail(jobId);
         if (jobDetail.status !== JobManageStatus.Open) {
-          if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
+          // if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
-            store.dispatch(cacheJobId(jobId));
+          //   store.dispatch(cacheJobId(jobId));
-            navigateTo(PageUrl.CertificationStart);
+          //   navigateTo(PageUrl.CertificationStart);
-            return;
+          //   return;
-          }
+          // }
 
           setShowBuy(true);
           return;
@@ -137,14 +137,27 @@ export default function MaterialViewPage() {
   }, [profile, jobId]);
   const handleNext = useCallback(async () => {
     setShowBuy(false);
+
+    if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
+      store.dispatch(cacheJobId(jobId!));
+      navigateTo(PageUrl.CertificationStart);
+      return;
+    }
+
     try {
       await postPublishJob(jobId!);
       await handleClickContact();
     } catch (e) {
+      console.error('submit error', e.errorCode, e.errorMsg);
+      console.dir(e);
+      if (e.errorCode === RESPONSE_ERROR_CODE.JOB_EXIST_ONE_PUBLISHED) {
+        Toast.info(e.errorMsg || e.errorCode, 3000);
+      } else {
         Toast.error('通告发布失败');
+      }
       collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
     }
-  }, [handleClickContact, jobId]);
+  }, [handleClickContact, jobId, userInfo.bossAuthStatus]);
   const handleClickNoViewTimes = useCallback(() => {
     setNoTimeDialogVisible(false);
     navigateBack();

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

@@ -24,7 +24,7 @@ const COMMENT_IMAGE = 'https://publiccdn.neighbourhood.com.cn/img/delegate-comme
 export default function BizService() {
   const inviteCode = useInviteCode();
   const cityOperators = useCityOperators();
-  const [value, setValue] = useState('2');
+  const [value, setValue] = useState('1');
 
   const handleClickDelegate = useCallback(() => {
     navigateTo(PageUrl.GroupDelegatePublish);
@@ -43,10 +43,11 @@ export default function BizService() {
       if (!checkCityCode(cityCode)) {
         return;
       }
-      const group = cityOperators.find(g => String(g.cityCode) === cityCode);
+      // const group = cityOperators.find(g => String(g.cityCode) === cityCode);
-      if (group) {
+      // if (group) {
-        openCustomerServiceChat(group.groupLink);
+      //   openCustomerServiceChat(group.groupLink);
-      }
+      // }
+      navigateTo(PageUrl.GroupDetail, { cityCode });
     },
     [cityOperators]
   );
@@ -80,7 +81,40 @@ export default function BizService() {
     <HomePage type={PageType.BatchPublish}>
       <div className={PREFIX}>
         <Tabs className={`${PREFIX}__tabs`} value={value} onChange={handleChange}>
-          <Tabs.TabPane value="0" title="群代发">
+          {/*<Tabs.TabPane value="0" title="代招">*/}
+          {/*  <div className={`${PREFIX}__recruitment`}>*/}
+          {/*    <div className={`${PREFIX}__recruitment-card`}>*/}
+          {/*      <div className={`${PREFIX}__recruitment-h5`}>服务城市</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-body`}>江、沪、皖-上海、南京、合肥</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-body`}>粤、闽-广州、深圳、佛山、厦门、福州、泉州</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-body`}>京、鲁-北京、青岛</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-body`}>鄂、豫、湘、陕-长沙、武汉、郑州、西安</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-body`}>川、渝、云-成都、重庆、昆明</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-h5`}>服务方式及收费标准</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-body`}>服务方式：提供录屏和基本资料供挑选，挑中安排面试</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-body`}>收费标准：安排一场面试200元</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-body`}>收费方式：预付费，按安排面试场数扣费</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-h5`}>服务能力</div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-body`}>*/}
+          {/*        我们在每个城市均有数量众多的主播群，少则几十个，多则上千个，有各种类型和层次的带货主播资源*/}
+          {/*      </div>*/}
+          {/*      <div className={`${PREFIX}__recruitment-btn-group`}>*/}
+          {/*        <Button className={`${PREFIX}__recruitment-btn`} onClick={handleOpenService}>*/}
+          {/*          点此咨询*/}
+          {/*        </Button>*/}
+          {/*      </div>*/}
+          {/*    </div>*/}
+          {/*  </div>*/}
+          {/*</Tabs.TabPane>*/}
+          <Tabs.TabPane
+            value="1"
+            title={
+              <>
+                群代发
+                <Image src={require('@/statics/svg/star.svg')} className={`${PREFIX}__star`} />
+              </>
+            }
+          >
             <div className={`${PREFIX}__delegate`}>
               <Image
                 mode="widthFix"
@@ -109,15 +143,7 @@ export default function BizService() {
               </div>
             </div>
           </Tabs.TabPane>
-          <Tabs.TabPane
+          <Tabs.TabPane value="2" title="主播群">
-            value="1"
-            title={
-              <>
-                主播群
-                <Image src={require('@/statics/svg/star.svg')} className={`${PREFIX}__star`} />
-              </>
-            }
-          >
             <SearchCity
               onSelectCity={handleSelectCity}
               currentCity={getCurrentCityCode()}
@@ -126,31 +152,6 @@ export default function BizService() {
               banner="点击城市名称，进本地通告群，免费招主播"
             />
           </Tabs.TabPane>
-          <Tabs.TabPane value="2" title="代招">
-            <div className={`${PREFIX}__recruitment`}>
-              <div className={`${PREFIX}__recruitment-card`}>
-                <div className={`${PREFIX}__recruitment-h5`}>服务城市</div>
-                <div className={`${PREFIX}__recruitment-body`}>江、沪、皖-上海、南京、合肥</div>
-                <div className={`${PREFIX}__recruitment-body`}>粤、闽-广州、深圳、佛山、厦门、福州、泉州</div>
-                <div className={`${PREFIX}__recruitment-body`}>京、鲁-北京、青岛</div>
-                <div className={`${PREFIX}__recruitment-body`}>鄂、豫、湘、陕-长沙、武汉、郑州、西安</div>
-                <div className={`${PREFIX}__recruitment-body`}>川、渝、云-成都、重庆、昆明</div>
-                <div className={`${PREFIX}__recruitment-h5`}>服务方式及收费标准</div>
-                <div className={`${PREFIX}__recruitment-body`}>服务方式：提供录屏和基本资料供挑选，挑中安排面试</div>
-                <div className={`${PREFIX}__recruitment-body`}>收费标准：安排一场面试200元</div>
-                <div className={`${PREFIX}__recruitment-body`}>收费方式：预付费，按安排面试场数扣费</div>
-                <div className={`${PREFIX}__recruitment-h5`}>服务能力</div>
-                <div className={`${PREFIX}__recruitment-body`}>
-                  我们在每个城市均有数量众多的主播群，少则几十个，多则上千个，有各种类型和层次的带货主播资源
-                </div>
-                <div className={`${PREFIX}__recruitment-btn-group`}>
-                  <Button className={`${PREFIX}__recruitment-btn`} onClick={handleOpenService}>
-                    点此咨询
-                  </Button>
-                </div>
-              </div>
-            </div>
-          </Tabs.TabPane>
         </Tabs>
       </div>
     </HomePage>

src/types/location.ts

@@ -1,3 +1,5 @@
+import { ProductSpecId } from '@/constants/product';
+
 export interface Coordinate {
   latitude: number; // 纬度，浮点数，范围为-90~90，负数表示南纬
   longitude: number; // 经度，范围为-180~180，负数表示西经
@@ -30,6 +32,11 @@ export interface CityConfigListItem {
   groupLink: string;
   created: string;
   updated: string;
-  price: number | null;
+  payPrice: number | null;
+  showPrice: number | null;
   sendCount: number | null;
+  groupQrCode?: string;
+  contactQrCode?: string;
+  originalPrice?: number;
+  productSpecId?: ProductSpecId;
 }

src/types/product.ts

@@ -8,13 +8,18 @@ export interface DeclarationTypeResult {
 }
 
 export interface ProductInfo {
-  productCode: ProductType;
+  // productCode: ProductType;
-  productId: ProductType;
+  // productId: ProductType;
+
   balance: number;
-  created: number;
+  plaidBalance: number;
-  updated: number;
+  freeBalance: number;
-  isPaidVip?: boolean;
+  content: string;
-  // 报单类型信息,只有 use 接口返回值才有
+  created: string;
+  updated: string;
+  isPaidVip: boolean;
+  isCreateResume: boolean;
+  allowBuyProduct: boolean;
   declarationTypeResult?: DeclarationTypeResult;
 }
 
@@ -107,3 +112,22 @@ export interface GetOrderInfoRequest {
   payOrderNo: string;
   userId: string;
 }
+
+export interface ProductSpecResult {
+  id: string;
+  productId: string;
+  productSpecId: ProductSpecId;
+  productType: ProductType;
+  productName: string;
+  title: string;
+  priceText: string;
+  expire: number;
+  payPrice: number; // 分
+  showPrice: number;
+  originalPrice: number;
+  badge: string;
+  contentSingle: string;
+  contentsJson: string;
+  sort: number;
+  createTime: string;
+}

src/utils/common.ts

@@ -15,12 +15,10 @@ export const isDesktop = (() => {
   return info.platform === 'windows' || info.platform === 'mac';
 })();
 
-export const logWithPrefix = isDev()
+export const logWithPrefix =
-  ? (prefix: string) =>
+  (prefix: string) =>
   (...args: BL.Anything[]) =>
-        console.log(`[${prefix}]`, ...args)
+    console.log(`[${prefix}]`, ...args);
-  : (_prefix: string) =>
-      (..._args: BL.Anything[]) => {};
 
 export const safeJsonParse = <T = BL.Anything>(str: string, defaultValue: BL.Anything = {}): T => {
   try {

src/utils/product.ts

@@ -15,7 +15,9 @@ import {
   CreatePayOrderParams,
   GetOrderInfoRequest,
   OrderInfo,
+  ProductSpecResult,
 } from '@/types/product';
+import { buildUrl } from '@/utils/common';
 import { getUserId } from '@/utils/user';
 
 export const isCancelPay = err => err?.errMsg === 'requestPayment:fail cancel';
@@ -44,6 +46,11 @@ export async function requestProductUseRecord(
   });
 }
 
+export async function requestProductTypeList(productType: ProductType) {
+  const list = await http.get<ProductSpecResult[]>(buildUrl(API.LIST_PRODUCT_TYPE, { productType }));
+  return list.sort((a, b) => a.sort - b.sort);
+}
+
 // 使用某一个产品
 export async function requestUseProduct(
   productCode: ProductType,
@@ -54,13 +61,14 @@ export async function requestUseProduct(
 }
 
 // 获取某个产品的剩余解锁次数
-export async function requestProductBalance(productCode: ProductType): Promise<[number, boolean | undefined]> {
+export async function requestProductBalance(productCode: ProductType): Promise<[number, ProductInfo]> {
   const data: GetProductDetailRequest = { productCode, userId: getUserId() };
-  const { balance, isPaidVip } = await http.post<ProductInfo>(API.GET_PRODUCT_DETAIL, {
+  const result = await http.post<ProductInfo>(API.GET_PRODUCT_DETAIL, {
     data,
     contentType: 'application/x-www-form-urlencoded',
   });
-  return [balance, isPaidVip];
+
+  return [result.balance, result];
 }
 
 // 是否可以购买某一个产品