Compare commits
4 Commits
365f3f6dd6
...
feat/3.7/i
| Author | SHA1 | Date | |
|---|---|---|---|
| 34e8a775e4 | |||
| c586e4b227 | |||
| 23879fe88d | |||
| 14853bcda2 |
24
src/app.tsx
24
src/app.tsx
@ -15,6 +15,29 @@ import { requestUserInfo, updateLastLoginTime } from '@/utils/user';
|
||||
import './app.less';
|
||||
|
||||
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 }) => {
|
||||
console.log('App launched.');
|
||||
await http.init(getInviteCodeFromQuery(query));
|
||||
@ -30,6 +53,7 @@ function App({ children }: PropsWithChildren<BL.Anything>) {
|
||||
});
|
||||
|
||||
useDidShow(options => {
|
||||
checkBasicUpdate();
|
||||
requestCityConfigs();
|
||||
|
||||
console.log(options);
|
||||
|
||||
@ -45,7 +45,7 @@ const GET_CONTACT_TYPE_OPTIONS = [
|
||||
{
|
||||
type: GET_CONTACT_TYPE.INVITE,
|
||||
icon: 'https://publiccdn.neighbourhood.com.cn/img/invite-operations.png',
|
||||
title: '邀请运营进群(进会员)',
|
||||
title: '邀请运营进群(送会员)',
|
||||
desc: '每邀请进一个主播群送一个日会员',
|
||||
btnText: '邀请',
|
||||
},
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
@import '@/styles/variables.less';
|
||||
|
||||
.product-dialog {
|
||||
|
||||
.layout() {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@ -31,7 +30,7 @@
|
||||
font-weight: 500;
|
||||
line-height: 72px;
|
||||
border-radius: 44px;
|
||||
color: #FFFFFF;
|
||||
color: #ffffff;
|
||||
background: @blHighlightColor;
|
||||
margin-top: 40px;
|
||||
}
|
||||
@ -42,7 +41,7 @@
|
||||
font-size: 24px;
|
||||
line-height: 48px;
|
||||
color: @blHighlightColor;
|
||||
background: #6D3DF514;
|
||||
background: #6d3df514;
|
||||
border-radius: 8px;
|
||||
padding: 32px 72px;
|
||||
margin-top: 40px;
|
||||
@ -73,7 +72,7 @@
|
||||
|
||||
&__describe {
|
||||
.describe-font();
|
||||
margin-top: 24px
|
||||
margin-top: 24px;
|
||||
}
|
||||
|
||||
&__content {
|
||||
@ -173,8 +172,8 @@
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
border-color: #E0E0E0;
|
||||
background: #F7F7F7;
|
||||
border-color: #e0e0e0;
|
||||
background: #f7f7f7;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
@ -237,9 +236,7 @@
|
||||
color: @blHighlightColor;
|
||||
display: inline;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// ============================================= 群 ================================================= //
|
||||
@ -323,7 +320,7 @@
|
||||
line-height: 36px;
|
||||
text-align: center;
|
||||
border-radius: 50%;
|
||||
border: 2px solid #E0E0E0;
|
||||
border: 2px solid #e0e0e0;
|
||||
}
|
||||
|
||||
&__qr-code__step-title {
|
||||
@ -338,7 +335,7 @@
|
||||
position: relative;
|
||||
width: 2px;
|
||||
height: 40px;
|
||||
background: #E0E0E0;
|
||||
background: #e0e0e0;
|
||||
margin: 4px 0;
|
||||
margin-left: 18px;
|
||||
}
|
||||
@ -365,7 +362,7 @@
|
||||
.divider {
|
||||
width: 540px;
|
||||
height: 1px;
|
||||
background: #E0E0E0;
|
||||
background: #e0e0e0;
|
||||
margin: 40px 0;
|
||||
}
|
||||
|
||||
@ -417,7 +414,7 @@
|
||||
margin-top: 40px;
|
||||
|
||||
.highlight {
|
||||
color: @blHighlightColor
|
||||
color: @blHighlightColor;
|
||||
}
|
||||
}
|
||||
|
||||
@ -523,7 +520,6 @@
|
||||
.button();
|
||||
}
|
||||
|
||||
|
||||
// ============================================= 发布通告的企业会员 ================================================= //
|
||||
&__publish-job-buy__header {
|
||||
.header-font();
|
||||
@ -576,21 +572,21 @@
|
||||
|
||||
&__item {
|
||||
position: relative;
|
||||
width: 230px;
|
||||
width: 182px;
|
||||
height: 156px;
|
||||
.flex-column();
|
||||
justify-content: center;
|
||||
border: 2px solid @blHighlightColor;
|
||||
border-radius: 8px;
|
||||
margin-right: 24px;
|
||||
margin-right: 15px;
|
||||
|
||||
&:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
border-color: #E0E0E0;
|
||||
background: #F7F7F7;
|
||||
border-color: #e0e0e0;
|
||||
background: #f7f7f7;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
@ -635,11 +631,11 @@
|
||||
}
|
||||
|
||||
&__left-line {
|
||||
background: linear-gradient(270deg, #E0E0E0 0%, #FFFFFF 100%);
|
||||
background: linear-gradient(270deg, #e0e0e0 0%, #ffffff 100%);
|
||||
}
|
||||
|
||||
&__right-line {
|
||||
background: linear-gradient(90deg, #E0E0E0 0%, #FFFFFF 100%);
|
||||
background: linear-gradient(90deg, #e0e0e0 0%, #ffffff 100%);
|
||||
}
|
||||
|
||||
&__title {
|
||||
@ -680,5 +676,4 @@
|
||||
margin-top: 32px;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -9,10 +9,10 @@ import { PREFIX } from '@/components/product-dialog/const';
|
||||
import { CollectEventName, ReportEventId } from '@/constants/event';
|
||||
import { OrderStatus, OrderType, ProductSpecId, ProductType } from '@/constants/product';
|
||||
import { SubscribeTempId } from '@/constants/subscribe';
|
||||
import { ProductSpecResult } from '@/types/product';
|
||||
import { logWithPrefix } from '@/utils/common';
|
||||
import { collectEvent, reportEvent } from '@/utils/event';
|
||||
import {
|
||||
getOrderPrice,
|
||||
isCancelPay,
|
||||
requestCreatePayInfo,
|
||||
requestOrderInfo,
|
||||
@ -21,7 +21,6 @@ import {
|
||||
} from '@/utils/product';
|
||||
import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
|
||||
import Toast from '@/utils/toast';
|
||||
import { ProductSpecResult } from '@/types/product';
|
||||
|
||||
interface IProps {
|
||||
onNext: () => void;
|
||||
@ -161,7 +160,7 @@ export default function CompanyPublishJobBuy(props: IProps) {
|
||||
<div
|
||||
key={item.payPrice}
|
||||
className={classNames(`${PREFIX}__company-publish-job-buy__item`, {
|
||||
selected: selectItem && item.payPrice === selectItem.payPrice,
|
||||
selected: selectItem && item.id === selectItem.id,
|
||||
disabled: item.payPrice === 0,
|
||||
})}
|
||||
onClick={item.payPrice === 0 ? undefined : () => handleClickItem(item)}
|
||||
|
||||
@ -167,9 +167,9 @@ export default function JobBuy(props: IProps) {
|
||||
{productList.map(item => {
|
||||
return (
|
||||
<div
|
||||
key={item.payPrice}
|
||||
key={item.id}
|
||||
className={classNames(`${PREFIX}__job-buy__item`, {
|
||||
selected: selectItem && item.payPrice === selectItem.payPrice,
|
||||
selected: selectItem && item.id === selectItem.id,
|
||||
disabled: item.payPrice === 0,
|
||||
})}
|
||||
onClick={item.payPrice === 0 ? undefined : () => handleClickItem(item)}
|
||||
|
||||
@ -17,4 +17,25 @@
|
||||
border-radius: 16px;
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
import { Image } from '@tarojs/components';
|
||||
|
||||
import { Cell } from '@taroify/core';
|
||||
import { GoodJob } from '@taroify/icons';
|
||||
import { useCallback } from 'react';
|
||||
|
||||
import MaterialCard from '@/components/material-card';
|
||||
@ -34,7 +35,15 @@ export default function AnchorFragment() {
|
||||
<Cell
|
||||
isLink
|
||||
align="center"
|
||||
title="免费领主播会员"
|
||||
title={
|
||||
<div className={`${PREFIX}__recommend-cell`}>
|
||||
免费领主播会员
|
||||
<div className={`${PREFIX}__recommend`}>
|
||||
<GoodJob />
|
||||
强烈推荐
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
className={`${PREFIX}__cell`}
|
||||
onClick={handleClickInviteOperations}
|
||||
/>
|
||||
|
||||
@ -40,8 +40,8 @@ export const usePublishJob = (jobId?: string): [boolean, Dispatch<SetStateAction
|
||||
Taro.hideLoading();
|
||||
const e = error as HttpError;
|
||||
const errorCode = e.errorCode;
|
||||
const errorMsg = e.info?.() || e.message;
|
||||
collectEvent(CollectEventName.PUBLISH_OPEN_JOB_FAILED, { jobId, error: e.info?.() || e.message });
|
||||
const errorMsg = e.errorMsg || e.info?.() || e.message;
|
||||
collectEvent(CollectEventName.PUBLISH_OPEN_JOB_FAILED, { jobId, error: errorMsg });
|
||||
if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_FREE_BALANCE) {
|
||||
setShowBuy(true);
|
||||
} 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) {
|
||||
Toast.info('该通告已到期,请创建新通告', 3000);
|
||||
} else {
|
||||
Toast.error(errorMsg || '发布失败请重试', 3000);
|
||||
Toast.info(errorMsg || '发布失败请重试', 3000);
|
||||
}
|
||||
console.error(e);
|
||||
}
|
||||
|
||||
@ -27,6 +27,7 @@ export enum RESPONSE_ERROR_CODE {
|
||||
INSUFFICIENT_FREE_BALANCE = 'INSUFFICIENT_FREE_BALANCE', // 免费查看次数(未购买会员)超限
|
||||
BOSS_VIP_EXPIRED = 'BOSS_VIP_EXPIRED', // 会员过期
|
||||
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 } = {
|
||||
|
||||
@ -30,7 +30,7 @@ import { dispatchUpdateUser, requestUserInfo } from '@/utils/user';
|
||||
import { uploadVideo } from '@/utils/video';
|
||||
|
||||
import './index.less';
|
||||
|
||||
import { RESPONSE_ERROR_CODE } from '@/http/constant';
|
||||
|
||||
const PREFIX = 'page-certification';
|
||||
const log = logWithPrefix(PREFIX);
|
||||
@ -158,8 +158,13 @@ export default function Certification() {
|
||||
Taro.eventCenter.trigger(EventName.COMPANY_JOB_PUBLISH_CHANGED);
|
||||
redirectTo(PageUrl.CertificationManage);
|
||||
} catch (e) {
|
||||
console.error('submit error', e);
|
||||
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);
|
||||
redirectTo(PageUrl.CertificationManage);
|
||||
} finally {
|
||||
|
||||
@ -2,7 +2,7 @@ import { Button, Image } from '@tarojs/components';
|
||||
import Taro from '@tarojs/taro';
|
||||
|
||||
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 { CITY_CODE_TO_NAME_MAP } from '@/constants/city';
|
||||
@ -19,7 +19,7 @@ const PREFIX = 'invite-operations';
|
||||
export default function InviteOperations() {
|
||||
const location = useLocation();
|
||||
const userInfo = useUserInfo();
|
||||
const [cityCode, setCityCode] = useState<string>(location.cityCode);
|
||||
const [cityCode, setCityCode] = useState<string>();
|
||||
const [staffInfo, setStaffInfo] = useState<StaffInfo | null>(null);
|
||||
|
||||
const handleClickCityMenu = useCallback(() => {
|
||||
@ -36,7 +36,7 @@ export default function InviteOperations() {
|
||||
}, []);
|
||||
|
||||
const handleCopy = useCallback(() => {
|
||||
copy(`我的ID是:${userInfo.userId},邀你进主播群`);
|
||||
copy(`我的播络ID是:${userInfo.userId},邀你进群`);
|
||||
}, [userInfo.userId]);
|
||||
|
||||
useEffect(() => {
|
||||
@ -46,6 +46,15 @@ export default function InviteOperations() {
|
||||
};
|
||||
}, [handleCityChange]);
|
||||
|
||||
const useCopyRef = useRef(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (!userInfo.userId) return;
|
||||
if (useCopyRef.current) return;
|
||||
handleCopy();
|
||||
useCopyRef.current = true;
|
||||
}, [handleCopy, userInfo.userId]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!cityCode) return;
|
||||
|
||||
@ -83,7 +92,7 @@ export default function InviteOperations() {
|
||||
加运营为好友并将以下信息 <div className="highlight">粘贴发送给运营</div>
|
||||
</div>
|
||||
<div className={`${PREFIX}__action-block`}>
|
||||
<div>我的ID是:{userInfo.userId},邀你进主播群</div>
|
||||
<div>我的播络ID是:{userInfo.userId},邀你进群</div>
|
||||
<Button className={`${PREFIX}__copy`} onClick={handleCopy}>
|
||||
复制
|
||||
</Button>
|
||||
|
||||
@ -41,6 +41,7 @@ import { getPageQuery, navigateBack, navigateTo } from '@/utils/route';
|
||||
import Toast from '@/utils/toast';
|
||||
|
||||
import './index.less';
|
||||
import { RESPONSE_ERROR_CODE } from '@/http/constant';
|
||||
|
||||
const PREFIX = 'page-job-publish';
|
||||
const log = logWithPrefix(PREFIX);
|
||||
@ -237,8 +238,13 @@ export default function JobPublish() {
|
||||
navigateBack();
|
||||
} catch (e) {
|
||||
createdJobIdRef.current = '';
|
||||
console.error('submit error', e);
|
||||
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);
|
||||
} finally {
|
||||
Taro.hideLoading();
|
||||
@ -253,8 +259,13 @@ export default function JobPublish() {
|
||||
await Toast.success('发布成功', 1500, true);
|
||||
navigateBack();
|
||||
} catch (e) {
|
||||
console.error('submit error', e);
|
||||
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);
|
||||
} finally {
|
||||
Taro.hideLoading();
|
||||
|
||||
@ -21,7 +21,24 @@
|
||||
}
|
||||
|
||||
&__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 {
|
||||
@ -29,7 +46,7 @@
|
||||
left: 24px;
|
||||
right: 24px;
|
||||
bottom: 0;
|
||||
background: #F5F6FA;
|
||||
background: #f5f6fa;
|
||||
}
|
||||
|
||||
&__submit-btn {
|
||||
|
||||
@ -181,6 +181,7 @@ export default function MaterialUploadVideo() {
|
||||
<div className={`${PREFIX}__header-tips`}>录屏是企业最关注的资料,建议提供多个风格和品类</div>
|
||||
</div>
|
||||
<div className={`${PREFIX}__video-list`}>
|
||||
<div className={`${PREFIX}__hint`}>注:请勿乱传,也不要上传简历,会被封号</div>
|
||||
{videoList.map(video => (
|
||||
<MaterialVideoCard
|
||||
key={video.coverUrl}
|
||||
|
||||
@ -141,7 +141,13 @@ export default function MaterialViewPage() {
|
||||
await postPublishJob(jobId!);
|
||||
await handleClickContact();
|
||||
} catch (e) {
|
||||
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);
|
||||
}
|
||||
}, [handleClickContact, jobId]);
|
||||
|
||||
@ -114,6 +114,7 @@ export interface GetOrderInfoRequest {
|
||||
}
|
||||
|
||||
export interface ProductSpecResult {
|
||||
id: string;
|
||||
productId: string;
|
||||
productSpecId: ProductSpecId;
|
||||
productType: ProductType;
|
||||
|
||||
Reference in New Issue
Block a user