feat: v3.2.1

surmon-china · Dec 8, 2021 · ea30f8d · ea30f8d
1 parent 8a5f19d
commit ea30f8d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+### v3.2.1 (2021-12-08)
+
+**Fix**
+
+- Fix pages banner height
+- Fix PC aside AdSense
+
 ### v3.2.0 (2021-12-08)
 
 **Feature**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "surmon.me",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Surmon.me blog",
   "author": {
     "name": "Surmon",

diff --git a/public/images/mammon/aliyun-minisite-532-178.jpg b/public/images/mammon/aliyun-minisite-532-178.jpg
diff --git a/public/images/mammon/jd-baijiu-1200-100.jpg b/public/images/mammon/jd-baijiu-1200-100.jpg
diff --git a/src/components/common/banner.vue b/src/components/common/banner.vue
@@ -67,12 +67,12 @@
 
       .title {
         font-size: 3em;
+        margin-top: 0;
         margin-bottom: $lg-gap * 2;
       }
 
       .description {
         font-size: $font-size-h4;
-        margin-bottom: 1em;
       }
     }
   }

diff --git a/src/components/layout/pc/aside/index.vue b/src/components/layout/pc/aside/index.vue
@@ -28,11 +28,11 @@
         </template>
       </calendar>
     </div>
-    <div class="module mammon-square" :placeholder="t(LANGUAGE_KEYS.AD)">
+    <div class="module mammon-square">
       <client-only>
         <Adsense
           ins-class="adsbygoogle"
-          data-ad-client="ca-pub-4710915636313788"
+          ins-style="display:inline-block;width:250px;height:250px"
           data-ad-slot="6138120718"
           class="content"
         />
@@ -215,7 +215,6 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        @extend .center-placeholder;
 
         .content {
           height: 250px;

diff --git a/src/services/adsense.ts b/src/services/adsense.ts
@@ -46,7 +46,19 @@ const getComponent = (clientID: string) =>
       const { i18n } = useEnhancer()
 
       return () => {
-        const { class: rootClass, insClass, insStyle, ...restAttrs } = props
+        const {
+          class: rootClass,
+          insClass,
+          insStyle,
+          dataAdClient,
+          dataAdSlot,
+          dataAdLayoutKey,
+          dataAdTest,
+          dataAdFormat,
+          dataFullWidthResponsive,
+          ...restAttrs
+        } = props
+
         return h(
           'div',
           {
@@ -62,7 +74,12 @@ const getComponent = (clientID: string) =>
             h('ins', {
               class: ['adsbygoogle', insClass],
               style: insStyle,
-              'data-ad-client': clientID,
+              'data-ad-client': dataAdClient || clientID,
+              'data-ad-slot': dataAdSlot,
+              'data-ad-layout-key': dataAdLayoutKey,
+              'data-ad-test': dataAdTest,
+              'data-ad-format': dataAdFormat,
+              'data-full-width-responsive': dataFullWidthResponsive,
               ...restAttrs
             }),
             h('script', `(adsbygoogle = window.adsbygoogle || []).push({})`)