11import AlgoliaSearchModal from '@/components/AlgoliaSearchModal'
22import Comment from '@/components/Comment'
3- import { AdSlot } from '@/components/GoogleAdsense'
43import LoadingCover from '@/components/LoadingCover'
54import replaceSearchResult from '@/components/Mark'
65import NotionPage from '@/components/NotionPage'
@@ -254,9 +253,6 @@ const LayoutSlug = props => {
254253 return (
255254 < >
256255 < div className = 'w-full mx-auto max-w-screen-3xl' >
257- { /* 广告位 */ }
258- < WWAds orientation = 'horizontal' />
259-
260256 { /* 文章锁 */ }
261257 { lock && < ArticleLock validPassword = { validPassword } /> }
262258
@@ -279,6 +275,12 @@ const LayoutSlug = props => {
279275
280276 { /* Notion文章主体 */ }
281277 < article className = 'max-w-3xl lg:col-span-3 w-full mx-auto px-2 lg:px-0' >
278+ { /* 正文前广告:与左右侧栏顶部对齐 */ }
279+ < WWAds
280+ orientation = 'horizontal'
281+ className = '!mt-0 w-full mb-8'
282+ />
283+
282284 < div id = 'article-wrapper' >
283285 < NotionPage post = { post } />
284286 </ div >
@@ -301,7 +303,7 @@ const LayoutSlug = props => {
301303 </ section >
302304 </ article >
303305
304- < div className = 'lg:col-span-1 flex flex-col justify-between px-2 lg:px-0 space-y-2 lg:space-y -0' >
306+ < div className = 'lg:col-span-1 flex flex-col gap-6 px-2 lg:px-0' >
305307 { /* meta信息 */ }
306308 < section className = 'text-lg gap-y-6 text-center lg:text-left' >
307309 < div className = 'text-gray-500 py-1 dark:text-gray-600 ' >
@@ -325,29 +327,24 @@ const LayoutSlug = props => {
325327 < PostGroupLatest { ...props } vertical = { true } />
326328 </ div >
327329
328- { /* Adsense */ }
329- < div >
330- < AdSlot />
330+ { /* 最新文章后的广告 */ }
331+ < div className = 'w-full' >
332+ < WWAds className = '!mt-0 w-full' />
331333 </ div >
332334
333- { /* 留白 */ }
334- < div > </ div >
335-
336335 { /* 文章分类区块 */ }
337336 < div >
338337 < CategoryGroup { ...props } />
339338 </ div >
340339
341- < div >
342- < TouchMeCard />
340+ { /* 分类后的广告 */ }
341+ < div className = 'w-full' >
342+ < WWAds className = '!mt-0 w-full' />
343343 </ div >
344344
345345 < div >
346- < WWAds />
346+ < TouchMeCard />
347347 </ div >
348-
349- { /* 底部留白 */ }
350- < div > </ div >
351348 </ div >
352349 </ div >
353350
0 commit comments