Compare commits

...

8 Commits

Author SHA1 Message Date
b0dd660dde feat: 群代发改版 2025-06-27 10:56:44 +08:00
56cf10c768 feat: 2025-06-25 22:47:53 +08:00
0ec366cc2e feat: 分享的文案 + 点击头像看模卡 + 提现文案 + 协议弹窗 + 进群限制 2025-06-17 00:03:58 +08:00
828497fcd6 feat: resume 2025-06-16 00:29:17 +08:00
fd5b3dab97 feat: fix conflict 2025-06-15 01:10:47 +08:00
1b782ee82c Merge branch 'trunk' into feat/update-login 2025-06-15 01:09:35 +08:00
80c0d71921 feat: login whatever 2025-06-15 01:09:30 +08:00
5acc25c8c9 feat: login 2025-06-08 22:57:23 +08:00
39 changed files with 555 additions and 171 deletions

View File

@ -0,0 +1,41 @@
@import '@/styles/common.less';
@import '@/styles/variables.less';
.agreement-popup {
&__content {
.flex-column();
padding: 40px 32px;
}
&__title {
font-size: 32px;
font-weight: 500;
line-height: 48px;
color: @blColor;;
margin-bottom: 24px;
}
&__body {
font-weight: 400;
font-size: 28px;
line-height: 40px;
color: @blColor;
margin-bottom: 24px;
align-self: flex-start;
};
&__btn-group {
margin-top: 32px;
.flex-row();
gap: 30px;
}
&__confirm-button {
.button(@width: 230px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 44px);
}
&__cancel-button {
.button(@width: 230px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 44px, @highlight: 0);
}
}

View File

@ -0,0 +1,66 @@
import { Button, ITouchEvent } from '@tarojs/components';
import { Popup } from '@taroify/core';
import { useCallback } from 'react';
import { BindPhoneStatus } from '@/components/login-button';
import PhoneButton from '@/components/phone-button';
import { ProtocolPrivacy } from '@/components/protocol-privacy';
import SafeBottomPadding from '@/components/safe-bottom-padding';
import './index.less';
interface IProps {
open: boolean;
onCancel: () => void;
onConfirm: (e: ITouchEvent) => void;
needPhone?: boolean;
needBindPhone?: boolean;
}
const PREFIX = 'agreement-popup';
export function AgreementPopup({ open, onCancel, onConfirm, needPhone, needBindPhone }: IProps) {
const handleBindPhone = useCallback(
(status: BindPhoneStatus, e: ITouchEvent) => {
if (status === BindPhoneStatus.Success) {
onConfirm(e);
} else {
onCancel();
}
},
[onCancel, onConfirm]
);
if (!open) {
return null;
}
return (
<Popup rounded className={PREFIX} placement="bottom" open={open} onClose={onCancel}>
<div className={`${PREFIX}__content`}>
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__body`}>
<div></div>
<div>使</div>
</div>
<ProtocolPrivacy divider />
<div className={`${PREFIX}__btn-group`}>
<Button className={`${PREFIX}__cancel-button`} onClick={onCancel}>
</Button>
{needBindPhone ? (
<PhoneButton className={`${PREFIX}__confirm-button`} needPhone={needPhone} onBindPhone={handleBindPhone}>
</PhoneButton>
) : (
<Button className={`${PREFIX}__confirm-button`} onClick={onConfirm}>
</Button>
)}
</div>
</div>
<SafeBottomPadding />
</Popup>
);
}

View File

@ -18,6 +18,7 @@ import './index.less';
interface IProps {
data: AnchorInfo;
jobId?: string;
validator: (onSuccess: () => void) => void;
}
const PREFIX = 'anchor-card';
@ -34,14 +35,17 @@ const getSalary = (data: AnchorInfo) => {
};
function AnchorCard(props: IProps) {
const { data, jobId } = props;
const { data, jobId, validator } = props;
const style = data.isRead ? ({ '--read-color': '#999999' } as React.CSSProperties) : {};
const cover = (data.materialVideoInfoList.find(video => video.isDefault) || data.materialVideoInfoList[0])?.coverUrl;
const handleClick = useCallback(
() => navigateTo(PageUrl.MaterialView, { jobId, resumeId: data.id, source: MaterialViewSource.AnchorList }),
[data, jobId]
);
const handleNavTo = useCallback(() => {
navigateTo(PageUrl.MaterialView, { jobId, resumeId: data.id, source: MaterialViewSource.AnchorList });
}, [data, jobId]);
const handleClick = useCallback(() => {
validator(handleNavTo);
}, [handleNavTo, validator]);
return (
<div className={PREFIX} style={style} onClick={handleClick}>

View File

@ -7,11 +7,16 @@ import { useCallback, useEffect, useRef, useState } from 'react';
import AnchorCard from '@/components/anchor-card';
import ListPlaceholder from '@/components/list-placeholder';
import LoginDialog from '@/components/login-dialog';
import { EventName } from '@/constants/app';
import { AnchorSortType } from '@/constants/material';
import useUserInfo from '@/hooks/use-user-info';
import { AnchorInfo, GetAnchorListRequest, IAnchorFilters } from '@/types/material';
import { logWithPrefix } from '@/utils/common';
import { requestAnchorList as requestData } from '@/utils/material';
import { getAgreementSigned, isNeedLogin, setAgreementSigned } from '@/utils/user';
import { AgreementPopup } from '../agreement-popup';
import './index.less';
@ -55,6 +60,11 @@ function AnchorList(props: IAnchorListProps) {
const requestProps = useRef<IRequestProps>({});
const prevRequestProps = useRef<IRequestProps>({});
const onListEmptyRef = useRef(onListEmpty);
const [openLogin, setLoginOpen] = useState(false);
const [openAssignment, setAssignmentOpen] = useState(false);
const successCallback = useRef<() => void>(() => {});
const userInfo = useUserInfo();
const needLogin = isNeedLogin(userInfo);
const handleRefresh = useCallback(async () => {
log('start pull refresh');
@ -120,6 +130,37 @@ function AnchorList(props: IAnchorListProps) {
[dataList]
);
const handleCancel = useCallback(() => {
setAssignmentOpen(false);
setAgreementSigned(false);
}, []);
const handleConfirm = useCallback(() => {
setAssignmentOpen(false);
setAgreementSigned(true);
successCallback.current();
}, []);
const handleLoginSuccess = useCallback(() => {
setLoginOpen(false);
successCallback.current();
}, []);
const handleLoginCancel = useCallback(() => {
setLoginOpen(false);
}, []);
const validator = (onSuccess: () => void) => {
successCallback.current = onSuccess;
if (!getAgreementSigned()) {
setAssignmentOpen(true);
} else if (needLogin) {
setLoginOpen(true);
} else {
onSuccess();
}
};
useEffect(() => {
onListEmptyRef.current = onListEmpty;
}, [onListEmpty]);
@ -183,26 +224,35 @@ function AnchorList(props: IAnchorListProps) {
}, [jobId, ready, filters, cityCode, sortType]);
return (
<PullRefresh
className={classNames(`${PREFIX}__pull-refresh`, className)}
loading={refreshing}
onRefresh={handleRefresh}
disabled={refreshDisabled || !ready}
>
<List
hasMore={hasMore}
onLoad={handleLoadMore}
loading={loadingMore || refreshing}
disabled={loadMoreError || !ready}
fixedHeight={typeof listHeight !== 'undefined'}
style={listHeight ? { height: `${listHeight}px` } : undefined}
<>
<PullRefresh
className={classNames(`${PREFIX}__pull-refresh`, className)}
loading={refreshing}
onRefresh={handleRefresh}
disabled={refreshDisabled || !ready}
>
{dataList.map(item => (
<AnchorCard data={item} jobId={jobId} key={item.id} />
))}
<ListPlaceholder hasMore={hasMore} loadingMore={loadingMore} loadMoreError={loadMoreError} />
</List>
</PullRefresh>
<List
hasMore={hasMore}
onLoad={handleLoadMore}
loading={loadingMore || refreshing}
disabled={loadMoreError || !ready}
fixedHeight={typeof listHeight !== 'undefined'}
style={listHeight ? { height: `${listHeight}px` } : undefined}
>
{dataList.map(item => (
<AnchorCard data={item} jobId={jobId} key={item.id} validator={validator} />
))}
<ListPlaceholder hasMore={hasMore} loadingMore={loadingMore} loadMoreError={loadMoreError} />
</List>
</PullRefresh>
<AgreementPopup
open={openAssignment}
onCancel={handleCancel}
onConfirm={handleConfirm}
needBindPhone={needLogin}
/>
{openLogin && <LoginDialog onCancel={handleLoginCancel} onSuccess={handleLoginSuccess} />}
</>
);
}

View File

@ -46,8 +46,8 @@ function JobRecommendList(props: IJobListProps) {
setDataList([]);
setLoading(true);
setLoadError(false);
const { jobResults = [] } = await requestMyRecommendJobList({ ...requestProps.current });
setDataList(jobResults);
const { jobResults } = await requestMyRecommendJobList({ ...requestProps.current });
setDataList(jobResults || []);
} catch (e) {
setDataList([]);
setLoadError(true);

View File

@ -1,11 +1,12 @@
import { Button, ButtonProps } from '@tarojs/components';
import { Button, ButtonProps, ITouchEvent } from '@tarojs/components';
import classNames from 'classnames';
import { useCallback, useState } from 'react';
import { AgreementPopup } from '@/components/agreement-popup';
import LoginDialog from '@/components/login-dialog';
import useUserInfo from '@/hooks/use-user-info';
import { isNeedLogin } from '@/utils/user';
import { getAgreementSigned, isNeedLogin, setAgreementSigned } from '@/utils/user';
import './index.less';
@ -17,6 +18,7 @@ export enum BindPhoneStatus {
export interface ILoginButtonProps extends ButtonProps {
needPhone?: boolean;
needAssignment?: boolean;
}
const PREFIX = 'login-button';
@ -24,12 +26,50 @@ const PREFIX = 'login-button';
function LoginButton(props: ILoginButtonProps) {
const { className, children, needPhone, onClick, ...otherProps } = props;
const userInfo = useUserInfo();
const [visible, setVisible] = useState(false);
const [loginVisible, setLoginVisible] = useState(false);
const [assignVisible, setAssignVisible] = useState(false);
const needLogin = isNeedLogin(userInfo);
// 点击按钮时,协议同意也手机也授权了 -> 下一步
//
// 点击按钮时,协议同意但是手机授权没给 -> 弹登录
// -> 如果授权了手机号就进行下一步
// -> 不给授权没下一步
//
// 点击按钮时,协议不同意 -> 弹协议窗口
// -> 如果同意就进行下一步
// -> 不同意没下一步
const handleClick = useCallback(
(e: ITouchEvent) => {
if (!getAgreementSigned()) {
setAssignVisible(true);
} else if (needLogin) {
setLoginVisible(true);
} else if (onClick) {
onClick(e);
}
},
[needLogin, onClick]
);
const onSuccess = useCallback(
const handleConfirm = useCallback(
(e: ITouchEvent) => {
setAssignVisible(false);
setAgreementSigned(true);
if (onClick) {
onClick(e);
}
},
[onClick]
);
const handleCancel = useCallback(() => {
setAgreementSigned(false);
setAssignVisible(false);
}, []);
const handleLoginSuccess = useCallback(
e => {
setVisible(false);
setLoginVisible(false);
onClick?.(e);
},
[onClick]
@ -37,14 +77,18 @@ function LoginButton(props: ILoginButtonProps) {
return (
<>
<Button
{...otherProps}
className={classNames(PREFIX, className)}
onClick={needLogin ? () => setVisible(true) : onClick}
>
<Button {...otherProps} className={classNames(PREFIX, className)} onClick={handleClick}>
{children}
</Button>
{visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={onSuccess} needPhone={needPhone} />}
<AgreementPopup
open={assignVisible}
onCancel={handleCancel}
onConfirm={handleConfirm}
needBindPhone={needLogin}
/>
{loginVisible && (
<LoginDialog onCancel={() => setLoginVisible(false)} onSuccess={handleLoginSuccess} needPhone={needPhone} />
)}
</>
);
}

View File

@ -17,22 +17,4 @@
.button(@width: 360px, @height: 72px, @fontSize: 28px, @fontWeight: 400, @borderRadius: 44px);
margin-top: 40px;
}
&__cancel-button {
min-width: fit-content;
font-size: 28px;
line-height: 32px;
color: @blHighlightColor;
background: transparent;
border: none;
margin-top: 40px;
&::after {
border-color: transparent
}
}
&__checkbox {
margin-top: 40px;
}
}

View File

@ -1,11 +1,6 @@
import { Button } from '@tarojs/components';
import { Dialog } from '@taroify/core';
import { useCallback, useState } from 'react';
import PhoneButton, { IPhoneButtonProps } from '@/components/phone-button';
import { ProtocolPrivacyCheckbox } from '@/components/protocol-privacy';
import Toast from '@/utils/toast';
import './index.less';
@ -21,36 +16,20 @@ const PREFIX = 'login-dialog';
export default function LoginDialog(props: IProps) {
const { title = '使用播络服务前,请先登录', needPhone, onSuccess, onCancel, onBindPhone } = props;
const [checked, setChecked] = useState(false);
const handleTipCheck = useCallback(() => {
Toast.info('请先阅读并同意协议');
}, []);
return (
<Dialog open onClose={onCancel}>
<Dialog.Content>
<div className={`${PREFIX}__container`}>
<div className={`${PREFIX}__title`}>{title}</div>
{!checked && (
<Button className={`${PREFIX}__confirm-button`} onClick={handleTipCheck}>
</Button>
)}
{checked && (
<PhoneButton
className={`${PREFIX}__confirm-button`}
onSuccess={onSuccess}
onBindPhone={onBindPhone}
needPhone={needPhone}
>
</PhoneButton>
)}
<Button className={`${PREFIX}__cancel-button`} onClick={onCancel}>
</Button>
<ProtocolPrivacyCheckbox checked={checked} onChange={setChecked} className={`${PREFIX}__checkbox`} />
<PhoneButton
className={`${PREFIX}__confirm-button`}
onSuccess={onSuccess}
onBindPhone={onBindPhone}
needPhone={needPhone}
>
</PhoneButton>
</div>
</Dialog.Content>
</Dialog>

View File

@ -60,7 +60,9 @@ export default function PartnerBanner() {
)}
<div className={`${PREFIX}__close`} onClick={handlePartnerBannerClose} />
</div>
{visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={handleBind} needPhone={needPhone} />}
{visible && (
<LoginDialog disableCheck onCancel={() => setVisible(false)} onSuccess={handleBind} needPhone={needPhone} />
)}
</>
);
}

View File

@ -39,7 +39,9 @@ function JoinEntry({ onBindSuccess }: JoinEntryProps) {
</Button>
)}
</div>
{visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={onBindSuccess} needPhone={needPhone} />}
{visible && (
<LoginDialog disableCheck onCancel={() => setVisible(false)} onSuccess={onBindSuccess} needPhone={needPhone} />
)}
</>
);
}

View File

@ -74,7 +74,7 @@ function WithdrawDialog(props: { open: boolean; onClose: () => void; count: numb
{+props.count}
<div className="yuan"></div>
</div>
<div className={`${PREFIX}-withdraw-dialog__hint`}>500</div>
<div className={`${PREFIX}-withdraw-dialog__hint`}>200</div>
<Button className={`${PREFIX}-withdraw-dialog__confirm-button`} onClick={handleWithdraw}>
</Button>
@ -124,10 +124,14 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
setStats(data);
}, []);
const handleViewWithdraw = useCallback(() => {
if (stats.availableBalance < 10 * 1000) {
Toast.error('提现金额需大于等于10元');
if (stats.availableBalance < 0) {
Toast.info('提现金额需大于等于0元');
return;
}
// if (stats.availableBalance < 10 * 1000) {
// Toast.error('提现金额需大于等于10元');
// return;
// }
setWithdrawOpen(true);
}, [stats.availableBalance]);
const handleWithdrawClose = useCallback(() => {
@ -193,7 +197,7 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
{!simple && <TipDialog open={tipOpen} onClose={handleTipClose} />}
{!simple && (
<WithdrawDialog
count={Math.min(Number(formatMoney(stats.availableBalance)), 500)}
count={Math.min(Number(formatMoney(stats.availableBalance)), 200)}
open={withdrawOpen}
onClose={handleWithdrawClose}
/>

View File

@ -19,7 +19,7 @@ export interface IPhoneButtonProps extends ButtonProps {
message?: string;
// 绑定后是否需要刷新接口获取手机号
needPhone?: boolean;
onBindPhone?: (status: BindPhoneStatus) => void;
onBindPhone?: (status: BindPhoneStatus, e: ITouchEvent) => void;
onSuccess?: (e: ITouchEvent) => void;
}
@ -44,17 +44,17 @@ export default function PhoneButton(props: IPhoneButtonProps) {
const encryptedData = e.detail.encryptedData;
const iv = e.detail.iv;
if (!encryptedData || !iv) {
onBindPhone?.(BindPhoneStatus.Cancel);
onBindPhone?.(BindPhoneStatus.Cancel, e as ITouchEvent);
return Toast.error('取消授权');
}
try {
await setPhoneNumber({ encryptedData, iv });
needPhone && (await requestUserInfo());
Toast.success(message);
onBindPhone?.(BindPhoneStatus.Success);
onBindPhone?.(BindPhoneStatus.Success, e as ITouchEvent);
onSuccess?.(e as ITouchEvent);
} catch (err) {
onBindPhone?.(BindPhoneStatus.Error);
onBindPhone?.(BindPhoneStatus.Error, e as ITouchEvent);
Toast.error('绑定失败');
log('bind phone fail', err);
}

View File

@ -1,4 +1,4 @@
import { Button, Image, Text } from '@tarojs/components';
import { Button, Text } from '@tarojs/components';
import Taro from '@tarojs/taro';
import { Cell } from '@taroify/core';
@ -35,29 +35,36 @@ interface CityOption extends ISelectOption<CityValue> {
const PREFIX = 'user-batch-publish';
const log = logWithPrefix(PREFIX);
const SERVICE_ILLUSTRATE = `群发次数每日一次连发3天
群发内容:仅限主播招聘通告,违规内容不发
联系方法:通告中留通告主联系方式,主播直接联系`;
const SERVICE_ILLUSTRATE = `服务方式:帮您把招聘需求发到众多同城合作主播群
群发次数每日1次连发3天
内容要求:仅限带货主播招聘需求,其他不发
主播联系:内容中留招聘方联系方式,主播直接联系`;
const cityValues: CityValue[] = [
{ cityCode: '440100', cityName: '广州', count: 300 },
{ cityCode: '440100', cityName: '广州', count: 300 }, // 800
{ cityCode: '440300', cityName: '深圳', count: 100 },
{ cityCode: '330100', cityName: '杭州', count: 300 },
{ cityCode: '110100', cityName: '北京', count: 100 },
{ cityCode: '510100', cityName: '成都', count: 50 },
{ cityCode: '330100', cityName: '杭州', count: 300 }, // 750
{ cityCode: '110100', cityName: '北京', count: 100 }, // 150
{ cityCode: '510100', cityName: '成都', count: 100 },
// { cityCode: '500100', cityName: '重庆', count: 50 },
{ cityCode: '430100', cityName: '长沙', count: 50 },
{ cityCode: '350200', cityName: '厦门', count: 50 },
{ cityCode: '310100', cityName: '上海', count: 100 },
{ cityCode: '420100', cityName: '武汉', count: 50 },
{ cityCode: '610100', cityName: '西安', count: 50 },
{ cityCode: '410100', cityName: '郑州', count: 100 },
{ cityCode: '310100', cityName: '上海', count: 100 }, // 150
{ cityCode: '420100', cityName: '武汉', count: 50 }, // 80
{ cityCode: '610100', cityName: '西安', count: 50 }, // 60
{ cityCode: '410100', cityName: '郑州', count: 100 }, // 150
].sort((a, b) => b.count - a.count);
const MIN_GROUP_SIZE = 20;
const GROUP_OPTIONS = [
{ value: MIN_GROUP_SIZE, productSpecId: ProductSpecId.GroupBatchPublish20, label: '20', price: 18 },
{ value: 50, productSpecId: ProductSpecId.GroupBatchPublish50, label: '50', price: 40 },
{ value: 60, productSpecId: ProductSpecId.GroupBatchPublish60, label: '60', price: 48 },
{ value: 80, productSpecId: ProductSpecId.GroupBatchPublish80, label: '80', price: 58 },
{ value: 100, productSpecId: ProductSpecId.GroupBatchPublish100, label: '100', price: 68 },
{ value: 150, productSpecId: ProductSpecId.GroupBatchPublish150, label: '150', price: 98 },
{ value: 300, productSpecId: ProductSpecId.GroupBatchPublish300, label: '300', price: 128 },
{ value: 500, productSpecId: ProductSpecId.GroupBatchPublish500, label: '500', price: 188 },
{ value: 500, productSpecId: ProductSpecId.GroupBatchPublish500, label: '500', price: 188 }, // 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 },
];
@ -156,7 +163,7 @@ export default function UserBatchPublish() {
return (
<div className={PREFIX}>
<Image mode="widthFix" className={`${PREFIX}__header-image`} src="https://neighbourhood.cn/pubJob.png" />
{/*<Image mode="widthFix" className={`${PREFIX}__header-image`} src="https://neighbourhood.cn/pubJob.png" />*/}
<div className={`${PREFIX}__title`}></div>
<Cell isLink align="center" className={`${PREFIX}__cell`} title={city?.cityName} onClick={handleClickCity} />
<div className={`${PREFIX}__title`}></div>

View File

@ -74,6 +74,7 @@ export enum PageUrl {
PrivacyWebview = 'pages/privacy-webview/index',
Partner = 'pages/partner/index',
WithdrawRecord = 'pages/withdraw-record/index',
GroupDelegatePublish = 'pages/group-delegate-publish/index',
}
export enum PluginUrl {

View File

@ -10,4 +10,6 @@ export enum CacheKey {
LAST_SELECT_MY_JOB = '__last_select_my_job__',
CLOSE_PARTNER_BANNER = '__close_partner_banner__',
INVITE_CODE = '__invite_code__',
AGREEMENT_SIGNED = '__agreement_signed__',
CITY_CODES = '__city_codes__',
}

View File

@ -5861,6 +5861,16 @@ export const CITY_INDEXES_LIST = [
];
export const GROUP_CITY_INDEXES_LIST = [
{
letter: 'B',
data: [
{
cityCode: '110100',
cityName: '北京',
keyword: 'BEIJING北京',
},
],
},
{
letter: 'C',
data: [
@ -5874,6 +5884,11 @@ export const GROUP_CITY_INDEXES_LIST = [
cityName: '成都',
keyword: 'CHENGDOU成都',
},
{
cityCode: '430100',
cityName: '长沙',
keyword: 'CHANGSHA长沙',
},
],
},
{
@ -5914,6 +5929,11 @@ export const GROUP_CITY_INDEXES_LIST = [
{
letter: 'H',
data: [
{
cityCode: '330100',
cityName: '杭州',
keyword: 'HANGZHOU杭州',
},
{
cityCode: '340100',
cityName: '合肥',
@ -5921,6 +5941,16 @@ export const GROUP_CITY_INDEXES_LIST = [
},
],
},
{
letter: 'K',
data: [
{
cityCode: '530100',
cityName: '昆明',
keyword: 'KUNMING昆明',
},
],
},
{
letter: 'N',
data: [
@ -5939,6 +5969,11 @@ export const GROUP_CITY_INDEXES_LIST = [
cityName: '青岛',
keyword: 'QINGDAO青岛',
},
{
cityCode: '350500',
cityName: '泉州',
keyword: 'QUANZHOU泉州',
},
],
},
{
@ -5959,11 +5994,6 @@ export const GROUP_CITY_INDEXES_LIST = [
cityName: '苏州',
keyword: 'SUZHOU苏州',
},
{
cityCode: '330300',
cityName: '温州',
keyword: 'WENZHOU温州',
},
],
},
{
@ -5979,6 +6009,11 @@ export const GROUP_CITY_INDEXES_LIST = [
{
letter: 'W',
data: [
{
cityCode: '330300',
cityName: '温州',
keyword: 'WENZHOU温州',
},
{
cityCode: '420100',
cityName: '武汉',
@ -5994,6 +6029,11 @@ export const GROUP_CITY_INDEXES_LIST = [
cityName: '西安',
keyword: 'XIAN西安',
},
{
cityCode: '350200',
cityName: '厦门',
keyword: 'XIAMEN厦门',
},
],
},
{

View File

@ -32,9 +32,14 @@ export enum ProductSpecId {
NewMonthlyVIP = 'VIP_M_NEW', // 18 每天五次
GroupBatchPublish20 = 'GROUP_BATCH_PUSH_20',
GroupBatchPublish50 = 'GROUP_BATCH_PUSH_50',
GroupBatchPublish60 = 'GROUP_BATCH_PUSH_60',
GroupBatchPublish80 = 'GROUP_BATCH_PUSH_80',
GroupBatchPublish100 = 'GROUP_BATCH_PUSH_100',
GroupBatchPublish150 = 'GROUP_BATCH_PUSH_150',
GroupBatchPublish300 = 'GROUP_BATCH_PUSH_300',
GroupBatchPublish500 = 'GROUP_BATCH_PUSH_500',
GroupBatchPublish750 = 'GROUP_BATCH_PUSH_750',
GroupBatchPublish800 = 'GROUP_BATCH_PUSH_800',
GroupBatchPublish1000 = 'GROUP_BATCH_PUSH_1000',
BOSS_PUB_JOB_1 = 'BOSS_PUB_JOB_1', // 旧版企业发通告会员
BOSS_VIP_NEW_1 = 'BOSS_VIP_NEW_1', // 新版企业发通告会员 - 周

View File

@ -62,7 +62,7 @@ const getSalaryPrice = (fullSalary?: SalaryRange, partSalary?: SalaryRange) => {
function ProfileIntentionFragment(props: IProps, ref) {
const { profile } = props;
const [cityCodes, setCityCodes] = useState(calcInitCityCodes(profile.cityCodes));
const [cityCodes, setCityCodes] = useState(calcInitCityCodes(profile.cityCodes || ''));
const [employType, setEmployType] = useState(profile.employType);
const [fullSalary, setFullSalary] = useState(calcSalarySelect(profile, true));
const [partSalary, setPartSalary] = useState(calcSalarySelect(profile, false));

View File

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

View File

@ -186,7 +186,7 @@ export default function AnchorPage() {
});
useShareAppMessage(() => {
return getCommonShareMessage(true, inviteCode);
return getCommonShareMessage({ useCapture: true, inviteCode, title: '数万名优质主播等你来挑' });
});
useDidShow(() => requestUnreadMessageCount());

View File

@ -0,0 +1,3 @@
export default definePageConfig({
navigationBarTitleText: '群代发',
});

View File

@ -0,0 +1,12 @@
import UserBatchPublish from '@/components/user-batch-publish';
import './index.less';
const PREFIX = 'group-delegate-publish';
export default function Partner() {
return (
<div className={PREFIX}>
<UserBatchPublish />
</div>
);
}

View File

@ -11,6 +11,7 @@ import { getCurrentCityCode } from '@/utils/location';
import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
import { getPageQuery } from '@/utils/route';
import { getCommonShareMessage } from '@/utils/share';
import { checkCityCode } from '@/utils/user';
import './index.less';
const PREFIX = 'group-v2-page';
@ -23,9 +24,12 @@ export default function GroupV2() {
getInviteCodeFromQueryAndUpdate(query);
});
useShareAppMessage(() => getCommonShareMessage(true, inviteCode));
useShareAppMessage(() => getCommonShareMessage({ inviteCode }));
const handleSelectCity = useCallback(cityCode => {
if (!checkCityCode(cityCode)) {
return;
}
const group = GROUPS.find(g => String(g.cityCode) === cityCode);
if (group) {
openCustomerServiceChat(group.serviceUrl);

View File

@ -112,7 +112,6 @@ const AnchorFooter = (props: { data: JobDetails }) => {
}, [data]);
const handleDialogHidden = useCallback(() => setDialogVisible(false), []);
return (
<>
<div className={`${PREFIX}__footer`}>
@ -236,7 +235,7 @@ export default function JobDetail() {
useShareAppMessage(() => {
if (!data) {
return getCommonShareMessage(true, inviteCode);
return getCommonShareMessage({ inviteCode });
}
return {
title: getJobTitle(data) || '',

View File

@ -4,7 +4,6 @@ import { Tabs } from '@taroify/core';
import { useCallback, useEffect, useRef, useState } from 'react';
import HomePage from '@/components/home-page';
import LocationDialog from '@/components/location-dialog';
import { LoginGuide } from '@/components/login-guide';
import MaterialGuide from '@/components/material-guide';
import { EventName, OpenSource, PageUrl } from '@/constants/app';
@ -82,13 +81,6 @@ export default function Job() {
}
}, []);
const handleCloseAuthorize = useCallback(() => setShowAuthorize(false), []);
const handleClickAuthorize = useCallback(() => {
requestLocation(true);
setShowAuthorize(false);
}, []);
useEffect(() => {
Taro.eventCenter.on(EventName.SELECT_CITY, handleCityChange);
return () => {
@ -116,6 +108,7 @@ export default function Job() {
} else {
log('show authorize location dialog');
setShowAuthorize(true);
requestLocation(true);
}
});
@ -128,7 +121,7 @@ export default function Job() {
path: getJumpUrl(PageUrl.Job, { sortType, c: inviteCode }),
};
}
return getCommonShareMessage(true, inviteCode);
return getCommonShareMessage({ inviteCode });
});
return (
@ -154,7 +147,6 @@ export default function Job() {
))}
</Tabs>
<div>
<LocationDialog open={showAuthorize} onClose={handleCloseAuthorize} onClick={handleClickAuthorize} />
<LoginGuide disabled={showAuthorize} onAfterBind={handleAfterBindPhone} />
{showMaterialGuide && <MaterialGuide onClose={() => setShowMaterialGuide(false)} />}
</div>

View File

@ -70,7 +70,7 @@ export default function MaterialProfilePage() {
useShareAppMessage(async () => {
const shareMessage = await getMaterialShareMessage(profile, false);
return shareMessage || getCommonShareMessage(false);
return shareMessage || getCommonShareMessage({ useCapture: false });
});
if (!profile) {

View File

@ -31,7 +31,7 @@ import {
PostMessageRequest,
} from '@/types/message';
import { isAnchorMode } from '@/utils/app';
import { getScrollItemId, last, logWithPrefix, safeJsonParse } from '@/utils/common';
import { getScrollItemId, last, logWithPrefix } from '@/utils/common';
import { collectEvent } from '@/utils/event';
import {
isExchangeMessage,
@ -55,7 +55,6 @@ import Toast from '@/utils/toast';
import { getUserId } from '@/utils/user';
import './index.less';
import useUserInfo from '@/hooks/use-user-info';
const PREFIX = 'page-message-chat';
const LIST_CONTAINER_CLASS = `${PREFIX}__chat-list`;
@ -86,19 +85,8 @@ const getHeaderLeftButtonText = (job?: IJobMessage, material?: IMaterialMessage)
return isAnchorMode() ? '不感兴趣' : '标记为不合适';
};
const getResumeId = (messages: IChatMessage[], userId?: string) => {
const resumeStr = messages.find(it => it.type === MessageType.Material && it.senderUserId !== userId)?.actionObject;
if (resumeStr) {
const { id } = safeJsonParse(resumeStr);
log('resumeId', id);
return id;
}
return undefined;
};
export default function MessageChat() {
const listHeight = useListHeight(CALC_LIST_PROPS);
const { userId } = useUserInfo();
const [input, setInput] = useState('');
const [showMore, setShowMore] = useState(false);
const [chat, setChat] = useState<IChatInfo | null>(null);
@ -107,8 +95,8 @@ export default function MessageChat() {
const [messages, setMessages] = useState<IChatMessage[]>([]);
const [messageStatusList, setMessageStatusList] = useState<IMessageStatus[]>([]);
const [jobId, setJobId] = useState<string>();
const [resumeId, setResumeId] = useState<string>();
const [job, setJob] = useState<IJobMessage>();
const [resumeId, setResumeId] = useState<string | undefined>();
const [material, setMaterial] = useState<IMaterialMessage>();
const [scrollItemId, setScrollItemId] = useState<string>();
const scrollToLowerRef = useRef(false);
@ -265,14 +253,6 @@ export default function MessageChat() {
// };
// }, []);
useEffect(() => {
if (resumeId) {
return;
}
setResumeId(getResumeId(messages, userId));
}, [messages, resumeId, userId]);
useEffect(() => {
if (!chat) {
return;
@ -319,6 +299,7 @@ export default function MessageChat() {
const parseMaterial = query.material ? parseQuery<IMaterialMessage>(query.material) : null;
// log('requestChatDetail', chatDetail, parseJob, parseMaterial);
setChat(chatDetail);
setResumeId(chatDetail.participants.find(u => u.userId !== currentUserId)?.resumeId);
setJobId(query.jobId);
setMessages(chatDetail.messages);
setScrollItemId(getScrollItemId(last(chatDetail.messages)?.msgId));

View File

@ -20,7 +20,7 @@ export default function Partner() {
};
useShareAppMessage(() => {
console.log('Partner inviteCode', inviteCode);
return getCommonShareMessage(false, inviteCode);
return getCommonShareMessage({ useCapture: false, inviteCode });
});
return (

View File

@ -1,6 +1,9 @@
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';
@ -8,12 +11,13 @@ import store from '@/store';
import { changeHomePage } from '@/store/actions';
import { getRoleType, switchDefaultTab, switchRoleType } from '@/utils/app';
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 mode = getRoleType();
useLoad(() => {
switchDefaultTab();
@ -30,6 +34,15 @@ export default function Start() {
await switchTab(COMPANY_TAB_LIST[0].pagePath as PageUrl);
};
const handleCancel = () => {
setOpen(false);
setAgreementSigned(false);
};
const handleConfirm = () => {
setOpen(false);
setAgreementSigned(true);
};
return (
<div className={`${PREFIX} ${mode ? '' : 'color-bg'}`}>
{mode && (
@ -69,6 +82,7 @@ export default function Start() {
</div>
</div>
<Slogan />
<AgreementPopup open={open} onCancel={handleCancel} onConfirm={handleConfirm} />
</>
)}
</div>

View File

@ -21,6 +21,72 @@
padding-top: var(--tabs-wrap-height);
}
}
&__header-image {
width: 100%;
height: 120px;
}
&__delegate {
& {
padding: 24px;
padding-bottom: calc(120px + env(safe-area-inset-bottom));
}
&-fix {
width: 100%;
background: #f5f6fa;
padding-left: 24px;
padding-right: 24px;
position: fixed;
left: 0;
right: 0;
bottom: 110px;
box-sizing: border-box;
padding-bottom: calc(24px + env(safe-area-inset-bottom));
}
&-image {
width: 100%;
height: 298px;
}
&-card {
background: #fff;
padding: 24px;
border-radius: 24px;
&.image {
padding: 1px;
justify-content: center;
align-items: center;
display: flex;
}
}
&-h5 {
font-style: normal;
font-weight: 400;
font-size: 28px;
line-height: 32px;
color: @blColor;
padding-top: 40px;
padding-bottom: 24px;
&:first-child {
padding-top: 0;
}
}
&-body {
font-weight: 400;
font-size: 28px;
line-height: 48px;
color: @blColorG2;
&.link {
margin-top: 16px;
color: @blHighlightColor;
}
}
&-btn {
.button(@width: 100%; @height: 80px; @fontSize: 32px);
margin-top: 32px;
}
}
&__recruitment {
padding: 24px;

View File

@ -1,39 +1,85 @@
import { useShareAppMessage } from '@tarojs/taro';
import { Image } from '@tarojs/components';
import Taro, { useShareAppMessage } from '@tarojs/taro';
import { Button, Tabs } from '@taroify/core';
import { useCallback } from 'react';
import HomePage from '@/components/home-page';
import SearchCity from '@/components/search-city';
import UserBatchPublish from '@/components/user-batch-publish';
import { PageUrl } from '@/constants/app';
import { GROUPS } from '@/constants/group';
import useInviteCode from '@/hooks/use-invite-code';
import { openCustomerServiceChat } from '@/utils/common';
import { getCurrentCityCode } from '@/utils/location';
import { navigateTo } from '@/utils/route';
import { getCommonShareMessage } from '@/utils/share';
import { checkCityCode } from '@/utils/user';
import './index.less';
const PREFIX = 'page-biz-service';
const EXAMPLE_IMAGE = 'https://publiccdn.neighbourhood.com.cn/img/delegate-example.png';
const COMMENT_IMAGE = 'https://publiccdn.neighbourhood.com.cn/img/delegate-comments.png';
export default function BizService() {
const inviteCode = useInviteCode();
const handleClickDelegate = useCallback(() => {
navigateTo(PageUrl.GroupDelegatePublish);
}, []);
const handlePreview = (current: string) => {
Taro.previewImage({
current,
urls: [EXAMPLE_IMAGE, COMMENT_IMAGE],
});
};
const handleOpenService = useCallback(() => {
openCustomerServiceChat('https://work.weixin.qq.com/kfid/kfcd60708731367168d');
}, []);
const handleSelectCity = useCallback(cityCode => {
if (!checkCityCode(cityCode)) {
return;
}
const group = GROUPS.find(g => String(g.cityCode) === cityCode);
if (group) {
openCustomerServiceChat(group.serviceUrl);
}
}, []);
useShareAppMessage(() => getCommonShareMessage(true, inviteCode));
useShareAppMessage(() => getCommonShareMessage({ inviteCode }));
return (
<HomePage>
<div className={PREFIX}>
<Tabs className={`${PREFIX}__tabs`} defaultValue={0}>
<Tabs.TabPane value={0} title="主播群">
<Tabs.TabPane value={0} title="群代发">
<div className={`${PREFIX}__delegate`}>
<Image
mode="widthFix"
className={`${PREFIX}__header-image`}
src="https://publiccdn.neighbourhood.com.cn/img/pub-job.png"
/>
<div className={`${PREFIX}__delegate-h5`}></div>
<div className={`${PREFIX}__delegate-card`}>
<div className={`${PREFIX}__delegate-body`}></div>
<div className={`${PREFIX}__delegate-body`}>13</div>
<div className={`${PREFIX}__delegate-body`}></div>
<div className={`${PREFIX}__delegate-body`}></div>
</div>
<div className={`${PREFIX}__delegate-h5`}></div>
<div className={`${PREFIX}__delegate-card image`} onClick={() => handlePreview(EXAMPLE_IMAGE)}>
<Image className={`${PREFIX}__delegate-image`} src={EXAMPLE_IMAGE} mode="heightFix" />
</div>
<div className={`${PREFIX}__delegate-h5`}></div>
<div className={`${PREFIX}__delegate-card image`} onClick={() => handlePreview(COMMENT_IMAGE)}>
<Image className={`${PREFIX}__delegate-image`} src={COMMENT_IMAGE} mode="heightFix" />
</div>
<div className={`${PREFIX}__delegate-fix`}>
<Button className={`${PREFIX}__delegate-btn`} onClick={handleClickDelegate}>
</Button>
</div>
</div>
</Tabs.TabPane>
<Tabs.TabPane value={1} title="免费招">
<SearchCity
onSelectCity={handleSelectCity}
currentCity={getCurrentCityCode()}
@ -42,9 +88,6 @@ export default function BizService() {
banner="点击城市名称,进本地通告群,免费招主播"
/>
</Tabs.TabPane>
<Tabs.TabPane value={1} title="群代发">
<UserBatchPublish />
</Tabs.TabPane>
<Tabs.TabPane value={2} title="代招">
<div className={`${PREFIX}__recruitment`}>
<div className={`${PREFIX}__recruitment-card`}>

View File

@ -38,7 +38,7 @@ export default function User() {
[]
);
useShareAppMessage(() => getCommonShareMessage(false));
useShareAppMessage(() => getCommonShareMessage({ useCapture: false }));
return (
<HomePage>

View File

@ -91,7 +91,7 @@ export default function WithdrawRecords() {
refresh();
}, []);
useShareAppMessage(() => {
return getCommonShareMessage(false, inviteCode);
return getCommonShareMessage({ useCapture: false, inviteCode });
});
return (

View File

@ -43,7 +43,9 @@ export interface ILocationMessage {
longitude: number;
}
export interface IChatUser extends Pick<UserInfo, 'userId' | 'nickName'> {}
export interface IChatUser extends Pick<UserInfo, 'userId' | 'nickName'> {
resumeId: string;
}
export interface IChatMessage {
msgId: string;

View File

@ -41,6 +41,8 @@ export const switchRoleType = async (appMode?: RoleType) => {
const curMode = getRoleType();
appMode = curMode === RoleType.Anchor ? RoleType.Company : RoleType.Anchor;
}
console.log('switchRoleType', appMode);
try {
await postSwitchRoleType(appMode);
store.dispatch(changeRoleType(appMode));

View File

@ -15,11 +15,27 @@ const getRandomCount = () => {
return (seed % 300) + 500;
};
export const getCommonShareMessage = (useCapture: boolean = true, inviteCode?: string): ShareAppMessageReturn => {
console.log('share share message', getJumpUrl(PageUrl.Job, inviteCode ? { c: inviteCode } : undefined));
interface ShareAppProps {
useCapture?: boolean;
inviteCode?: string;
title?: string;
path?: PageUrl;
params?: Record<string, BL.Anything>;
}
export const getCommonShareMessage = ({
useCapture = true,
inviteCode,
title,
path,
params = {},
}: ShareAppProps = {}): ShareAppMessageReturn => {
const inviteParams = inviteCode ? { c: inviteCode } : undefined;
const sharePath = path ? getJumpUrl(path, { ...params, ...inviteParams }) : getJumpUrl(PageUrl.Job, inviteParams);
console.log('share share message', sharePath);
return {
title: `昨天新增了${getRandomCount()}条主播通告,宝子快来看看`,
path: getJumpUrl(PageUrl.Job, inviteCode ? { c: inviteCode } : undefined),
title: title || `昨天新增了${getRandomCount()}条主播通告,宝子快来看看`,
path: sharePath,
imageUrl: useCapture ? undefined : imageUrl,
};
};

View File

@ -148,3 +148,23 @@ export async function followGroup(blGroupId: FollowGroupRequest['blGroupId']) {
return false;
}
}
export const getAgreementSigned = (): boolean | '' => Taro.getStorageSync(CacheKey.AGREEMENT_SIGNED);
export const setAgreementSigned = (signed: boolean) => Taro.setStorageSync(CacheKey.AGREEMENT_SIGNED, signed);
export const getCityCodes = (): string[] => {
const cachedValue = Taro.getStorageSync(CacheKey.CITY_CODES);
return !cachedValue || !Array.isArray(cachedValue) ? [] : cachedValue;
};
export const setCityCodes = (cityCode: string[]) => Taro.setStorageSync(CacheKey.CITY_CODES, cityCode);
export const checkCityCode = (cityCode: string): boolean => {
const cachedCityCodes = getCityCodes();
const isNewCityCode = cachedCityCodes.indexOf(cityCode) === -1;
if (cachedCityCodes.length === 2 && isNewCityCode) {
Toast.info('最多只能进入2个城市');
return false;
}
if (isNewCityCode) {
setCityCodes([...cachedCityCodes, cityCode]);
}
return true;
};