8 Commits

Author SHA1 Message Date
10e7f39c92 feat: update 2025-07-29 23:00:57 +08:00
1c1bb146fc feat: job publish 2025-07-28 23:35:51 +08:00
260e543fe6 feat: 报单优化 2025-07-27 23:23:29 +08:00
0cd1a46762 revert ad 2025-07-27 15:59:28 +08:00
1ddc8b46c9 feat: 去掉login guide 2025-07-12 19:42:22 +08:00
5820fa8d25 feat: 2025-07-12 15:43:19 +08:00
80846d507f feat: 广告还有角色异常报错 2025-07-12 15:28:40 +08:00
42d1208ee4 feat: get is vip 2025-07-07 22:08:51 +08:00
43 changed files with 497 additions and 543 deletions

View File

@ -17,22 +17,25 @@ import './index.less';
const PREFIX = 'join-group-hint';
const DEFAULT_GROUP = {
name: '播络主播招聘群',
serviceUrl: 'https://work.weixin.qq.com/kfid/kfcc60ac7b6420787a8',
};
export function JoinGroupHint() {
const cityCode = getCurrentCityCode();
const roleType = getRoleTypeWithDefault();
const group = GROUPS.find(g => String(g.cityCode) === cityCode);
const [clicked, setClicked] = useState(!!Taro.getStorageSync(CacheKey.JOIN_GROUP_CARD_CLICKED));
const handleClick = useCallback(() => {
if (!checkCityCode(cityCode)) {
if (group && !checkCityCode(cityCode)) {
return;
}
if (group) {
openCustomerServiceChat(group.serviceUrl);
Taro.setStorageSync(CacheKey.JOIN_GROUP_CARD_CLICKED, true);
setClicked(true);
}
openCustomerServiceChat(group ? group.serviceUrl : DEFAULT_GROUP.serviceUrl);
Taro.setStorageSync(CacheKey.JOIN_GROUP_CARD_CLICKED, true);
setClicked(true);
}, [cityCode, group]);
if (!group || !validCityCode(cityCode) || clicked) {
if (!validCityCode(cityCode) || clicked) {
return null;
}
@ -44,7 +47,9 @@ export function JoinGroupHint() {
mode="aspectFit"
/>
<div className={`${PREFIX}__left`}>
<div className={`${PREFIX}__left-title`}>{CITY_CODE_TO_NAME_MAP.get(cityCode)}</div>
<div className={`${PREFIX}__left-title`}>
{group ? `${CITY_CODE_TO_NAME_MAP.get(cityCode)}主播招聘群` : DEFAULT_GROUP.name}
</div>
<div className={`${PREFIX}__left-desc`}>{roleType === RoleType.Anchor ? '高薪工作早知道' : '免费招主播'}</div>
</div>
<div className={`${PREFIX}__right`}>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -16,6 +16,7 @@ import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
import Toast from '@/utils/toast';
interface IProps {
defaultSelect?: number;
onNext: () => void;
}
@ -85,8 +86,8 @@ const subscribe = async () => {
};
export default function CompanyPublishJobBuy(props: IProps) {
const { onNext } = props;
const [selectItem, setSelectItem] = useState(LIST[0]);
const { onNext, defaultSelect = 0 } = props;
const [selectItem, setSelectItem] = useState(LIST[defaultSelect]);
const handleClickItem = useCallback((newSelectItem: Item) => setSelectItem(newSelectItem), []);

View File

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

View File

@ -2,7 +2,7 @@ import Taro from '@tarojs/taro';
import { Button } from '@taroify/core';
import classNames from 'classnames';
import { Fragment, useCallback, useEffect, useState } from 'react';
import { useCallback, useEffect, useState } from 'react';
import Badge from '@/components/badge';
import { PREFIX } from '@/components/product-dialog/const';
@ -16,7 +16,7 @@ import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
import Toast from '@/utils/toast';
interface IProps {
justBuy?: boolean;
buyOnly?: boolean;
onConfirm: () => void;
}
@ -24,29 +24,32 @@ interface Item {
id: ProductSpecId;
title: string;
content: string;
buyOnlyContent?: string;
price: string;
amt: number;
badge?: string;
}
const LIST: Item[] = [
{ id: ProductSpecId.DailyVIP, title: '会员', content: '1天内免广告', price: '60播豆', amt: 6, badge: '限时体验' },
{ id: ProductSpecId.WeeklyVIP, title: '会员', content: '每日2次', price: '免费', amt: 0 },
{
id: ProductSpecId.DailyVIP,
title: '日会员',
content: '每日+10次',
buyOnlyContent: '每日12次',
price: '60播豆',
amt: 6,
badge: '限时体验',
},
{
id: ProductSpecId.WeeklyVIP,
title: '周会员',
content: '7天内免广告',
content: '每日+10次',
buyOnlyContent: '每日12次',
price: '180播豆',
amt: 18,
badge: '4.2折',
badge: ' 超值',
},
// {
// id: ProductSpecId.NewMonthlyVIP,
// title: '月会员',
// content: '30天内免广告',
// price: '300播豆',
// amt: 30,
// badge: '1.6折',
// },
];
const log = logWithPrefix('job-buy');
@ -63,7 +66,7 @@ const subscribe = async () => {
};
export default function JobBuy(props: IProps) {
const { onConfirm } = props;
const { onConfirm, buyOnly } = props;
const [selectItem, setSelectItem] = useState(LIST[1]);
const handleClickItem = useCallback((newSelectItem: Item) => setSelectItem(newSelectItem), []);
@ -107,44 +110,47 @@ export default function JobBuy(props: IProps) {
return (
<div className={`${PREFIX}__job-buy`}>
<div className={`${PREFIX}__job-buy__header`}>
{props.justBuy ? (
<div></div>
) : (
<Fragment>
<div></div>
<div className="highlight"></div>
</Fragment>
)}
</div>
<div className={`${PREFIX}__job-buy__describe`}>
{props.justBuy ? (
<div>10</div>
) : (
<Fragment>
<div></div>
<div className="highlight"></div>
<div></div>
<div className="highlight"></div>
</Fragment>
)}
</div>
{buyOnly ? (
<div className={`${PREFIX}__job-buy__header`}></div>
) : (
<div className={`${PREFIX}__job-buy__header`}>
<div></div>
<div className="highlight"></div>
</div>
)}
{buyOnly ? (
<div className={`${PREFIX}__job-buy__describe`}>12</div>
) : (
<div className={`${PREFIX}__job-buy__describe`}>
<div></div>
<div className="highlight"></div>
<div> </div>
<div className="highlight"></div>
</div>
)}
<div className={`${PREFIX}__job-buy__container`}>
{LIST.map(item => (
<div
key={item.price}
className={classNames(`${PREFIX}__job-buy__item`, {
selected: item.amt === selectItem.amt,
disabled: item.amt === 0,
})}
onClick={item.amt === 0 ? undefined : () => handleClickItem(item)}
>
<div className={classNames(`${PREFIX}__job-buy__item__title`, { free: item.amt === 0 })}>{item.title}</div>
<div className={`${PREFIX}__job-buy__item__content`}>{item.content}</div>
<div className={`${PREFIX}__job-buy__item__price`}>{item.price}</div>
{item.badge && <Badge className={`${PREFIX}__job-buy__item__badge`} text={item.badge} />}
</div>
))}
{LIST.map(item => {
if (buyOnly && !item.amt) {
return null;
}
return (
<div
key={item.price}
className={classNames(`${PREFIX}__job-buy__item`, {
selected: item.amt === selectItem.amt,
disabled: item.amt === 0,
})}
onClick={item.amt === 0 ? undefined : () => handleClickItem(item)}
>
<div className={classNames(`${PREFIX}__job-buy__item__title`, { free: item.amt === 0 })}>
{item.title}
</div>
<div className={`${PREFIX}__job-buy__item__content`}>{buyOnly ? item.buyOnlyContent : item.content}</div>
<div className={`${PREFIX}__job-buy__item__price`}>{item.price}</div>
{item.badge && <Badge className={`${PREFIX}__job-buy__item__badge`} text={item.badge} />}
</div>
);
})}
</div>
<Button className={`${PREFIX}__job-buy__button`} onClick={handleBuy}>
{`支付 ${selectItem.amt}`}

View File

@ -24,10 +24,6 @@ export enum EventName {
SELECT_MY_PUBLISH_JOB = 'select_my_publish_job',
EXIT_CHAT_PAGE = 'exit_chat_page',
VIEW_MATERIAL_SUCCESS = 'view_material_success',
PRE_ACTION_SHARE_SUCCESS = 'pre_action_share_success',
PRE_ACTION_VIDEO_SUCCESS = 'pre_action_video_success',
PRE_ACTION_VIDEO_ERROR = 'pre_action_video_error',
SHOW_VIDEO_REWARD = 'show_video_reward',
}
export enum OpenSource {
@ -79,7 +75,6 @@ export enum PageUrl {
Partner = 'pages/partner/index',
WithdrawRecord = 'pages/withdraw-record/index',
GroupDelegatePublish = 'pages/group-delegate-publish/index',
PartnerShare = 'pages/partner-share/index',
}
export enum PluginUrl {

View File

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

View File

@ -176,7 +176,6 @@ export const PART_PRICE_OPTIONS = PART_EMPLOY_SALARY_OPTIONS.filter(o => !!o.val
export const FULL_PRICE_OPTIONS = FULL_EMPLOY_SALARY_OPTIONS.filter(o => !!o.value);
export enum GET_CONTACT_TYPE {
SHARE = 'share',
VIP = 'vip',
VIDEO = 'video',
MATERIAL = 'material',
}

View File

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

View File

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

View File

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

View File

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

View File

@ -170,12 +170,11 @@ export default function AnchorPage() {
const query = getPageQuery();
getInviteCodeFromQueryAndUpdate(query);
console.log('哈哈哈 useLoad');
try {
const { jobResults = [] } = await requestJobManageList({ status: JobManageStatus.Open });
if (!jobResults.length) {
Toast.info('当前是根据定位为您展示主播');
// Toast.info('当前是根据定位为您展示主播');
return;
}
const lastSelectJobId = getLastSelectMyJobId();

View File

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

View File

@ -7,7 +7,7 @@ import BlFormInput from '@/components/bl-form-input';
import BlFormItem from '@/components/bl-form-item';
import LoadingDialog from '@/components/loading-dialog';
import SafeBottomPadding from '@/components/safe-bottom-padding';
import { PageUrl } from '@/constants/app';
import { EventName, PageUrl } from '@/constants/app';
import { CertificationStatusType } from '@/constants/company';
import { CollectEventName, ReportEventId } from '@/constants/event';
import useUserInfo from '@/hooks/use-user-info';
@ -16,12 +16,18 @@ import { isValidIdCard, isValidPhone, logWithPrefix } from '@/utils/common';
import { postCertification, getPhone } from '@/utils/company';
import { collectEvent, reportEvent } from '@/utils/event';
import { chooseMedia } from '@/utils/material';
import { redirectTo } from '@/utils/route';
import { redirectTo } from '@/utils/route';
import Toast from '@/utils/toast';
import { dispatchUpdateUser, requestUserInfo } from '@/utils/user';
import { uploadVideo } from '@/utils/video';
import './index.less';
import { requestProductBalance } from '@/utils/product';
import { ProductType } from '@/constants/product';
import useCachedJob from '@/hooks/use-cached-job';
import { postCreateJob } from '@/utils/job';
import { Dialog } from '@taroify/core';
import CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
const PREFIX = 'page-certification';
const log = logWithPrefix(PREFIX);
@ -100,6 +106,8 @@ export default function Certification() {
// const [code, setCode] = useState('');
const [company, setCompany] = useState('');
const [open, setOpen] = useState(false);
const [showBuy, setShowBuy] = useState(false);
const cachedJobData = useCachedJob();
const handleClickIdCardLeft = useCallback(async () => {
reportEvent(ReportEventId.CLICK_UPLOAD_ID_CARD, { type: 'left' });
@ -133,6 +141,26 @@ export default function Certification() {
setCompany(value);
}, []);
const handleCreateJob = useCallback(async () => {
if (cachedJobData.employType) {
Taro.showLoading();
try {
await postCreateJob(cachedJobData);
Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
await Toast.success('通告创建成功', 1500, true);
redirectTo(PageUrl.CertificationManage);
} catch (e) {
console.error('submit error', e);
Toast.error('通告审核失败请重试');
collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
} finally {
Taro.hideLoading();
}
} else {
Toast.error('数据出错');
}
}, [cachedJobData]);
const handleSubmit = useCallback(async () => {
reportEvent(ReportEventId.CLICK_CERTIFICATION_SUBMIT);
const data: ICertificationRequest = {
@ -157,7 +185,16 @@ export default function Certification() {
return;
}
dispatchUpdateUser({ bossAuthStatus: CertificationStatusType.Success });
redirectTo(PageUrl.CertificationManage);
// 判断付钱没有
const [time] = await requestProductBalance(ProductType.CompanyPublishJob);
if (time <= 0) {
// 付钱
setShowBuy(true);
Taro.hideLoading();
} else {
// 获取data创建
await handleCreateJob();
}
} catch (e) {
console.error('submit error', e);
Toast.error('认证失败请重试');
@ -262,6 +299,11 @@ export default function Certification() {
<div>
<LoadingDialog open={open} text="认证中" />
</div>
<Dialog open={showBuy} onClose={() => setShowBuy(false)}>
<Dialog.Content>
<CompanyPublishJobBuy onNext={handleCreateJob} defaultSelect={1} />
</Dialog.Content>
</Dialog>
</div>
);
}

View File

@ -1,7 +1,7 @@
import { Map, MapProps, Text, Image, Button } from '@tarojs/components';
import Taro, { useLoad, useShareAppMessage } from '@tarojs/taro';
import React, { useCallback, useEffect, useRef, useState } from 'react';
import React, { useCallback, useEffect, useState } from 'react';
import { CertificationStatusIcon } from '@/components/certification-status';
import CommonDialog from '@/components/common-dialog';
@ -9,13 +9,13 @@ import DevDiv from '@/components/dev-div';
import JobRecommendList from '@/components/job-recommend-list';
import { JoinGroupHint } from '@/components/join-group-hint';
import LoginButton from '@/components/login-button';
import MaterialGuide from '@/components/material-guide';
import PageLoading from '@/components/page-loading';
import { PrejobPopup } from '@/components/prejob-popup';
import ProductJobDialog from '@/components/product-dialog/job';
import { RoleType, EventName, PageUrl } from '@/constants/app';
import { CertificationStatusType } from '@/constants/company';
import { CollectEventName, ReportEventId } from '@/constants/event';
import { EMPLOY_TYPE_TITLE_MAP } from '@/constants/job';
import { EMPLOY_TYPE_TITLE_MAP, GET_CONTACT_TYPE } from '@/constants/job';
import useInviteCode from '@/hooks/use-invite-code';
import useUserInfo from '@/hooks/use-user-info';
import useRoleType from '@/hooks/user-role-type';
@ -76,9 +76,12 @@ const AnchorFooter = (props: { data: JobDetails }) => {
reportEvent(ReportEventId.CLICK_JOB_CONTACT);
try {
const needCreateMaterial = await isNeedCreateMaterial();
if (needCreateMaterial) {
setShowMaterialGuide(true);
return;
if (data.sourcePlat !== 'bl') {
if (needCreateMaterial) {
setShowMaterialGuide(true);
return;
}
}
if (data.isAuthed) {
const toUserId = data.userId;
@ -86,19 +89,27 @@ const AnchorFooter = (props: { data: JobDetails }) => {
Toast.error('不能与自己聊天');
return;
}
const profile = await requestProfileDetail();
const chat = await postCreateChat(toUserId);
const materialMessage: IMaterialMessage = {
id: profile.id,
name: profile.name,
age: profile.age,
height: profile.height,
weight: profile.weight,
shoeSize: profile.shoeSize,
gender: profile.gender,
workedSecCategoryStr: profile.workedSecCategoryStr,
};
navigateTo(PageUrl.MessageChat, { chatId: chat.chatId, material: materialMessage, jobId: data.id });
let materialMessage: null | IMaterialMessage = null;
if (!needCreateMaterial) {
const profile = await requestProfileDetail();
materialMessage = {
id: profile.id,
name: profile.name,
age: profile.age,
height: profile.height,
weight: profile.weight,
shoeSize: profile.shoeSize,
gender: profile.gender,
workedSecCategoryStr: profile.workedSecCategoryStr,
};
}
navigateTo(PageUrl.MessageChat, {
chatId: chat.chatId,
initText: !materialMessage,
material: materialMessage,
jobId: data.id,
});
} else {
setDialogVisible(true);
}
@ -113,7 +124,15 @@ const AnchorFooter = (props: { data: JobDetails }) => {
}
}, [data]);
const handleDialogHidden = useCallback(() => setDialogVisible(false), []);
const handleDialogHidden = useCallback(() => {
setDialogVisible(false);
}, []);
const handleConfirmPrejob = useCallback((type: GET_CONTACT_TYPE) => {
setShowMaterialGuide(false);
if (GET_CONTACT_TYPE.VIP === type) {
setDialogVisible(true);
}
}, []);
return (
<>
<div className={`${PREFIX}__footer`}>
@ -126,7 +145,9 @@ const AnchorFooter = (props: { data: JobDetails }) => {
</div>
<div>
{dialogVisible && <ProductJobDialog data={data} onClose={handleDialogHidden} />}
{showMaterialGuide && <MaterialGuide onClose={() => setShowMaterialGuide(false)} />}
{showMaterialGuide && (
<PrejobPopup onCancel={() => setShowMaterialGuide(false)} onConfirm={handleConfirmPrejob} />
)}
<CommonDialog
content={errorTips}
confirm="确定"
@ -183,7 +204,6 @@ export default function JobDetail() {
const roleType = useRoleType();
const userInfo = useUserInfo();
const [data, setData] = useState<JobDetails | null>(null);
const videoRef = useRef<Taro.RewardedVideoAd | null>(null);
const isOwner = roleType === RoleType.Company && userInfo.userId === data?.userId;
const inviteCode = useInviteCode();
@ -220,60 +240,12 @@ export default function JobDetail() {
};
}, []);
useEffect(() => {
const handleLoad = () => {
log('视频奖励加载成功');
};
const handleError = err => {
Taro.eventCenter.trigger(EventName.PRE_ACTION_VIDEO_ERROR);
log('视频奖励加载失败', err);
};
const handleClose = res => {
if (res.isEnded) {
Taro.eventCenter.trigger(EventName.PRE_ACTION_VIDEO_SUCCESS);
} else {
Toast.info('请完整观看广告以获得奖励');
}
};
const handleShowVideo = async () => {
if (videoRef.current) {
try {
await videoRef.current.show();
} catch (error) {
Taro.eventCenter.trigger(EventName.PRE_ACTION_VIDEO_ERROR);
Toast.info('广告奖励加载失败,请重试');
log('激励视频显示失败');
}
} else {
Taro.eventCenter.trigger(EventName.PRE_ACTION_VIDEO_ERROR);
Toast.info('广告奖励加载失败,请重试');
log('激励视频加载&显示失败');
}
};
videoRef.current = Taro.createRewardedVideoAd({
adUnitId: 'adunit-ca879f574edfeb33',
});
videoRef.current.onLoad(handleLoad);
videoRef.current.onClose(handleClose);
videoRef.current.onError(handleError);
videoRef.current.load();
Taro.eventCenter.on(EventName.SHOW_VIDEO_REWARD, handleShowVideo);
return () => {
if (videoRef.current) {
videoRef.current.offLoad(handleLoad);
videoRef.current.offError(handleError);
videoRef.current.offClose(handleClose);
}
Taro.eventCenter.off(EventName.SHOW_VIDEO_REWARD);
};
}, []);
useLoad(async () => {
switchRoleType(RoleType.Anchor);
const query = getPageQuery<Pick<JobDetails, 'id'> & { c: string; share: string }>();
const query = getPageQuery<Pick<JobDetails, 'id'> & { c: string }>();
if (query?.share === 'true') {
switchRoleType(RoleType.Anchor);
}
getInviteCodeFromQueryAndUpdate(query);
const jobId = query?.id;
if (!jobId) {

View File

@ -1,6 +1,7 @@
import { BaseEventOrig, Button, InputProps } from '@tarojs/components';
import Taro, { useLoad } from '@tarojs/taro';
import { Dialog } from '@taroify/core';
import classNames from 'classnames';
import { useCallback, useEffect, useState } from 'react';
@ -12,15 +13,29 @@ import BlFormSelect from '@/components/bl-form-select';
import BlSalaryInput, { BlSalaryValue } from '@/components/bl-salary-input';
import { CityPickerPopup } from '@/components/city-picker';
import PageLoading from '@/components/page-loading';
import CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
import SafeBottomPadding from '@/components/safe-bottom-padding';
import { EventName, PageUrl } from '@/constants/app';
import { CertificationStatusType } from '@/constants/company';
import { CollectEventName } from '@/constants/event';
import { EMPLOY_TYPE_TITLE_MAP, EmployType, JOB_TYPE_SELECT_OPTIONS, JobType } from '@/constants/job';
import { ProductType } from '@/constants/product';
import useUserInfo from '@/hooks/use-user-info';
import store from '@/store';
import { cacheCreateJob } from '@/store/actions';
import { CreateJobInfo, JobDetails } from '@/types/job';
import { logWithPrefix } from '@/utils/common';
import { collectEvent } from '@/utils/event';
import { postCloseJob, postCreateJob, postUpdateJob, requestJobDetail, isFullTimePriceRequired, isPartTimePriceRequired } from '@/utils/job';
import {
postCloseJob,
postCreateJob,
postUpdateJob,
requestJobDetail,
isFullTimePriceRequired,
isPartTimePriceRequired,
} from '@/utils/job';
import { getCityValues } from '@/utils/location';
import { requestProductBalance } from '@/utils/product';
import { getPageQuery, navigateBack, navigateTo } from '@/utils/route';
import Toast from '@/utils/toast';
@ -91,6 +106,8 @@ export default function JobPublish() {
const [city, setCity] = useState<string[] | undefined>();
const [showCityPicker, setShowCityPicker] = useState(false);
const [address, setAddress] = useState('');
const [showBuy, setShowBuy] = useState(false);
const userInfo = useUserInfo();
const handleEmployTypeChange = useCallback((value: EmployType) => {
setEmployType(value);
@ -144,7 +161,7 @@ export default function JobPublish() {
}
}, [job]);
const handleSubmit = useCallback(async () => {
const getCreateJobInfo = useCallback((): [CreateJobInfo, string[]] => {
const cityCodes = city || [];
const data: CreateJobInfo = {
title,
@ -160,6 +177,11 @@ export default function JobPublish() {
highPriceForPartyTime: !isPartTimePriceRequired(employType) ? 0 : salary[3],
address: address,
};
return [data, cityCodes];
}, [address, category, city, describe, employType, salary, title]);
const handleSubmit = useCallback(async () => {
const [data, cityCodes] = getCreateJobInfo();
const errMsg = isInvalidCreateJobInfo(data);
if (errMsg) {
Toast.info(errMsg);
@ -178,6 +200,20 @@ export default function JobPublish() {
await postUpdateJob(data);
Taro.eventCenter.trigger(EventName.JOB_UPDATE, job!.id);
} else {
if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
// 去认证
store.dispatch(cacheCreateJob(data));
navigateTo(PageUrl.CertificationStart);
Taro.hideLoading();
return;
}
const [time] = await requestProductBalance(ProductType.CompanyPublishJob);
if (time <= 0) {
// 付钱
setShowBuy(true);
Taro.hideLoading();
return;
}
await postCreateJob(data);
}
Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
@ -190,7 +226,30 @@ export default function JobPublish() {
} finally {
Taro.hideLoading();
}
}, [isUpdate, job, title, employType, category, describe, city, salary, address]);
}, [getCreateJobInfo, isUpdate, job, userInfo.bossAuthStatus]);
const handleNext = useCallback(async () => {
const [data, cityCodes] = getCreateJobInfo();
const cityValues = getCityValues(cityCodes);
if (!data.address.startsWith(cityValues)) {
data.address = `${cityValues}${data.address}`;
}
Taro.showLoading();
try {
await postCreateJob(data);
Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
await Toast.success('创建成功', 1500, true);
navigateBack();
} catch (e) {
console.error('submit error', e);
Toast.error('审核失败请重试');
collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
} finally {
Taro.hideLoading();
}
}, [getCreateJobInfo]);
useEffect(() => {
const callback = (d: string) => setDescribe(d);
@ -306,6 +365,11 @@ export default function JobPublish() {
onConfirm={handleConfirmCityPicker}
onCancel={() => setShowCityPicker(false)}
/>
<Dialog open={showBuy} onClose={() => setShowBuy(false)}>
<Dialog.Content>
<CompanyPublishJobBuy onNext={handleNext} defaultSelect={1}/>
</Dialog.Content>
</Dialog>
</div>
</div>
);

View File

@ -3,8 +3,8 @@ import Taro, { useDidShow, useLoad, useShareAppMessage } from '@tarojs/taro';
import { Tabs } from '@taroify/core';
import { useCallback, useEffect, useRef, useState } from 'react';
import { AgreementPopup } from '@/components/agreement-popup';
import HomePage from '@/components/home-page';
import { LoginGuide } from '@/components/login-guide';
import MaterialGuide from '@/components/material-guide';
import { EventName, OpenSource, PageType, PageUrl, RoleType } from '@/constants/app';
import { EmployType, JOB_PAGE_TABS, SortType } from '@/constants/job';
@ -21,8 +21,7 @@ import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
import { getJumpUrl, getPageQuery, navigateTo } from '@/utils/route';
import { getCommonShareMessage } from '@/utils/share';
import Toast from '@/utils/toast';
import { isNeedCreateMaterial } from '@/utils/user';
import { getAgreementSigned, setAgreementSigned } from '@/utils/user';
import './index.less';
const PREFIX = 'job';
@ -40,9 +39,19 @@ export default function Job() {
longitude: location.longitude,
});
const [showMaterialGuide, setShowMaterialGuide] = useState(false);
const [showAuthorize, setShowAuthorize] = useState(false);
const cityValuesChangedRef = useRef(false);
const [openAgreementPopup, setAgreementPopupOpen] = useState(typeof getAgreementSigned() !== 'boolean');
const getLocation = async () => {
if (await isNotNeedAuthorizeLocation()) {
log('not need authorize location');
requestLocation();
} else {
log('show authorize location dialog');
// setShowAuthorize(true);
requestLocation(true);
}
};
const handleTypeChange = useCallback(value => setTabType(value), []);
const handleClickCity = useCallback(
@ -76,12 +85,19 @@ export default function Job() {
setCityCode(code);
}, []);
const handleAfterBindPhone = useCallback(async () => {
if (await isNeedCreateMaterial()) {
setShowMaterialGuide(true);
}
}, []);
const handleCancelAgreementPopup = () => {
setAgreementPopupOpen(false);
setAgreementSigned(false);
getLocation();
};
const handleConfirmAgreementPopup = () => {
setAgreementPopupOpen(false);
setAgreementSigned(true);
getLocation();
};
useEffect(() => {
Taro.eventCenter.on(EventName.SELECT_CITY, handleCityChange);
return () => {
@ -104,13 +120,8 @@ export default function Job() {
setSortType(type);
}
getInviteCodeFromQueryAndUpdate(query);
if (await isNotNeedAuthorizeLocation()) {
log('not need authorize location');
requestLocation();
} else {
log('show authorize location dialog');
setShowAuthorize(true);
requestLocation(true);
if (!openAgreementPopup) {
getLocation();
}
});
@ -149,8 +160,12 @@ export default function Job() {
))}
</Tabs>
<div>
<LoginGuide disabled={showAuthorize} onAfterBind={handleAfterBindPhone} />
{showMaterialGuide && <MaterialGuide onClose={() => setShowMaterialGuide(false)} />}
<AgreementPopup
open={openAgreementPopup}
onCancel={handleCancelAgreementPopup}
onConfirm={handleConfirmAgreementPopup}
/>
</div>
</HomePage>
);

View File

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

View File

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

View File

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

View File

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

View File

@ -1,61 +0,0 @@
import { Button, Image } from '@tarojs/components';
import Taro, { useDidShow, useShareAppMessage } from '@tarojs/taro';
import { EventName } from '@/constants/app';
import useInviteCode from '@/hooks/use-invite-code';
import { hasShareToGetContact, setShareToGetContact } from '@/utils/job';
import { navigateBack } from '@/utils/route';
import { getCommonShareMessage } from '@/utils/share';
import './index.less';
const PREFIX = 'partner-share';
export default function Partner() {
const inviteCode = useInviteCode();
useDidShow(() => {
if (!hasShareToGetContact()) {
Taro.eventCenter.trigger(EventName.PRE_ACTION_SHARE_SUCCESS);
navigateBack(-1);
}
});
useShareAppMessage(() => {
setShareToGetContact();
console.log('Partner inviteCode', inviteCode);
return getCommonShareMessage({ useCapture: false, inviteCode });
});
return (
<div className={PREFIX}>
<div className={`${PREFIX}__header`}>
<Image
src="https://publiccdn.neighbourhood.com.cn/img/money.png"
mode="aspectFit"
className={`${PREFIX}__money`}
/>
<div>3</div>
</div>
<div className={`${PREFIX}__body`}>
<div className={`${PREFIX}__item`}>
<Image src="https://publiccdn.neighbourhood.com.cn/img/01.svg" mode="aspectFit" className={`${PREFIX}__no`} />
<div>
<div className="highlight">20%</div>
</div>
</div>
<div className={`${PREFIX}__item`}>
<Image src="https://publiccdn.neighbourhood.com.cn/img/02.svg" mode="aspectFit" className={`${PREFIX}__no`} />
<div></div>
</div>
<div className={`${PREFIX}__item`}>
<Image src="https://publiccdn.neighbourhood.com.cn/img/03.svg" mode="aspectFit" className={`${PREFIX}__no`} />
<div>
<div className="highlight">5%</div>
</div>
</div>
<Button className={`${PREFIX}__btn`} openType="share">
</Button>
</div>
</div>
);
}

View File

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

View File

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

View File

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

View File

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

7
src/store/actions/job.ts Normal file
View File

@ -0,0 +1,7 @@
import { CreateJobInfo } from '@/types/job';
import { CREATE_JOB } from '../constants';
export const cacheCreateJob = (value: CreateJobInfo) => ({ type: CREATE_JOB, value });
export const clearCachedJob = () => ({ type: CREATE_JOB, value: {} });

View File

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

View File

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

19
src/store/reducers/job.ts Normal file
View File

@ -0,0 +1,19 @@
import { Action } from 'redux';
import { CreateJobInfo } from '@/types/job';
import { CREATE_JOB } from '../constants';
const INIT_STATE: Partial<CreateJobInfo> = {};
const userInfo = (state: Partial<CreateJobInfo> = INIT_STATE, action: Action): Partial<CreateJobInfo> => {
const { type, value } = action as BL.Anything;
switch (type) {
case CREATE_JOB:
return value;
default:
return state;
}
};
export default userInfo;

View File

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

View File

@ -49,6 +49,7 @@ export type JobDetails = JobInfo &
declarationType: DeclarationType; // 报单类型
userId: string; // 发布人的 userId
verifyFailReason?: string; // 审核不通过的原因
sourcePlat?: string;
};
export interface JobManageInfo {

View File

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

View File

@ -1,4 +1,5 @@
import { RoleType, PageType } from '@/constants/app';
import { CreateJobInfo } from '@/types/job';
import { UserMessage } from '@/types/message';
import { PartnerInfo } from '@/types/partner';
@ -10,6 +11,7 @@ export interface IState {
userInfo: UserInfo;
message: UserMessage;
partnerInfo: PartnerInfo;
jobState: CreateJobInfo;
}
export interface AppState {

View File

@ -131,19 +131,3 @@ export function postPublishJob(jobId: string) {
export function postCloseJob(jobId: string) {
return http.post(API.CLOSE_JOB, { data: { jobId }, contentType: 'application/x-www-form-urlencoded' });
}
export function setSkipPrejobAction(skip = true) {
Taro.setStorageSync(CacheKey.SKIP_PREACTION, skip);
}
export function getSkipPrejobAction() {
return !!Taro.getStorageSync(CacheKey.SKIP_PREACTION);
}
export function setShareToGetContact(job = true) {
Taro.setStorageSync(job ? CacheKey.SHARE_TO_GET_JOB_CONTACT : CacheKey.SHARE_TO_GET_ANCHOR_CONTACT, true);
}
export function hasShareToGetContact(job = true) {
return !Taro.getStorageSync(job ? CacheKey.SHARE_TO_GET_JOB_CONTACT : CacheKey.SHARE_TO_GET_ANCHOR_CONTACT);
}

View File

@ -2,7 +2,7 @@ import Taro from '@tarojs/taro';
import { ProductType, QrCodeType } from '@/constants/product';
import http from '@/http';
import { API, DOMAIN } from '@/http/api';
import { API } from '@/http/api';
import {
ProductInfo,
GetProductDetailRequest,
@ -54,13 +54,13 @@ export async function requestUseProduct(
}
// 获取某个产品的剩余解锁次数
export async function requestProductBalance(productCode: ProductType) {
export async function requestProductBalance(productCode: ProductType): Promise<[number, boolean | undefined]> {
const data: GetProductDetailRequest = { productCode, userId: getUserId() };
const { balance } = await http.post<ProductInfo>(API.GET_PRODUCT_DETAIL, {
const { balance, isPaidVip } = await http.post<ProductInfo>(API.GET_PRODUCT_DETAIL, {
data,
contentType: 'application/x-www-form-urlencoded',
});
return balance;
return [balance, isPaidVip];
}
// 是否可以购买某一个产品