From dc845d46e199c2b18e197a651e036cf9eee94332 Mon Sep 17 00:00:00 2001 From: Therainclouds <245141853@qq.com> Date: Thu, 12 Feb 2026 21:53:15 +0800 Subject: [PATCH] n --- frontend/src/pages/activity/Detail.jsx | 12 +++++++++++- miniprogram/config/index.js | 7 ------- miniprogram/package.json | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/frontend/src/pages/activity/Detail.jsx b/frontend/src/pages/activity/Detail.jsx index 97da7d3..1cd1a21 100644 --- a/frontend/src/pages/activity/Detail.jsx +++ b/frontend/src/pages/activity/Detail.jsx @@ -24,6 +24,7 @@ const ActivityDetail = () => { const headerBg = useTransform(scrollY, [0, 60], ['rgba(255,255,255,0)', 'rgba(255,255,255,1)']); const headerShadow = useTransform(scrollY, [0, 60], ['none', '0 2px 8px rgba(0,0,0,0.1)']); const headerColor = useTransform(scrollY, [0, 60], ['rgba(255,255,255,1)', 'rgba(0,0,0,0.85)']); + const titleOpacity = useTransform(scrollY, [100, 200], [0, 1]); const { data: activity, isLoading, error } = useQuery({ queryKey: ['activity', id], @@ -140,7 +141,7 @@ const ActivityDetail = () => { {activity.title} @@ -222,6 +223,15 @@ const ActivityDetail = () => { {signUpMutation.isPending ? '提交中...' : activity.is_signed_up ? '已报名' : '立即报名'} + + setLoginVisible(false)} + onLoginSuccess={(userData) => { + login(userData); + // Auto trigger signup after login if needed, or just let user click again + }} + /> ); }; diff --git a/miniprogram/config/index.js b/miniprogram/config/index.js index a27fdef..3a0295d 100644 --- a/miniprogram/config/index.js +++ b/miniprogram/config/index.js @@ -32,13 +32,6 @@ const config = { enable: false // Disable cache to fix prebundle error }, mini: { - webpackChain(chain) { - chain.module - .rule('script') - .include - .add(path.resolve('src')) - .add(path.resolve('node_modules/marked')) - }, postcss: { pxtransform: { enable: true, diff --git a/miniprogram/package.json b/miniprogram/package.json index e4c76b9..f4a98af 100644 --- a/miniprogram/package.json +++ b/miniprogram/package.json @@ -42,7 +42,7 @@ "@tarojs/runtime": "3.6.20", "@tarojs/shared": "3.6.20", "@tarojs/taro": "3.6.20", - "marked": "^4.3.0", + "marked": "^4.0.18", "react": "^18.0.0", "react-dom": "^18.0.0", "taro-ui": "^3.0.0-alpha.10"