This commit is contained in:
chashaobao
2026-01-05 00:22:42 +08:00
parent c586e4b227
commit 34e8a775e4
6 changed files with 63 additions and 27 deletions

View File

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

View File

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

View File

@ -9,10 +9,10 @@ import { PREFIX } from '@/components/product-dialog/const';
import { CollectEventName, ReportEventId } from '@/constants/event'; import { CollectEventName, ReportEventId } from '@/constants/event';
import { OrderStatus, OrderType, ProductSpecId, ProductType } from '@/constants/product'; import { OrderStatus, OrderType, ProductSpecId, ProductType } from '@/constants/product';
import { SubscribeTempId } from '@/constants/subscribe'; import { SubscribeTempId } from '@/constants/subscribe';
import { ProductSpecResult } from '@/types/product';
import { logWithPrefix } from '@/utils/common'; import { logWithPrefix } from '@/utils/common';
import { collectEvent, reportEvent } from '@/utils/event'; import { collectEvent, reportEvent } from '@/utils/event';
import { import {
getOrderPrice,
isCancelPay, isCancelPay,
requestCreatePayInfo, requestCreatePayInfo,
requestOrderInfo, requestOrderInfo,
@ -21,7 +21,6 @@ import {
} from '@/utils/product'; } from '@/utils/product';
import { postSubscribe, subscribeMessage } from '@/utils/subscribe'; import { postSubscribe, subscribeMessage } from '@/utils/subscribe';
import Toast from '@/utils/toast'; import Toast from '@/utils/toast';
import { ProductSpecResult } from '@/types/product';
interface IProps { interface IProps {
onNext: () => void; onNext: () => void;

View File

@ -36,7 +36,7 @@ export default function InviteOperations() {
}, []); }, []);
const handleCopy = useCallback(() => { const handleCopy = useCallback(() => {
copy(`我的ID是${userInfo.userId},邀你进主播`); copy(`我的播络ID是${userInfo.userId},邀你进群`);
}, [userInfo.userId]); }, [userInfo.userId]);
useEffect(() => { useEffect(() => {
@ -92,7 +92,7 @@ export default function InviteOperations() {
<div className="highlight"></div> <div className="highlight"></div>
</div> </div>
<div className={`${PREFIX}__action-block`}> <div className={`${PREFIX}__action-block`}>
<div>ID是{userInfo.userId}</div> <div>ID是{userInfo.userId}</div>
<Button className={`${PREFIX}__copy`} onClick={handleCopy}> <Button className={`${PREFIX}__copy`} onClick={handleCopy}>
</Button> </Button>

View File

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

View File

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