Merge pull request #1 from hzboluo/feat/3.7/invite-members

Feat/3.7/invite members
This commit is contained in:
EleanorMao
2026-01-18 10:02:53 +08:00
committed by GitHub
35 changed files with 1115 additions and 250 deletions

View File

@ -15,6 +15,29 @@ import { requestUserInfo, updateLastLoginTime } from '@/utils/user';
import './app.less'; import './app.less';
function App({ children }: PropsWithChildren<BL.Anything>) { 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 }) => { useLaunch(async ({ query }) => {
console.log('App launched.'); console.log('App launched.');
await http.init(getInviteCodeFromQuery(query)); await http.init(getInviteCodeFromQuery(query));
@ -30,6 +53,7 @@ function App({ children }: PropsWithChildren<BL.Anything>) {
}); });
useDidShow(options => { useDidShow(options => {
checkBasicUpdate();
requestCityConfigs(); requestCityConfigs();
console.log(options); console.log(options);

View File

@ -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;
}
}

View File

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

View File

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

View File

@ -146,25 +146,6 @@ export default function PartnerIntro() {
</Swiper> </Swiper>
</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}__block`}>
<div className={`${PREFIX}__title`}>3</div> <div className={`${PREFIX}__title`}>3</div>
<div className={`${PREFIX}__card`}> <div className={`${PREFIX}__card`}>
@ -194,6 +175,25 @@ export default function PartnerIntro() {
</div> </div>
</div> </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}__block`}>
<div className={`${PREFIX}__title`}></div> <div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__card ${PREFIX}__special`}> <div className={`${PREFIX}__card ${PREFIX}__special`}>

View File

@ -1,18 +1,20 @@
import { Button, Image } from '@tarojs/components'; 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 { Fragment, useCallback, useState } from 'react';
import JobBuy from '@/components/product-dialog/steps-ui/job-buy'; import JobBuy from '@/components/product-dialog/steps-ui/job-buy';
import SafeBottomPadding from '@/components/safe-bottom-padding'; import SafeBottomPadding from '@/components/safe-bottom-padding';
import { PageUrl } from '@/constants/app'; import { PageUrl } from '@/constants/app';
import { CacheKey } from '@/constants/cache-key';
import { GET_CONTACT_TYPE } from '@/constants/job'; import { GET_CONTACT_TYPE } from '@/constants/job';
import { navigateTo } from '@/utils/route'; import { navigateTo, switchTab } from '@/utils/route';
import './index.less'; import './index.less';
interface IProps { interface IProps {
onCancel: () => void; onCancel: () => void;
isCreateResume?: boolean;
onConfirm: (type: GET_CONTACT_TYPE) => void; onConfirm: (type: GET_CONTACT_TYPE) => void;
} }
@ -30,23 +32,48 @@ const GET_CONTACT_TYPE_OPTIONS = [
type: GET_CONTACT_TYPE.VIP, type: GET_CONTACT_TYPE.VIP,
icon: 'https://publiccdn.neighbourhood.com.cn/img/diamond.svg', icon: 'https://publiccdn.neighbourhood.com.cn/img/diamond.svg',
title: '播络会员', title: '播络会员',
desc: '开通会员每天可查看10个', desc: '开通会员每天免费查看',
btnText: '开通', 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 }: IProps) {
const [openPopup, setOpenPopup] = useState(true); const [openPopup, setOpenPopup] = useState(true);
const [openDialog, setOpenDialog] = useState(false); const [openDialog, setOpenDialog] = useState(false);
const [clicked, setClicked] = useState(!!Taro.getStorageSync(CacheKey.JOIN_GROUP_POPUP_CLICKED));
const handleClick = (type: GET_CONTACT_TYPE) => () => { const handleClick = (type: GET_CONTACT_TYPE) => () => {
if (type === GET_CONTACT_TYPE.MATERIAL) { if (type === GET_CONTACT_TYPE.MATERIAL) {
navigateTo(PageUrl.MaterialUploadVideo); navigateTo(PageUrl.MaterialUploadVideo);
onConfirm(type); onConfirm(type);
} }
if (type === GET_CONTACT_TYPE.INVITE) {
navigateTo(PageUrl.InviteOperations);
onConfirm(type);
}
if (type === GET_CONTACT_TYPE.VIP) { if (type === GET_CONTACT_TYPE.VIP) {
setOpenPopup(false); setOpenPopup(false);
setOpenDialog(true); 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 () => { const handleAfterBuy = useCallback(async () => {
onConfirm(GET_CONTACT_TYPE.VIP); onConfirm(GET_CONTACT_TYPE.VIP);
@ -58,6 +85,9 @@ export function PrejobPopup({ onCancel, onConfirm }: IProps) {
<div className={`${PREFIX}__title`}></div> <div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__body`}> <div className={`${PREFIX}__body`}>
{GET_CONTACT_TYPE_OPTIONS.map(option => { {GET_CONTACT_TYPE_OPTIONS.map(option => {
if (clicked && option.type === GET_CONTACT_TYPE.GROUP) {
return;
}
return ( return (
<div className={`${PREFIX}__item`} key={option.type}> <div className={`${PREFIX}__item`} key={option.type}>
<div className={`${PREFIX}__item-icon ${option.type}`}> <div className={`${PREFIX}__item-icon ${option.type}`}>
@ -81,7 +111,7 @@ export function PrejobPopup({ onCancel, onConfirm }: IProps) {
</Popup> </Popup>
<Dialog open={openDialog} onClose={onCancel}> <Dialog open={openDialog} onClose={onCancel}>
<Dialog.Content> <Dialog.Content>
<JobBuy onConfirm={handleAfterBuy} buyOnly /> <JobBuy onConfirm={handleAfterBuy} isCreateResume={isCreateResume} />
</Dialog.Content> </Dialog.Content>
</Dialog> </Dialog>
</Fragment> </Fragment>

View File

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

View File

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

View File

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

View File

@ -2,55 +2,64 @@ import Taro from '@tarojs/taro';
import { Button } from '@taroify/core'; import { Button } from '@taroify/core';
import classNames from 'classnames'; import classNames from 'classnames';
import { useCallback, useEffect, useState } from 'react'; import { Fragment, useCallback, useEffect, useState } from 'react';
import Badge from '@/components/badge'; import Badge from '@/components/badge';
import { PREFIX } from '@/components/product-dialog/const'; import { PREFIX } from '@/components/product-dialog/const';
import { PageUrl } from '@/constants/app';
import { CollectEventName } from '@/constants/event'; 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 { SubscribeTempId } from '@/constants/subscribe';
import { ProductSpecResult } from '@/types/product';
import { logWithPrefix } from '@/utils/common'; import { logWithPrefix } from '@/utils/common';
import { collectEvent } from '@/utils/event'; 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 { postSubscribe, subscribeMessage } from '@/utils/subscribe';
import Toast from '@/utils/toast'; import Toast from '@/utils/toast';
interface IProps { interface IProps {
buyOnly?: boolean;
onConfirm: () => void; 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 log = logWithPrefix('job-buy');
const SUBSCRIBE_ID = SubscribeTempId.SUBSCRIBE_VIP; const SUBSCRIBE_ID = SubscribeTempId.SUBSCRIBE_VIP;
@ -66,20 +75,26 @@ const subscribe = async () => {
}; };
export default function JobBuy(props: IProps) { 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 () => { const handleBuy = useCallback(async () => {
log('handleBuy', selectItem); log('handleBuy', selectItem);
if (!selectItem) {
Toast.error('请选择购买的产品');
return;
}
try { try {
Taro.showLoading(); Taro.showLoading();
const { payOrderNo, createPayInfo } = await requestCreatePayInfo({ const { payOrderNo, createPayInfo } = await requestCreatePayInfo({
type: OrderType.VIP, type: OrderType.VIP,
amt: getOrderPrice(selectItem.amt), amt: selectItem.payPrice,
productCode: ProductType.VIP, productCode: ProductType.VIP,
productSpecId: selectItem.id, productSpecId: selectItem.productSpecId,
}); });
log('handleBuy payInfo', payOrderNo, createPayInfo); log('handleBuy payInfo', payOrderNo, createPayInfo);
await requestPayment({ await requestPayment({
@ -104,59 +119,81 @@ export default function JobBuy(props: IProps) {
} }
}, [selectItem, onConfirm]); }, [selectItem, onConfirm]);
const handleGetProductInfo = useCallback(async () => {
const result = await requestProductTypeList(ProductType.VIP);
setProductList(result);
setSelectItem(result[0]);
}, []);
const handleResume = useCallback(() => {
navigateTo(PageUrl.MaterialUploadVideo);
}, []);
useEffect(() => { useEffect(() => {
handleGetProductInfo();
collectEvent(CollectEventName.CREATE_ORDER_VIEW, { orderType: OrderType.VIP }); collectEvent(CollectEventName.CREATE_ORDER_VIEW, { orderType: OrderType.VIP });
}, []); }, []);
return ( return (
<div className={`${PREFIX}__job-buy`}> <div className={`${PREFIX}__job-buy`}>
{buyOnly ? ( {isCreateResume ? (
<div className={`${PREFIX}__job-buy__header`}></div> <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>
</Fragment>
) : ( ) : (
<div className={`${PREFIX}__job-buy__header`}> <Fragment>
<div></div> <div className={`${PREFIX}__job-buy__header`}>
<div className="highlight"></div> <div></div>
</div> </div>
)} <div className={`${PREFIX}__job-buy__describe`}>
{buyOnly ? ( <div> </div>
<div className={`${PREFIX}__job-buy__describe`}>12</div> <div className="highlight" onClick={handleResume}>
) : (
<div className={`${PREFIX}__job-buy__describe`}> </div>
<div></div> </div>
<div className="highlight"></div> </Fragment>
<div> </div>
<div className="highlight"></div>
</div>
)} )}
<div className={`${PREFIX}__job-buy__container`}> <div className={`${PREFIX}__job-buy__container`}>
{LIST.map(item => { {productList.map(item => {
if (buyOnly && !item.amt) {
return null;
}
return ( return (
<div <div
key={item.price} key={item.id}
className={classNames(`${PREFIX}__job-buy__item`, { 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} {item.title}
</div> </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} />} {item.badge && <Badge className={`${PREFIX}__job-buy__item__badge`} text={item.badge} />}
</div> </div>
); );
})} })}
</div> </div>
<div className={`${PREFIX}__job-buy__hint`}> {selectItem && (
<div className="highlight">24</div> <div className={`${PREFIX}__job-buy__hint`}>
</div> {selectItem?.title}
<Button className={`${PREFIX}__job-buy__button`} onClick={handleBuy}> <div className="highlight">
{`支付 ${selectItem.amt}`} {selectItem?.expire > 1 ? `${selectItem.expire}` : `${selectItem.expire * 24}小时`}
</div>
</div>
)}
<Button className={`${PREFIX}__job-buy__button`} disabled={!selectItem} onClick={handleBuy}>
{`支付 ${selectItem?.showPrice}`}
</Button> </Button>
{/* <div className={`${PREFIX}__job-buy__tips`}>{`已选:${selectItem.title},含进本地群服务`}</div> */} {/* <div className={`${PREFIX}__job-buy__tips`}>{`已选:${selectItem.title},含进本地群服务`}</div> */}
</div> </div>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -17,4 +17,25 @@
border-radius: 16px; border-radius: 16px;
margin-top: 24px; 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;
}
}
} }

View File

@ -1,6 +1,7 @@
import { Image } from '@tarojs/components'; import { Image } from '@tarojs/components';
import { Cell } from '@taroify/core'; import { Cell } from '@taroify/core';
import { GoodJob } from '@taroify/icons';
import { useCallback } from 'react'; import { useCallback } from 'react';
import MaterialCard from '@/components/material-card'; import MaterialCard from '@/components/material-card';
@ -18,6 +19,8 @@ export default function AnchorFragment() {
const handleClickSwitch = useCallback(() => switchRoleType(RoleType.Company), []); const handleClickSwitch = useCallback(() => switchRoleType(RoleType.Company), []);
const handleClickInviteOperations = useCallback(() => navigateTo(PageUrl.InviteOperations), []);
return ( return (
<div className={PREFIX}> <div className={PREFIX}>
<MaterialCard /> <MaterialCard />
@ -29,6 +32,21 @@ export default function AnchorFragment() {
className={`${PREFIX}__cell`} className={`${PREFIX}__cell`}
onClick={handleClickMyDeclaration} 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 <Image
mode="widthFix" mode="widthFix"
className={`${PREFIX}__switch-to-company`} className={`${PREFIX}__switch-to-company`}

View File

@ -101,6 +101,7 @@ export const APP_CONFIG: AppConfigType = {
PageUrl.GiveVip, PageUrl.GiveVip,
PageUrl.GroupOwnerCertificate, PageUrl.GroupOwnerCertificate,
PageUrl.PartnerShareVip, PageUrl.PartnerShareVip,
PageUrl.InviteOperations,
PageUrl.AccelerateDelegatePublish, PageUrl.AccelerateDelegatePublish,
// PageUrl.DevDebug, // PageUrl.DevDebug,
], ],

View File

@ -40,8 +40,8 @@ export const usePublishJob = (jobId?: string): [boolean, Dispatch<SetStateAction
Taro.hideLoading(); Taro.hideLoading();
const e = error as HttpError; const e = error as HttpError;
const errorCode = e.errorCode; 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) {
setShowBuy(true); setShowBuy(true);
} else if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_BALANCE) { } else if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_BALANCE) {
@ -50,7 +50,7 @@ export const usePublishJob = (jobId?: string): [boolean, Dispatch<SetStateAction
} else if (errorCode === RESPONSE_ERROR_CODE.BOSS_VIP_EXPIRED) { } else if (errorCode === RESPONSE_ERROR_CODE.BOSS_VIP_EXPIRED) {
Toast.info('该通告已到期,请创建新通告', 3000); Toast.info('该通告已到期,请创建新通告', 3000);
} else { } else {
Toast.error(errorMsg || '发布失败请重试', 3000); Toast.info(errorMsg || '发布失败请重试', 3000);
} }
console.error(e); console.error(e);
} }

View File

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

View File

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

View File

@ -2,7 +2,7 @@ import { BaseEventOrig, Button, ButtonProps, Image, InputProps } from '@tarojs/c
import Taro, { UploadTask } from '@tarojs/taro'; import Taro, { UploadTask } from '@tarojs/taro';
import { Dialog } from '@taroify/core'; import { Dialog } from '@taroify/core';
import { useCallback, useEffect, useState } from 'react'; import { useCallback, useEffect, useState } from 'react';
import BlFormInput from '@/components/bl-form-input'; import BlFormInput from '@/components/bl-form-input';
import BlFormItem from '@/components/bl-form-item'; import BlFormItem from '@/components/bl-form-item';
@ -30,7 +30,7 @@ import { dispatchUpdateUser, requestUserInfo } from '@/utils/user';
import { uploadVideo } from '@/utils/video'; import { uploadVideo } from '@/utils/video';
import './index.less'; import './index.less';
import { RESPONSE_ERROR_CODE } from '@/http/constant';
const PREFIX = 'page-certification'; const PREFIX = 'page-certification';
const log = logWithPrefix(PREFIX); const log = logWithPrefix(PREFIX);
@ -158,8 +158,13 @@ export default function Certification() {
Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED); Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
redirectTo(PageUrl.CertificationManage); redirectTo(PageUrl.CertificationManage);
} catch (e) { } catch (e) {
console.error('submit error', e); console.error('submit error', e.errorCode, e.errorMsg);
Toast.error('通告发布失败'); 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); collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
redirectTo(PageUrl.CertificationManage); redirectTo(PageUrl.CertificationManage);
} finally { } finally {

View File

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

View File

@ -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;
}
}

View File

@ -0,0 +1,126 @@
import { Button, Image } from '@tarojs/components';
import Taro from '@tarojs/taro';
import { Arrow } from '@taroify/icons';
import { Fragment, useCallback, useEffect, 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 { 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 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(`我的播络ID是${userInfo.userId},邀你进群`);
}, [userInfo.userId]);
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 (useCopyRef.current) return;
handleCopy();
useCopyRef.current = true;
}, [handleCopy, userInfo.userId]);
useEffect(() => {
if (!cityCode) return;
getStaffInfo(cityCode)
.then(data => {
setStaffInfo(data);
})
.catch(() => {
setStaffInfo(null);
});
}, [cityCode]);
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` }}>
</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>ID是{userInfo.userId}</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>
);
}

View File

@ -269,6 +269,21 @@
flex: 2 2; flex: 2 2;
.button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px;); .button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px;);
margin-left: 32px; 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;
}
} }
} }

View File

@ -12,7 +12,7 @@ import { JoinGroupHint } from '@/components/join-group-hint';
import LoginButton from '@/components/login-button'; import LoginButton from '@/components/login-button';
import PageLoading from '@/components/page-loading'; import PageLoading from '@/components/page-loading';
import { PrejobPopup } from '@/components/prejob-popup'; 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 CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
import { EventName, PageUrl, RoleType } from '@/constants/app'; import { EventName, PageUrl, RoleType } from '@/constants/app';
import { CertificationStatusType } from '@/constants/company'; import { CertificationStatusType } from '@/constants/company';
@ -27,6 +27,7 @@ import { RESPONSE_ERROR_CODE } from '@/http/constant';
import { HttpError } from '@/http/error'; import { HttpError } from '@/http/error';
import { JobDetails } from '@/types/job'; import { JobDetails } from '@/types/job';
import { IMaterialMessage } from '@/types/message'; import { IMaterialMessage } from '@/types/message';
import { GetProductIsUnlockResponse, ProductInfo } from '@/types/product';
import { switchRoleType } from '@/utils/app'; import { switchRoleType } from '@/utils/app';
import { copy, logWithPrefix } from '@/utils/common'; import { copy, logWithPrefix } from '@/utils/common';
import { reportEvent } from '@/utils/event'; import { reportEvent } from '@/utils/event';
@ -40,8 +41,7 @@ import { getJumpUrl, getPageQuery, navigateTo } from '@/utils/route';
import { getCommonShareMessage } from '@/utils/share'; import { getCommonShareMessage } from '@/utils/share';
import { formatDate } from '@/utils/time'; import { formatDate } from '@/utils/time';
import Toast from '@/utils/toast'; import Toast from '@/utils/toast';
import { isNeedCreateMaterial } from '@/utils/user'; import { isNeedPhone } from '@/utils/user';
import './index.less'; import './index.less';
const PREFIX = 'job-detail'; const PREFIX = 'job-detail';
@ -70,8 +70,30 @@ const getMapCallout = (data: JobDetails): MapProps.callout | undefined => {
const AnchorFooter = (props: { data: JobDetails }) => { const AnchorFooter = (props: { data: JobDetails }) => {
const { data } = props; const { data } = props;
const [errorTips, setErrorTips] = useState<string>(''); const [errorTips, setErrorTips] = useState<string>('');
const [dialogVisible, setDialogVisible] = useState(false); const [showJobContactDialog, setShowJobContactDialog] = useState(false);
const [showMaterialGuide, setShowMaterialGuide] = useState(false); const [showMaterialGuide, setShowMaterialGuide] = useState(false);
const [productInfo, setProductInfo] = useState<undefined | ProductInfo>();
const [productRecord, setProductRecord] = useState<undefined | GetProductIsUnlockResponse>();
const userInfo = useUserInfo();
const needPhone = isNeedPhone(userInfo);
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 () => { const handleClickContact = useCallback(async () => {
log('handleClickContact'); log('handleClickContact');
@ -79,21 +101,8 @@ const AnchorFooter = (props: { data: JobDetails }) => {
return; return;
} }
reportEvent(ReportEventId.CLICK_JOB_CONTACT); 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) { if (data.isAuthed) {
const toUserId = data.userId; const toUserId = data.userId;
if (isChatWithSelf(toUserId)) { if (isChatWithSelf(toUserId)) {
@ -102,7 +111,7 @@ const AnchorFooter = (props: { data: JobDetails }) => {
} }
const chat = await postCreateChat(toUserId); const chat = await postCreateChat(toUserId);
let materialMessage: null | IMaterialMessage = null; let materialMessage: null | IMaterialMessage = null;
if (!needCreateMaterial) { if (!!productInfo?.isCreateResume) {
const profile = await requestProfileDetail(); const profile = await requestProfileDetail();
if (profile) { if (profile) {
materialMessage = { materialMessage = {
@ -124,7 +133,13 @@ const AnchorFooter = (props: { data: JobDetails }) => {
jobId: data.id, jobId: data.id,
}); });
} else { } 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) { } catch (error) {
const e = error as HttpError; const e = error as HttpError;
@ -135,31 +150,99 @@ const AnchorFooter = (props: { data: JobDetails }) => {
Toast.error('请求失败请重试'); Toast.error('请求失败请重试');
} }
} }
}, [data]); }, [data, productInfo?.freeBalance, productInfo?.isCreateResume, productInfo?.isPaidVip]);
const handleDialogClose = useCallback(() => {
setShowJobContactDialog(false);
// Refresh data after dialog closes
getProductRecord();
}, [getProductRecord]);
const handleConfirmPrejob = useCallback(
(type: GET_CONTACT_TYPE) => {
setShowMaterialGuide(false);
if (GET_CONTACT_TYPE.VIP === type) {
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]);
const handleDialogHidden = useCallback(() => {
setDialogVisible(false);
}, []);
const handleConfirmPrejob = useCallback((type: GET_CONTACT_TYPE) => {
setShowMaterialGuide(false);
if (GET_CONTACT_TYPE.VIP === type) {
setDialogVisible(true);
}
}, []);
return ( return (
<> <>
<div className={`${PREFIX}__footer`}> <div className={`${PREFIX}__footer`}>
<Button className={`${PREFIX}__share-button`} openType="share"> <Button className={`${PREFIX}__share-button`} openType="share">
</Button> </Button>
<LoginButton className={`${PREFIX}__contact-publisher`} onClick={handleClickContact}> <LoginButton
{data.isAuthed ? '在线沟通' : '立即联系'} needRefresh
onRefresh={handleRefresh}
className={`${PREFIX}__contact-publisher`}
onClick={handleClickContact}
>
{data.isAuthed ? '在线沟通' : '查看联系方式'}
{needPhone ? (
<div className={`${PREFIX}__contact-publisher-tag`}></div>
) : !productRecord && (data.isAuthed || productInfo?.content) ? (
<div className={`${PREFIX}__contact-publisher-tag`}>
{data.isAuthed ? '急招岗位可免费查看' : productInfo?.content}
</div>
) : null}
</LoginButton> </LoginButton>
</div> </div>
<div> <div>
{dialogVisible && <ProductJobDialog data={data} onClose={handleDialogHidden} />} {showJobContactDialog && (
<ProductJobContactDialog
data={data}
productRecord={productRecord}
productInfo={productInfo}
onRefreshBalance={getProductBalance}
onClose={handleDialogClose}
/>
)}
{showMaterialGuide && ( {showMaterialGuide && (
<PrejobPopup onCancel={() => setShowMaterialGuide(false)} onConfirm={handleConfirmPrejob} /> <PrejobPopup
isCreateResume={productInfo?.isCreateResume}
onCancel={() => setShowMaterialGuide(false)}
onConfirm={handleConfirmPrejob}
/>
)} )}
<CommonDialog <CommonDialog
content={errorTips} content={errorTips}

View File

@ -41,6 +41,7 @@ import { getPageQuery, navigateBack, navigateTo } from '@/utils/route';
import Toast from '@/utils/toast'; import Toast from '@/utils/toast';
import './index.less'; import './index.less';
import { RESPONSE_ERROR_CODE } from '@/http/constant';
const PREFIX = 'page-job-publish'; const PREFIX = 'page-job-publish';
const log = logWithPrefix(PREFIX); const log = logWithPrefix(PREFIX);
@ -237,8 +238,13 @@ export default function JobPublish() {
navigateBack(); navigateBack();
} catch (e) { } catch (e) {
createdJobIdRef.current = ''; createdJobIdRef.current = '';
console.error('submit error', e); console.error('submit error', e.errorCode, e.errorMsg);
Toast.error('审核失败请重试'); 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); collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
} finally { } finally {
Taro.hideLoading(); Taro.hideLoading();
@ -253,8 +259,13 @@ export default function JobPublish() {
await Toast.success('发布成功', 1500, true); await Toast.success('发布成功', 1500, true);
navigateBack(); navigateBack();
} catch (e) { } catch (e) {
console.error('submit error', e); console.error('submit error', e.errorCode, e.errorMsg);
Toast.error('审核失败请重试'); 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); collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
} finally { } finally {
Taro.hideLoading(); Taro.hideLoading();

View File

@ -21,7 +21,24 @@
} }
&__video-list { &__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 { &__footer {
@ -29,11 +46,11 @@
left: 24px; left: 24px;
right: 24px; right: 24px;
bottom: 0; bottom: 0;
background: #F5F6FA; background: #f5f6fa;
} }
&__submit-btn { &__submit-btn {
.button(@width: 100%, @height: 80px, @fontSize: 32px, @fontWeight: 400, @borderRadius: 48px); .button(@width: 100%, @height: 80px, @fontSize: 32px, @fontWeight: 400, @borderRadius: 48px);
bottom: 40px; bottom: 40px;
} }
} }

View File

@ -181,6 +181,7 @@ export default function MaterialUploadVideo() {
<div className={`${PREFIX}__header-tips`}></div> <div className={`${PREFIX}__header-tips`}></div>
</div> </div>
<div className={`${PREFIX}__video-list`}> <div className={`${PREFIX}__video-list`}>
<div className={`${PREFIX}__hint`}></div>
{videoList.map(video => ( {videoList.map(video => (
<MaterialVideoCard <MaterialVideoCard
key={video.coverUrl} key={video.coverUrl}

View File

@ -141,7 +141,13 @@ export default function MaterialViewPage() {
await postPublishJob(jobId!); await postPublishJob(jobId!);
await handleClickContact(); await handleClickContact();
} catch (e) { } catch (e) {
Toast.error('通告发布失败'); 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); collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
} }
}, [handleClickContact, jobId]); }, [handleClickContact, jobId]);

View File

@ -24,7 +24,7 @@ const COMMENT_IMAGE = 'https://publiccdn.neighbourhood.com.cn/img/delegate-comme
export default function BizService() { export default function BizService() {
const inviteCode = useInviteCode(); const inviteCode = useInviteCode();
const cityOperators = useCityOperators(); const cityOperators = useCityOperators();
const [value, setValue] = useState('2'); const [value, setValue] = useState('0');
const handleClickDelegate = useCallback(() => { const handleClickDelegate = useCallback(() => {
navigateTo(PageUrl.GroupDelegatePublish); navigateTo(PageUrl.GroupDelegatePublish);
@ -80,7 +80,40 @@ export default function BizService() {
<HomePage type={PageType.BatchPublish}> <HomePage type={PageType.BatchPublish}>
<div className={PREFIX}> <div className={PREFIX}>
<Tabs className={`${PREFIX}__tabs`} value={value} onChange={handleChange}> <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`}> <div className={`${PREFIX}__delegate`}>
<Image <Image
mode="widthFix" mode="widthFix"
@ -109,15 +142,7 @@ export default function BizService() {
</div> </div>
</div> </div>
</Tabs.TabPane> </Tabs.TabPane>
<Tabs.TabPane <Tabs.TabPane value="2" title="主播群">
value="1"
title={
<>
<Image src={require('@/statics/svg/star.svg')} className={`${PREFIX}__star`} />
</>
}
>
<SearchCity <SearchCity
onSelectCity={handleSelectCity} onSelectCity={handleSelectCity}
currentCity={getCurrentCityCode()} currentCity={getCurrentCityCode()}
@ -126,31 +151,6 @@ export default function BizService() {
banner="点击城市名称,进本地通告群,免费招主播" banner="点击城市名称,进本地通告群,免费招主播"
/> />
</Tabs.TabPane> </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> </Tabs>
</div> </div>
</HomePage> </HomePage>

View File

@ -8,13 +8,18 @@ export interface DeclarationTypeResult {
} }
export interface ProductInfo { export interface ProductInfo {
productCode: ProductType; // productCode: ProductType;
productId: ProductType; // productId: ProductType;
balance: number; 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; declarationTypeResult?: DeclarationTypeResult;
} }
@ -107,3 +112,22 @@ export interface GetOrderInfoRequest {
payOrderNo: string; payOrderNo: string;
userId: 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;
}

View File

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

View File

@ -15,7 +15,9 @@ import {
CreatePayOrderParams, CreatePayOrderParams,
GetOrderInfoRequest, GetOrderInfoRequest,
OrderInfo, OrderInfo,
ProductSpecResult,
} from '@/types/product'; } from '@/types/product';
import { buildUrl } from '@/utils/common';
import { getUserId } from '@/utils/user'; import { getUserId } from '@/utils/user';
export const isCancelPay = err => err?.errMsg === 'requestPayment:fail cancel'; 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( export async function requestUseProduct(
productCode: ProductType, 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 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, data,
contentType: 'application/x-www-form-urlencoded', contentType: 'application/x-www-form-urlencoded',
}); });
return [balance, isPaidVip];
return [result.balance, result];
} }
// 是否可以购买某一个产品 // 是否可以购买某一个产品