26 Commits

Author SHA1 Message Date
7f866c51be fea: update 2025-09-24 08:15:52 +08:00
fe33d0493c feat: update 2025-09-20 20:00:44 +08:00
87f8e1f7e2 feat: update 2025-09-20 19:52:56 +08:00
afa94e2c48 Merge branch 'trunk' into feat/material-list-updat 2025-09-20 18:28:53 +08:00
b8b33841d4 feat: 2025-09-20 18:25:58 +08:00
828e9b7512 feat: update style 2025-09-19 23:53:17 +08:00
1d8a0d7a33 feat: update 2025-09-19 23:49:31 +08:00
8c5fd1a86b feat: update 2025-09-19 22:55:21 +08:00
a4e03ae1bd Merge branch 'trunk' into feat/share-coupon 2025-09-14 21:38:42 +08:00
8e42fef4f7 feat: ps 2025-09-11 21:28:01 +08:00
6f7e78896a feat: distance 2025-09-10 21:37:20 +08:00
b9cd0a3e6d feat: update material card 2025-09-08 23:28:17 +08:00
c0d27a5ab2 feat: update img 2025-09-05 01:44:42 +08:00
6d76c82e96 feat: update 2025-09-03 23:50:03 +08:00
f2e7fd9d85 feat: 2025-09-01 18:44:26 +08:00
087e05a9a0 feat: update 2025-09-01 18:43:49 +08:00
aea8323d95 feat: 2025-08-31 22:43:00 +08:00
61686950bd feat: update 2025-08-28 14:47:02 +08:00
eea89263f2 Merge branch 'trunk' into feat/share-coupon 2025-08-28 14:45:50 +08:00
285db3f445 feat: wenan update 2025-08-28 14:40:48 +08:00
d0369bab36 feat: ui 2025-08-28 10:37:40 +08:00
898c6ab6ca Merge branch 'trunk' into feat/share-coupon 2025-08-28 08:56:37 +08:00
763a6245d2 feat: update 2025-08-28 08:56:26 +08:00
670a389f12 feat: share 2025-08-26 22:55:19 +08:00
2cb532c3d7 feat: 2025-08-24 17:35:13 +08:00
6a2c94c7cf feat: build 2025-08-17 13:44:41 +08:00
51 changed files with 6893 additions and 13142 deletions

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
dist/
dist-dev/
deploy_versions/
.temp/
.rn_temp/

View File

@ -12,6 +12,20 @@ const MockPlugin: PluginItem = [
}
];
const CIPluginOpt = () => {
const brand = process.env.BRAND as 'prod' | 'dev'; // 取环境变量
const map = {
prod: { appid: 'wxf0724a83f8e377d2', privateKeyPath: 'keys/private.wxf0724a83f8e377d2.key' },
dev: { appid: 'wx2d56597fd541f1a6', privateKeyPath: 'keys/private.wx2d56597fd541f1a6.key' },
};
return {
weapp: map[brand] || map.prod,
version: process.env.VERSION || '1.0.0',
desc: `build for ${brand}`,
};
};
// https://taro-docs.jd.com/docs/next/config#defineconfig-辅助函数
export default defineConfig(async (merge, _env: ConfigEnv) => {
const baseConfig: UserConfigExport = {
@ -25,13 +39,15 @@ export default defineConfig(async (merge, _env: ConfigEnv) => {
828: 1.81 / 2
},
sourceRoot: 'src',
outputRoot: 'dist',
plugins: ['@tarojs/plugin-html'],
outputRoot: process.env.OUTPUT_ROOT || 'dist',
plugins: [['@tarojs/plugin-mini-ci', CIPluginOpt()], '@tarojs/plugin-html'],
// plugins: ['@tarojs/plugin-html', MockPlugin],
defineConstants: {
'process.env.BRAND': JSON.stringify(process.env.BRAND),
},
copy: {
patterns: [
{from: 'project.config.dev.json',to: 'dist-dev/project.config.json'},
],
options: {
}

View File

@ -0,0 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEArjidDs/HGidBTzyOssyhX/Yvlr+BZxO3Qqe1iFBIJYWVXwiJ
KFVZw14rPKnh6ORB9qpMq3+fYJ7VsodmobnVlTaFXxJ8yi+tVZSZyZPtHabu2JVO
qu7LX709p5NTFcrmOY6+NJA827+hg6V0Nl3b4CWLsouPHgiIxpqnLeaOka3lbPMq
vQuDeMCbQNFe5Jz7C0gc6dXwEpDExNX4WiVfi4UP5bcYiUKlbdben5i6qbFrZ4QK
woYoAIhr60jQGfB6Jg7YkbbAyh42XR3BMkf2TPQqieZM1/IKNuw2evtA2BqLJuiz
cQ1qNBBXczbJv9KjBVAzAJgT4InUyJF+QfFJ6wIDAQABAoIBAQCf2kohIPvqP0Jp
VYMJA0C+L8CSbLxqu2hWvFKP9Dl+VAct30MZwtZNr8W0L5uceHMdxDv8z2iI2rPw
ztOYaE5UTmYpSWk+imhcMbC5iAT0RAq6pqQ7qkboXVaIv2BoinabMSHMUNvGNRoZ
FGKAz7XDADAhbnOudt4ofBYQw47kkko8vaDZBJS6UGN+QVJpyBtJKohaXKC6HRva
2c8zDwVZlKMrPl4WB4cg0+WPv6vUZymv8U7flwY0xJBBWwZUxqbmjqbTg8BGb5Mu
tpIZRvTGNxbDu9Ms7mdYdGGe/PFmqgj1hOomeXvBlnYz+fmWHu5ElyPGBHD92N7x
Hdcopp4BAoGBANqQUfxzjGcBvSSSowehSvgVCnUFsTxSE8c9HQRX4LtMnLCo6c6m
Hxf+l67FyY5704EW29PLu5ETdLBm6pCaIk8aJo467l8M9BOHmE/CwNciloHxXa4h
/gUKex6EsFJoT+1gaCaDJeu0gDJl49QnpYOrma2CZ8vyG3+NCotuYturAoGBAMwP
8G2ObLZUFPZAfhGZrobUom2dCtJXenYupxSvJ/rNd7zY+F3pcyi461eMIkKFaxQX
bRyDi/LRCQRKrSDuw3Dt4Ne9gkpdlI/LUDTUUbWdDuCXxfsXSRAYHC1ae0rsiGQv
PaTotkDSjdAIKdgd0bmeufFZ2Ozmid2lHzSZfwrBAoGAQXSVSSClvLeVmJ1du8w/
MnrCrfctdB40lCemSAW1ZQJ1rqZ3lw7DIyF49buAOG63EeLxpMVQAAuul6HKv9GZ
Us1HHLNjbg3oDu093S07KXLPVk0dvCer9oCEDMi6MYPR5ApKRrZiJevhtLY0+/V/
qSY8GO2D/l0chR+NN+KwMo8CgYB4Y07s04G/b4uOXC4EJC6azQems2eXAJT29D8O
LOfhRybE+xxMC1YtSCtP0xTDOgMaL1fn4pPGBRzUs1nAfBxBm5VyshMT3HGxA7ml
8TzjcG0+g0wB/pLUM+UrvJ3QbgtpT5WGnOQpCg8wFCDbp3v7jnEUunUIDlp3sNrg
JU6WAQKBgDjcfRDtnmSxSiejsZaZM7gCAYlZq6WBuvQ6WF+nD9mzEgzkw3F+1cHC
Y905VPGb/vCPAV+JdN7LxnMn2G3JoWPqrhOIT6KgPgAYbVAq1hmLqXMjGi53n9uY
39GL4UgJkywIdEkla/8zNFNKZgQulWPDJqb/MFcVo3/VegEfwdbk
-----END RSA PRIVATE KEY-----

View File

@ -0,0 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEA1Tl6FYIIWB8b+OjYY9s6cOJf71Vn0J/u/kdq5CH/LMOdNrUh
fq3shAwdDkXmuRIpHU7Noxisu71tB2EumigIwBDRVyrdwPu/p6QWyaMgrh0bdtaC
LKW/j2teNU1MCSWyCDyEeZ9PJteK5+ieX+ZPDg17HLV2dISpB71AGyM461DIHCAV
uaanUJ4MYCtp9t7OFgrD4dNzDMH0lBJBczRQAmnit0GpJD/y2rfgtL+HaKpDN8rc
w80+3HVfhKq3niy/vBbI6alqFb1Mh9O5q6/c1tEWQKPn3TzneGIDhMupGzHEzrVR
j87+1cyYi8PtBdNMPls+zPn7MoajjrASFyo1hQIDAQABAoIBABHu652zehAvTaL5
snlzjs6/u2HdxQV+7hLk3tChK10QdsCLK24EIshYXHk+19Do/hxA7HqzMJP5spnU
Sp8cjt/YikLSkCQTCGOJIYGD/tOmDxFHqVsn9ZySYzIIdkSurvKSZHH2PCoAJuaq
Yeee7zc3WwtnF7dlEPJdsG6X38mqslzaLOuiftkHJ8hQ+1rWM9FFEp/S3pLfLB+7
jEQhuVk0WjLTqmWmKvi0Nz5tUibBpF1OHtCfIhPjb1N8k/bcv1jumETx+2PDxA62
zpPNGespBaET+jeEqNCqLO7Zq8+iUO8d4XpZsFCR2cyE6zzXK2mhQ+2pW2BRU/DI
w/ZylmECgYEA6uPRJ4uk+NavoJlQCv7R9B8CGbwzbRaG8sg/NuwvTOO6D4FGUdcu
f8qA2kCd8bSCuWrS1mVgPpvzwHt5Bh3k7FC/0SfW5ZDC5Lp1IssI0jeka39vfPOD
ZdcvgJ3dUnHUrvb4L4PclgCa3KPXLTVDnK+4ExvaYOxNAaG6wROCGBsCgYEA6GMy
nCsPr21kKmhybCrhcTYoENb45hz6CCnXr4MGnYzF9c2ss2KXjR/boCdhF+3wxmmm
F4TKgcicOUfOJIXSIHBD9nphLa5CfrksLxfX0iIyNCG74aXIWl6M6QgQZdWqV4qC
xYTtFYACELIb8qK/mraMP28c9BzDpwd909ZlAt8CgYEAmpXCIa+CrA3GWgBsMEBR
9sKthDha8/E+cOuexsubuZOp8OhYWiYuwQWJ1ZlvGRJ+cf6+sUDYnXvPaJ8aIA9u
iKQACWuZv02NJjEcRACxVoAuIl0lB2vPzydWaOP8M3UczuVUoxi6BLJzOMBPLb5/
N9BhaZoMF3uMloVUvhrTpH8CgYA9sQfgeXYChjHPKEcn/AI5Qb1FKyyMOikOPb1q
dIgvDw4GgQFV5diBuHFfhNS7u4jtw2I6YCA6b/05H5zUCUqNHgCM0FQ4AkjYx2O5
ZMUAnd9iA4qTDqWvh+Y0ftWLkztTXgv1T6J40LC7qezNbvMaqVd2B5NSIsi18MEw
mXvbVQKBgQC0Rh5TJEfeBWRoIixwFuDUgHYRsdk3SV1hymYO3aKBr0uD8Arv4v1M
XO6DchFjcpKuwScjXX5yEot5PJOUTPG2T2uBPnJggtNig2dnRzQDLM+bK0vVecoz
QL9YMOYv6DNH6Z2yEfMZHZLto9Oaqm9J62hZahZ2GukFLOMBGZAVhA==
-----END RSA PRIVATE KEY-----

View File

@ -10,29 +10,10 @@
"framework": "React"
},
"scripts": {
"build:weapp": "taro build --type weapp",
"build:swan": "taro build --type swan",
"build:alipay": "taro build --type alipay",
"build:tt": "taro build --type tt",
"build:h5": "taro build --type h5",
"build:rn": "taro build --type rn",
"build:qq": "taro build --type qq",
"build:jd": "taro build --type jd",
"build:quickapp": "taro build --type quickapp",
"build:harmony-hybrid": "taro build --type harmony-hybrid",
"dev:weapp": "npm run build:weapp -- --watch",
"dev:swan": "npm run build:swan -- --watch",
"dev:alipay": "npm run build:alipay -- --watch",
"dev:tt": "npm run build:tt -- --watch",
"dev:h5": "npm run build:h5 -- --watch",
"dev:rn": "npm run build:rn -- --watch",
"dev:qq": "npm run build:qq -- --watch",
"dev:jd": "npm run build:jd -- --watch",
"dev:quickapp": "npm run build:quickapp -- --watch",
"dev:harmony-hybrid": "npm run build:harmony-hybrid -- --watch",
"test": "jest",
"lint:format": "npx prettier --write",
"lint:format-all": "npx prettier --write 'src/**/*.{ts,js,css,jsx,html,vue,tsx}'"
"build:weapp": "BRAND=prod taro build --type weapp",
"build:dev:weapp": "BRAND=dev OUTPUT_ROOT=dist-dev taro build --type weapp --upload",
"dev:weapp": "BRAND=prod npm run build:weapp -- --watch",
"dev:dev:weapp": "BRAND=dev OUTPUT_ROOT=dist-dev taro build --type weapp --watch"
},
"browserslist": [
"last 3 versions",
@ -76,6 +57,7 @@
"@babel/core": "^7.8.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
"@tarojs/cli": "4.0.9",
"@tarojs/plugin-mini-ci": "^4.1.5",
"@tarojs/plugin-mock": "^0.0.9",
"@tarojs/taro-loader": "4.0.9",
"@tarojs/test-utils-react": "^0.1.1",
@ -95,6 +77,7 @@
"eslint-plugin-react-hooks": "^4.2.0",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.5.0",
"miniprogram-ci": "^2.1.14",
"postcss": "^8.4.18",
"prettier": "^3.3.1",
"react-refresh": "^0.11.0",
@ -110,5 +93,5 @@
"@tarojs/binding"
]
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
"packageManager": "pnpm@10.12.4+sha512.5ea8b0deed94ed68691c9bad4c955492705c5eeb8a87ef86bc62c74a26b037b08ff9570f108b2e4dbd1dd1a9186fea925e527f141c648e85af45631074680184"
}

5985
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

47
project.config.dev.json Normal file
View File

@ -0,0 +1,47 @@
{
"miniprogramRoot": "./",
"description": "boluo app",
"setting": {
"urlCheck": true,
"es6": false,
"enhance": false,
"compileHotReLoad": false,
"postcss": false,
"minified": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"coverView": false,
"showShadowRootInWxmlPanel": false,
"packNpmRelationList": [],
"ignoreUploadUnusedFiles": true,
"compileWorklet": false,
"uglifyFileName": false,
"uploadWithSourceMap": true,
"packNpmManually": false,
"minifyWXSS": true,
"minifyWXML": true,
"localPlugins": false,
"disableUseStrict": false,
"useCompilerPlugins": false,
"condition": false,
"swc": false,
"disableSWC": true
},
"compileType": "miniprogram",
"srcMiniprogramRoot": "dist/",
"condition": {},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 2
},
"libVersion": "3.4.6",
"packOptions": {
"ignore": [],
"include": []
},
"appid": "wx2d56597fd541f1a6",
"simulatorPluginLibVersion": {}
}

View File

@ -9,7 +9,7 @@ import { PageUrl } from '@/constants/app';
import { MaterialViewSource, WORK_YEAR_LABELS } from '@/constants/material';
import { AnchorInfo } from '@/types/material';
import { calcDistance } from '@/utils/location';
import { getBasicInfo } from '@/utils/material';
import { getBasicInfo, getSalary } from '@/utils/material';
import { navigateTo } from '@/utils/route';
import { activeDate } from '@/utils/time';
@ -22,17 +22,6 @@ interface IProps {
}
const PREFIX = 'anchor-card';
const getSalary = (data: AnchorInfo) => {
const { fullTimeMinPrice, fullTimeMaxPrice, partyTimeMinPrice, partyTimeMaxPrice } = data;
const prices: string[] = [];
if (fullTimeMinPrice && fullTimeMaxPrice) {
prices.push(`${fullTimeMinPrice / 1000}-${fullTimeMaxPrice / 1000}K/月`);
}
if (partyTimeMinPrice && partyTimeMaxPrice) {
prices.push(`${partyTimeMinPrice}-${partyTimeMaxPrice}/小时`);
}
return prices.filter(Boolean).join(' ');
};
function AnchorCard(props: IProps) {
const { data, jobId, validator } = props;

View File

@ -5,34 +5,19 @@ import { isEqual } from 'lodash-es';
import { useCallback, useState } from 'react';
import PickerToolbar from '@/components/picker-toolbar';
import {
EmployType,
ALL_EMPLOY_TYPES,
FULL_PRICE_OPTIONS,
PART_PRICE_OPTIONS,
EMPLOY_TYPE_TITLE_MAP,
} from '@/constants/job';
import {
ALL_ANCHOR_READ_TYPES,
ALL_GENDER_TYPES,
ANCHOR_READ_TITLE_MAP,
AnchorReadType,
GENDER_TYPE_TITLE_MAP,
GenderType,
} from '@/constants/material';
import { FULL_PRICE_OPTIONS, PART_PRICE_OPTIONS } from '@/constants/job';
import { ALL_ANCHOR_READ_TYPES, ANCHOR_READ_TITLE_MAP, AnchorReadType } from '@/constants/material';
import { IAnchorFilters } from '@/types/material';
import { isUndefined } from '@/utils/common';
import './index.less';
type MoreFilter = Omit<IAnchorFilters, 'employType' | 'gender'>;
interface IProps {
value: IAnchorFilters;
onConfirm: (newValue: IAnchorFilters) => void;
value: MoreFilter;
onConfirm: (newValue: MoreFilter) => void;
}
const PREFIX = 'anchor-picker';
const getDefaultGender = (value: IAnchorFilters) => value.gender;
const getDefaultEmploy = (value: IAnchorFilters) => value.employType;
const getDefaultReadType = (value: IAnchorFilters) => value.readType;
const getDefaultCategory = (value: IAnchorFilters) => value.category || '';
const getSalaryValue = (value: IAnchorFilters, full: boolean) => {
@ -47,9 +32,7 @@ const getSalaryValue = (value: IAnchorFilters, full: boolean) => {
function AnchorPicker(props: IProps) {
const { value, onConfirm } = props;
const [gender, setGender] = useState<GenderType | undefined>(getDefaultGender(value));
const [readType, setReadType] = useState<AnchorReadType | undefined>(getDefaultReadType(value));
const [employType, setEmployType] = useState<EmployType | undefined>(getDefaultEmploy(value));
const [fullSalary, setFullSalary] = useState(getSalaryValue(value, true));
const [partSalary, setPartSalary] = useState(getSalaryValue(value, false));
const [category, setCategory] = useState(getDefaultCategory(value));
@ -59,9 +42,7 @@ function AnchorPicker(props: IProps) {
}, []);
const handleClickReset = useCallback(() => {
setGender(undefined);
setReadType(undefined);
setEmployType(undefined);
setFullSalary(null);
setPartSalary(null);
setCategory('');
@ -83,10 +64,6 @@ function AnchorPicker(props: IProps) {
const handleClickConfirm = useCallback(() => {
const filters: IAnchorFilters = {};
if (!isUndefined(gender)) {
filters.gender = gender === GenderType.All ? undefined : gender;
}
employType && (filters.employType = employType);
readType && (filters.readType = readType);
category && (filters.category = category);
if (fullSalary) {
@ -98,34 +75,10 @@ function AnchorPicker(props: IProps) {
filters.highPriceForPartyTime = partSalary.maxSalary;
}
onConfirm(filters);
}, [gender, employType, readType, category, fullSalary, partSalary, onConfirm]);
}, [readType, category, fullSalary, partSalary, onConfirm]);
return (
<div className={PREFIX}>
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__container`}>
{ALL_GENDER_TYPES.map((type: GenderType) => (
<div
key={type}
onClick={() => setGender(type)}
className={classNames(`${PREFIX}__item`, { selected: type === gender })}
>
{GENDER_TYPE_TITLE_MAP[type]}
</div>
))}
</div>
<div className={`${PREFIX}__title`}>/</div>
<div className={`${PREFIX}__container`}>
{ALL_EMPLOY_TYPES.map(type => (
<div
key={type}
onClick={() => setEmployType(type)}
className={classNames(`${PREFIX}__item`, { selected: type === employType })}
>
{EMPLOY_TYPE_TITLE_MAP[type]}
</div>
))}
</div>
<div className={`${PREFIX}__title`}>/</div>
<div className={`${PREFIX}__container`}>
{ALL_ANCHOR_READ_TYPES.map(type => (

View File

@ -0,0 +1,13 @@
import Select, { ISelectProps } from '@/components/select';
import { GENDER_OPTIONS, GenderType } from '@/constants/material';
interface IProps extends Omit<ISelectProps<GenderType>, 'options'> {
value: GenderType;
}
function GenderSelect(props: IProps) {
const { value: selectValue, onSelect } = props;
return <Select options={GENDER_OPTIONS} title="性别" value={selectValue} onSelect={onSelect} />;
}
export default GenderSelect;

View File

@ -1,6 +1,6 @@
@import '@/styles/common.less';
@import '@/styles/variables.less';
.job-card {
&__container {
width: 100%;
@ -11,6 +11,16 @@
border-radius: 16px;
background: #FFFFFF;
margin-bottom: 24px;
position: relative;
}
&__mask {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(255, 255, 255, 0.4);
}
&__header {
@ -160,4 +170,4 @@
color: @blColorG2;
}
}
}

View File

@ -5,11 +5,11 @@ import React, { useCallback } from 'react';
import { CertificationStatusIcon } from '@/components/certification-status';
import { PageUrl } from '@/constants/app';
import { CITY_CODE_TO_NAME_MAP, COUNTY_CODE_TO_NAME_MAP } from '@/constants/city';
// import { CITY_CODE_TO_NAME_MAP, COUNTY_CODE_TO_NAME_MAP } from '@/constants/city';
import { CertificationStatusType } from '@/constants/company';
import { EMPLOY_TYPE_TITLE_MAP, EmployType } from '@/constants/job';
import { JobInfo } from '@/types/job';
import { LocationInfo } from '@/types/location';
// import { LocationInfo } from '@/types/location';
import { getJobSalary, getJobTitle } from '@/utils/job';
import { calcDistance } from '@/utils/location';
import { navigateTo, redirectTo } from '@/utils/route';
@ -23,16 +23,16 @@ interface IProps {
}
const PREFIX = 'job-card';
const getCityDes = (location: LocationInfo) => {
if (!location) {
return '';
}
let des = CITY_CODE_TO_NAME_MAP.get(location.cityCode);
if (location.countyCode) {
des += `-${COUNTY_CODE_TO_NAME_MAP.get(location.countyCode)}`;
}
return des;
};
// const getCityDes = (location: LocationInfo) => {
// if (!location) {
// return '';
// }
// let des = CITY_CODE_TO_NAME_MAP.get(location.cityCode);
// if (location.countyCode) {
// des += `-${COUNTY_CODE_TO_NAME_MAP.get(location.countyCode)}`;
// }
// return des;
// };
function JobCard(props: IProps) {
const { className, data, redirectOpen } = props;
@ -84,12 +84,12 @@ function JobCard(props: IProps) {
<div className={`${PREFIX}__summary`}>{jobDescription || sourceText}</div>
<div className={`${PREFIX}__distance-wrapper`}>
<div className={`${PREFIX}__detailed-address`}>{jobLocation?.address}</div>
{/*{distance && (*/}
{/* <>*/}
{/* <Image className={`${PREFIX}__distance-icon`} src={require('@/statics/svg/location.svg')} />*/}
{/* <div className={`${PREFIX}__distance`}>{calcDistance(distance)}</div>*/}
{/* </>*/}
{/*)}*/}
{distance && (
<>
<Image className={`${PREFIX}__distance-icon`} src={require('@/statics/svg/location.svg')} />
<div className={`${PREFIX}__distance`}>{calcDistance(distance)}</div>
</>
)}
</div>
</div>
<div className={`${PREFIX}__divider`} />
@ -104,6 +104,7 @@ function JobCard(props: IProps) {
</div>
{/*<div className={`${PREFIX}__city`}>{getCityDes(jobLocation)}</div>*/}
</div>
{data.isRead && <div className={`${PREFIX}__mask`} />}
</div>
);
}

View File

@ -1,3 +1,5 @@
import Taro from '@tarojs/taro';
import { List, PullRefresh } from '@taroify/core';
import classNames from 'classnames';
import { isEqual } from 'lodash-es';
@ -5,6 +7,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
import JobCard from '@/components/job-card';
import ListPlaceholder from '@/components/list-placeholder';
import { EventName } from '@/constants/app';
import { JobType, EmployType, SortType } from '@/constants/job';
import { JobInfo, GetJobsRequest } from '@/types/job';
import { logWithPrefix } from '@/utils/common';
@ -58,6 +61,23 @@ function JobList(props: IJobListProps) {
const prevRequestProps = useRef<IRequestProps>({});
const onListEmptyRef = useRef(onListEmpty);
const handleReadJob = useCallback(
(jobId: string) => {
const index = dataList.findIndex(d => String(d.id) === jobId);
if (index < 0) {
return;
}
const job = dataList[index];
if (!job || job.isRead) {
return;
}
log('auto mark read', jobId);
dataList.splice(index, 1, { ...job, isRead: true });
setDataList([...dataList]);
},
[dataList]
);
const handleRefresh = useCallback(async () => {
log('start pull refresh');
try {
@ -109,6 +129,13 @@ function JobList(props: IJobListProps) {
onListEmptyRef.current = onListEmpty;
}, [onListEmpty]);
useEffect(() => {
Taro.eventCenter.on(EventName.VIEW_JOB_SUCCESS, handleReadJob);
return () => {
Taro.eventCenter.off(EventName.VIEW_JOB_SUCCESS, handleReadJob);
};
}, [handleReadJob]);
useEffect(() => {
log('request params changed');
requestProps.current = {

View File

@ -4,7 +4,7 @@
.material-card {
padding: 32px 24px;
border-radius: 16px;
background: #FFFFFF;
background: #ffffff;
box-sizing: border-box;
&__header {
@ -16,6 +16,10 @@
.flex-row();
}
&__right {
color: @blHighlightColor;
}
&__title {
font-size: 32px;
line-height: 40px;
@ -50,7 +54,7 @@
&__body {
width: 100%;
height: 156px;
height: 160px;
margin-top: 24px;
.flex-column();
justify-content: center;
@ -80,38 +84,44 @@
}
}
&__scroll-view {
position: relative;
&__info {
.flex-row();
gap: 24px;
width: 100%;
height: 100%;
.flex-row();
&::-webkit-scrollbar {
display: none;
&-left {
width: 125px;
height: 160px;
}
&::after {
content: '';
position: absolute;
right: 0;
width: 102px;
&-cover {
width: 100%;
height: 100%;
background: linear-gradient(91.41deg, rgba(255, 255, 255, 0) 1.86%, #FFFFFF 99.47%);
border-radius: 12px;
}
&-right {
.name {
font-style: normal;
font-weight: 500;
font-size: 28px;
line-height: 32px;
color: @blColor;
margin-bottom: 12px;
}
.info,
.worked {
font-weight: 400;
font-size: 24px;
line-height: 36px;
color: @blColorG2;
margin-bottom: 8px;
}
.salary {
font-weight: 500;
font-size: 24px;
line-height: 36px;
color: @blColor;
}
}
}
&__cover-list {
height: 100%;
.flex-row();
}
&__cover-image {
width: 120px;
height: 100%;
margin-right: 24px;
// 不知道为啥高度不对,可能 scroll-view 默认底部是滚动条高度?
margin-top: 38px;
border-radius: 8px;
}
}
}

View File

@ -1,4 +1,4 @@
import { Image, ScrollView } from '@tarojs/components';
import { Image } from '@tarojs/components';
import Taro from '@tarojs/taro';
import { Loading } from '@taroify/core';
@ -9,11 +9,12 @@ import { useCallback, useEffect, useRef, useState } from 'react';
import LoginButton from '@/components/login-button';
import { EventName, PageUrl } from '@/constants/app';
import { CollectEventName, ReportEventId } from '@/constants/event';
import { WORK_YEAR_LABELS } from '@/constants/material';
import useUserInfo from '@/hooks/use-user-info';
import { MaterialProfile } from '@/types/material';
import { logWithPrefix } from '@/utils/common';
import { collectEvent, reportEvent } from '@/utils/event';
import { requestProfileDetail, sortVideos } from '@/utils/material';
import { getBasicInfo, getSalary, requestProfileDetail, sortVideos } from '@/utils/material';
import { navigateTo } from '@/utils/route';
import Toast from '@/utils/toast';
import { isValidUserInfo } from '@/utils/user';
@ -34,8 +35,9 @@ function MaterialCard(props: IProps) {
const userInfo = useUserInfo();
const [loading, setLoading] = useState(true);
const [profile, setProfile] = useState<MaterialProfile | null>(null);
const refreshRef = useRef((_f?: boolean) => { });
const refreshRef = useRef((_f?: boolean) => {});
const hasMaterial = !!profile;
const firstCover = sortVideos(profile?.materialVideoInfoList || [])[0];
const handleGoCreateProfile = useCallback(() => {
reportEvent(ReportEventId.CLICK_GO_TO_CREATE_MATERIAL);
@ -44,7 +46,7 @@ function MaterialCard(props: IProps) {
const handleGoProfile = useCallback(() => {
if (!hasMaterial) {
realtimeLogger.info('handleGoProfile noMaterial')
realtimeLogger.info('handleGoProfile noMaterial');
return;
}
navigateTo(PageUrl.MaterialProfile).catch(err => {
@ -67,7 +69,7 @@ function MaterialCard(props: IProps) {
try {
const profileDetail = await requestProfileDetail();
if (!profileDetail) {
realtimeLogger.info('getProfileDetail no profileDetail')
realtimeLogger.info('getProfileDetail no profileDetail');
}
setProfile(profileDetail);
} catch (e) {
@ -90,8 +92,10 @@ function MaterialCard(props: IProps) {
refreshRef.current?.(true);
};
Taro.eventCenter.on(EventName.CREATE_PROFILE, callback);
Taro.eventCenter.on(EventName.UPDATE_PROFILE, callback);
return () => {
Taro.eventCenter.off(EventName.CREATE_PROFILE, callback);
Taro.eventCenter.on(EventName.UPDATE_PROFILE, callback);
};
}, [userInfo]);
@ -100,16 +104,11 @@ function MaterialCard(props: IProps) {
<div className={`${PREFIX}__header`}>
<div className={`${PREFIX}__header__left`}>
<div className={`${PREFIX}__header__title`}></div>
{/* {profile && (
<div
className={`${PREFIX}__header__progress`}
>{`完成度${Math.min((profile.progressBar || 0) * 100, 100)}%`}</div>
)} */}
</div>
{profile && (
<div className={`${PREFIX}__header__right`}>
{/* <div className={`${PREFIX}__header__status`}>{profile?.isOpen ? '开放中' : '关闭'}</div> */}
<ArrowRight className={`${PREFIX}__header__icon`} />
<div></div>
<ArrowRight color="#6D3DF5" className={`${PREFIX}__header__icon`} />
</div>
)}
</div>
@ -123,18 +122,21 @@ function MaterialCard(props: IProps) {
</div>
)}
{!loading && hasMaterial && (
<ScrollView className={`${PREFIX}__scroll-view`} showScrollbar={false} enableFlex enhanced scrollX>
<div className={`${PREFIX}__cover-list`}>
{sortVideos(profile?.materialVideoInfoList || []).map(video => (
<Image
className={`${PREFIX}__cover-image`}
mode="aspectFit"
key={video.coverUrl}
src={video.coverUrl}
/>
))}
<div className={`${PREFIX}__info`}>
{firstCover && (
<div className={`${PREFIX}__info-left`}>
<Image className={`${PREFIX}__info-cover`} mode="aspectFill" src={firstCover.coverUrl} />
</div>
)}
<div className={`${PREFIX}__info-right`}>
<div className="name">{profile?.name}</div>
<div className="info">
{WORK_YEAR_LABELS[profile?.workedYear] || ''}·{getBasicInfo({ ...profile, shoeSize: null })}
</div>
<div className="worked"> {profile?.workedSecCategoryStr}</div>
<div className="salary">{getSalary(profile)}</div>
</div>
</ScrollView>
</div>
)}
{loading && <Loading />}
</div>

View File

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

View File

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

View File

@ -1,19 +1,19 @@
import { Button, Canvas } from '@tarojs/components';
import Taro from '@tarojs/taro';
import { useCallback, useState } from 'react';
import { useCallback } from 'react';
import { openCustomerServiceChat } from '@/utils/common';
import { getPartnerQrcode } from '@/utils/partner';
import { getCouponQrCode, generateMembershipCoupon } from '@/utils/coupon';
import './index.less';
const PREFIX = 'partner-intro';
export default function PartnerIntro() {
const [posterPath, setPosterPath] = useState('');
const getQrcode = async () => {
try {
const data = await getPartnerQrcode(); // 假设 getPartnerQrcode 返回 ArrayBuffer
const { code } = await generateMembershipCoupon();
const data = await getCouponQrCode(code);
const base64 = Taro.arrayBufferToBase64(data);
return `data:image/png;base64,${base64}`;
} catch (error) {
@ -36,11 +36,9 @@ export default function PartnerIntro() {
height: 2668, // 实际绘制高度
destWidth: 750, // 目标显示宽度
destHeight: 1334, // 目标显示高度
fileType: 'jpg',
fileType: 'png',
});
setPosterPath(tempFilePath.tempFilePath);
resolve(tempFilePath.tempFilePath);
});
} catch (error) {
@ -57,21 +55,21 @@ export default function PartnerIntro() {
const canvas = res[0].node;
const ctx = canvas.getContext('2d');
canvas.width = 1500;
canvas.height = 2668;
canvas.width = 550 * 2;
canvas.height = 918 * 2;
ctx.scale(2, 2);
// 绘制背景图片
const bgImage = canvas.createImage();
const poster = 'https://publiccdn.neighbourhood.com.cn/img/poster.png'
const poster = 'https://publiccdn.neighbourhood.com.cn/img/share-coupon-poster2.png';
bgImage.src = poster;
bgImage.onload = () => {
ctx.drawImage(bgImage, 0, 0, 750, 1334);
ctx.drawImage(bgImage, 0, 0, 550, 918);
const qrCodeImage = canvas.createImage();
qrCodeImage.src = qrCode; // 假设 getQrcode() 返回的是二维码图片的路径
qrCodeImage.onload = () => {
ctx.drawImage(qrCodeImage, 235, 894, 280, 280); // 绘制二维码,位置和大小
ctx.drawImage(qrCodeImage, 196, 600, 180, 160); // 绘制二维码,位置和大小
saveCanvasToTempFile().then(tempPath => {
resolve(tempPath);
});
@ -84,13 +82,10 @@ export default function PartnerIntro() {
});
};
const savePoster = async () => {
let filePath = posterPath;
if (!filePath) {
Taro.showLoading({ title: '正在生成海报' });
const qrCode = await getQrcode();
filePath = await drawCanvas(qrCode);
Taro.hideLoading();
}
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'];
@ -144,7 +139,9 @@ export default function PartnerIntro() {
<div className={`${PREFIX}__block`}>
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__card`}>
<div className={`${PREFIX}__body`}></div>
<div className={`${PREFIX}__body`}>
</div>
</div>
</div>
<div className={`${PREFIX}__block`}>
@ -163,10 +160,10 @@ export default function PartnerIntro() {
<div className={`${PREFIX}__footer`}>
<Button className={`${PREFIX}__download-button`} onClick={savePoster}>
</Button>
<Button className={`${PREFIX}__share-button`} openType="share">
</Button>
</div>
</div>

View File

@ -8,7 +8,51 @@
background: #6d3df5;
color: #fff;
&__simple {
&-simple {
padding: 39px 35px;
height: 120px;
box-sizing: border-box;
&__bg {
position: absolute;
top: 0;
left: 0;
width: 100%;
border-radius: 16px;
height: 100%;
}
&__content {
.flex-row();
line-height: 42px;
position: relative;
z-index: 1;
}
&__title {
font-size: 26px;
color: #FFFFFF;
}
&__money {
font-weight: 800;
margin-left: 12px;
font-size: 44px;
}
&__button {
position: absolute;
z-index: 2;
top: 44px;
right: 24px;
font-size: 28px;
line-height: 32px;
&-image {
width: 24px;
height: 24px;
display: inline-block;
margin-left: 8px;
}
}
}
&__bg {
@ -28,20 +72,7 @@
z-index: 1;
}
&__button {
position: absolute;
z-index: 2;
top: 44px;
right: 56px;
font-size: 24px;
line-height: 24px;
&-image {
width: 20px;
height: 20px;
display: inline-block;
margin-left: 4px;
}
}
&__title {
font-style: normal;
font-weight: 400;

View File

@ -144,24 +144,37 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
useEffect(() => {
getProfitStats();
}, []);
if (simple) {
return (
<div className={`${PREFIX} ${PREFIX}-simple`}>
<Image
className={`${PREFIX}-simple__bg`}
src="https://publiccdn.neighbourhood.com.cn/img/partner_bg.png"
mode="aspectFill"
/>
<div className={`${PREFIX}-simple__content`}>
<div className={`${PREFIX}-simple__title`}>()</div>
<div className={`${PREFIX}-simple__money`}>{formatMoney(total)}</div>
</div>
<div className={`${PREFIX}-simple__button`} onClick={handleNavigate}>
<Image
className={`${PREFIX}-simple__button-image`}
mode="aspectFit"
src={require('@/statics/svg/caret-right.svg')}
/>
</div>
</div>
);
}
return (
<div className={`${PREFIX} ${simple ? `${PREFIX}__simple` : ''}`}>
<div className={PREFIX}>
<Image
className={`${PREFIX}__bg`}
src="https://publiccdn.neighbourhood.com.cn/img/partner_bg.png"
mode="aspectFill"
/>
<div className={`${PREFIX}__content`}>
{simple && (
<div className={`${PREFIX}__button`} onClick={handleNavigate}>
<Image
className={`${PREFIX}__button-image`}
mode="aspectFit"
src={require('@/statics/svg/caret-right.svg')}
/>
</div>
)}
<div className={`${PREFIX}__total`}>
<div className={`${PREFIX}__title`}></div>
<div className={`${PREFIX}__money`}>{formatMoney(total)}</div>
@ -183,25 +196,21 @@ export default function PartnerKanban({ simple }: PartnerKanbanProps) {
<div className={`${PREFIX}__money`}>{formatMoney(stats.availableProfit)}</div>
</div>
</div>
{!simple && (
<div className={`${PREFIX}__buttons`}>
<Button className={`${PREFIX}__withdraw`} onClick={handleViewWithdraw}>
</Button>
<Button className={`${PREFIX}__record`} onClick={handleNavigateRecord}>
</Button>
</div>
)}
<div className={`${PREFIX}__buttons`}>
<Button className={`${PREFIX}__withdraw`} onClick={handleViewWithdraw}>
</Button>
<Button className={`${PREFIX}__record`} onClick={handleNavigateRecord}>
</Button>
</div>
</div>
{!simple && <TipDialog open={tipOpen} onClose={handleTipClose} />}
{!simple && (
<WithdrawDialog
count={Math.min(Number(formatMoney(stats.availableBalance)), 200)}
open={withdrawOpen}
onClose={handleWithdrawClose}
/>
)}
<TipDialog open={tipOpen} onClose={handleTipClose} />
<WithdrawDialog
count={Math.min(Number(formatMoney(stats.availableBalance)), 200)}
open={withdrawOpen}
onClose={handleWithdrawClose}
/>
</div>
);
}

View File

@ -226,6 +226,20 @@
margin-top: 32px;
}
&__hint {
font-size: 24px;
line-height: 40px;
text-align: center;
color: @blColorG1;
margin-top: 24px;
.highlight {
color: @blHighlightColor;
display: inline;
}
}
}
// ============================================= 群 ================================================= //

View File

@ -152,6 +152,9 @@ export default function JobBuy(props: IProps) {
);
})}
</div>
<div className={`${PREFIX}__job-buy__hint`}>
<div className="highlight">24</div>
</div>
<Button className={`${PREFIX}__job-buy__button`} onClick={handleBuy}>
{`支付 ${selectItem.amt}`}
</Button>

View File

@ -28,6 +28,7 @@
justify-content: space-between;
box-sizing: border-box;
padding: 0 24px;
flex: 0 0 96px;
&.selected {
color: @blHighlightColor;
@ -45,4 +46,4 @@
border-top-left-radius: 24px;
border-top-right-radius: 24px;
}
}
}

View File

@ -0,0 +1,13 @@
import Select, { ISelectProps } from '@/components/select';
import { JOB_TYPE_SELECT_OPTIONS_WITH_ALL, JobType } from '@/constants/job';
interface IProps extends Omit<ISelectProps<JobType>, 'options'> {
value: JobType;
}
function TopCategorySelect(props: IProps) {
const { value: selectValue, onSelect } = props;
return <Select options={JOB_TYPE_SELECT_OPTIONS_WITH_ALL} title="品类" value={selectValue} onSelect={onSelect} />;
}
export default TopCategorySelect;

View File

@ -36,7 +36,7 @@ interface CityOption extends ISelectOption<CityValue> {
const PREFIX = 'user-batch-publish';
const log = logWithPrefix(PREFIX);
const SERVICE_ILLUSTRATE = `服务方式:帮您把招聘需求发到众多同城合作主播群
群发次数:每日1次连发3天
群发次数:杭州、广州发3次其他城市1次
内容要求:仅限带货主播招聘需求,其他不发
主播联系:内容中留招聘方联系方式,主播直接联系`;
const cityValues: CityValue[] = [

View File

@ -24,6 +24,7 @@ export enum EventName {
SELECT_MY_PUBLISH_JOB = 'select_my_publish_job',
EXIT_CHAT_PAGE = 'exit_chat_page',
VIEW_MATERIAL_SUCCESS = 'view_material_success',
VIEW_JOB_SUCCESS = 'view_job_success',
}
export enum OpenSource {
@ -75,6 +76,7 @@ export enum PageUrl {
Partner = 'pages/partner/index',
WithdrawRecord = 'pages/withdraw-record/index',
GroupDelegatePublish = 'pages/group-delegate-publish/index',
GiveVip = 'pages/give-vip/index',
}
export enum PluginUrl {

View File

@ -7,6 +7,7 @@ export enum JobType {
Jewelry = 'JEWELRY', // 珠宝
Appliance = 'APPLIANCE', // 家电
Furniture = 'FURNITURE', // 日用家具
OutdoorSports = 'OUTDOOR_SPORTS',
PetFamily = 'PET_FAMILY', // 母婴宠物
Luxury = 'LUXURY', // 奢品
LocalLive = 'LOCAL_LIVE', // 本地生活
@ -87,6 +88,7 @@ export const JOB_TYPE_TITLE_MAP: { [key in JobType]: string } = {
[JobType.Jewelry]: '珠宝',
[JobType.Appliance]: '家电',
[JobType.Furniture]: '日用家具',
[JobType.OutdoorSports]: '户外运动',
[JobType.PetFamily]: '母婴宠物',
[JobType.Luxury]: '奢品',
[JobType.LocalLive]: '本地生活',
@ -173,6 +175,7 @@ export const JOB_TYPE_SELECT_OPTIONS = [
{ label: JOB_TYPE_TITLE_MAP[JobType.Jewelry], value: JobType.Jewelry },
{ label: JOB_TYPE_TITLE_MAP[JobType.Appliance], value: JobType.Appliance },
{ label: JOB_TYPE_TITLE_MAP[JobType.Furniture], value: JobType.Furniture },
{ label: JOB_TYPE_TITLE_MAP[JobType.OutdoorSports], value: JobType.OutdoorSports },
{ label: JOB_TYPE_TITLE_MAP[JobType.PetFamily], value: JobType.PetFamily },
{ label: JOB_TYPE_TITLE_MAP[JobType.Luxury], value: JobType.Luxury },
{ label: JOB_TYPE_TITLE_MAP[JobType.LocalLive], value: JobType.LocalLive },
@ -181,6 +184,11 @@ export const JOB_TYPE_SELECT_OPTIONS = [
{ label: JOB_TYPE_TITLE_MAP[JobType.Other], value: JobType.Other },
];
export const JOB_TYPE_SELECT_OPTIONS_WITH_ALL = [
{ label: JOB_TYPE_TITLE_MAP[JobType.All], value: JobType.All },
...JOB_TYPE_SELECT_OPTIONS,
];
const MAX_SALARY = 10000000;
export const PART_EMPLOY_SALARY_OPTIONS = [
{ label: '不限' },

View File

@ -84,14 +84,25 @@ export const WORK_YEAR_OPTIONS = [
{ label: WORK_YEAR_LABELS[WorkedYears.MoreThreeYear], value: WorkedYears.MoreThreeYear },
];
export const ALL_GENDER_TYPES = [GenderType.All, GenderType.MEN, GenderType.WOMEN];
export const GENDER_TYPE_TITLE_MAP = {
[GenderType.All]: '不限',
[GenderType.WOMEN]: '女',
[GenderType.MEN]: '男',
};
export const GENDER_OPTIONS = [
{
value: GenderType.All,
label: GENDER_TYPE_TITLE_MAP[GenderType.All],
},
{
value: GenderType.WOMEN,
label: GENDER_TYPE_TITLE_MAP[GenderType.WOMEN],
},
{
value: GenderType.MEN,
label: GENDER_TYPE_TITLE_MAP[GenderType.MEN],
},
];
export const ALL_ANCHOR_READ_TYPES = Object.values(AnchorReadType);
export const ANCHOR_READ_TITLE_MAP = {

View File

@ -18,7 +18,8 @@ import {
ALL_SORT_TYPES,
EMPLOY_TYPE_TITLE_MAP,
EmployType,
JOB_TABS, JobSourceType,
JOB_TABS,
JobSourceType,
JobType,
SORT_TYPE_TITLE_MAP,
SortType,
@ -143,12 +144,7 @@ function JobFragment(props: IProps) {
return (
<div className={`${PREFIX}__container`}>
<div className={`${PREFIX}__top-search-bar`}>
<SearchInput
disabled
className={`${PREFIX}__search`}
placeholder="试试 女装"
onClick={handleClickSearch}
/>
<SearchInput disabled className={`${PREFIX}__search`} placeholder="试试 女装" onClick={handleClickSearch} />
<div className={classNames(`${PREFIX}__employType-select`)} onClick={handleClickEmployTypeSelect}>
<div className="title">
{employType && employType !== EmployType.All ? EMPLOY_TYPE_TITLE_MAP[employType] : '类型'}

View File

@ -98,6 +98,7 @@ export const APP_CONFIG: AppConfigType = {
PageUrl.Partner,
PageUrl.WithdrawRecord,
PageUrl.GroupDelegatePublish,
PageUrl.GiveVip,
// PageUrl.DevDebug,
],
window: {

View File

@ -1,5 +1,6 @@
// export const DOMAIN = 'http://192.168.60.191:8082';
export const DOMAIN = 'https://neighbourhood.cn';
// export const DOMAIN = 'http://192.168.60.116:8082';
export const DOMAIN = process.env.BRAND === 'dev' ? 'https://dev.neighbourhood.cn' : 'https://neighbourhood.cn';
// export const DOMAIN = 'https://dev.neighbourhood.cn';
export const BASE_URL = `${DOMAIN}/api`;
export enum API {
@ -84,4 +85,7 @@ export enum API {
GET_PROFIT_STAT = '/user/profits',
WITHDRAW = '/user/withdraw',
GET_WITHDRAW_LIST = '/user/withdraw/records',
GENERATE_MEMBERSHIP_COUPON = '/coupon/membership/generate',
CLAIM_MEMBERSHIP_COUPON = '/coupon/membership/claim',
GET_VIP_QRCODE = '/user/getVipQrCode',
}

View File

@ -52,7 +52,11 @@
font-size: 28px;
line-height: 32px;
color: @blColor;
gap: 20px;
&-item {
display: flex;
}
.title {
margin-right: 5px;
}
@ -61,11 +65,17 @@
padding: 0 24px;
}
&__overlay-outer {
top: 82px;
top: 72px;
}
&__overlay-inner {
width: 100%;
max-height: 100%;
overflow: hidden;
.bl-select__items-container {
max-height: calc(100vh - 610rpx);
overflow-y: auto;
}
}
&__tips-container {
@ -91,8 +101,6 @@
margin-top: 50px;
}
&__popup {
&-content {
.flex-column();

View File

@ -5,11 +5,13 @@ import { Popup } from '@taroify/core';
import { ArrowDown, ArrowUp } from '@taroify/icons';
import classNames from 'classnames';
import { isEqual } from 'lodash-es';
import { useCallback, useEffect, useState } from 'react';
import { useCallback, useEffect, useMemo, useState } from 'react';
import AnchorList, { IAnchorListProps } from '@/components/anchor-list';
import AnchorPicker from '@/components/anchor-picker';
import CustomNavigationBar from '@/components/custom-navigation-bar';
import EmployTypeSelect from '@/components/employ-type-select';
import GenderSelect from '@/components/gender-select';
import HomePage from '@/components/home-page';
import Overlay from '@/components/overlay';
import PageLoading from '@/components/page-loading';
@ -17,8 +19,14 @@ import PartnerBanner from '@/components/partner-banner';
import SafeBottomPadding from '@/components/safe-bottom-padding';
import SwitchBar from '@/components/switch-bar';
import { APP_TAB_BAR_ID, EventName, OpenSource, PageType, PageUrl, RoleType } from '@/constants/app';
import { EmployType } from '@/constants/job';
import { ALL_ANCHOR_SORT_TYPES, ANCHOR_SORT_TYPE_TITLE_MAP, AnchorSortType } from '@/constants/material';
import { EMPLOY_TYPE_TITLE_MAP, EmployType, JOB_TYPE_TITLE_MAP, JobType } from '@/constants/job';
import {
ALL_ANCHOR_SORT_TYPES,
ANCHOR_SORT_TYPE_TITLE_MAP,
AnchorSortType,
GENDER_TYPE_TITLE_MAP,
GenderType,
} from '@/constants/material';
import useInviteCode from '@/hooks/use-invite-code';
import useListHeight, { IUseListHeightProps } from '@/hooks/use-list-height';
import useLocation from '@/hooks/use-location';
@ -36,6 +44,7 @@ import { getCommonShareMessage } from '@/utils/share';
import Toast from '@/utils/toast';
import './index.less';
import TopCategorySelect from '@/components/top-category-select';
const PREFIX = 'page-anchor';
const LIST_CONTAINER_CLASS = `${PREFIX}__list-container`;
@ -78,12 +87,22 @@ function ListWrapper(props: IAnchorListProps) {
return <AnchorList listHeight={listHeight} {...props} onListEmpty={handleListEmpty} />;
}
enum FilterType {
gender,
employType,
topCategory,
more,
}
export default function AnchorPage() {
const location = useLocation();
const [loading, setLoading] = useState(true);
const [selectJob, setSelectJob] = useState<JobManageInfo | undefined>();
const [filters, setFilters] = useState<IAnchorFilters>({ employType: EmployType.All });
const [showFilter, setShowFilter] = useState<boolean>(false);
const [moreFilters, setMoreFilters] = useState<IAnchorFilters>({});
const [gender, setGender] = useState<GenderType>(GenderType.All);
const [employType, setEmployType] = useState<EmployType>(EmployType.All);
const [topCategory, setTopCategory] = useState<JobType>(JobType.All);
const [showFilter, setShowFilter] = useState<FilterType | null>(null);
const [sortType, setSortType] = useState<AnchorSortType>(AnchorSortType.Active);
const [openPopup, setOpenPopup] = useState<boolean>(false);
const [coordinate, setCoordinate] = useState<Coordinate>({
@ -106,20 +125,35 @@ export default function AnchorPage() {
[selectJob]
);
const handleClickSalarySelect = useCallback(() => {
setShowFilter(!showFilter);
}, [showFilter]);
const handleClickFilterSelect = (type: FilterType) => () => {
setShowFilter(type === showFilter ? null : type);
};
const handleHideFilter = useCallback(() => setShowFilter(false), []);
const handleHideFilter = useCallback(() => setShowFilter(null), []);
const handleFilterChange = useCallback(
(newFilters: IAnchorFilters) => {
!isEqual(newFilters, filters) && setFilters(newFilters);
setShowFilter(false);
!isEqual(newFilters, moreFilters) && setMoreFilters(newFilters);
setShowFilter(null);
},
[filters]
[moreFilters]
);
const handleChangeSelectGender = useCallback((value: GenderType) => {
setGender(value);
setShowFilter(null);
}, []);
const handleChangeSelectEmployType = useCallback((value: EmployType) => {
setEmployType(value);
setShowFilter(null);
}, []);
const handleChangeSelectTopCategory = useCallback((value: JobType) => {
setTopCategory(value);
setShowFilter(null);
}, []);
const handleClickSortType = useCallback(async (type: AnchorSortType) => setSortType(type), []);
const handleJobChange = useCallback(
@ -205,6 +239,15 @@ export default function AnchorPage() {
useDidShow(() => requestUnreadMessageCount());
const filters = useMemo(
() => ({
...moreFilters,
topCategory: topCategory === JobType.All ? undefined : topCategory,
gender: gender === -1 ? undefined : gender,
employType,
}),
[moreFilters, gender, employType, topCategory]
);
return (
<HomePage type={PageType.Anchor}>
{!!loading && <PageLoading className={`${PREFIX}__loading`} />}
@ -224,9 +267,23 @@ export default function AnchorPage() {
</div>
))}
</div>
<div className={classNames(`${PREFIX}__filter`)} onClick={handleClickSalarySelect}>
<div className="title"></div>
{showFilter ? <ArrowUp /> : <ArrowDown />}
<div className={classNames(`${PREFIX}__filter`)}>
<div className={`${PREFIX}__filter-item`} onClick={handleClickFilterSelect(FilterType.gender)}>
<div className="title">{gender === GenderType.All ? '性别' : GENDER_TYPE_TITLE_MAP[gender]}</div>
{showFilter === FilterType.gender ? <ArrowUp /> : <ArrowDown />}
</div>
<div className={`${PREFIX}__filter-item`} onClick={handleClickFilterSelect(FilterType.employType)}>
<div className="title">{employType === EmployType.All ? '类型' : EMPLOY_TYPE_TITLE_MAP[employType]}</div>
{showFilter === FilterType.employType ? <ArrowUp /> : <ArrowDown />}
</div>
<div className={`${PREFIX}__filter-item`} onClick={handleClickFilterSelect(FilterType.topCategory)}>
<div className="title">{topCategory === JobType.All ? '品类' : JOB_TYPE_TITLE_MAP[topCategory]}</div>
{showFilter === FilterType.topCategory ? <ArrowUp /> : <ArrowDown />}
</div>
<div className={`${PREFIX}__filter-item`} onClick={handleClickFilterSelect(FilterType.more)}>
<div className="title"></div>
{showFilter === FilterType.more ? <ArrowUp /> : <ArrowDown />}
</div>
</div>
</div>
<div className={`${PREFIX}__banner`}>
@ -243,12 +300,36 @@ export default function AnchorPage() {
className={LIST_CONTAINER_CLASS}
/>
<Overlay
visible={showFilter}
visible={showFilter === FilterType.gender}
onClickOuter={handleHideFilter}
outerClassName={`${PREFIX}__overlay-outer`}
innerClassName={`${PREFIX}__overlay-inner`}
>
<AnchorPicker value={filters} onConfirm={handleFilterChange} />
<GenderSelect value={gender} onSelect={handleChangeSelectGender} />
</Overlay>
<Overlay
visible={showFilter === FilterType.employType}
onClickOuter={handleHideFilter}
outerClassName={`${PREFIX}__overlay-outer`}
innerClassName={`${PREFIX}__overlay-inner`}
>
<EmployTypeSelect value={employType} onSelect={handleChangeSelectEmployType} />
</Overlay>
<Overlay
visible={showFilter === FilterType.topCategory}
onClickOuter={handleHideFilter}
outerClassName={`${PREFIX}__overlay-outer`}
innerClassName={`${PREFIX}__overlay-inner`}
>
<TopCategorySelect value={topCategory} onSelect={handleChangeSelectTopCategory} />
</Overlay>
<Overlay
visible={showFilter === FilterType.more}
onClickOuter={handleHideFilter}
outerClassName={`${PREFIX}__overlay-outer`}
innerClassName={`${PREFIX}__overlay-inner`}
>
<AnchorPicker value={moreFilters} onConfirm={handleFilterChange} />
</Overlay>
</div>
<Popup

View File

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

View File

@ -0,0 +1,130 @@
@import '@/styles/variables.less';
@import '@/styles/common.less';
.give-vip {
padding: 40px 24px 200px 24px;
&__hint {
font-size: 28px;
line-height: 48px;
color: @blColorG2;
gap: 12px;
.flex-row();
justify-content: center;
}
&__icon {
width: 65px;
height: 65px;
}
&__title {
margin-top: 24px;
font-weight: 500;
font-size: 40px;
line-height: 48px;
color: @blColor;
text-align: center;
flex: 0 1 auto;
gap: 12px;
.flex-row();
justify-content: center;
.highlight {
margin-left: -12px;
display: inline-block;
color: @blHighlightColor;
}
}
&__bg {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: -1;
}
&__info {
&-block {
margin-top: 48px;
}
&-title {
font-weight: 500;
font-size: 32px;
line-height: 32px;
color: #1d2129;
margin-bottom: 24px;
}
&-card {
box-sizing: border-box;
background: #ffffff;
border-radius: 24px;
padding: 32px;
}
&-body {
font-weight: 400;
font-size: 28px;
line-height: 40px;
color: #333333;
margin-bottom: 32px;
}
&-img {
width: 100%;
height: 614px;
}
}
&__footer {
position: fixed;
bottom: 0;
width: 100%;
padding: 12px 32px;
box-shadow: 0px -4px 20px 0px #00000014;
box-sizing: border-box;
background: #ffffff;
}
&__footer-body {
.flex-row();
justify-content: center;
}
&__button {
.button(@height: 88px; @fontSize: 32px; @fontWeight: 500; @borderRadius: 44px;);
width: 400px;
}
&__coupon {
&-info {
position: relative;
margin-top: 32px;
padding: 24px;
box-sizing: border-box;
border-radius: 24px;
.flex-column();
justify-content: center;
}
&-title {
font-weight: 500;
font-size: 32px;
line-height: 48px;
color: @blHighlightColor;
margin-bottom: 8px;
}
&-intro {
font-size: 28px;
line-height: 40px;
margin-bottom: 12px;
color: @blColor;
gap: 4px;
.flex-row();
.highlight {
font-weight: 600;
font-size: 32px;
line-height: 56px;
color: @blHighlightColor;
}
}
&-valid {
font-size: 28px;
line-height: 40px;
color: @blColorG2;
}
}
}

View File

@ -0,0 +1,103 @@
import { Image, Button } from '@tarojs/components';
import { useLoad } from '@tarojs/taro';
import { Fragment, useCallback, useState } from 'react';
import SafeBottomPadding from '@/components/safe-bottom-padding';
import { PageUrl } from '@/constants/app';
import { logWithPrefix } from '@/utils/common';
import { claimMembershipCoupon, getCouponCodeFromQuery } from '@/utils/coupon';
import { getPageQuery, switchTab } from '@/utils/route';
import { formatTime } from '@/utils/time';
import './index.less';
const PREFIX = 'give-vip';
const log = logWithPrefix(PREFIX);
enum State {
PENDING,
SUCCESS,
FAILED,
}
export default function GiveVip() {
const [state, setState] = useState<State>(State.PENDING);
const [expireAt, setExpireAt] = useState('');
const [usedBefore, setUsedBefore] = useState(false);
const handleNavigate = useCallback(() => {
switchTab(PageUrl.Job);
}, []);
useLoad(() => {
const query = getPageQuery<{ d: string }>();
const code = getCouponCodeFromQuery(query);
claimMembershipCoupon(code!)
.then(res => {
setUsedBefore(res.usedBefore);
setExpireAt(res.usageExpireAt);
setState(Date.now() > new Date(res.usageExpireAt).getTime() ? State.FAILED : State.SUCCESS);
})
.catch(err => {
console.error(err);
setState(State.FAILED);
});
});
return (
<div className={PREFIX}>
{state === State.SUCCESS && (
<Fragment>
<div className={`${PREFIX}__title`}>
<Image src="https://publiccdn.neighbourhood.com.cn/img/partner-yes.svg" className={`${PREFIX}__icon`} />
<div>{usedBefore ? '宝子,你已经领过了,下周再来' : '宝子,播络会员领取成功'}</div>
</div>
<div className={`${PREFIX}__coupon-info`}>
<Image src="https://publiccdn.neighbourhood.com.cn/img/parnet-share-bg.png" className={`${PREFIX}__bg`} />
<div className={`${PREFIX}__coupon-title`}></div>
<div className={`${PREFIX}__coupon-intro`}>
<div className="highlight">10</div>
</div>
<div className={`${PREFIX}__coupon-valid`}>
{formatTime(expireAt, 'YYYY/MM/DD HH:mm:ss', false)}
</div>
</div>
</Fragment>
)}
{state === State.FAILED && (
<Fragment>
<div className={`${PREFIX}__hint`}>
<Image
src="https://publiccdn.neighbourhood.com.cn/img/link-invalid.svg"
mode="aspectFit"
className={`${PREFIX}__icon`}
/>
<div className={`${PREFIX}__hint-title`}></div>
</div>
<div className={`${PREFIX}__title`}>
<div className="highlight"></div>
</div>
</Fragment>
)}
<div className={`${PREFIX}__info-block`}>
<div className={`${PREFIX}__info-title`}></div>
<div className={`${PREFIX}__info-card`}>
<div className={`${PREFIX}__info-body`}>
便
</div>
<Image
className={`${PREFIX}__info-img`}
src="https://publiccdn.neighbourhood.com.cn/img/partner-share-coupon-img.png"
mode="heightFix"
/>
</div>
</div>
<div className={`${PREFIX}__footer`}>
<div className={`${PREFIX}__footer-body`}>
<Button className={`${PREFIX}__button`} onClick={handleNavigate}>
使
</Button>
</div>
<SafeBottomPadding />
</div>
</div>
);
}

View File

@ -200,7 +200,9 @@ const CompanyFooter = (props: { data: JobDetails }) => {
const errorCode = e.errorCode;
const errorMsg = e.info?.() || e.message;
collectEvent(CollectEventName.PUBLISH_OPEN_JOB_FAILED, { jobId: data.id, error: e.info?.() || e.message });
if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_BALANCE) {
if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_FREE_BALANCE) {
setShowBuy(true);
} else if (errorCode === RESPONSE_ERROR_CODE.INSUFFICIENT_BALANCE) {
Toast.info('您购买的产品已耗尽使用次数');
setShowBuy(true);
} else if (errorCode === RESPONSE_ERROR_CODE.BOSS_VIP_EXPIRED) {
@ -286,6 +288,7 @@ export default function JobDetail() {
if (!jobId) {
return;
}
Taro.eventCenter.trigger(EventName.VIEW_JOB_SUCCESS, jobId);
try {
const res = await requestJobDetail(jobId);
setData(res);

View File

@ -56,7 +56,27 @@
&__icon {
width: 48px;
height: 48px;
}
&__block {
margin-top: 24px;
.flex-row();
gap: 16px;
}
&__status {
font-size: 28px;
line-height: 32px;
font-weight: 400;
color: @blColorG1;
&.open {
color: @blHighlightColor;
}
&.error {
color: #FF5051;
}
}
}
}
}

View File

@ -6,6 +6,7 @@ import classNames from 'classnames';
import { useCallback, useState } from 'react';
import { EventName, OpenSource } from '@/constants/app';
import { JOB_MANAGE_STATUS_TITLE_MAP, JobManageStatus } from '@/constants/job';
import { JobManageInfo } from '@/types/job';
import { getJobLocation, requestJobManageList } from '@/utils/job';
import { getPageQuery, navigateBack } from '@/utils/route';
@ -15,7 +16,14 @@ import Toast from '@/utils/toast';
import './index.less';
const PREFIX = 'page-job-select-my-publish';
const STATUS_CLASS_MAP = {
[JobManageStatus.WaitVerify]: 'pending',
[JobManageStatus.Open]: 'open',
[JobManageStatus.Pending]: 'pending',
[JobManageStatus.Error]: 'error',
[JobManageStatus.Close]: 'close',
[JobManageStatus.Expire]: 'close',
};
export default function JobSelectMyPublish() {
const [list, setList] = useState<JobManageInfo[]>([]);
const [jobId, setJobId] = useState<string | null>('1');
@ -57,13 +65,18 @@ export default function JobSelectMyPublish() {
</div>
<div className={`${PREFIX}__right`}>
<div className={`${PREFIX}__right__time`}>{formatTime(item.updated)}</div>
{item.id === jobId && (
<Image
mode="aspectFit"
className={`${PREFIX}__right__icon`}
src={require('@/statics/svg/success.svg')}
/>
)}
<div className={`${PREFIX}__right__block`}>
<div className={classNames(`${PREFIX}__right__status`, { [STATUS_CLASS_MAP[item.status]]: true })}>
{JOB_MANAGE_STATUS_TITLE_MAP[item.status]}
</div>
{item.id === jobId && (
<Image
mode="aspectFit"
className={`${PREFIX}__right__icon`}
src={require('@/statics/svg/success.svg')}
/>
)}
</div>
</div>
</div>
))}

View File

@ -9,13 +9,17 @@ import PageLoading from '@/components/page-loading';
import CompanyPublishJobBuy from '@/components/product-dialog/steps-ui/company-publish-job-buy';
import SafeBottomPadding from '@/components/safe-bottom-padding';
import { EventName, OpenSource, PageUrl, RoleType } from '@/constants/app';
import { CertificationStatusType } from '@/constants/company';
import { CollectEventName } from '@/constants/event';
import { JobManageStatus } from '@/constants/job';
import { MaterialViewSource } from '@/constants/material';
import ProfileViewFragment from '@/fragments/profile/view';
import useInviteCode from '@/hooks/use-invite-code';
import useUserInfo from '@/hooks/use-user-info';
import { RESPONSE_ERROR_CODE } from '@/http/constant';
import { HttpError } from '@/http/error';
import store from '@/store';
import { cacheJobId } from '@/store/actions';
import { JobManageInfo } from '@/types/job';
import { MaterialProfile } from '@/types/material';
import { IJobMessage } from '@/types/message';
@ -29,10 +33,6 @@ import { getInviteCodeFromQueryAndUpdate } from '@/utils/partner';
import { getPageQuery, navigateBack, navigateTo, redirectTo } from '@/utils/route';
import Toast from '@/utils/toast';
import './index.less';
import useUserInfo from '@/hooks/use-user-info';
import { CertificationStatusType } from '@/constants/company';
import store from '@/store';
import { cacheJobId } from '@/store/actions';
const PREFIX = 'page-material-view';

View File

@ -6,7 +6,9 @@ import { useState } from 'react';
import PartnerIntro from '@/components/partner-intro';
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';
@ -18,9 +20,17 @@ export default function Partner() {
const handleChange = v => {
setTab(v);
};
useShareAppMessage(() => {
useShareAppMessage(async () => {
console.log('Partner inviteCode', inviteCode);
return getCommonShareMessage({ useCapture: false, 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',
});
});
return (

View File

@ -5,5 +5,7 @@ import Toast from '@/utils/toast';
import './index.less';
export default function ProtocolWebview() {
return <WebView src="https://neighbourhood.cn/user-agreement.html" onError={() => Toast.error('加载失败请重试')} />;
return (
<WebView src="https://neighbourhood.cn/user-agreement.html?t=1" onError={() => Toast.error('加载失败请重试')} />
);
}

View File

@ -82,7 +82,7 @@ export default function BizService() {
<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`}>广31</div>
<div className={`${PREFIX}__delegate-body`}></div>
<div className={`${PREFIX}__delegate-body`}></div>
</div>

11
src/types/coupon.ts Normal file
View File

@ -0,0 +1,11 @@
export type ClaimMembershipCouponResponse = {
code: string;
usedBefore: boolean;
usageExpireAt: string;
};
export type GenerateMembershipCouponResponse = {
code: string;
linkExpireAt: string;
shareUrl: string;
};

View File

@ -17,6 +17,7 @@ export interface JobInfo {
distance?: number; // 距离。一期没有
isAuthed?: boolean; // 是否认证
companyName?: string;
isRead?: boolean;
}
export interface CreateJobInfo extends Pick<JobInfo, 'title' | 'employType' | 'jobDescription'> {

View File

@ -101,6 +101,7 @@ export interface IAnchorFilters {
lowPriceForPartyTime?: number;
highPriceForPartyTime?: number;
category?: string;
topCategory?: string;
readType?: AnchorReadType;
}

31
src/utils/coupon.ts Normal file
View File

@ -0,0 +1,31 @@
import http from '@/http';
import { API } from '@/http/api';
import { ClaimMembershipCouponResponse, GenerateMembershipCouponResponse } from '@/types/coupon';
export const generateMembershipCoupon = async () => {
return await http.post<GenerateMembershipCouponResponse>(API.GENERATE_MEMBERSHIP_COUPON);
};
export const claimMembershipCoupon = async (code: string) => {
return await http.post<ClaimMembershipCouponResponse>(API.CLAIM_MEMBERSHIP_COUPON, {
contentType: 'application/x-www-form-urlencoded',
data: { code },
});
};
export const getCouponQrCode = async (code: string) => {
return await http.post(API.GET_VIP_QRCODE, {
contentType: 'application/x-www-form-urlencoded',
responseType: 'arraybuffer',
data: { code },
});
};
export const getCouponCodeFromQuery = (query: Record<string, string>): string | undefined => {
if (query) {
if (query.scene) {
return query.scene.replace('d%3D', '');
}
if (query.d) {
return query.d;
}
}
return undefined;
};

View File

@ -62,6 +62,28 @@ export const getBasicInfo = (profile: Pick<MaterialProfile, 'age' | 'height' | '
return result.join('·');
};
export const getSalary = (
data: Pick<MaterialProfile, 'fullTimeMaxPrice' | 'fullTimeMinPrice' | 'partyTimeMaxPrice' | 'partyTimeMinPrice'>
) => {
const { fullTimeMinPrice, fullTimeMaxPrice, partyTimeMinPrice, partyTimeMaxPrice } = data;
const prices: string[] = [];
if (fullTimeMinPrice && fullTimeMaxPrice) {
if (fullTimeMinPrice >= 50000) {
prices.push(`${fullTimeMinPrice / 1000}K以上/月`);
} else {
prices.push(`${fullTimeMinPrice / 1000}-${fullTimeMaxPrice / 1000}K/月`);
}
}
if (partyTimeMinPrice && partyTimeMaxPrice) {
if (partyTimeMinPrice >= 500) {
prices.push(`500以上/小时`);
} else {
prices.push(`${partyTimeMinPrice}-${partyTimeMaxPrice}/小时`);
}
}
return prices.filter(Boolean).join(' ');
};
export const chooseMedia = async (option: Taro.chooseMedia.Option = {}) => {
try {
const result = await Taro.chooseMedia({

View File

@ -20,6 +20,7 @@ interface ShareAppProps {
inviteCode?: string;
title?: string;
path?: PageUrl;
imageUrl?: string;
params?: Record<string, BL.Anything>;
}
@ -28,6 +29,7 @@ export const getCommonShareMessage = ({
inviteCode,
title,
path,
imageUrl: _imageUrl,
params = {},
}: ShareAppProps = {}): ShareAppMessageReturn => {
const inviteParams = inviteCode ? { c: inviteCode } : undefined;
@ -36,6 +38,6 @@ export const getCommonShareMessage = ({
return {
title: title || `昨天新增了${getRandomCount()}条主播通告,宝子快来看看`,
path: sharePath,
imageUrl: useCapture ? undefined : imageUrl,
imageUrl: useCapture ? undefined : _imageUrl || imageUrl,
};
};

View File

@ -1,10 +1,12 @@
import dayjs from 'dayjs';
export function formatTime(time: number | string, template = 'YYYY-MM-DD'): string {
export function formatTime(time: number | string, template = 'YYYY-MM-DD', toNum = true): string {
if (!time) {
return '';
}
time = Number(time);
if (toNum) {
time = Number(time);
}
return dayjs(time).format(template);
}

12833
yarn.lock

File diff suppressed because it is too large Load Diff