diff --git a/.eslintrc.js b/.eslintrc.js index b404be1..fceaddd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -31,6 +31,10 @@ module.exports = { 'error', { devDependencies: ['./*.js'] }, ], + '@typescript-eslint/no-var-requires': [ + 'error', + { devDependencies: ['./*.js'] }, + ], 'import/extensions': [ 'error', 'ignorePackages', diff --git a/components/Marathon/Faq/index.jsx b/components/Marathon/Faq/index.jsx index 0a337d1..31218d9 100644 --- a/components/Marathon/Faq/index.jsx +++ b/components/Marathon/Faq/index.jsx @@ -144,6 +144,16 @@ export default function Faq() { > 在申請期間每人只能提交一件學習計畫,待公告入選者後,使用者可新增至多三個學習計劃。 + + 按下最後的提交按鈕即算申請。早鳥票只需要於12/31 23:59 前點擊「提交」,就可以享有早鳥優惠。即使提交後,在申請截止前都可以繼續修改計畫,計畫將會自動儲存。 + + + 可以唷!我們會以申請時選擇的資格為主。 + ); } diff --git a/pages/learning-marathon/index.jsx b/pages/learning-marathon/index.jsx index b823d3d..0963bf3 100644 --- a/pages/learning-marathon/index.jsx +++ b/pages/learning-marathon/index.jsx @@ -98,8 +98,10 @@ const useScrollPaddingTop = () => { }; handleScrollPaddingTop(); + window.addEventListener('resize', handleScrollPaddingTop); window.addEventListener('storage', handleStorage); return () => { + window.removeEventListener('resize', handleScrollPaddingTop); window.removeEventListener('storage', handleStorage); }; }, []); @@ -224,9 +226,9 @@ const Nav = () => {