4 Commits

Author SHA1 Message Date
34e8a775e4 feat 2026-01-05 00:22:42 +08:00
c586e4b227 feat: 2025-12-29 23:49:51 +08:00
23879fe88d feat: 2025-12-27 16:26:53 +08:00
14853bcda2 feat: 2025-12-27 16:21:33 +08:00
16 changed files with 145 additions and 46 deletions

View File

@ -15,6 +15,29 @@ import { requestUserInfo, updateLastLoginTime } from '@/utils/user';
import './app.less'; import './app.less';
function App({ children }: PropsWithChildren<BL.Anything>) { function App({ children }: PropsWithChildren<BL.Anything>) {
const checkBasicUpdate = () => {
if (process.env.TARO_ENV !== 'weapp' || !Taro.canIUse('getUpdateManager')) {
return;
}
const manager = Taro.getUpdateManager();
manager.onCheckForUpdate(res => {
console.log('onCheckForUpdate', res);
});
// 新版本下载完成
manager.onUpdateReady(() => {
Taro.showModal({
title: '更新提示',
content: '新版本已经准备好,是否重启应用?',
success: function (res) {
if (res.confirm) {
// 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
manager.applyUpdate();
}
},
});
});
};
useLaunch(async ({ query }) => { useLaunch(async ({ query }) => {
console.log('App launched.'); console.log('App launched.');
await http.init(getInviteCodeFromQuery(query)); await http.init(getInviteCodeFromQuery(query));
@ -30,6 +53,7 @@ function App({ children }: PropsWithChildren<BL.Anything>) {
}); });
useDidShow(options => { useDidShow(options => {
checkBasicUpdate();
requestCityConfigs(); requestCityConfigs();
console.log(options); console.log(options);

View File

@ -45,7 +45,7 @@ const GET_CONTACT_TYPE_OPTIONS = [
{ {
type: GET_CONTACT_TYPE.INVITE, type: GET_CONTACT_TYPE.INVITE,
icon: 'https://publiccdn.neighbourhood.com.cn/img/invite-operations.png', icon: 'https://publiccdn.neighbourhood.com.cn/img/invite-operations.png',
title: '邀请运营进群(会员)', title: '邀请运营进群(会员)',
desc: '每邀请进一个主播群送一个日会员', desc: '每邀请进一个主播群送一个日会员',
btnText: '邀请', btnText: '邀请',
}, },

View File

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

View File

@ -9,10 +9,10 @@ import { PREFIX } from '@/components/product-dialog/const';
import { CollectEventName, ReportEventId } from '@/constants/event'; import { CollectEventName, ReportEventId } from '@/constants/event';
import { OrderStatus, OrderType, ProductSpecId, ProductType } from '@/constants/product'; import { OrderStatus, OrderType, ProductSpecId, ProductType } from '@/constants/product';
import { SubscribeTempId } from '@/constants/subscribe'; import { SubscribeTempId } from '@/constants/subscribe';
import { ProductSpecResult } from '@/types/product';
import { logWithPrefix } from '@/utils/common'; import { logWithPrefix } from '@/utils/common';
import { collectEvent, reportEvent } from '@/utils/event'; import { collectEvent, reportEvent } from '@/utils/event';
import { import {
getOrderPrice,
isCancelPay, isCancelPay,
requestCreatePayInfo, requestCreatePayInfo,
requestOrderInfo, requestOrderInfo,
@ -21,7 +21,6 @@ import {
} from '@/utils/product'; } from '@/utils/product';
import { postSubscribe, subscribeMessage } from '@/utils/subscribe'; import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
import Toast from '@/utils/toast'; import Toast from '@/utils/toast';
import { ProductSpecResult } from '@/types/product';
interface IProps { interface IProps {
onNext: () => void; onNext: () => void;
@ -161,7 +160,7 @@ export default function CompanyPublishJobBuy(props: IProps) {
<div <div
key={item.payPrice} key={item.payPrice}
className={classNames(`${PREFIX}__company-publish-job-buy__item`, { className={classNames(`${PREFIX}__company-publish-job-buy__item`, {
selected: selectItem && item.payPrice === selectItem.payPrice, selected: selectItem && item.id === selectItem.id,
disabled: item.payPrice === 0, disabled: item.payPrice === 0,
})} })}
onClick={item.payPrice === 0 ? undefined : () => handleClickItem(item)} onClick={item.payPrice === 0 ? undefined : () => handleClickItem(item)}

View File

@ -167,9 +167,9 @@ export default function JobBuy(props: IProps) {
{productList.map(item => { {productList.map(item => {
return ( return (
<div <div
key={item.payPrice} key={item.id}
className={classNames(`${PREFIX}__job-buy__item`, { className={classNames(`${PREFIX}__job-buy__item`, {
selected: selectItem && item.payPrice === selectItem.payPrice, selected: selectItem && item.id === selectItem.id,
disabled: item.payPrice === 0, disabled: item.payPrice === 0,
})} })}
onClick={item.payPrice === 0 ? undefined : () => handleClickItem(item)} onClick={item.payPrice === 0 ? undefined : () => handleClickItem(item)}

View File

@ -17,4 +17,25 @@
border-radius: 16px; border-radius: 16px;
margin-top: 24px; margin-top: 24px;
} }
&__recommend {
display: inline-flex;
line-height: 36px;
padding: 0 8px;
height: 36px;
background: rgb(255, 80, 81);
border-radius: 4px;
font-size: 24px;
color: #fff;
align-items: center;
gap: 6px;
position: absolute;
left: 208px;
top: 8px;
width: 128px;
&-cell {
position: relative;
}
}
} }

View File

@ -1,6 +1,7 @@
import { Image } from '@tarojs/components'; import { Image } from '@tarojs/components';
import { Cell } from '@taroify/core'; import { Cell } from '@taroify/core';
import { GoodJob } from '@taroify/icons';
import { useCallback } from 'react'; import { useCallback } from 'react';
import MaterialCard from '@/components/material-card'; import MaterialCard from '@/components/material-card';
@ -34,7 +35,15 @@ export default function AnchorFragment() {
<Cell <Cell
isLink isLink
align="center" align="center"
title="免费领主播会员" title={
<div className={`${PREFIX}__recommend-cell`}>
<div className={`${PREFIX}__recommend`}>
<GoodJob />
</div>
</div>
}
className={`${PREFIX}__cell`} className={`${PREFIX}__cell`}
onClick={handleClickInviteOperations} onClick={handleClickInviteOperations}
/> />

View File

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

View File

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

View File

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

View File

@ -2,7 +2,7 @@ import { Button, Image } from '@tarojs/components';
import Taro from '@tarojs/taro'; import Taro from '@tarojs/taro';
import { Arrow } from '@taroify/icons'; import { Arrow } from '@taroify/icons';
import { Fragment, useCallback, useEffect, useState } from 'react'; import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
import { EventName, OpenSource, PageUrl } from '@/constants/app'; import { EventName, OpenSource, PageUrl } from '@/constants/app';
import { CITY_CODE_TO_NAME_MAP } from '@/constants/city'; import { CITY_CODE_TO_NAME_MAP } from '@/constants/city';
@ -19,7 +19,7 @@ const PREFIX = 'invite-operations';
export default function InviteOperations() { export default function InviteOperations() {
const location = useLocation(); const location = useLocation();
const userInfo = useUserInfo(); const userInfo = useUserInfo();
const [cityCode, setCityCode] = useState<string>(location.cityCode); const [cityCode, setCityCode] = useState<string>();
const [staffInfo, setStaffInfo] = useState<StaffInfo | null>(null); const [staffInfo, setStaffInfo] = useState<StaffInfo | null>(null);
const handleClickCityMenu = useCallback(() => { const handleClickCityMenu = useCallback(() => {
@ -36,7 +36,7 @@ export default function InviteOperations() {
}, []); }, []);
const handleCopy = useCallback(() => { const handleCopy = useCallback(() => {
copy(`我的ID是${userInfo.userId},邀你进主播`); copy(`我的播络ID是${userInfo.userId},邀你进群`);
}, [userInfo.userId]); }, [userInfo.userId]);
useEffect(() => { useEffect(() => {
@ -46,6 +46,15 @@ export default function InviteOperations() {
}; };
}, [handleCityChange]); }, [handleCityChange]);
const useCopyRef = useRef(false);
useEffect(() => {
if (!userInfo.userId) return;
if (useCopyRef.current) return;
handleCopy();
useCopyRef.current = true;
}, [handleCopy, userInfo.userId]);
useEffect(() => { useEffect(() => {
if (!cityCode) return; if (!cityCode) return;
@ -83,7 +92,7 @@ export default function InviteOperations() {
<div className="highlight"></div> <div className="highlight"></div>
</div> </div>
<div className={`${PREFIX}__action-block`}> <div className={`${PREFIX}__action-block`}>
<div>ID是{userInfo.userId}</div> <div>ID是{userInfo.userId}</div>
<Button className={`${PREFIX}__copy`} onClick={handleCopy}> <Button className={`${PREFIX}__copy`} onClick={handleCopy}>
</Button> </Button>

View File

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

View File

@ -21,7 +21,24 @@
} }
&__video-list { &__video-list {
margin-top: 16px; margin-top: 25px;
}
&__hint {
line-height: 64px;
height: 64px;
background: #fff4f0;
border-radius: 24px 24px 0px 0px;
padding: 0 24px;
font-weight: 400;
font-size: 26px;
color: #946724;
+ .material-video-card {
margin-top: 0;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
} }
&__footer { &__footer {
@ -29,7 +46,7 @@
left: 24px; left: 24px;
right: 24px; right: 24px;
bottom: 0; bottom: 0;
background: #F5F6FA; background: #f5f6fa;
} }
&__submit-btn { &__submit-btn {

View File

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

View File

@ -141,7 +141,13 @@ export default function MaterialViewPage() {
await postPublishJob(jobId!); await postPublishJob(jobId!);
await handleClickContact(); await handleClickContact();
} catch (e) { } catch (e) {
Toast.error('通告发布失败'); console.error('submit error', e.errorCode, e.errorMsg);
console.dir(e);
if (e.errorCode === RESPONSE_ERROR_CODE.JOB_EXIST_ONE_PUBLISHED) {
Toast.info(e.errorMsg || e.errorCode, 3000);
} else {
Toast.error('通告发布失败');
}
collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e); collectEvent(CollectEventName.PUBLISH_JOB_FAILED, e);
} }
}, [handleClickContact, jobId]); }, [handleClickContact, jobId]);

View File

@ -114,6 +114,7 @@ export interface GetOrderInfoRequest {
} }
export interface ProductSpecResult { export interface ProductSpecResult {
id: string;
productId: string; productId: string;
productSpecId: ProductSpecId; productSpecId: ProductSpecId;
productType: ProductType; productType: ProductType;