3 Commits

Author SHA1 Message Date
fde2027588 feat: 2025-10-26 22:23:14 +08:00
a179654898 feat: update 2025-10-20 07:58:50 +08:00
bc141fcf1b feat: share ticket 2025-10-15 20:46:42 +08:00
43 changed files with 783 additions and 292 deletions

View File

@ -12,4 +12,9 @@ page {
.taroify-tabs__wrap__scroll {
.base-bg();
}
}
}
@font-face {
font-family: 'Alimama ShuHeiTi';
src: url('https://publiccdn.neighbourhood.com.cn/font/almmheiti.ttf');
}

View File

@ -6,7 +6,7 @@ import { Provider } from 'react-redux';
import { REFRESH_UNREAD_COUNT_TIME } from '@/constants/message';
import http from '@/http';
import store from '@/store';
import { requestServiceUrls } from '@/utils/location';
import { requestCityOperators } from '@/utils/location';
import { requestUnreadMessageCount } from '@/utils/message';
import { decryptOpenGid, getInviteCode, getInviteCodeFromQuery } from '@/utils/partner';
import qiniuUpload from '@/utils/qiniu-upload';
@ -30,28 +30,30 @@ function App({ children }: PropsWithChildren<BL.Anything>) {
});
useDidShow(options => {
requestServiceUrls();
requestCityOperators();
console.log(options);
Taro.getGroupEnterInfo()
.then(info => {
const inviteCode = getInviteCodeFromQuery(options?.query || {});
const authCode = options?.query?.authCode;
decryptOpenGid({
inviteCode,
authCode,
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
iv: info.iv,
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
encryptedData: info.encryptedData,
const inviteCode = getInviteCodeFromQuery(options?.query || {});
const authCode = options?.query?.authCode;
if (inviteCode || authCode) {
Taro.getGroupEnterInfo()
.then(info => {
decryptOpenGid({
inviteCode,
authCode,
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
iv: info.iv,
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
encryptedData: info.encryptedData,
});
console.log('哈哈哈', info);
})
.catch(() => {
console.log('没有解析到群', options?.scene);
});
console.log('哈哈哈', info);
})
.catch(() => {
console.log('没有解析到群', options?.scene);
});
}
});
return <Provider store={store}>{children}</Provider>;

View File

@ -5,10 +5,16 @@
&__banner {
font-weight: 400;
font-size: 24px;
height: 72px;
height: 74px;
padding: 32px 32px 25px;
line-height: 36px;
color: #999999;
background: #F5F6FA;
position: fixed;
z-index: 1;
top: 99px;
left: 0;
right: 0;
}
&__title {
height: 72px;

View File

@ -7,7 +7,7 @@ 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 useServiceUrls from '@/hooks/use-service-urls';
import useCityOperators from '@/hooks/use-city-operators';
import { getRoleTypeWithDefault } from '@/utils/app';
import { openCustomerServiceChat } from '@/utils/common';
import { getCurrentCityCode } from '@/utils/location';
@ -24,14 +24,14 @@ const DEFAULT_GROUP = {
export function JoinGroupHint() {
const cityCode = getCurrentCityCode();
const roleType = getRoleTypeWithDefault();
const serviceUrls = useServiceUrls();
const group = serviceUrls.find(g => String(g.cityCode) === cityCode);
const cityOperators = useCityOperators();
const group = cityOperators.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);
openCustomerServiceChat(group ? group.groupLink : DEFAULT_GROUP.serviceUrl);
Taro.setStorageSync(CacheKey.JOIN_GROUP_CARD_CLICKED, true);
setClicked(true);
}, [cityCode, group]);

View File

@ -18,7 +18,7 @@ export default function LoginDialog(props: IProps) {
const { title = '使用播络服务前,请先登录', needPhone, onSuccess, onCancel, onBindPhone } = props;
return (
<Dialog open onClose={onCancel}>
<Dialog open onClose={onCancel} className={PREFIX}>
<Dialog.Content>
<div className={`${PREFIX}__container`}>
<div className={`${PREFIX}__title`}>{title}</div>

View File

@ -12,7 +12,7 @@ import './index.less';
const PREFIX = 'partner-fragment-banner';
export default function PartnerBanner() {
export default function PartnerBanner({ isBoss = false }) {
const userInfo = useUserInfo();
const needPhone = isNeedPhone(userInfo);
const isPartner = userInfo.isPartner;
@ -50,7 +50,11 @@ export default function PartnerBanner() {
<div className={PREFIX} onClick={handleClick}>
<Image
className={`${PREFIX}__image`}
src="https://publiccdn.neighbourhood.com.cn/img/partner_banner.png"
src={
isBoss
? 'https://publiccdn.neighbourhood.com.cn/img/partner_banner.png'
: 'https://publiccdn.neighbourhood.com.cn/img/partner-banner-boss.png'
}
mode="scaleToFill"
/>
{needPhone && (
@ -60,9 +64,7 @@ export default function PartnerBanner() {
)}
<div className={`${PREFIX}__close`} onClick={handlePartnerBannerClose} />
</div>
{visible && (
<LoginDialog onCancel={() => setVisible(false)} onSuccess={handleBind} needPhone={needPhone} />
)}
{visible && <LoginDialog onCancel={() => setVisible(false)} onSuccess={handleBind} needPhone={needPhone} />}
</>
);
}

View File

@ -2,26 +2,53 @@
@import '@/styles/common.less';
.partner-intro {
padding-top: 112px;
padding-bottom: calc(112px + constant(safe-area-inset-bottom));
padding-bottom: calc(112px + env(safe-area-inset-bottom));
background: #eae5fb;
padding-top: 271px;
position: relative;
padding-bottom: calc(142px + constant(safe-area-inset-bottom));
padding-bottom: calc(142px + env(safe-area-inset-bottom));
&__banner {
background: rgb(229, 225, 248);
height: 88px;
line-height: 88px;
text-align: center;
font-size: 28px;
position: fixed;
top: 98px;
&__bg {
width: 100%;
height: 705px;
position: absolute;
top: 0;
left: 0;
right: 0;
width: 100vw;
}
&__slogan {
top: 66px;
left: 44px;
position: absolute;
font-family: 'Alimama ShuHeiTi';
font-style: normal;
font-weight: 700;
font-size: 44px;
line-height: 62px;
color: #333333;
> div {
margin-bottom: 12px;
}
&-highlight {
display: inline-block;
padding-left: 12px;
padding-right: 9px;
font-size: 64px;
line-height: 62px;
background: linear-gradient(87.53deg, #683DE3 0.4%, #39227D 84.55%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
text-fill-color: transparent;
}
}
&__main {
padding-left: 24px;
padding-right: 24px;
position: relative;
z-index: 1;
}
&__highlight {
@ -34,15 +61,17 @@
}
&__block {
margin-bottom: 40px;
margin-bottom: 12px;
position: relative;
}
&__swiper {
margin-bottom: 48px;
&-wrapper {
margin-bottom: 8px;
background: #fff;
border-radius: 24px;
position: relative;
border: 1px solid #6d3df5;
}
&-bg {
@ -54,12 +83,11 @@
}
}
&__swiper-item {
box-sizing: border-box;
height: 130px;
padding: 24px 32px;
&-item {
&-time {
font-style: normal;
font-size: 28px;
line-height: 40px;
@ -69,6 +97,7 @@
}
&-details {
margin-top: 5px;
white-space: nowrap;
}
&-id {
font-size: 24px;
@ -98,7 +127,7 @@
&__card {
background: #fff;
border-radius: 24px;
padding: 24px 32px;
padding: 68px 32px 44px;
}
&__h1 {
@ -108,10 +137,30 @@
color: #1d2129;
margin-bottom: 16px;
margin-top: 32px;
position: relative;
z-index: 0;
&.no-dot {
&:after {
background: transparent;
}
}
&:first-child {
margin-top: 0;
}
&:after {
content: '';
width: 28px;
height: 28px;
background: #ffd236;
border-radius: 50%;
position: absolute;
left: -6px;
top: -3px;
z-index: -1;
}
}
&__body {
@ -130,12 +179,19 @@
}
&__title {
margin-bottom: 24px;
margin-left: 48px;
margin-right: 48px;
font-weight: 500;
font-size: 32px;
line-height: 32px;
line-height: 80px;
height: 80px;
transform: translateY(50%);
background: #ffd236;
box-shadow: 0px 12px 0px #ffa35d;
border-radius: 60px;
color: #1d2129;
text-align: center;
position: relative;
}
&__recommend {
@ -143,17 +199,19 @@
line-height: 36px;
padding: 0 8px;
height: 36px;
margin-left: 16px;
background: rgba(255, 80, 81, 0.12);
background: rgb(255, 80, 81);
border-radius: 4px;
font-size: 24px;
color: #ff5051;
color: #fff;
align-items: center;
position: absolute;
gap: 6px;
right: -25px;
top: -18px;
}
&__special {
padding: 32px;
padding-top: 75px;
.flex-column();
.partner-intro__body {
@ -176,6 +234,7 @@
&__footer {
position: fixed;
bottom: 0;
z-index: 2;
width: 100vw;
background: #ffffff;
padding: 12px 32px;
@ -188,17 +247,20 @@
display: flex;
flex-direction: row;
box-sizing: border-box;
justify-content: center;
}
&__download-button {
flex: 1 1;
//flex: 1 1;
.button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px; @highlight: 0);
}
&__share-button {
flex: 2 2;
//flex: 2 2;
flex: 0 0 406px;
width: 406px;
.button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px;);
margin-left: 32px;
//margin-left: 32px;
}
}

View File

@ -1,5 +1,4 @@
import { Button, Canvas, Image } from '@tarojs/components';
import Taro from '@tarojs/taro';
import { Swiper } from '@taroify/core';
import { GoodJob } from '@taroify/icons';
@ -8,114 +7,14 @@ import { useCallback, useEffect, useRef, useState } from 'react';
import { PageUrl } from '@/constants/app';
import { EarnType, UserProfitListItem } from '@/types/partner';
import { openCustomerServiceChat } from '@/utils/common';
import { generateMembershipCoupon, getCouponQrCode } from '@/utils/coupon';
import { formatMoney, formatTimestamp, getLastProfitList } from '@/utils/partner';
import { formatMoney, formatTimestamp, formatUserId, getLastProfitList } from '@/utils/partner';
import { navigateTo } from '@/utils/route';
import './index.less';
const PREFIX = 'partner-intro';
export default function PartnerIntro() {
const getQrcode = async () => {
try {
const { code } = await generateMembershipCoupon();
const data = await getCouponQrCode(code);
const base64 = Taro.arrayBufferToBase64(data);
return `data:image/png;base64,${base64}`;
} catch (error) {
console.error('获取二维码失败', error);
Taro.showToast({ title: '获取二维码失败', icon: 'none' });
throw error;
}
};
const saveCanvasToTempFile = (): Promise<string> => {
return new Promise((resolve, reject) => {
try {
const query = Taro.createSelectorQuery().select('#posterCanvas');
query.fields({ node: true }).exec(async res => {
const canvas = res[0].node;
const tempFilePath = await Taro.canvasToTempFilePath({
canvas,
x: 0,
y: 0,
width: 1500, // 实际绘制宽度
height: 2668, // 实际绘制高度
destWidth: 750, // 目标显示宽度
destHeight: 1334, // 目标显示高度
fileType: 'png',
});
resolve(tempFilePath.tempFilePath);
});
} catch (error) {
console.error('保存 Canvas 到临时文件失败', error);
Taro.showToast({ title: '保存 Canvas 失败', icon: 'none' });
reject(error);
}
});
};
const drawCanvas = (qrCode: string): Promise<string> => {
const query = Taro.createSelectorQuery().select('#posterCanvas');
return new Promise(resolve => {
query.fields({ node: true, size: true }).exec(async res => {
const canvas = res[0].node;
const ctx = canvas.getContext('2d');
canvas.width = 550 * 2;
canvas.height = 918 * 2;
ctx.scale(2, 2);
// 绘制背景图片
const bgImage = canvas.createImage();
const poster = 'https://publiccdn.neighbourhood.com.cn/img/share-coupon-poster2.png';
bgImage.src = poster;
bgImage.onload = () => {
ctx.drawImage(bgImage, 0, 0, 550, 918);
const qrCodeImage = canvas.createImage();
qrCodeImage.src = qrCode; // 假设 getQrcode() 返回的是二维码图片的路径
qrCodeImage.onload = () => {
ctx.drawImage(qrCodeImage, 196, 600, 180, 160); // 绘制二维码,位置和大小
saveCanvasToTempFile().then(tempPath => {
resolve(tempPath);
});
};
};
bgImage.onerror = err => {
console.error(err);
};
});
});
};
const savePoster = async () => {
Taro.showLoading({ title: '正在生成海报' });
const qrCode = await getQrcode();
const filePath = await drawCanvas(qrCode);
Taro.hideLoading();
const res = await Taro.getSetting();
const hasPermission = res.authSetting['scope.writePhotosAlbum'];
if (hasPermission === false) {
Taro.showModal({
title: '提示',
content: '需要访问相册权限才能保存图片,请前往设置开启权限',
showCancel: false,
success() {
Taro.openSetting();
},
});
} else {
try {
await Taro.authorize({ scope: 'scope.writePhotosAlbum' });
await Taro.saveImageToPhotosAlbum({ filePath });
Taro.showToast({ title: '保存成功', icon: 'success' });
} catch (error) {
console.error(error);
Taro.showToast({ title: '保存失败', icon: 'none' });
}
}
};
const handleConfirm = useCallback(() => {
navigateTo(PageUrl.GroupOwnerCertificate);
}, []);
@ -124,6 +23,10 @@ export default function PartnerIntro() {
openCustomerServiceChat('https://work.weixin.qq.com/kfid/kfc4fcf6b109b3771d7');
}, []);
const handleJump = useCallback(() => {
navigateTo(PageUrl.PartnerShareVip);
}, []);
const timerRef = useRef<NodeJS.Timeout | null>(null);
const [bannerList, setBannerList] = useState<UserProfitListItem[]>([]);
@ -134,7 +37,7 @@ export default function PartnerIntro() {
}
const list = await getLastProfitList();
setBannerList(s => [...s, ...list]);
setBannerList(list);
timerRef.current = setTimeout(
() => {
@ -156,8 +59,16 @@ export default function PartnerIntro() {
}, [getBannerList]);
return (
<div className={PREFIX}>
<div className={`${PREFIX}__banner`}>
<span className={`${PREFIX}__highlight`}>75%</span>
<Image
src="https://publiccdn.neighbourhood.com.cn/img/partner-intro-bg.png"
className={`${PREFIX}__bg`}
mode="aspectFill"
/>
<div className={`${PREFIX}__slogan`}>
<div></div>
<div>
<div className={`${PREFIX}__slogan-highlight`}>75%</div>
</div>
</div>
<div className={`${PREFIX}__main`}>
<div className={`${PREFIX}__swiper-wrapper`}>
@ -168,18 +79,18 @@ export default function PartnerIntro() {
/>
<Swiper className={`${PREFIX}__swiper`} autoplay={3000} touchable={false}>
{bannerList.map((item, index) => (
<Swiper.Item className={`${PREFIX}__swiper-item`} key={index}>
<Swiper.Item className={`${PREFIX}__swiper-item`} key={`${item.userId}-${index}`}>
<div className={`${PREFIX}__swiper-item-time`}>{formatTimestamp(item.updatedAt)}</div>
<div className={`${PREFIX}__swiper-item-details`}>
<div className={`${PREFIX}__swiper-item-id`}>{item.userId}</div>
<div className={`${PREFIX}__swiper-item-id`}>{formatUserId(item.userId)}</div>
<div className={`${PREFIX}__swiper-item-info`}>
{[EarnType.CHAT_ACTIVITY_SHARE_L1, EarnType.CHAT_ACTIVITY_SHARE_L2].includes(item.earnType)
? '主播被开聊'
: '会员支付'}
<div className="money">+{formatMoney(item.total)}</div>
<div className="money">+{formatMoney(item.amount, 1)}</div>
</div>
<div className={`${PREFIX}__swiper-item-info`}>
<div className="money">{formatMoney(item.amount)}</div>
<div className="money">{formatMoney(item.total, 1)}</div>
</div>
</div>
</Swiper.Item>
@ -187,6 +98,25 @@ export default function PartnerIntro() {
</Swiper>
</div>
<div className={`${PREFIX}__block`}>
<div className={`${PREFIX}__title`}>
<div className={`${PREFIX}__recommend`}>
<GoodJob />
</div>
</div>
<div className={`${PREFIX}__card ${PREFIX}__special`}>
<div className={`${PREFIX}__body`}>
<div className="center">
访
</div>
</div>
<Button className={`${PREFIX}__service`} onClick={handleConfirm}>
</Button>
</div>
</div>
<div className={`${PREFIX}__block`}>
<div className={`${PREFIX}__title`}>3</div>
<div className={`${PREFIX}__card`}>
@ -209,34 +139,17 @@ export default function PartnerIntro() {
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__card`}>
<div className={`${PREFIX}__body`}>
<div>1.</div>
<div>2.</div>
<div className={`${PREFIX}__h1`}></div>
<div></div>
<div className={`${PREFIX}__h1`}></div>
<div></div>
</div>
</div>
</div>
<div className={`${PREFIX}__block`}>
<div className={`${PREFIX}__title`}>
<div className={`${PREFIX}__recommend`}>
<GoodJob />
</div>
</div>
<div className={`${PREFIX}__card ${PREFIX}__special`}>
<div className={`${PREFIX}__body`}>
<div className="center">
访
</div>
</div>
<Button className={`${PREFIX}__service`} onClick={handleConfirm}>
</Button>
</div>
</div>
<div className={`${PREFIX}__block`}>
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__card ${PREFIX}__special`}>
<div className={`${PREFIX}__h1`}></div>
<div className={`${PREFIX}__h1 no-dot`}></div>
<Button className={`${PREFIX}__service`} onClick={handleOpenService}>
</Button>
@ -246,10 +159,7 @@ export default function PartnerIntro() {
<Canvas id="posterCanvas" canvas-id="posterCanvas" type="2d" style="width: 750px; height: 1334px;" />
<div className={`${PREFIX}__footer`}>
<Button className={`${PREFIX}__download-button`} onClick={savePoster}>
</Button>
<Button className={`${PREFIX}__share-button`} openType="share">
<Button className={`${PREFIX}__share-button`} onClick={handleJump}>
</Button>
</div>

View File

@ -48,8 +48,8 @@ const LIST: Item[] = [
{
id: ProductSpecId.BOSS_VIP_NEW_2,
title: '推荐一月',
price: '480播豆',
amt: 48,
price: '680播豆',
amt: 68,
badge: '限时体验',
contents: [
{ content: '-通告每日优先展示', highlight: true },
@ -61,8 +61,8 @@ const LIST: Item[] = [
{
id: ProductSpecId.BOSS_VIP_NEW_3,
title: '推荐一季',
price: '960播豆',
amt: 96,
price: '1360播豆',
amt: 136,
badge: '6.7折',
contents: [
{ content: '-通告每日优先展示', highlight: true },

View File

@ -2,9 +2,10 @@ import { BaseEventOrig, InputProps, ScrollView } from '@tarojs/components';
import Taro from '@tarojs/taro';
import { Search } from '@taroify/core';
import { useCallback, useEffect, useState } from 'react';
import { Fragment, useCallback, useEffect, useState } from 'react';
import { CITY_CODE_TO_NAME_MAP, CITY_INDEXES_LIST, GROUP_CITY_INDEXES_LIST } from '@/constants/city';
import { CITY_CODE_TO_NAME_MAP, CITY_INDEXES_LIST } from '@/constants/city';
import useCityOperators from '@/hooks/use-city-operators';
import { logWithPrefix } from '@/utils/common';
import './index.less';
@ -68,8 +69,19 @@ export default function SearchCity({
const [touchAnchor, setTouchAnchor] = useState<string | undefined>();
const [touchMoving, setTouchMoving] = useState(false);
const [searchResult, setSearchResult] = useState<Item[]>([]);
const cityOperators = useCityOperators();
const groupCityCodes = cityOperators.map(it => (it.groupLink ? it.cityCode : null)).filter(Boolean);
const showSearchList = searchResult.length > 0;
const CITY_LIST = forGroup ? GROUP_CITY_INDEXES_LIST : CITY_INDEXES_LIST;
const CITY_LIST = forGroup
? CITY_INDEXES_LIST.map(({ letter, data }) => {
return {
letter,
data: data.filter(it => groupCityCodes.includes(it.cityCode)),
};
}).filter(item => item.data.length > 0)
: CITY_INDEXES_LIST;
const HOT_CITY_LIST = forGroup ? HOT_CITY.filter(it => groupCityCodes.includes(`${it.cityCode}`)) : HOT_CITY;
const handleSearchChange = useCallback((event: BaseEventOrig<InputProps.inputEventDetail>) => {
const value = event.detail.value;
@ -173,19 +185,25 @@ export default function SearchCity({
<div>
<div className={`${PREFIX}__position-title`}></div>
<div className={`${PREFIX}__position-city`}>{CITY_CODE_TO_NAME_MAP.get(currentCity)}</div>
<div className={`${PREFIX}__hot-city-title`}></div>
<div className={`${PREFIX}__hot-city-container`}>
{HOT_CITY.map(city => (
<div
key={city.cityCode}
className={`${PREFIX}__hot-city-item`}
data-code={city.cityCode}
onClick={handleSelectCity}
>
{city.cityName}
{!!HOT_CITY_LIST.length && (
<Fragment>
<div className={`${PREFIX}__hot-city-title`}></div>
<div className={`${PREFIX}__hot-city-container`}>
{HOT_CITY_LIST.map(city => {
return (
<div
key={city.cityCode}
className={`${PREFIX}__hot-city-item`}
data-code={city.cityCode}
onClick={handleSelectCity}
>
{city.cityName}
</div>
);
})}
</div>
))}
</div>
</Fragment>
)}
<div className={`${PREFIX}__indexes-list`}>
{CITY_LIST.map(item => {
return (

View File

@ -79,6 +79,7 @@ export enum PageUrl {
GroupDelegatePublish = 'pages/group-delegate-publish/index',
GiveVip = 'pages/give-vip/index',
GroupOwnerCertificate = 'pages/group-owner-certification/index',
PartnerShareVip = 'pages/partner-share-vip/index',
}
export enum PluginUrl {

View File

@ -75,7 +75,7 @@ export const EMPLOY_TYPE_TITLE_MAP = {
export const JOB_SOURCE_TYPE_TITLE_MAP = {
[JobSourceType.All]: '全部',
[JobSourceType.BL]: '认证通告',
[JobSourceType.BL]: '急招',
[JobSourceType.VX]: '群通告',
};
@ -122,10 +122,10 @@ export const JOB_PAGE_TABS = [
type: JobSourceType.BL,
title: JOB_SOURCE_TYPE_TITLE_MAP[JobSourceType.BL],
},
{
type: JobSourceType.VX,
title: JOB_SOURCE_TYPE_TITLE_MAP[JobSourceType.VX],
},
// {
// type: JobSourceType.VX,
// title: JOB_SOURCE_TYPE_TITLE_MAP[JobSourceType.VX],
// },
];
export const JOB_EMPLOY_TYPE_OPTIONS = [

View File

@ -13,6 +13,21 @@
.taroify-cell__value {
color: @blColor;
}
&-icon {
width: 40px;
height: 40px;
border-radius: 50%;
background: rgba(255, 80, 81, 0.16);
display: inline-flex;
justify-content: center;
align-items: center;
margin-right: 16px;
> image {
width: 18px;
height: 24px;
}
}
}
&__go-publish-cell {
@ -24,4 +39,6 @@
color: @blHighlightColor;
}
}
}

View File

@ -1,3 +1,5 @@
import { Image } from '@tarojs/components';
import { Cell } from '@taroify/core';
import classNames from 'classnames';
import { useCallback } from 'react';
@ -27,7 +29,14 @@ export default function CompanyFragment() {
<Cell
isLink
align="center"
title="发通告,让主播主动报单"
title={
<div>
<div className={`${PREFIX}__cell-icon`}>
<Image src="https://publiccdn.neighbourhood.com.cn/img/lightning.svg" />
</div>
</div>
}
className={classNames(`${PREFIX}__cell`, `${PREFIX}__go-publish-cell`)}
onClick={handlePublishJob}
>

View File

@ -0,0 +1,10 @@
import { useSelector } from 'react-redux';
import { selectCityOperators } from '@/store/selector';
function useCityOperators() {
const data = useSelector(selectCityOperators);
return data || [];
}
export default useCityOperators;

View File

@ -100,6 +100,7 @@ export const APP_CONFIG: AppConfigType = {
PageUrl.GroupDelegatePublish,
PageUrl.GiveVip,
PageUrl.GroupOwnerCertificate,
PageUrl.PartnerShareVip,
// PageUrl.DevDebug,
],
window: {

View File

@ -1,10 +0,0 @@
import { useSelector } from 'react-redux';
import { selectServiceUrls } from '@/store/selector';
function useServiceUrls() {
const data = useSelector(selectServiceUrls);
return data || [];
}
export default useServiceUrls;

View File

@ -107,7 +107,7 @@ class Http {
url: BASE_URL + url,
data,
method: method,
header: { 'content-type': contentType /*'user-Id': '588002047871053824' */ },
header: { 'content-type': contentType /*,'user-Id': '588002047871053824'*/ },
};
return this.request(option);
};

View File

@ -233,6 +233,10 @@ export default function AnchorPage() {
}
});
Taro.showShareMenu({
withShareTicket: true,
});
useShareAppMessage(() => {
return getCommonShareMessage({ inviteCode, title: '数万名优质主播等你来挑', path: PageUrl.Anchor });
});
@ -287,7 +291,7 @@ export default function AnchorPage() {
</div>
</div>
<div className={`${PREFIX}__banner`}>
<PartnerBanner />
<PartnerBanner isBoss />
</div>
<ListWrapper
filters={filters}

View File

@ -24,6 +24,8 @@
padding-left: 24px;
padding-right: 24px;
padding-top: 48px;
padding-bottom: calc(48px + constant(safe-area-inset-bottom));
padding-bottom: calc(48px + env(safe-area-inset-bottom));
}
&__block {
@ -50,7 +52,6 @@
.highlight {
color: @blHighlightColor;
display: inline;
}
&.center {
@ -122,6 +123,7 @@
width: 280px;
height: 280px;
background: #6F7686;
display: block;
margin: auto auto 24px;
}
}

View File

@ -30,10 +30,10 @@ export default function GroupOwnerCertification() {
const { authCode } = await generateGroupAuthCode();
return getCommonShareMessage({
useCapture: false,
title: `群主测试,${authCode}`,
title: `我在认证群主,宝子帮我点击下 ${authCode}`,
inviteCode,
params: { authCode },
path: PageUrl.GroupOwnerCertificate,
path: PageUrl.Job,
imageUrl: 'https://publiccdn.neighbourhood.com.cn/img/share-group-owner-certificate.png',
});
});
@ -98,14 +98,21 @@ export default function GroupOwnerCertification() {
<div className={`${PREFIX}__lined-wrapper`}>
<div className={`${PREFIX}__lined-title`}></div>
</div>
{staffInfo && <Image className={`${PREFIX}__qrcode`} src={staffInfo.staffQrCode} mode="aspectFill" />}
{staffInfo && (
<Image
className={`${PREFIX}__qrcode`}
src={staffInfo.staffQrCode}
showMenuByLongpress
mode="aspectFill"
/>
)}
</div>
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__card`}>
<div className={`${PREFIX}__h1 ${PREFIX}__bold`}></div>
<div className={`${PREFIX}__body center`}>
<div className={`${PREFIX}__body`}>
<div className="highlight">1</div>
1
<div>1</div>
</div>
<Button className={`${PREFIX}__share`} openType="share">

View File

@ -5,8 +5,8 @@ import { useCallback } from 'react';
import HomePage from '@/components/home-page';
import SearchCity from '@/components/search-city';
import { PageType, PageUrl, RoleType } from '@/constants/app';
import useCityOperators from '@/hooks/use-city-operators';
import useInviteCode from '@/hooks/use-invite-code';
import useServiceUrls from '@/hooks/use-service-urls';
import { switchRoleType } from '@/utils/app';
import { openCustomerServiceChat } from '@/utils/common';
import { getCurrentCityCode } from '@/utils/location';
@ -20,7 +20,7 @@ const PREFIX = 'group-v2-page';
export default function GroupV2() {
const inviteCode = useInviteCode();
const serviceUrls = useServiceUrls();
const cityOperators = useCityOperators();
useLoad(() => {
switchRoleType(RoleType.Anchor);
@ -38,12 +38,12 @@ export default function GroupV2() {
if (!checkCityCode(cityCode)) {
return;
}
const group = serviceUrls.find(g => String(g.cityCode) === cityCode);
const group = cityOperators.find(g => String(g.cityCode) === cityCode);
if (group) {
openCustomerServiceChat(group.serviceUrl);
openCustomerServiceChat(group.groupLink);
}
},
[serviceUrls]
[cityOperators]
);
return (

View File

@ -1,4 +1,4 @@
import { useShareAppMessage } from '@tarojs/taro';
import Taro, { useShareAppMessage } from '@tarojs/taro';
import { Tabs } from '@taroify/core';
import { useCallback, useState } from 'react';
@ -20,6 +20,10 @@ export default function Group() {
const handleTypeChange = useCallback(value => setTabType(value), []);
Taro.showShareMenu({
withShareTicket: true,
});
useShareAppMessage(() => getCommonShareMessage());
return (

View File

@ -297,7 +297,9 @@ export default function JobDetail() {
Toast.error('出错了,请重试');
}
});
Taro.showShareMenu({
withShareTicket: true,
});
useShareAppMessage(() => {
if (!data) {
return getCommonShareMessage({ inviteCode });

View File

@ -23,5 +23,24 @@
background-color: @blTabLineColor;
border-radius: 0;
}
.taroify-dialog.taroify-popup {
position: absolute;
}
}
}
&__tab-icon {
width: 32px;
height: 32px;
border-radius: 50%;
background: rgba(255, 80, 81, 0.16);
display: inline-flex;
justify-content: center;
align-items: center;
margin-right: 8px;
> image {
width: 14.4px;
height: 19.2px;
}
}
}

View File

@ -1,3 +1,4 @@
import { Image } from '@tarojs/components';
import Taro, { useDidShow, useLoad, useShareAppMessage } from '@tarojs/taro';
import { Tabs } from '@taroify/core';
@ -132,6 +133,10 @@ export default function Job() {
useDidShow(() => requestUnreadMessageCount());
Taro.showShareMenu({
withShareTicket: true,
});
useShareAppMessage(() => {
if (sortType === SortType.CREATE_TIME) {
return {
@ -152,7 +157,20 @@ export default function Job() {
style={{ height: barHeight.current, paddingTop: statusBarHeight.current }}
>
{JOB_PAGE_TABS.map(tab => (
<Tabs.TabPane value={tab.type} title={tab.title} key={tab.type}>
<Tabs.TabPane
value={tab.type}
title={
<>
{tab.type === JobSourceType.BL ? (
<div className={`${PREFIX}__tab-icon`}>
<Image src="https://publiccdn.neighbourhood.com.cn/img/lightning.svg" />
</div>
) : null}
{tab.title}
</>
}
key={tab.type}
>
<JobFragment
cityCode={cityCode}
sortType={sortType}

View File

@ -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, RoleType } from '@/constants/app';
import { EventName } from '@/constants/app';
import { CollectEventName } from '@/constants/event';
import { MaterialStatus } from '@/constants/material';
import ProfileViewFragment from '@/fragments/profile/view';
@ -15,9 +15,7 @@ import { collectEvent } from '@/utils/event';
import { getMaterialShareMessage, requestProfileDetail, updateProfileStatus } from '@/utils/material';
import { getCommonShareMessage } from '@/utils/share';
import Toast from '@/utils/toast';
import './index.less';
import { switchRoleType } from '@/utils/app';
const PREFIX = 'page-material-profile';

View File

@ -199,6 +199,10 @@ export default function MaterialViewPage() {
}
});
Taro.showShareMenu({
withShareTicket: true,
});
useShareAppMessage(async () => {
const shareMessage = await getMaterialShareMessage(profile, true, inviteCode, jobId);
return shareMessage as BL.Anything;

View File

@ -0,0 +1,3 @@
export default definePageConfig({
navigationBarTitleText: '赠送会员',
});

View File

@ -0,0 +1,182 @@
@import '@/styles/variables.less';
@import '@/styles/common.less';
.share-vip {
background: #eae5fb;
padding-top: 200px;
position: relative;
padding-bottom: calc(142px + constant(safe-area-inset-bottom));
padding-bottom: calc(142px + env(safe-area-inset-bottom));
&__bg {
width: 100%;
height: 705px;
position: absolute;
top: 0;
left: 0;
}
&__slogan {
top: 66px;
left: 44px;
position: absolute;
font-family: 'Alimama ShuHeiTi';
font-style: normal;
font-weight: 700;
font-size: 44px;
line-height: 62px;
color: #333333;
> div {
margin-bottom: 12px;
}
&-highlight {
display: inline-block;
padding-left: 12px;
padding-right: 9px;
font-size: 64px;
line-height: 62px;
background: linear-gradient(87.53deg, #683DE3 0.4%, #39227D 84.55%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
text-fill-color: transparent;
}
}
&__main {
padding-left: 24px;
padding-right: 24px;
position: relative;
z-index: 1;
}
&__highlight {
color: @blHighlightColor;
font-family: 'DIN Alternate';
padding: 0 8px;
font-weight: 700;
display: inline-block;
font-size: 40px;
}
&__block {
margin-bottom: 12px;
position: relative;
}
&__card {
background: #fff;
border-radius: 24px;
padding: 68px 32px 44px;
}
&__h1 {
font-weight: 500;
font-size: 32px;
line-height: 40px;
color: #1d2129;
margin-bottom: 16px;
margin-top: 32px;
position: relative;
z-index: 0;
&:first-child {
margin-top: 0;
}
&:after {
content: '';
width: 28px;
height: 28px;
background: #ffd236;
border-radius: 50%;
position: absolute;
left: -6px;
top: -3px;
z-index: -1;
}
}
&__body {
font-weight: 400;
font-size: 28px;
line-height: 40px;
color: @blColor;
&.grey {
color: @blColorG2;
}
&.center {
text-align: center;
}
}
&__title {
margin-left: 48px;
margin-right: 48px;
font-weight: 500;
font-size: 32px;
line-height: 80px;
height: 80px;
transform: translateY(50%);
background: #ffd236;
box-shadow: 0px 12px 0px #ffa35d;
border-radius: 60px;
color: #1d2129;
text-align: center;
position: relative;
}
&__service {
.button(@height: 72px; @width: 384px; @fontSize: 28px; @fontWeight: 400; @borderRadius: 44px; @highlight: 0);
margin-top: 32px;
}
&__tip {
margin-top: 24px;
font-size: 24px;
line-height: 40px;
color: #999999;
}
&__footer {
position: fixed;
bottom: 0;
z-index: 2;
width: 100vw;
background: #ffffff;
padding: 12px 32px;
padding-bottom: calc(constant(safe-area-inset-bottom) + 12px);
/* 兼容 iOS < 11.2 */
padding-bottom: calc(env(safe-area-inset-bottom) + 12px);
/* 兼容 iOS >= 11.2 */
box-shadow: 0px -4px 20px 0px #00000014;
display: flex;
flex-direction: row;
box-sizing: border-box;
justify-content: center;
}
&__download-button {
flex: 1 1;
.button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px; @highlight: 0);
}
&__share-button {
flex: 2 2;
width: 406px;
.button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px;);
margin-left: 32px;
}
}
#posterCanvas {
position: fixed;
bottom: -99999px;
left: -99999px;
visibility: hidden;
}

View File

@ -0,0 +1,191 @@
import { Button, Canvas, Image } from '@tarojs/components';
import Taro, { useShareAppMessage } from '@tarojs/taro';
import { PageUrl } from '@/constants/app';
import useInviteCode from '@/hooks/use-invite-code';
import { generateMembershipCoupon, getCouponQrCode } from '@/utils/coupon';
import { getCommonShareMessage } from '@/utils/share';
import './index.less';
const PREFIX = 'share-vip';
export default function PartnerShareVip() {
const inviteCode = useInviteCode();
Taro.showShareMenu({
withShareTicket: true,
});
useShareAppMessage(async () => {
console.log('Partner inviteCode', inviteCode);
const { code } = await generateMembershipCoupon();
return getCommonShareMessage({
useCapture: false,
inviteCode,
title: '宝子,送你个播络会员,免费找主播工作',
path: PageUrl.GiveVip,
params: { d: code },
imageUrl: 'https://publiccdn.neighbourhood.com.cn/img/share-coupon1.png',
});
});
const getQrcode = async () => {
try {
const { code } = await generateMembershipCoupon();
const data = await getCouponQrCode(code);
const base64 = Taro.arrayBufferToBase64(data);
return `data:image/png;base64,${base64}`;
} catch (error) {
console.error('获取二维码失败', error);
Taro.showToast({ title: '获取二维码失败', icon: 'none' });
throw error;
}
};
const saveCanvasToTempFile = (): Promise<string> => {
return new Promise((resolve, reject) => {
try {
const query = Taro.createSelectorQuery().select('#posterCanvas');
query.fields({ node: true }).exec(async res => {
const canvas = res[0].node;
const tempFilePath = await Taro.canvasToTempFilePath({
canvas,
x: 0,
y: 0,
width: 1500, // 实际绘制宽度
height: 2668, // 实际绘制高度
destWidth: 750, // 目标显示宽度
destHeight: 1334, // 目标显示高度
fileType: 'png',
});
resolve(tempFilePath.tempFilePath);
});
} catch (error) {
console.error('保存 Canvas 到临时文件失败', error);
Taro.showToast({ title: '保存 Canvas 失败', icon: 'none' });
reject(error);
}
});
};
const drawCanvas = (qrCode: string): Promise<string> => {
const query = Taro.createSelectorQuery().select('#posterCanvas');
return new Promise(resolve => {
query.fields({ node: true, size: true }).exec(async res => {
const canvas = res[0].node;
const ctx = canvas.getContext('2d');
canvas.width = 550 * 2;
canvas.height = 918 * 2;
ctx.scale(2, 2);
// 绘制背景图片
const bgImage = canvas.createImage();
const poster = 'https://publiccdn.neighbourhood.com.cn/img/share-coupon-poster2.png';
bgImage.src = poster;
bgImage.onload = () => {
ctx.drawImage(bgImage, 0, 0, 550, 918);
const qrCodeImage = canvas.createImage();
qrCodeImage.src = qrCode; // 假设 getQrcode() 返回的是二维码图片的路径
qrCodeImage.onload = () => {
ctx.drawImage(qrCodeImage, 196, 600, 180, 160); // 绘制二维码,位置和大小
saveCanvasToTempFile().then(tempPath => {
resolve(tempPath);
});
};
};
bgImage.onerror = err => {
console.error(err);
};
});
});
};
const savePoster = async () => {
Taro.showLoading({ title: '正在生成海报' });
const qrCode = await getQrcode();
const filePath = await drawCanvas(qrCode);
Taro.hideLoading();
const res = await Taro.getSetting();
const hasPermission = res.authSetting['scope.writePhotosAlbum'];
if (hasPermission === false) {
Taro.showModal({
title: '提示',
content: '需要访问相册权限才能保存图片,请前往设置开启权限',
showCancel: false,
success() {
Taro.openSetting();
},
});
} else {
try {
await Taro.authorize({ scope: 'scope.writePhotosAlbum' });
await Taro.saveImageToPhotosAlbum({ filePath });
Taro.showToast({ title: '保存成功', icon: 'success' });
} catch (error) {
console.error(error);
Taro.showToast({ title: '保存失败', icon: 'none' });
}
}
};
return (
<div className={PREFIX}>
<Image
src="https://publiccdn.neighbourhood.com.cn/img/partner-share-vip-bg.png"
className={`${PREFIX}__bg`}
mode="aspectFill"
/>
<div className={`${PREFIX}__slogan`}>
<div>
<div className={`${PREFIX}__slogan-highlight`}></div>
</div>
<div></div>
</div>
<div className={`${PREFIX}__main`}>
<div className={`${PREFIX}__block`}>
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__card`}>
<div className={`${PREFIX}__h1`}></div>
<div className={`${PREFIX}__body`}>&#34;&#34;</div>
<div className={`${PREFIX}__h1`}></div>
<div className={`${PREFIX}__body`}>&#34;&#34;</div>
</div>
</div>
<div className={`${PREFIX}__block`}>
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__card`}>
<div className={`${PREFIX}__body`}>
<div className={`${PREFIX}__h1`}></div>
<div>7</div>
<div className={`${PREFIX}__h1`}></div>
<div></div>
</div>
</div>
</div>
<div className={`${PREFIX}__block`}>
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__card`}>
<div className={`${PREFIX}__body`}>
<div className={`${PREFIX}__h1`}></div>
<div> </div>
<div className={`${PREFIX}__h1`}></div>
<div></div>
</div>
</div>
</div>
</div>
<Canvas id="posterCanvas" canvas-id="posterCanvas" type="2d" style="width: 750px; height: 1334px;" />
<div className={`${PREFIX}__footer`}>
<Button className={`${PREFIX}__download-button`} onClick={savePoster}>
</Button>
<Button className={`${PREFIX}__share-button`} openType="share">
</Button>
</div>
</div>
);
}

View File

@ -1,4 +1,4 @@
import { useShareAppMessage } from '@tarojs/taro';
import Taro, { useShareAppMessage } from '@tarojs/taro';
import { Tabs } from '@taroify/core';
import { useState } from 'react';
@ -8,7 +8,6 @@ import PartnerInviteList from '@/components/partner-invite-list';
import PartnerProfit from '@/components/partner-profit';
import { PageUrl } from '@/constants/app';
import useInviteCode from '@/hooks/use-invite-code';
import { generateMembershipCoupon } from '@/utils/coupon';
import { getCommonShareMessage } from '@/utils/share';
import './index.less';
@ -20,16 +19,28 @@ export default function Partner() {
const handleChange = v => {
setTab(v);
};
Taro.showShareMenu({
withShareTicket: true,
});
useShareAppMessage(async () => {
console.log('Partner inviteCode', inviteCode);
const { code } = await generateMembershipCoupon();
// const { code } = await generateMembershipCoupon();
// return getCommonShareMessage({
// useCapture: false,
// inviteCode,
// title: '宝子,送你个播络会员,免费找主播工作',
// path: PageUrl.GiveVip,
// params: { d: code },
// imageUrl: 'https://publiccdn.neighbourhood.com.cn/img/share-coupon1.png',
// });
return getCommonShareMessage({
useCapture: false,
inviteCode,
title: '宝子,送你个播络会员,免费找主播工作',
path: PageUrl.GiveVip,
params: { d: code },
imageUrl: 'https://publiccdn.neighbourhood.com.cn/img/share-coupon1.png',
title: '播络专业主播招聘平台招募合伙人',
path: PageUrl.Partner,
imageUrl: 'https://publiccdn.neighbourhood.com.cn/img/share-partner.png',
});
});

View File

@ -7,8 +7,8 @@ import { useCallback, useState } from 'react';
import HomePage from '@/components/home-page';
import SearchCity from '@/components/search-city';
import { PageType, PageUrl, RoleType } from '@/constants/app';
import useCityOperators from '@/hooks/use-city-operators';
import useInviteCode from '@/hooks/use-invite-code';
import useServiceUrls from '@/hooks/use-service-urls';
import { switchRoleType } from '@/utils/app';
import { openCustomerServiceChat } from '@/utils/common';
import { getCurrentCityCode } from '@/utils/location';
@ -23,7 +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 serviceUrls = useServiceUrls();
const cityOperators = useCityOperators();
const [value, setValue] = useState('0');
const handleClickDelegate = useCallback(() => {
@ -43,12 +43,12 @@ export default function BizService() {
if (!checkCityCode(cityCode)) {
return;
}
const group = serviceUrls.find(g => String(g.cityCode) === cityCode);
const group = cityOperators.find(g => String(g.cityCode) === cityCode);
if (group) {
openCustomerServiceChat(group.serviceUrl);
openCustomerServiceChat(group.groupLink);
}
},
[serviceUrls]
[cityOperators]
);
const handleChange = useCallback(v => {
setValue(v);
@ -63,6 +63,10 @@ export default function BizService() {
}
});
Taro.showShareMenu({
withShareTicket: true,
});
useShareAppMessage(() =>
getCommonShareMessage({
inviteCode,

View File

@ -69,19 +69,23 @@
}
&__header__contact {
width: 60px;
height: 60px;
border-radius: 50%;
background: #0000004D;
width: 76px;
height: 81px;
padding: 0;
margin: 0;
display: flex;
align-items: center;
justify-content: center;
background: transparent;
border: none;
&:after {
border: none;
}
}
&__header__contact-icon {
width: 36px;
height: 36px;
width: 76px;
height: 81px;
}
}

View File

@ -65,7 +65,7 @@ export default function User() {
<Image
mode="aspectFit"
className={`${PREFIX}__header__contact-icon`}
src={require('@/statics/svg/contact.svg')}
src="https://publiccdn.neighbourhood.com.cn/img/kefu.svg"
/>
</Button>
</div>

View File

@ -1,4 +1,4 @@
import { useShareAppMessage } from '@tarojs/taro';
import Taro, { useShareAppMessage } from '@tarojs/taro';
import { List, PullRefresh } from '@taroify/core';
import { useCallback, useEffect, useRef, useState } from 'react';
@ -90,6 +90,11 @@ export default function WithdrawRecords() {
};
refresh();
}, []);
Taro.showShareMenu({
withShareTicket: true,
});
useShareAppMessage(() => {
return getCommonShareMessage({ useCapture: false, inviteCode });
});

View File

@ -10,4 +10,4 @@ export const changeHomePage = (value: PageType) => ({ type: CHANGE_HOME_PAGE, va
export const setLocationInfo = (value: LocationInfo) => ({ type: SET_LOCATION_INFO, value });
export const setServiceUrls = (value: AppState['serviceUrls']) => ({ type: SET_SERVICE_URLS, value });
export const setCityOperators = (value: AppState['cityOperators']) => ({ type: SET_SERVICE_URLS, value });

View File

@ -23,7 +23,7 @@ const INIT_STATE: AppState = {
roleType: defaultAppMode,
homePageType: defaultAppMode === RoleType.Company ? PageType.Anchor : PageType.JOB,
location: Taro.getStorageSync<LocationInfo>(CacheKey.CACHE_LOCATION_INFO) || DEFAULT_LOCATION,
serviceUrls: [],
cityOperators: [],
};
const appState = (state: AppState = INIT_STATE, action: Action): AppState => {
@ -35,7 +35,7 @@ const appState = (state: AppState = INIT_STATE, action: Action): AppState => {
case CHANGE_HOME_PAGE:
return { ...state, homePageType: value };
case SET_SERVICE_URLS:
return { ...state, serviceUrls: value };
return { ...state, cityOperators: value };
case SET_LOCATION_INFO:
Taro.setStorageSync(CacheKey.CACHE_LOCATION_INFO, value);
return { ...state, location: value };

View File

@ -6,4 +6,4 @@ export const selectHomePageType = (state: IState) => state.appState.homePageType
export const selectLocation = (state: IState) => state.appState.location;
export const selectServiceUrls = (state: IState) => state.appState.serviceUrls || {};
export const selectCityOperators = (state: IState) => state.appState.cityOperators || {};

View File

@ -17,9 +17,8 @@ export interface AppState {
roleType: RoleType;
homePageType: PageType;
location: LocationInfo;
serviceUrls: Array<{
title: string;
cityCode: number;
serviceUrl: string;
cityOperators: Array<{
cityCode: string;
groupLink: string;
}>;
}

View File

@ -6,7 +6,7 @@ import { CITY_CODE_TO_NAME_MAP, COUNTY_CODE_TO_NAME_MAP, PROVINCE_CODE_TO_NAME_M
import http from '@/http';
import { API } from '@/http/api';
import store from '@/store';
import { setLocationInfo, setServiceUrls } from '@/store/actions';
import { setLocationInfo, setCityOperators } from '@/store/actions';
import { selectLocation } from '@/store/selector';
import { CityOperatorListItem, GetCityCodeRequest, LocationInfo } from '@/types/location';
@ -135,14 +135,13 @@ export async function requestLocation(force: boolean = false) {
return location;
}
export async function requestServiceUrls() {
const list = await http.post<CityOperatorListItem[]>(API.GET_ALL_CITY_OPERATOR);
export async function requestCityOperators() {
const list = await http.get<CityOperatorListItem[]>(API.GET_ALL_CITY_OPERATOR);
store.dispatch(
setServiceUrls(
setCityOperators(
(list || []).map(it => ({
title: `${it.cityName}`,
cityCode: Number(it.cityCode),
serviceUrl: it.groupLink,
cityCode: it.cityCode,
groupLink: it.groupLink,
}))
)
);

View File

@ -21,8 +21,8 @@ import {
WithdrawRecord,
WithdrawResponse,
} from '@/types/partner';
import { requestUserInfo } from '@/utils/user';
import { buildUrl } from '@/utils/common';
import { requestUserInfo } from '@/utils/user';
export const getInviteCodeFromQuery = (query: Record<string, string>): string | undefined => {
if (query) {
@ -81,12 +81,12 @@ export const getProfitList = async (data: GetProfitRequest) => {
return Array.isArray(result) ? result : [];
return [];
};
export const formatMoney = (cents: number) => {
export const formatMoney = (cents: number, fraction = 2) => {
if (!cents) {
return '0';
}
const yuan = cents / 100;
return yuan.toFixed(2);
return yuan.toFixed(fraction);
};
export function formatTimestamp(timestamp: string, dateOnly?: boolean): string {
// 创建 Date 对象
@ -134,7 +134,9 @@ export async function getWithdrawList(data: IPaginationRequest) {
});
}
export async function getLastProfitList() {
const result = await http.get<UserProfitListItem[]>(API.GET_PROFIT_LIST);
const result = await http.get<UserProfitListItem[]>(API.GET_USER_PROFIT_LIST, {
contentType: 'application/x-www-form-urlencoded',
});
return Array.isArray(result) ? result : [];
}
@ -151,6 +153,6 @@ export async function decryptOpenGid(data: DecryptOpenGidBody) {
});
}
export async function getStaffInfo(cityCode: string) {
const result = await http.post<StaffInfo[]>(buildUrl(API.GET_STAFF_CODE, { cityCode }));
const result = await http.get<StaffInfo[]>(buildUrl(API.GET_STAFF_CODE, { cityCode }));
return Array.isArray(result) && result.length ? result[0] : null;
}

View File

@ -31,7 +31,7 @@ export const getUserId = () => getUserInfo().userId;
export const isValidUserInfo = (info: UserInfo) => !!info.userId;
export const isNeedLogin = (info: UserInfo) => !info.isBindPhone;
// export const isNeedLogin = (info: UserInfo) => !info.isBindPhone || info.userId === '534740874077898752';
// export const isNeedLogin = (info: UserInfo) => !info.isBindPhone || info.userId === '218396277145075712';
export const isNeedPhone = (info: UserInfo) => isNeedLogin(info) || !info.phone;