@dcloudio/uni-cli-shared 2.0.2-alpha-4070420250630001 → 2.0.2-alpha-4070520250704001

package/components/ad.mixin.mp-weixin.js

@@ -65,6 +65,7 @@ export default {
     this._loading = false
     this._wxRewardedAd = null
     this._wxInterstitialAd = null
+    this._userInvokeShowFlag = false
     this._providerType = ProviderType.ShanHu
     if (this.preload && this._canCreateAd()) {
       this.load()
@@ -86,6 +87,10 @@ export default {
 
     show (e) {
       this.errorMessage = null
+      if (this.loading) {
+        this._userInvokeShowFlag = true
+        return
+      }
       if (this._providerType === ProviderType.ShanHu) {
         this._showAdInPlugin(this.selectComponent('.uniad-plugin'))
       } else if (this._providerType === ProviderType.WeChat) {
@@ -121,14 +126,21 @@ export default {
     _onmpload (e) {
       this.loading = false
       this._dispatchEvent(EventType.Load, {})
+      if (this._userInvokeShowFlag) {
+        this._userInvokeShowFlag = false
+        setTimeout(() => {
+          this.show()
+        }, 1)
+      }
     },
 
     _onmpclose (e) {
-      this._dispatchEvent(EventType.Close, e.detail)
-      if (e.detail.adsdata) {
-        const adv = e.detail.adv
-        const adsdata = e.detail.adsdata
-        const version = e.detail.version
+      const detail = e.detail || e
+      this._dispatchEvent(EventType.Close, detail)
+      if (detail.adsdata) {
+        const adv = detail.adv
+        const adsdata = detail.adsdata
+        const version = detail.version
 
         /* eslint-disable no-undef */
         uniCloud.callFunction({
@@ -146,9 +158,9 @@ export default {
           }
         })
 
-        delete e.detail.adv
-        delete e.detail.adsdata
-        delete e.detail.version
+        delete detail.adv
+        delete detail.adsdata
+        delete detail.version
       }
     },
 
@@ -184,6 +196,10 @@ export default {
           }
         } else if (adData.provider === 10018) {
           this._providerType = ProviderType.WeChat
+          if (adData.tmpl_type === 24) {
+            this.customFullscreen = 'uni-ad-custom-fullscreen'
+          }
+          this.loading = true
           this.selectComponent('.uniad-plugin-wx').setConfig(adData)
         }
       })
@@ -191,6 +207,7 @@ export default {
 
     _onwxchannelerror (e) {
       this.wxchannel = false
+      this._dispatchEvent(EventType.Error, e.detail)
       this.$nextTick(() => {
         this._providerType = ProviderType.ShanHu
         this.selectComponent('.uniad-plugin').shanhuChannel()

package/components/uniad.vue

@@ -10,7 +10,7 @@
     />
     <!-- #ifdef MP-WEIXIN -->
     <ad-custom v-if="userwx" :unit-id="userUnitId" class="uni-ad-custom" data-com-type="wx" :class="[customFullscreen]" @load="_onmpload" @error="_onmperror"></ad-custom>
-    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" data-com-type="wx" @load="_onmpload" @error="_onwxchannelerror"></uniad-plugin-wx>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" :class="[customFullscreen]" data-com-type="wx" @load="_onmpload" @error="_onwxchannelerror"></uniad-plugin-wx>
     <!-- #endif -->
   </view>
 </template>
@@ -33,7 +33,8 @@ export default {
 </script>
 
 <style>
-.uni-ad-custom-fullscreen {
+.uni-ad-custom-fullscreen {
+  display: flex;
   height: 100vh;
 }
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-alpha-4070420250630001",
+  "version": "2.0.2-alpha-4070520250704001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -27,5 +27,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "b411b2c47252aa4ed7a531fd13d0f256c113d3f3"
+  "gitHead": "40ab5f0ac156bba5446030b572ad8e00b7961948"
 }