Compare commits
11 Commits
b0dd660dde
...
trunk
Author | SHA1 | Date | |
---|---|---|---|
260e543fe6 | |||
0cd1a46762 | |||
1ddc8b46c9 | |||
5820fa8d25 | |||
80846d507f | |||
42d1208ee4 | |||
2c48a70b6d | |||
e8cf28b6e9 | |||
de7f0e14fe | |||
de2f380cd9 | |||
0020eb8dbe |
@ -1,18 +1,21 @@
|
||||
import React from 'react';
|
||||
|
||||
import BaseTabBar from '@/components/tab-bar';
|
||||
import { PageType } from '@/constants/app';
|
||||
|
||||
import './index.less';
|
||||
|
||||
interface IProps extends React.PropsWithChildren {}
|
||||
interface IProps extends React.PropsWithChildren {
|
||||
type: PageType;
|
||||
}
|
||||
|
||||
export default function HomePage(props: IProps) {
|
||||
const { children } = props;
|
||||
const { children, type } = props;
|
||||
|
||||
return (
|
||||
<React.Fragment>
|
||||
{children}
|
||||
<BaseTabBar />
|
||||
<BaseTabBar type={type} />
|
||||
</React.Fragment>
|
||||
);
|
||||
}
|
||||
|
41
src/components/join-group-hint/index.less
Normal file
41
src/components/join-group-hint/index.less
Normal 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);
|
||||
}
|
||||
}
|
63
src/components/join-group-hint/index.tsx
Normal file
63
src/components/join-group-hint/index.tsx
Normal 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>
|
||||
);
|
||||
}
|
@ -80,4 +80,8 @@
|
||||
margin-top: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
&__no-subscription {
|
||||
|
||||
}
|
||||
}
|
@ -57,7 +57,9 @@ export function MessageNoTimesDialog(props: INoTimesProps) {
|
||||
<Dialog className={NO_TIMES} onClose={onClose} open={open}>
|
||||
<Dialog.Content>
|
||||
<div className={`${NO_TIMES}__title`}>未读消息提醒次数不够了!</div>
|
||||
<div className={`${NO_TIMES}__tips`}>有通知次数才能<span className="highlight">及时收到</span>招聘邀请,快点击“点我增加”吧~</div>
|
||||
<div className={`${NO_TIMES}__tips`}>
|
||||
有通知次数才能<span className="highlight">及时收到</span>招聘邀请,快点击“点我增加”吧~
|
||||
</div>
|
||||
<div className={`${NO_TIMES}__body`}>
|
||||
<div className={`${NO_TIMES}__times`}>{`未读消息提醒剩余:${times}次`}</div>
|
||||
<Button className={`${NO_TIMES}__btn`} onClick={onClick}>
|
||||
|
82
src/components/prejob-popup/index.less
Normal file
82
src/components/prejob-popup/index.less
Normal 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;
|
||||
}
|
||||
}
|
89
src/components/prejob-popup/index.tsx
Normal file
89
src/components/prejob-popup/index.tsx
Normal 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>
|
||||
);
|
||||
}
|
@ -3,6 +3,7 @@ export const PREFIX = 'product-dialog';
|
||||
export enum DialogStatus {
|
||||
// 加载中
|
||||
LOADING = 'loading',
|
||||
PRE_ACTION = 'pre_action',
|
||||
// 直接联系通告主
|
||||
JOB_CONTACT_DIRECT = 'job_contact_direct',
|
||||
// 联系客服去联系通告主 -> 订阅通知
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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 {
|
||||
|
@ -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);
|
||||
|
@ -115,7 +115,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;
|
||||
|
@ -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) {
|
||||
|
@ -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,32 +110,47 @@ export default function JobBuy(props: IProps) {
|
||||
|
||||
return (
|
||||
<div className={`${PREFIX}__job-buy`}>
|
||||
<div className={`${PREFIX}__job-buy__header`}>
|
||||
<div>今日通告对接次数</div>
|
||||
<div className="highlight">已用完</div>
|
||||
</div>
|
||||
<div className={`${PREFIX}__job-buy__describe`}>
|
||||
<div>请</div>
|
||||
<div className="highlight">明日</div>
|
||||
<div>再来 或 </div>
|
||||
<div className="highlight">升级会员</div>
|
||||
</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} 元`}
|
||||
|
@ -1,14 +1,11 @@
|
||||
import { Tabbar } from '@taroify/core';
|
||||
import classNames from 'classnames';
|
||||
import { useCallback } from 'react';
|
||||
import { useDispatch, useSelector } from 'react-redux';
|
||||
|
||||
import { APP_TAB_BAR_ID, RoleType, PageType, PageUrl } from '@/constants/app';
|
||||
import { ANCHOR_TAB_LIST, COMPANY_TAB_LIST, TabItemType } from '@/hooks/use-config';
|
||||
import useMessage from '@/hooks/use-message';
|
||||
import useRoleType from '@/hooks/user-role-type';
|
||||
import { changeHomePage } from '@/store/actions';
|
||||
import { selectHomePageType } from '@/store/selector';
|
||||
import { logWithPrefix } from '@/utils/common';
|
||||
import { switchTab } from '@/utils/route';
|
||||
|
||||
@ -16,6 +13,7 @@ import './index.less';
|
||||
|
||||
interface IProps {
|
||||
className?: string;
|
||||
type: PageType;
|
||||
}
|
||||
|
||||
const PREFIX = 'base-tab-bar';
|
||||
@ -40,25 +38,21 @@ const TabItem = (props: { item: TabItemType }) => {
|
||||
);
|
||||
};
|
||||
|
||||
function BaseTabBar(props: IProps) {
|
||||
const { className } = props;
|
||||
function BaseTabBar({ className, type }: IProps) {
|
||||
const roleType = useRoleType();
|
||||
const currentPage = useSelector(selectHomePageType);
|
||||
const dispatch = useDispatch();
|
||||
|
||||
const tabs = roleType === RoleType.Anchor ? ANCHOR_TAB_LIST : COMPANY_TAB_LIST;
|
||||
|
||||
const handleTabClick = useCallback(
|
||||
(value: PageType) => {
|
||||
if (value === currentPage) {
|
||||
if (value === type) {
|
||||
return;
|
||||
}
|
||||
dispatch(changeHomePage(value));
|
||||
const item = tabs.find((i: TabItemType) => i.type === value);
|
||||
log('tab bar changed', value, item?.pagePath);
|
||||
item && switchTab(item.pagePath as PageUrl);
|
||||
},
|
||||
[tabs, currentPage, dispatch]
|
||||
[tabs, type]
|
||||
);
|
||||
|
||||
// useEffect(() => {
|
||||
@ -72,14 +66,14 @@ function BaseTabBar(props: IProps) {
|
||||
|
||||
return (
|
||||
<div className={classNames(`${PREFIX}__wrapper`, className)} id={APP_TAB_BAR_ID}>
|
||||
<Tabbar className={PREFIX} defaultValue={currentPage}>
|
||||
<Tabbar className={PREFIX} value={type}>
|
||||
{tabs.map((item: TabItemType) => {
|
||||
return (
|
||||
<Tabbar.TabItem
|
||||
key={item.pagePath}
|
||||
value={item.type}
|
||||
onClick={() => handleTabClick(item.type)}
|
||||
className={classNames(`${PREFIX}__item`, { selected: item.type === currentPage })}
|
||||
className={classNames(`${PREFIX}__item`, { selected: item.type === type })}
|
||||
>
|
||||
<TabItem item={item} />
|
||||
</Tabbar.TabItem>
|
||||
|
@ -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);
|
||||
|
@ -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__',
|
||||
}
|
||||
|
@ -174,3 +174,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',
|
||||
}
|
||||
|
@ -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 每天五次
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
@ -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)}>
|
||||
|
@ -48,7 +48,7 @@ const CompanyTabs: TabItemType[] = [
|
||||
{
|
||||
type: PageType.BatchPublish,
|
||||
pagePath: PageUrl.UserBatchPublish,
|
||||
text: '免费招',
|
||||
text: '代招代发',
|
||||
},
|
||||
];
|
||||
|
||||
|
13
src/hooks/use-previous.ts
Normal file
13
src/hooks/use-previous.ts
Normal file
@ -0,0 +1,13 @@
|
||||
import { useEffect, useRef } from 'react';
|
||||
|
||||
function usePrevious<T>(value: T) {
|
||||
const ref = useRef<T>();
|
||||
|
||||
useEffect(() => {
|
||||
ref.current = value;
|
||||
}, [value]);
|
||||
|
||||
return ref.current;
|
||||
}
|
||||
|
||||
export default usePrevious;
|
@ -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 } = {
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { Image } from '@tarojs/components';
|
||||
import Taro, { NodesRef, useDidShow, useLoad, useShareAppMessage } from '@tarojs/taro';
|
||||
|
||||
import { ArrowUp, ArrowDown } from '@taroify/icons';
|
||||
import { ArrowDown, ArrowUp } from '@taroify/icons';
|
||||
import classNames from 'classnames';
|
||||
import { isEqual } from 'lodash-es';
|
||||
import { useCallback, useEffect, useState } from 'react';
|
||||
@ -14,7 +14,7 @@ import Overlay from '@/components/overlay';
|
||||
import PageLoading from '@/components/page-loading';
|
||||
import PartnerBanner from '@/components/partner-banner';
|
||||
import SwitchBar from '@/components/switch-bar';
|
||||
import { APP_TAB_BAR_ID, EventName, OpenSource, PageUrl } from '@/constants/app';
|
||||
import { APP_TAB_BAR_ID, EventName, OpenSource, PageType, PageUrl, RoleType } from '@/constants/app';
|
||||
import { EmployType, JobManageStatus } from '@/constants/job';
|
||||
import { ALL_ANCHOR_SORT_TYPES, ANCHOR_SORT_TYPE_TITLE_MAP, AnchorSortType } from '@/constants/material';
|
||||
import useInviteCode from '@/hooks/use-invite-code';
|
||||
@ -23,6 +23,7 @@ import useLocation from '@/hooks/use-location';
|
||||
import { JobManageInfo } from '@/types/job';
|
||||
import { Coordinate } from '@/types/location';
|
||||
import { IAnchorFilters } from '@/types/material';
|
||||
import { switchRoleType } from '@/utils/app';
|
||||
import { logWithPrefix } from '@/utils/common';
|
||||
import { getLastSelectMyJobId, requestJobManageList, setLastSelectMyJobId } from '@/utils/job';
|
||||
import { getWxLocation } from '@/utils/location';
|
||||
@ -165,6 +166,8 @@ export default function AnchorPage() {
|
||||
}, [location]);
|
||||
|
||||
useLoad(async () => {
|
||||
switchRoleType(RoleType.Company);
|
||||
|
||||
const query = getPageQuery();
|
||||
getInviteCodeFromQueryAndUpdate(query);
|
||||
|
||||
@ -186,13 +189,13 @@ export default function AnchorPage() {
|
||||
});
|
||||
|
||||
useShareAppMessage(() => {
|
||||
return getCommonShareMessage({ useCapture: true, inviteCode, title: '数万名优质主播等你来挑' });
|
||||
return getCommonShareMessage({ inviteCode, title: '数万名优质主播等你来挑', path: PageUrl.Anchor });
|
||||
});
|
||||
|
||||
useDidShow(() => requestUnreadMessageCount());
|
||||
|
||||
return (
|
||||
<HomePage>
|
||||
<HomePage type={PageType.Anchor}>
|
||||
{!!loading && <PageLoading className={`${PREFIX}__loading`} />}
|
||||
<CustomNavigationBar className={`${PREFIX}__navigation-bar`}>
|
||||
{selectJob && <SwitchBar title={selectJob.title.substring(0, 4)} onClick={handleClickSwitch} />}
|
||||
|
@ -4,7 +4,7 @@ import { Button } from '@taroify/core';
|
||||
import { useCallback } from 'react';
|
||||
|
||||
import HomePage from '@/components/home-page';
|
||||
import { PageUrl } from '@/constants/app';
|
||||
import { PageType, PageUrl } from '@/constants/app';
|
||||
import { copy, logWithPrefix } from '@/utils/common';
|
||||
import { navigateTo } from '@/utils/route';
|
||||
|
||||
@ -136,7 +136,7 @@ export default function DevDebug() {
|
||||
});
|
||||
|
||||
return (
|
||||
<HomePage>
|
||||
<HomePage type={PageType.DEV}>
|
||||
<div className={PREFIX}>
|
||||
{/* <div>{`最近一次的订单 ID: ${lastOrderNo}`}</div>
|
||||
<Button onClick={() => handleCreateOrder(OrderType.Group)} style={marginTopStyle} color="primary">
|
||||
|
@ -4,8 +4,10 @@ import { useCallback } from 'react';
|
||||
|
||||
import HomePage from '@/components/home-page';
|
||||
import SearchCity from '@/components/search-city';
|
||||
import { PageType, PageUrl, RoleType } from '@/constants/app';
|
||||
import { GROUPS } from '@/constants/group';
|
||||
import useInviteCode from '@/hooks/use-invite-code';
|
||||
import { switchRoleType } from '@/utils/app';
|
||||
import { openCustomerServiceChat } from '@/utils/common';
|
||||
import { getCurrentCityCode } from '@/utils/location';
|
||||
import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
|
||||
@ -20,11 +22,15 @@ export default function GroupV2() {
|
||||
const inviteCode = useInviteCode();
|
||||
|
||||
useLoad(() => {
|
||||
switchRoleType(RoleType.Anchor);
|
||||
|
||||
const query = getPageQuery();
|
||||
getInviteCodeFromQueryAndUpdate(query);
|
||||
});
|
||||
|
||||
useShareAppMessage(() => getCommonShareMessage({ inviteCode }));
|
||||
useShareAppMessage(() =>
|
||||
getCommonShareMessage({ inviteCode, title: '邀请你加入本地主播求职招聘群', path: PageUrl.GroupV2 })
|
||||
);
|
||||
|
||||
const handleSelectCity = useCallback(cityCode => {
|
||||
if (!checkCityCode(cityCode)) {
|
||||
@ -37,14 +43,14 @@ export default function GroupV2() {
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<HomePage>
|
||||
<HomePage type={PageType.GroupV2}>
|
||||
<div className={PREFIX}>
|
||||
<SearchCity
|
||||
onSelectCity={handleSelectCity}
|
||||
currentCity={getCurrentCityCode()}
|
||||
forGroup
|
||||
offset={72}
|
||||
banner="点击城市加入本地通告群,高薪工作早知道"
|
||||
banner="点击城市加入本地主播招聘群,高薪职位早知道"
|
||||
/>
|
||||
</div>
|
||||
</HomePage>
|
||||
|
@ -4,6 +4,7 @@ import { Tabs } from '@taroify/core';
|
||||
import { useCallback, useState } from 'react';
|
||||
|
||||
import HomePage from '@/components/home-page';
|
||||
import { PageType } from '@/constants/app';
|
||||
import { GroupType, GROUP_PAGE_TABS } from '@/constants/group';
|
||||
import GroupFragment from '@/fragments/group';
|
||||
import useNavigation from '@/hooks/use-navigation';
|
||||
@ -22,7 +23,7 @@ export default function Group() {
|
||||
useShareAppMessage(() => getCommonShareMessage());
|
||||
|
||||
return (
|
||||
<HomePage>
|
||||
<HomePage type={PageType.Group}>
|
||||
<Tabs
|
||||
swipeable
|
||||
value={tabType}
|
||||
|
@ -7,14 +7,15 @@ 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 { 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';
|
||||
@ -22,6 +23,7 @@ import { RESPONSE_ERROR_CODE } from '@/http/constant';
|
||||
import { HttpError } from '@/http/error';
|
||||
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';
|
||||
@ -74,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;
|
||||
@ -84,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);
|
||||
}
|
||||
@ -111,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`}>
|
||||
@ -124,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="确定"
|
||||
@ -218,7 +241,11 @@ export default function JobDetail() {
|
||||
}, []);
|
||||
|
||||
useLoad(async () => {
|
||||
const query = getPageQuery<Pick<JobDetails, 'id'> & { c: string }>();
|
||||
const query = getPageQuery<Pick<JobDetails, 'id'> & { c: string; share: string }>();
|
||||
|
||||
if (query?.share === 'true') {
|
||||
switchRoleType(RoleType.Anchor);
|
||||
}
|
||||
getInviteCodeFromQueryAndUpdate(query);
|
||||
const jobId = query?.id;
|
||||
if (!jobId) {
|
||||
@ -237,6 +264,7 @@ export default function JobDetail() {
|
||||
if (!data) {
|
||||
return getCommonShareMessage({ inviteCode });
|
||||
}
|
||||
|
||||
return {
|
||||
title: getJobTitle(data) || '',
|
||||
path: getJumpUrl(PageUrl.JobDetail, { id: data.id, share: true, c: inviteCode }),
|
||||
@ -278,6 +306,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`}>
|
||||
|
@ -3,16 +3,17 @@ 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, PageUrl } from '@/constants/app';
|
||||
import { EventName, OpenSource, PageType, PageUrl, RoleType } from '@/constants/app';
|
||||
import { EmployType, JOB_PAGE_TABS, SortType } from '@/constants/job';
|
||||
import JobFragment from '@/fragments/job/base';
|
||||
import useInviteCode from '@/hooks/use-invite-code';
|
||||
import useLocation from '@/hooks/use-location';
|
||||
import useNavigation from '@/hooks/use-navigation';
|
||||
import { Coordinate } from '@/types/location';
|
||||
import { switchRoleType } from '@/utils/app';
|
||||
import { logWithPrefix } from '@/utils/common';
|
||||
import { getWxLocation, isNotNeedAuthorizeLocation, requestLocation } from '@/utils/location';
|
||||
import { requestUnreadMessageCount } from '@/utils/message';
|
||||
@ -20,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';
|
||||
@ -39,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(
|
||||
@ -75,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 () => {
|
||||
@ -96,19 +113,15 @@ export default function Job() {
|
||||
}, [location]);
|
||||
|
||||
useLoad(async () => {
|
||||
switchRoleType(RoleType.Anchor);
|
||||
const query = getPageQuery<{ sortType: SortType; c?: string; scene?: string }>();
|
||||
const type = query.sortType;
|
||||
if (type === SortType.CREATE_TIME) {
|
||||
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();
|
||||
}
|
||||
});
|
||||
|
||||
@ -121,11 +134,11 @@ export default function Job() {
|
||||
path: getJumpUrl(PageUrl.Job, { sortType, c: inviteCode }),
|
||||
};
|
||||
}
|
||||
return getCommonShareMessage({ inviteCode });
|
||||
return getCommonShareMessage({ inviteCode, path: PageUrl.Job });
|
||||
});
|
||||
|
||||
return (
|
||||
<HomePage>
|
||||
<HomePage type={PageType.JOB}>
|
||||
<Tabs
|
||||
swipeable
|
||||
value={tabType}
|
||||
@ -147,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>
|
||||
);
|
||||
|
@ -6,7 +6,7 @@ import { useCallback, useEffect, useState } from 'react';
|
||||
import MaterialManagePopup from '@/components/material-manage-popup';
|
||||
import PageLoading from '@/components/page-loading';
|
||||
import SafeBottomPadding from '@/components/safe-bottom-padding';
|
||||
import { EventName } from '@/constants/app';
|
||||
import { EventName, RoleType } from '@/constants/app';
|
||||
import { CollectEventName } from '@/constants/event';
|
||||
import { MaterialStatus } from '@/constants/material';
|
||||
import ProfileViewFragment from '@/fragments/profile/view';
|
||||
@ -17,6 +17,7 @@ import { getCommonShareMessage } from '@/utils/share';
|
||||
import Toast from '@/utils/toast';
|
||||
|
||||
import './index.less';
|
||||
import { switchRoleType } from '@/utils/app';
|
||||
|
||||
const PREFIX = 'page-material-profile';
|
||||
|
||||
|
@ -6,7 +6,7 @@ import { useCallback, useEffect, useState } from 'react';
|
||||
import CommonDialog from '@/components/common-dialog';
|
||||
import PageLoading from '@/components/page-loading';
|
||||
import SafeBottomPadding from '@/components/safe-bottom-padding';
|
||||
import { EventName, OpenSource, PageUrl } from '@/constants/app';
|
||||
import { EventName, OpenSource, PageUrl, RoleType } from '@/constants/app';
|
||||
import { CollectEventName } from '@/constants/event';
|
||||
import { MaterialViewSource } from '@/constants/material';
|
||||
import ProfileViewFragment from '@/fragments/profile/view';
|
||||
@ -16,6 +16,7 @@ import { HttpError } from '@/http/error';
|
||||
import { JobManageInfo } from '@/types/job';
|
||||
import { MaterialProfile } from '@/types/material';
|
||||
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';
|
||||
@ -141,6 +142,8 @@ export default function MaterialViewPage() {
|
||||
}, []);
|
||||
|
||||
useLoad(async () => {
|
||||
switchRoleType(RoleType.Company);
|
||||
|
||||
const context = getPageQuery<IViewContext | IShareContext>();
|
||||
getInviteCodeFromQueryAndUpdate(context as BL.Anything);
|
||||
try {
|
||||
|
@ -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);
|
||||
}
|
||||
@ -175,6 +180,7 @@ export default function MessageChat() {
|
||||
);
|
||||
|
||||
const handleClickReject = useCallback(async () => {
|
||||
await postAddMessageTimes('message_chat_page');
|
||||
if (!chat || !receiver || reject) {
|
||||
return;
|
||||
}
|
||||
@ -274,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>();
|
||||
@ -305,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);
|
||||
|
@ -7,8 +7,9 @@ import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
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 } from '@/constants/app';
|
||||
import { APP_TAB_BAR_ID, EventName, PageType } from '@/constants/app';
|
||||
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';
|
||||
@ -20,7 +21,10 @@ import {
|
||||
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`;
|
||||
@ -58,12 +62,52 @@ export default function Message() {
|
||||
|
||||
const handleClickHelp = useCallback(() => setShowHelp(true), []);
|
||||
|
||||
const handleClickAddMessageTimes = useCallback(async () => {
|
||||
const addMessageTimes = useCallback(async () => {
|
||||
await postAddMessageTimes('message_page');
|
||||
const remain = await requestRemainPushTime();
|
||||
setTimes(remain);
|
||||
}, []);
|
||||
|
||||
const handleClickAddMessageTimes = useCallback(async () => {
|
||||
const [hasRefused, acceptIds] = await isSubscribeRefused(MessageSubscribeIds);
|
||||
if (hasRefused) {
|
||||
await Taro.showModal({
|
||||
title: '提示',
|
||||
content:
|
||||
'您未订阅消息提醒,不能及时获得招聘消息,请前往“设置”,将“新聊天消息”、“未读消息”“面试邀请”均设置为“接收”',
|
||||
showCancel: false,
|
||||
confirmText: '打开设置',
|
||||
});
|
||||
await Taro.openSetting({
|
||||
withSubscriptions: true,
|
||||
});
|
||||
const { subscriptionsSetting: { mainSwitch, itemSettings = {} } = {} } = await Taro.getSetting({
|
||||
withSubscriptions: true,
|
||||
});
|
||||
console.log('subscriptionsSetting:', mainSwitch, itemSettings);
|
||||
const successIds = mainSwitch
|
||||
? MessageSubscribeIds.reduce<SubscribeTempId[]>((acc, id) => {
|
||||
if ((!itemSettings[id] || itemSettings[id] === 'accept') && !acceptIds.includes(id)) {
|
||||
acc.push(id);
|
||||
}
|
||||
return acc;
|
||||
}, [])
|
||||
: [];
|
||||
if (!successIds.length) {
|
||||
return;
|
||||
}
|
||||
console.log('successIds:', successIds);
|
||||
collectEvent(CollectEventName.MESSAGE_DEV_LOG, {
|
||||
action: 'subscribe_new_message_reminder',
|
||||
source: 'message_page',
|
||||
successIds,
|
||||
});
|
||||
await postSubscribe(MessageSubscribeIds, successIds);
|
||||
} else {
|
||||
await addMessageTimes();
|
||||
}
|
||||
}, [addMessageTimes]);
|
||||
|
||||
useDidHide(() => (pageVisibleRef.current = false));
|
||||
|
||||
useDidShow(() => {
|
||||
@ -101,7 +145,7 @@ export default function Message() {
|
||||
}, [roleType]);
|
||||
|
||||
return (
|
||||
<HomePage>
|
||||
<HomePage type={PageType.Message}>
|
||||
<div className={PREFIX}>
|
||||
<div className={HEADER_CLASS}>
|
||||
<div className={`${HEADER_CLASS}__times`}>
|
||||
|
@ -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>
|
||||
|
@ -20,6 +20,15 @@
|
||||
> .taroify-tabs__content {
|
||||
padding-top: var(--tabs-wrap-height);
|
||||
}
|
||||
|
||||
//.taroify-tabs__nav .taroify-tabs__tab:nth-child(2) .taroify-badge-wrapper {
|
||||
// left: 18px;
|
||||
//}
|
||||
}
|
||||
|
||||
&__star {
|
||||
width: 33px;
|
||||
height: 38px;
|
||||
}
|
||||
&__header-image {
|
||||
width: 100%;
|
||||
|
@ -1,17 +1,18 @@
|
||||
import { Image } from '@tarojs/components';
|
||||
import Taro, { useShareAppMessage } from '@tarojs/taro';
|
||||
import Taro, { useLoad, useShareAppMessage } from '@tarojs/taro';
|
||||
|
||||
import { Button, Tabs } from '@taroify/core';
|
||||
import { useCallback } from 'react';
|
||||
import { useCallback, useState } from 'react';
|
||||
|
||||
import HomePage from '@/components/home-page';
|
||||
import SearchCity from '@/components/search-city';
|
||||
import { PageUrl } from '@/constants/app';
|
||||
import { PageType, PageUrl, RoleType } from '@/constants/app';
|
||||
import { GROUPS } from '@/constants/group';
|
||||
import useInviteCode from '@/hooks/use-invite-code';
|
||||
import { switchRoleType } from '@/utils/app';
|
||||
import { openCustomerServiceChat } from '@/utils/common';
|
||||
import { getCurrentCityCode } from '@/utils/location';
|
||||
import { navigateTo } from '@/utils/route';
|
||||
import { getPageQuery, navigateTo } from '@/utils/route';
|
||||
import { getCommonShareMessage } from '@/utils/share';
|
||||
import { checkCityCode } from '@/utils/user';
|
||||
|
||||
@ -22,6 +23,7 @@ const EXAMPLE_IMAGE = 'https://publiccdn.neighbourhood.com.cn/img/delegate-examp
|
||||
const COMMENT_IMAGE = 'https://publiccdn.neighbourhood.com.cn/img/delegate-comments.png';
|
||||
export default function BizService() {
|
||||
const inviteCode = useInviteCode();
|
||||
const [value, setValue] = useState('0');
|
||||
|
||||
const handleClickDelegate = useCallback(() => {
|
||||
navigateTo(PageUrl.GroupDelegatePublish);
|
||||
@ -44,13 +46,33 @@ export default function BizService() {
|
||||
openCustomerServiceChat(group.serviceUrl);
|
||||
}
|
||||
}, []);
|
||||
useShareAppMessage(() => getCommonShareMessage({ inviteCode }));
|
||||
const handleChange = useCallback(v => {
|
||||
setValue(v);
|
||||
}, []);
|
||||
|
||||
useLoad(() => {
|
||||
switchRoleType(RoleType.Company);
|
||||
|
||||
const query = getPageQuery<{ tab?: string }>();
|
||||
if (query.tab) {
|
||||
handleChange(query.tab);
|
||||
}
|
||||
});
|
||||
|
||||
useShareAppMessage(() =>
|
||||
getCommonShareMessage({
|
||||
inviteCode,
|
||||
path: PageUrl.UserBatchPublish,
|
||||
title: '邀请你加入本地主播求职招聘群',
|
||||
params: { tab: '1' },
|
||||
})
|
||||
);
|
||||
|
||||
return (
|
||||
<HomePage>
|
||||
<HomePage type={PageType.BatchPublish}>
|
||||
<div className={PREFIX}>
|
||||
<Tabs className={`${PREFIX}__tabs`} defaultValue={0}>
|
||||
<Tabs.TabPane value={0} title="群代发">
|
||||
<Tabs className={`${PREFIX}__tabs`} value={value} onChange={handleChange}>
|
||||
<Tabs.TabPane value="0" title="群代发">
|
||||
<div className={`${PREFIX}__delegate`}>
|
||||
<Image
|
||||
mode="widthFix"
|
||||
@ -79,7 +101,15 @@ export default function BizService() {
|
||||
</div>
|
||||
</div>
|
||||
</Tabs.TabPane>
|
||||
<Tabs.TabPane value={1} title="免费招">
|
||||
<Tabs.TabPane
|
||||
value="1"
|
||||
title={
|
||||
<>
|
||||
主播群
|
||||
{/*<Image src={require('@/statics/svg/star.svg')} className={`${PREFIX}__star`} />*/}
|
||||
</>
|
||||
}
|
||||
>
|
||||
<SearchCity
|
||||
onSelectCity={handleSelectCity}
|
||||
currentCity={getCurrentCityCode()}
|
||||
@ -88,7 +118,7 @@ export default function BizService() {
|
||||
banner="点击城市名称,进本地通告群,免费招主播"
|
||||
/>
|
||||
</Tabs.TabPane>
|
||||
<Tabs.TabPane value={2} title="代招">
|
||||
<Tabs.TabPane value="2" title="代招">
|
||||
<div className={`${PREFIX}__recruitment`}>
|
||||
<div className={`${PREFIX}__recruitment-card`}>
|
||||
<div className={`${PREFIX}__recruitment-h5`}>服务城市</div>
|
||||
|
@ -9,7 +9,7 @@ import LoginButton from '@/components/login-button';
|
||||
import PartnerEntry from '@/components/partner-entry';
|
||||
import Slogan from '@/components/slogan';
|
||||
import SwitchBar from '@/components/switch-bar';
|
||||
import { RoleType, PageUrl } from '@/constants/app';
|
||||
import { RoleType, PageUrl, PageType } from '@/constants/app';
|
||||
import AnchorFragment from '@/fragments/user/anchor';
|
||||
import CompanyFragment from '@/fragments/user/company';
|
||||
import useUserInfo from '@/hooks/use-user-info';
|
||||
@ -41,7 +41,7 @@ export default function User() {
|
||||
useShareAppMessage(() => getCommonShareMessage({ useCapture: false }));
|
||||
|
||||
return (
|
||||
<HomePage>
|
||||
<HomePage type={PageType.User}>
|
||||
<CustomNavigationBar className={`${PREFIX}__navigation-bar`}>
|
||||
<SwitchBar title={roleType === RoleType.Anchor ? '切换为企业' : '切换为主播'} onClick={handleSwitchRoleType} />
|
||||
</CustomNavigationBar>
|
||||
|
4
src/statics/svg/star.svg
Normal file
4
src/statics/svg/star.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg width="33" height="36" viewBox="0 0 33 36" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M8.57143 8.57143L12 0L15.4286 8.57143L24 12L15.4286 15.4286L12 24L8.57143 15.4286L0 12L8.57143 8.57143Z" fill="#FF5051"/>
|
||||
<path opacity="0.24" d="M24.6429 27.6429L26.5 23L28.3571 27.6429L33 29.5L28.3571 31.3571L26.5 36L24.6429 31.3571L20 29.5L24.6429 27.6429Z" fill="#FF5051"/>
|
||||
</svg>
|
After Width: | Height: | Size: 390 B |
@ -49,6 +49,7 @@ export type JobDetails = JobInfo &
|
||||
declarationType: DeclarationType; // 报单类型
|
||||
userId: string; // 发布人的 userId
|
||||
verifyFailReason?: string; // 审核不通过的原因
|
||||
sourcePlat?: string;
|
||||
};
|
||||
|
||||
export interface JobManageInfo {
|
||||
|
@ -13,6 +13,7 @@ export interface ProductInfo {
|
||||
balance: number;
|
||||
created: number;
|
||||
updated: number;
|
||||
isPaidVip?: boolean;
|
||||
// 报单类型信息,只有 use 接口返回值才有
|
||||
declarationTypeResult?: DeclarationTypeResult;
|
||||
}
|
||||
|
@ -37,12 +37,19 @@ export const switchDefaultTab = async () => {
|
||||
};
|
||||
|
||||
export const switchRoleType = async (appMode?: RoleType) => {
|
||||
const curMode = getRoleType();
|
||||
|
||||
if (curMode && appMode === curMode) {
|
||||
console.log('[utils:app] skip switch role because of role type is equal to that of local');
|
||||
return;
|
||||
}
|
||||
|
||||
if (!appMode) {
|
||||
const curMode = getRoleType();
|
||||
console.log('[utils:app] no app mode from arguments');
|
||||
appMode = curMode === RoleType.Anchor ? RoleType.Company : RoleType.Anchor;
|
||||
}
|
||||
|
||||
console.log('switchRoleType', appMode);
|
||||
console.log('[utils:app] switchRoleType', appMode);
|
||||
try {
|
||||
await postSwitchRoleType(appMode);
|
||||
store.dispatch(changeRoleType(appMode));
|
||||
|
@ -4,12 +4,12 @@ export const isDev = () => process.env.NODE_ENV === 'development';
|
||||
// export const isDev = () => true;
|
||||
|
||||
export const isIPhone = (() => {
|
||||
const info = Taro.getSystemInfoSync();
|
||||
const info = Taro.getDeviceInfo();
|
||||
return info.platform === 'ios';
|
||||
})();
|
||||
|
||||
export const isDesktop = (() => {
|
||||
const info = Taro.getSystemInfoSync();
|
||||
const info = Taro.getDeviceInfo();
|
||||
return info.platform === 'windows' || info.platform === 'mac';
|
||||
})();
|
||||
|
||||
|
@ -8,20 +8,20 @@ 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';
|
||||
|
@ -101,6 +101,7 @@ export const postAddMessageTimes = async (source: string) => {
|
||||
await postSubscribe(MessageSubscribeIds, successIds);
|
||||
};
|
||||
|
||||
|
||||
export const postCreateChat = (toUserId: string) => {
|
||||
return http.post<IChatInfo>(API.MESSAGE_CREATE_CHAT, { data: { toUserId } });
|
||||
};
|
||||
|
@ -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];
|
||||
}
|
||||
|
||||
// 是否可以购买某一个产品
|
||||
|
@ -7,24 +7,35 @@ import { logWithPrefix } from '@/utils/common';
|
||||
|
||||
const log = logWithPrefix('subscribe-utils');
|
||||
|
||||
export const isSubscribeRefused = async (tempId: SubscribeTempId | SubscribeTempId[]) => {
|
||||
export const isSubscribeRefused = async (
|
||||
tempId: SubscribeTempId | SubscribeTempId[]
|
||||
): Promise<[boolean, SubscribeTempId[]]> => {
|
||||
tempId = Array.isArray(tempId) ? tempId : [tempId];
|
||||
const { subscriptionsSetting } = await Taro.getSetting({ withSubscriptions: true });
|
||||
log('isSubscribeRefuse subscriptionsSetting:', subscriptionsSetting);
|
||||
if (!subscriptionsSetting) {
|
||||
return false;
|
||||
return [false, []];
|
||||
}
|
||||
const { mainSwitch, itemSettings = {} } = subscriptionsSetting;
|
||||
if (!mainSwitch) {
|
||||
return true;
|
||||
return [true, []];
|
||||
}
|
||||
return tempId.some(id => {
|
||||
const acceptedIds: SubscribeTempId[] = [];
|
||||
let refused = false;
|
||||
tempId.some(id => {
|
||||
const item = itemSettings[id];
|
||||
if (!item) {
|
||||
return false;
|
||||
if (item === 'accept') {
|
||||
acceptedIds.push(id);
|
||||
}
|
||||
return item === 'reject';
|
||||
|
||||
if (refused) {
|
||||
return;
|
||||
}
|
||||
|
||||
refused = item === 'reject';
|
||||
});
|
||||
|
||||
return [refused || false, acceptedIds];
|
||||
};
|
||||
|
||||
export const subscribeMessage = async (tempIds: SubscribeTempId[]) => {
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user