15 Commits

Author SHA1 Message Date
34f9c8d0e6 feat: 2025-08-16 13:02:46 +08:00
943f921e56 feat: 加群+一些bug+样式+job list改default sort 2025-08-15 00:41:44 +08:00
33ef940d6e 实人认证 2025-08-07 00:53:00 +08:00
61336b5282 feat: update tonggao 2025-08-07 00:24:49 +08:00
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
2c48a70b6d feat: 去掉月会员,改文案 2025-07-07 15:13:35 +08:00
e8cf28b6e9 feat: 广告 2025-07-07 01:15:50 +08:00
de7f0e14fe feat:群代发默认选项修改 + 加群卡片 2025-07-02 23:36:34 +08:00
61 changed files with 1112 additions and 323 deletions

View File

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

View File

@ -84,12 +84,12 @@ function JobCard(props: IProps) {
<div className={`${PREFIX}__summary`}>{jobDescription || sourceText}</div>
<div className={`${PREFIX}__distance-wrapper`}>
<div className={`${PREFIX}__detailed-address`}>{jobLocation?.address}</div>
{distance && (
<>
<Image className={`${PREFIX}__distance-icon`} src={require('@/statics/svg/location.svg')} />
<div className={`${PREFIX}__distance`}>{calcDistance(distance)}</div>
</>
)}
{/*{distance && (*/}
{/* <>*/}
{/* <Image className={`${PREFIX}__distance-icon`} src={require('@/statics/svg/location.svg')} />*/}
{/* <div className={`${PREFIX}__distance`}>{calcDistance(distance)}</div>*/}
{/* </>*/}
{/*)}*/}
</div>
</div>
<div className={`${PREFIX}__divider`} />
@ -102,7 +102,7 @@ function JobCard(props: IProps) {
/>
<div className={`${PREFIX}__publisher-name`}>{publisher}</div>
</div>
<div className={`${PREFIX}__city`}>{getCityDes(jobLocation)}</div>
{/*<div className={`${PREFIX}__city`}>{getCityDes(jobLocation)}</div>*/}
</div>
</div>
);

View File

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

View File

@ -0,0 +1,41 @@
@import '@/styles/common.less';
@import '@/styles/variables.less';
.join-group-hint {
.flex-row();
background: #FFFFFF;
border-radius: 16px;
padding: 32px 24px;
margin-top: 24px;
margin-bottom: 24px;
&__icon {
width: 80px;
height: 80px;
margin-right: 32px;
}
&__left {
flex: 1;
padding-left: 8px;
&-title {
font-weight: 500;
font-size: 32px;
line-height: 40px;
margin-bottom: 16px;
}
&-desc {
font-weight: 400;
font-size: 28px;
line-height: 40px;
}
}
&__right {
flex: 0 0 auto;
}
&__button {
.button(@width: 186px, @height: 64px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 32px, @highlight: 0);
}
}

View File

@ -0,0 +1,63 @@
import { Button, Image } from '@tarojs/components';
import Taro from '@tarojs/taro';
import { Plus } from '@taroify/icons';
import { useCallback, useState } from 'react';
import { RoleType } from '@/constants/app';
import { CacheKey } from '@/constants/cache-key';
import { CITY_CODE_TO_NAME_MAP } from '@/constants/city';
import { GROUPS } from '@/constants/group';
import { getRoleTypeWithDefault } from '@/utils/app';
import { openCustomerServiceChat } from '@/utils/common';
import { getCurrentCityCode } from '@/utils/location';
import { checkCityCode, validCityCode } from '@/utils/user';
import './index.less';
const PREFIX = 'join-group-hint';
const DEFAULT_GROUP = {
name: '播络主播招聘群',
serviceUrl: 'https://work.weixin.qq.com/kfid/kfcc60ac7b6420787a8',
};
export function JoinGroupHint() {
const cityCode = getCurrentCityCode();
const roleType = getRoleTypeWithDefault();
const group = GROUPS.find(g => String(g.cityCode) === cityCode);
const [clicked, setClicked] = useState(!!Taro.getStorageSync(CacheKey.JOIN_GROUP_CARD_CLICKED));
const handleClick = useCallback(() => {
if (group && !checkCityCode(cityCode)) {
return;
}
openCustomerServiceChat(group ? group.serviceUrl : DEFAULT_GROUP.serviceUrl);
Taro.setStorageSync(CacheKey.JOIN_GROUP_CARD_CLICKED, true);
setClicked(true);
}, [cityCode, group]);
if (!validCityCode(cityCode) || clicked) {
return null;
}
return (
<div className={PREFIX}>
<Image
className={`${PREFIX}__icon`}
src="https://publiccdn.neighbourhood.com.cn/img/group-avatar.png"
mode="aspectFit"
/>
<div className={`${PREFIX}__left`}>
<div className={`${PREFIX}__left-title`}>
{group ? `${CITY_CODE_TO_NAME_MAP.get(cityCode)}主播招聘群` : DEFAULT_GROUP.name}
</div>
<div className={`${PREFIX}__left-desc`}>{roleType === RoleType.Anchor ? '高薪工作早知道' : '免费招主播'}</div>
</div>
<div className={`${PREFIX}__right`}>
<Button className={`${PREFIX}__button`} onClick={handleClick}>
<Plus />
</Button>
</div>
</div>
);
}

View File

@ -0,0 +1,82 @@
@import '@/styles/common.less';
@import '@/styles/variables.less';
.prejob-popup {
&__content {
padding: 40px 32px;
}
&__title {
font-weight: 500;
font-size: 32px;
line-height: 48px;
margin-bottom: 31px;
text-align: center;
}
&__body {
}
&__item {
.flex-row();
margin-bottom: 40px;
&:last-child {
margin-bottom: 0;
}
&-icon {
width: 88px;
height: 88px;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
&.material {
background: #feba00;
> image {
width: 40px;
height: 46px;
}
}
&.vip {
background: #b094ff;
> image {
width: 48px;
height: 42px;
}
}
&.video {
background: #34a853;
> image {
width: 46px;
height: 44px;
}
}
}
&-main {
padding: 0 24px;
flex: 1;
.title {
font-weight: 500;
font-size: 28px;
line-height: 40px;
margin-bottom: 8px;
}
.desc {
font-size: 24px;
line-height: 36px;
color: @blColorG1;
}
}
&-action {
flex: 0 0 auto;
}
}
&__btn {
.button(@width: 136px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 43px, @highlight: 0);
background: #f2f2f2;
}
}

View File

@ -0,0 +1,89 @@
import { Button, Image } from '@tarojs/components';
import { Popup, Dialog } from '@taroify/core';
import { Fragment, useCallback, useState } from 'react';
import JobBuy from '@/components/product-dialog/steps-ui/job-buy';
import SafeBottomPadding from '@/components/safe-bottom-padding';
import { PageUrl } from '@/constants/app';
import { GET_CONTACT_TYPE } from '@/constants/job';
import { navigateTo } from '@/utils/route';
import './index.less';
interface IProps {
onCancel: () => void;
onConfirm: (type: GET_CONTACT_TYPE) => void;
}
const PREFIX = 'prejob-popup';
const GET_CONTACT_TYPE_OPTIONS = [
{
type: GET_CONTACT_TYPE.MATERIAL,
icon: 'https://publiccdn.neighbourhood.com.cn/img/file.svg',
title: '创建模卡(免费报单)',
desc: '免费报单,优先推荐给企业,机会更多',
btnText: '创建',
},
{
type: GET_CONTACT_TYPE.VIP,
icon: 'https://publiccdn.neighbourhood.com.cn/img/diamond.svg',
title: '播络会员',
desc: '开通会员每天可查看10个',
btnText: '开通',
},
];
export function PrejobPopup({ onCancel, onConfirm }: IProps) {
const [openPopup, setOpenPopup] = useState(true);
const [openDialog, setOpenDialog] = useState(false);
const handleClick = (type: GET_CONTACT_TYPE) => () => {
if (type === GET_CONTACT_TYPE.MATERIAL) {
navigateTo(PageUrl.MaterialUploadVideo);
onConfirm(type);
}
if (type === GET_CONTACT_TYPE.VIP) {
setOpenPopup(false);
setOpenDialog(true);
}
};
const handleAfterBuy = useCallback(async () => {
onConfirm(GET_CONTACT_TYPE.VIP);
}, [onConfirm]);
return (
<Fragment>
<Popup rounded className={PREFIX} placement="bottom" open={openPopup} onClose={onCancel}>
<div className={`${PREFIX}__content`}>
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__body`}>
{GET_CONTACT_TYPE_OPTIONS.map(option => {
return (
<div className={`${PREFIX}__item`} key={option.type}>
<div className={`${PREFIX}__item-icon ${option.type}`}>
<Image mode="aspectFit" src={option.icon} />
</div>
<div className={`${PREFIX}__item-main`}>
<div className="title">{option.title}</div>
<div className="desc">{option.desc}</div>
</div>
<div className={`${PREFIX}__item-action`}>
<Button className={`${PREFIX}__btn`} onClick={handleClick(option.type)}>
{option.btnText}
</Button>
</div>
</div>
);
})}
</div>
</div>
<SafeBottomPadding />
</Popup>
<Dialog open={openDialog} onClose={onCancel}>
<Dialog.Content>
<JobBuy onConfirm={handleAfterBuy} buyOnly />
</Dialog.Content>
</Dialog>
</Fragment>
);
}

View File

@ -3,6 +3,7 @@ export const PREFIX = 'product-dialog';
export enum DialogStatus {
// 加载中
LOADING = 'loading',
PRE_ACTION = 'pre_action',
// 直接联系通告主
JOB_CONTACT_DIRECT = 'job_contact_direct',
// 联系客服去联系通告主 -> 订阅通知

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

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

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

@ -41,7 +41,7 @@ function ProductJobDialog(props: Omit<IProps, 'visible'>) {
}, [onClose]);
const handleAfterBuy = useCallback(async () => {
const time = await requestProductBalance(PRODUCT_CODE);
const [time] = await requestProductBalance(PRODUCT_CODE);
if (time <= 0) {
Toast.error('发生错误请重试');
onClose();
@ -83,7 +83,7 @@ function ProductJobDialog(props: Omit<IProps, 'visible'>) {
handleContact(result.declarationTypeResult);
return;
}
const time = await requestProductBalance(PRODUCT_CODE);
const [time] = await requestProductBalance(PRODUCT_CODE);
if (time <= 0) {
const allowBuy = await requestAllBuyProduct(PRODUCT_CODE);
setStatus(allowBuy ? DialogStatus.JOB_BUY : DialogStatus.JOB_UNABLE_UNLOCK);

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]);
}, [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

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

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

@ -16,6 +16,7 @@ import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
import Toast from '@/utils/toast';
interface IProps {
buyOnly?: boolean;
onConfirm: () => void;
}
@ -23,6 +24,7 @@ interface Item {
id: ProductSpecId;
title: string;
content: string;
buyOnlyContent?: string;
price: string;
amt: number;
badge?: string;
@ -31,17 +33,19 @@ interface Item {
const LIST: Item[] = [
{ id: ProductSpecId.WeeklyVIP, title: '非会员', content: '每日2次', price: '免费', amt: 0 },
{
id: ProductSpecId.WeeklyVIP,
title: '会员',
content: '每日5次',
id: ProductSpecId.DailyVIP,
title: '会员',
content: '每日+10次',
buyOnlyContent: '每日12次',
price: '60播豆',
amt: 6,
badge: '限时体验',
},
{
id: ProductSpecId.NewMonthlyVIP,
title: '会员',
content: '每日5次',
id: ProductSpecId.WeeklyVIP,
title: '会员',
content: '每日+10次',
buyOnlyContent: '每日12次',
price: '180播豆',
amt: 18,
badge: ' 超值',
@ -62,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), []);
@ -106,18 +110,30 @@ export default function JobBuy(props: IProps) {
return (
<div className={`${PREFIX}__job-buy`}>
{buyOnly ? (
<div className={`${PREFIX}__job-buy__header`}></div>
) : (
<div className={`${PREFIX}__job-buy__header`}>
<div></div>
<div className="highlight"></div>
</div>
)}
{buyOnly ? (
<div className={`${PREFIX}__job-buy__describe`}>12</div>
) : (
<div className={`${PREFIX}__job-buy__describe`}>
<div></div>
<div className="highlight"></div>
<div> </div>
<div className="highlight"></div>
</div>
)}
<div className={`${PREFIX}__job-buy__container`}>
{LIST.map(item => (
{LIST.map(item => {
if (buyOnly && !item.amt) {
return null;
}
return (
<div
key={item.price}
className={classNames(`${PREFIX}__job-buy__item`, {
@ -126,12 +142,15 @@ export default function JobBuy(props: IProps) {
})}
onClick={item.amt === 0 ? undefined : () => handleClickItem(item)}
>
<div className={classNames(`${PREFIX}__job-buy__item__title`, { free: item.amt === 0 })}>{item.title}</div>
<div className={`${PREFIX}__job-buy__item__content`}>{item.content}</div>
<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

@ -40,18 +40,18 @@ const SERVICE_ILLUSTRATE = `服务方式:帮您把招聘需求发到众多同
内容要求:仅限带货主播招聘需求,其他不发
主播联系:内容中留招聘方联系方式,主播直接联系`;
const cityValues: CityValue[] = [
{ cityCode: '440100', cityName: '广州', count: 300 }, // 800
{ cityCode: '440100', cityName: '广州', count: 800 },
{ cityCode: '440300', cityName: '深圳', count: 100 },
{ cityCode: '330100', cityName: '杭州', count: 300 }, // 750
{ cityCode: '110100', cityName: '北京', count: 100 }, // 150
{ cityCode: '330100', cityName: '杭州', count: 750 },
{ cityCode: '110100', cityName: '北京', count: 150 },
{ cityCode: '510100', cityName: '成都', count: 100 },
// { cityCode: '500100', cityName: '重庆', count: 50 },
{ cityCode: '500100', cityName: '重庆', count: 50 },
{ cityCode: '430100', cityName: '长沙', count: 50 },
{ cityCode: '350200', cityName: '厦门', count: 50 },
{ cityCode: '310100', cityName: '上海', count: 100 }, // 150
{ cityCode: '420100', cityName: '武汉', count: 50 }, // 80
{ cityCode: '610100', cityName: '西安', count: 50 }, // 60
{ cityCode: '410100', cityName: '郑州', count: 100 }, // 150
{ cityCode: '310100', cityName: '上海', count: 150 },
{ cityCode: '420100', cityName: '武汉', count: 80 },
{ cityCode: '610100', cityName: '西安', count: 60 },
{ cityCode: '410100', cityName: '郑州', count: 150 },
].sort((a, b) => b.count - a.count);
const MIN_GROUP_SIZE = 20;
const GROUP_OPTIONS = [
@ -62,7 +62,7 @@ const GROUP_OPTIONS = [
{ value: 100, productSpecId: ProductSpecId.GroupBatchPublish100, label: '100', price: 68 },
{ value: 150, productSpecId: ProductSpecId.GroupBatchPublish150, label: '150', price: 98 },
{ value: 300, productSpecId: ProductSpecId.GroupBatchPublish300, label: '300', price: 128 },
{ value: 500, productSpecId: ProductSpecId.GroupBatchPublish500, label: '500', price: 188 }, // 168
{ value: 500, productSpecId: ProductSpecId.GroupBatchPublish500, label: '500', price: 168 },
{ value: 750, productSpecId: ProductSpecId.GroupBatchPublish750, label: '750', price: 188 },
{ value: 800, productSpecId: ProductSpecId.GroupBatchPublish800, label: '800', price: 198 },
{ value: 1000, productSpecId: ProductSpecId.GroupBatchPublish1000, label: '1000', price: 288 },
@ -146,7 +146,7 @@ export default function UserBatchPublish() {
useEffect(() => {
try {
const cOptions: CityOption[] = cityValues.map(value => ({ value, label: value.cityName }));
const initCity = cOptions[0].value;
const initCity = (cOptions.find(o => o.label === '重庆') || cOptions[0]).value;
setLoading(false);
setCity(initCity);

View File

@ -12,4 +12,5 @@ export enum CacheKey {
INVITE_CODE = '__invite_code__',
AGREEMENT_SIGNED = '__agreement_signed__',
CITY_CODES = '__city_codes__',
JOIN_GROUP_CARD_CLICKED = '__join_group_card_clicked__',
}

View File

@ -5934,6 +5934,11 @@ export const GROUP_CITY_INDEXES_LIST = [
cityName: '杭州',
keyword: 'HANGZHOU杭州',
},
{
cityCode: '230100',
cityName: '哈尔滨',
keyword: 'HAERBIN哈尔滨',
},
{
cityCode: '340100',
cityName: '合肥',
@ -5941,6 +5946,16 @@ export const GROUP_CITY_INDEXES_LIST = [
},
],
},
{
letter: 'J',
data: [
{
cityCode: '370100',
cityName: '济南',
keyword: 'JINAN济南',
},
],
},
{
letter: 'K',
data: [
@ -5984,11 +5999,21 @@ export const GROUP_CITY_INDEXES_LIST = [
cityName: '上海',
keyword: 'SHANGHAI上海',
},
{
cityCode: '210100',
cityName: '沈阳',
keyword: 'SHENYANG沈阳',
},
{
cityCode: '440300',
cityName: '深圳',
keyword: 'SHENZHEN深圳',
},
{
cityCode: '130100',
cityName: '石家庄',
keyword: 'SHIJIAZHUANG石家庄',
},
{
cityCode: '320500',
cityName: '苏州',
@ -6004,6 +6029,11 @@ export const GROUP_CITY_INDEXES_LIST = [
cityName: '天津',
keyword: 'TIANJIN天津',
},
{
cityCode: '140100',
cityName: '太原',
keyword: 'TAIYUAN太原',
},
],
},
{
@ -6044,6 +6074,11 @@ export const GROUP_CITY_INDEXES_LIST = [
cityName: '郑州',
keyword: 'ZHENGZHOU郑州',
},
{
cityCode: '430200',
cityName: '株洲',
keyword: 'ZHUZHOU株洲',
},
],
},
];

View File

@ -56,5 +56,11 @@ export const GROUPS: GroupItem[] = [
{ title: '【温州】', cityCode: 330300, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcb0ea5f197a18b335' },
{ title: '【天津】', cityCode: 120100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcda46c23dade6f6a3' },
{ title: '【昆明】', cityCode: 530100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcf2aebcbf3d46d9cd' },
{ title: '【石家庄】', cityCode: 130100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfc7dedcc69aaa9cdae' },
{ title: '【太原】', cityCode: 140100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfccc8b59411baa7c24' },
{ title: '【株洲】', cityCode: 430200, serviceUrl: 'https://work.weixin.qq.com/kfid/kfc8584f903f9263f85' },
{ title: '【哈尔滨】', cityCode: 230100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcaf757d0590d2bad0' },
{ title: '【沈阳】', cityCode: 210100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcbe96e71d87061f88' },
{ title: '【济南】', cityCode: 370100, serviceUrl: 'https://work.weixin.qq.com/kfid/kfc57d4d9bd032fe89c' },
{ title: '【全国】', cityCode: 440300, serviceUrl: 'https://work.weixin.qq.com/kfid/kfcc60ac7b6420787a8' },
];

View File

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

View File

@ -27,6 +27,7 @@ export enum ProductSpecId {
AddGroup2 = 'ADDGROUP_2',
AddGroup3 = 'ADDGROUP_3',
BossVip = 'BOSSVIP',
DailyVIP = 'VIP_D',
WeeklyVIP = 'VIP_W',
MonthlyVIP = 'VIP_M', // 30 每天十次
NewMonthlyVIP = 'VIP_M_NEW', // 18 每天五次

View File

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

View File

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

View File

@ -27,7 +27,7 @@ const log = logWithPrefix(PREFIX);
const realtimeLogger = Taro.getRealtimeLogManager();
realtimeLogger.tag(PREFIX);
const calcInitCityCodes = (codeString: string = '') => {
const codes = codeString.split('、');
const codes = (codeString || '').split('、');
return codes.filter(code => !!CITY_CODE_TO_NAME_MAP.get(code));
};

View File

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

View File

@ -17,6 +17,7 @@ import { navigateTo } from '@/utils/route';
import './index.less';
import onChangeEventDetail = SwiperProps.onChangeEventDetail;
import { JoinGroupHint } from '@/components/join-group-hint';
interface IProps {
editable: boolean;
@ -29,7 +30,7 @@ const log = logWithPrefix(PREFIX);
const DEFAULT_TEXT = '未填写';
const getIndentCity = (codeString: string = '') => {
const codes = codeString.split('、');
const codes = (codeString||'').split('、');
const cityNames: string[] = [];
codes.forEach(code => {
const cityName = CITY_CODE_TO_NAME_MAP.get(code);
@ -207,6 +208,7 @@ export default function ProfileViewFragment(props: IProps) {
>{`${coverIndex + 1}/${profile.materialVideoInfoList.length}`}</div>
</div>
</div>
{!editable && <JoinGroupHint />}
<div className={`${PREFIX}__body`}>
<div className={`${PREFIX}__basic-info`}>
<div className={`${PREFIX}__basic-info__name-container`}>
@ -228,7 +230,9 @@ export default function ProfileViewFragment(props: IProps) {
{index ? (
<div className={`${PREFIX}__info-group__header__title`}>{data.title}</div>
) : (
<DevDiv className={`${PREFIX}__info-group__header__title`} OnDev={onDev}>{data.title}</DevDiv>
<DevDiv className={`${PREFIX}__info-group__header__title`} OnDev={onDev}>
{data.title}
</DevDiv>
)}
{editable && (
<div className={`${PREFIX}__info-group__header__edit`} onClick={() => handleEditGroupItem(data.type)}>

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 useCachedJobId() {
const data = useSelector(selectCreatedJob);
return data;
}
export default useCachedJobId;

View File

@ -35,7 +35,7 @@ const AnchorTabs: TabItemType[] = [
{
type: PageType.GroupV2,
pagePath: PageUrl.GroupV2,
text: '主播群',
text: '通告群',
},
];
@ -48,7 +48,7 @@ const CompanyTabs: TabItemType[] = [
{
type: PageType.BatchPublish,
pagePath: PageUrl.UserBatchPublish,
text: '免费招',
text: '代招代发',
},
];

View File

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

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

@ -90,4 +90,25 @@
color: @blColor;
margin-top: 50px;
}
&__popup {
&-content {
.flex-column();
padding: 40px 32px 64px 32px;
}
&-title {
font-weight: 500;
font-size: 36px;
line-height: 57px;
text-align: center;
margin-bottom: 48px;
}
&-confirm {
.button(@width: 360px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 44px);
}
}
}

View File

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

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

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

View File

@ -1,35 +1,42 @@
import { Map, MapProps, Text, Image, Button } from '@tarojs/components';
import { Button, Image, Map, MapProps, Text } from '@tarojs/components';
import Taro, { useLoad, useShareAppMessage } from '@tarojs/taro';
import { Dialog } from '@taroify/core';
import React, { useCallback, useEffect, useState } from 'react';
import { CertificationStatusIcon } from '@/components/certification-status';
import CommonDialog from '@/components/common-dialog';
import DevDiv from '@/components/dev-div';
import JobRecommendList from '@/components/job-recommend-list';
import { JoinGroupHint } from '@/components/join-group-hint';
import LoginButton from '@/components/login-button';
import MaterialGuide from '@/components/material-guide';
import PageLoading from '@/components/page-loading';
import { PrejobPopup } from '@/components/prejob-popup';
import ProductJobDialog from '@/components/product-dialog/job';
import { RoleType, EventName, PageUrl } from '@/constants/app';
import CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
import { EventName, PageUrl, RoleType } from '@/constants/app';
import { CertificationStatusType } from '@/constants/company';
import { CollectEventName, ReportEventId } from '@/constants/event';
import { EMPLOY_TYPE_TITLE_MAP } from '@/constants/job';
import { EMPLOY_TYPE_TITLE_MAP, GET_CONTACT_TYPE, JobManageStatus } from '@/constants/job';
import { ProductType } from '@/constants/product';
import useInviteCode from '@/hooks/use-invite-code';
import useUserInfo from '@/hooks/use-user-info';
import useRoleType from '@/hooks/user-role-type';
import { RESPONSE_ERROR_CODE } from '@/http/constant';
import { HttpError } from '@/http/error';
import store from '@/store';
import { cacheJobId } from '@/store/actions';
import { JobDetails } from '@/types/job';
import { IMaterialMessage } from '@/types/message';
import { switchRoleType } from '@/utils/app';
import { copy, logWithPrefix } from '@/utils/common';
import { collectEvent, reportEvent } from '@/utils/event';
import { getJobTitle, getJobSalary, postPublishJob, requestJobDetail } from '@/utils/job';
import { getJobSalary, getJobTitle, postPublishJob, requestJobDetail } from '@/utils/job';
import { calcDistance, isValidLocation } from '@/utils/location';
import { requestProfileDetail } from '@/utils/material';
import { isChatWithSelf, postCreateChat } from '@/utils/message';
import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
import { requestProductBalance, requestProductUseRecord } from '@/utils/product';
import { getJumpUrl, getPageQuery, navigateTo } from '@/utils/route';
import { getCommonShareMessage } from '@/utils/share';
import { formatDate } from '@/utils/time';
@ -75,19 +82,31 @@ const AnchorFooter = (props: { data: JobDetails }) => {
reportEvent(ReportEventId.CLICK_JOB_CONTACT);
try {
const needCreateMaterial = await isNeedCreateMaterial();
if (data.sourcePlat !== 'bl') {
if (needCreateMaterial) {
const result = await requestProductUseRecord(ProductType.VIP, { jobId: data.id });
if (!result) {
const [time, isPaidVip] = await requestProductBalance(ProductType.VIP);
if (time <= 0 || !isPaidVip) {
setShowMaterialGuide(true);
return;
}
}
}
}
if (data.isAuthed) {
const toUserId = data.userId;
if (isChatWithSelf(toUserId)) {
Toast.error('不能与自己聊天');
return;
}
const profile = await requestProfileDetail();
const chat = await postCreateChat(toUserId);
const materialMessage: IMaterialMessage = {
let materialMessage: null | IMaterialMessage = null;
if (!needCreateMaterial) {
const profile = await requestProfileDetail();
if (profile) {
materialMessage = {
id: profile.id,
name: profile.name,
age: profile.age,
@ -97,7 +116,14 @@ const AnchorFooter = (props: { data: JobDetails }) => {
gender: profile.gender,
workedSecCategoryStr: profile.workedSecCategoryStr,
};
navigateTo(PageUrl.MessageChat, { chatId: chat.chatId, material: materialMessage, jobId: data.id });
}
}
navigateTo(PageUrl.MessageChat, {
chatId: chat.chatId,
initText: !materialMessage,
material: materialMessage,
jobId: data.id,
});
} else {
setDialogVisible(true);
}
@ -112,7 +138,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`}>
@ -125,7 +159,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="确定"
@ -140,25 +176,37 @@ const AnchorFooter = (props: { data: JobDetails }) => {
const CompanyFooter = (props: { data: JobDetails }) => {
const { data } = props;
const [showBuy, setShowBuy] = useState(false);
const userInfo = useUserInfo();
const handleClickEdit = useCallback(() => navigateTo(PageUrl.JobPublish, { jobId: data.id }), [data]);
const handlePublishJob = useCallback(async () => {
try {
if (userInfo.bossAuthStatus !== CertificationStatusType.Success) {
store.dispatch(cacheJobId(data.id));
navigateTo(PageUrl.CertificationStart);
return;
}
Taro.showLoading();
await postPublishJob(data.id);
Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
setShowBuy(false);
Toast.success('发布成功');
Taro.hideLoading();
} catch (error) {
Taro.hideLoading();
const e = error as HttpError;
const errorCode = e.errorCode;
const errorMsg = e.info?.() || e.message;
collectEvent(CollectEventName.PUBLISH_OPEN_JOB_FAILED, { jobId: data.id, error: e.info?.() || e.message });
if (errorCode === RESPONSE_ERROR_CODE.BOSS_VIP_EXPIRED) {
if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_BALANCE) {
Toast.info('您购买的产品已耗尽使用次数');
setShowBuy(true);
} else if (errorCode === RESPONSE_ERROR_CODE.BOSS_VIP_EXPIRED) {
Toast.info('该通告已到期,请创建新通告', 3000);
} else {
Toast.error(e.message || '发布失败请重试', 3000);
Toast.error(errorMsg || '发布失败请重试', 3000);
}
console.error(e);
}
@ -170,10 +218,19 @@ const CompanyFooter = (props: { data: JobDetails }) => {
<Button className={`${PREFIX}__share-button`} onClick={handleClickEdit}>
</Button>
<Button className={`${PREFIX}__contact-publisher`} onClick={handlePublishJob}>
<Button
disabled={data.status === JobManageStatus.Open}
className={`${PREFIX}__contact-publisher`}
onClick={handlePublishJob}
>
</Button>
</div>
<Dialog open={showBuy} onClose={() => setShowBuy(false)}>
<Dialog.Content>
<CompanyPublishJobBuy onNext={handlePublishJob} />
</Dialog.Content>
</Dialog>
</>
);
};
@ -219,9 +276,11 @@ export default function JobDetail() {
}, []);
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) {
@ -282,6 +341,8 @@ export default function JobDetail() {
{data.companyName && <div className={`${PREFIX}__company`}>{`公司:${data.companyName}`}</div>}
</div>
{!isOwner && <JoinGroupHint />}
<div className={`${PREFIX}__content`}>
<div className={`${PREFIX}__content-title`}></div>
<div className={`${PREFIX}__tags`}>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

@ -8,23 +8,22 @@ import HomePage from '@/components/home-page';
import MessageCard from '@/components/message-card';
import { MessageHelpDialog, MessageNoTimesDialog } from '@/components/message-dialog';
import { APP_TAB_BAR_ID, EventName, PageType } from '@/constants/app';
import { CollectEventName } from '@/constants/event';
import { REFRESH_CHAT_LIST_TIME } from '@/constants/message';
import { MessageSubscribeIds, SubscribeTempId } from '@/constants/subscribe';
import useListHeight, { IUseListHeightProps } from '@/hooks/use-list-height';
import useRoleType from '@/hooks/user-role-type';
import { MainMessage } from '@/types/message';
import { logWithPrefix } from '@/utils/common';
import { collectEvent } from '@/utils/event';
import {
postAddMessageTimes,
requestMessageList,
requestRemainPushTime,
requestUnreadMessageCount,
} from '@/utils/message';
import { isSubscribeRefused, postSubscribe } from '@/utils/subscribe';
import './index.less';
import { collectEvent } from '@/utils/event';
import { CollectEventName } from '@/constants/event';
const PREFIX = 'page-message';
const HEADER_CLASS = `${PREFIX}__header`;

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(() => {
if (!mode) {
switchRoleType(RoleType.Anchor).then(() => {
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);
};
} 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 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}`}>
{/*{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

@ -17,7 +17,6 @@ import { getCommonShareMessage } from '@/utils/share';
import { checkCityCode } from '@/utils/user';
import './index.less';
import { SortType } from '@/constants/job';
const PREFIX = 'page-biz-service';
const EXAMPLE_IMAGE = 'https://publiccdn.neighbourhood.com.cn/img/delegate-example.png';
@ -106,8 +105,8 @@ export default function BizService() {
value="1"
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';

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

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

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 SET_JOB_ID = 'SET_JOB_ID';

View File

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

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

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

View File

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

View File

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

View File

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

View File

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

View File

@ -2,26 +2,26 @@ import Taro from '@tarojs/taro';
import { CacheKey } from '@/constants/cache-key';
import { CollectEventName } from '@/constants/event';
import { EmployType, JobManageStatus, UserJobType } from '@/constants/job';
import { EmployType, JobManageStatus, JobSourceType, UserJobType } from '@/constants/job';
import http from '@/http';
import { API } from '@/http/api';
import store from '@/store';
import { selectLocation } from '@/store/selector';
import {
JobDetails,
CreateJobInfo,
GetJobManagesRequest,
GetJobManagesResponse,
GetJobsDetailsRequest,
GetJobsRequest,
GetJobsResponse,
JobInfo,
GetMyRecommendJobRequest,
GetUserJobRequest,
GetUserJobResponse,
MyDeclaredJobInfo,
MyBrowsedJobInfo,
GetMyRecommendJobRequest,
GetJobManagesRequest,
GetJobManagesResponse,
CreateJobInfo,
JobDetails,
JobInfo,
JobManageInfo,
MyBrowsedJobInfo,
MyDeclaredJobInfo,
} from '@/types/job';
import { collectEvent } from '@/utils/event';
import { getCityValues } from '@/utils/location';
@ -80,6 +80,7 @@ async function requestMyBrowsedJobList(data: GetUserJobRequest) {
export async function requestJobList(data: GetJobsRequest = {}) {
const isGetMyJob = data.isOwner || data.isFollow;
data.sourceType = data.sourceType === JobSourceType.All ? undefined : data.sourceType;
const url = isGetMyJob ? API.GET_MY_JOB_LIST_V2 : API.GET_JOB_LIST;
return await http.post<GetJobsResponse>(url, { data });
}
@ -116,8 +117,9 @@ export async function requestHasPublishedJob() {
return data.jobResults.length > 0;
}
export function postCreateJob(data: CreateJobInfo) {
return http.post(API.CREATE_JOB, { data });
export async function postCreateJob(data: CreateJobInfo): Promise<string> {
const jobId = await http.post(API.CREATE_JOB, { data });
return jobId;
}
export function postUpdateJob(data: CreateJobInfo) {

View File

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

View File

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

View File

@ -156,14 +156,18 @@ export const getCityCodes = (): string[] => {
return !cachedValue || !Array.isArray(cachedValue) ? [] : cachedValue;
};
export const setCityCodes = (cityCode: string[]) => Taro.setStorageSync(CacheKey.CITY_CODES, cityCode);
export const checkCityCode = (cityCode: string): boolean => {
export const validCityCode = (cityCode: string) => {
const cachedCityCodes = getCityCodes();
const isNewCityCode = cachedCityCodes.indexOf(cityCode) === -1;
if (cachedCityCodes.length === 2 && isNewCityCode) {
return !(cachedCityCodes.length === 2 && isNewCityCode);
};
export const checkCityCode = (cityCode: string): boolean => {
if (!validCityCode(cityCode)) {
Toast.info('最多只能进入2个城市');
return false;
}
if (isNewCityCode) {
const cachedCityCodes = getCityCodes();
if (cachedCityCodes.indexOf(cityCode) === -1) {
setCityCodes([...cachedCityCodes, cityCode]);
}
return true;