@dcloudio/uni-cli-shared 2.0.2-alpha-4070620250731001 → 2.0.2-alpha-4080120250820001

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

@@ -206,7 +206,7 @@ export default {
     },
 
     _onwxchannelerror (e) {
-      this._dispatchEvent(EventType.Error, e.detail)
+      this._dispatchEvent(EventType.Error, e.detail || e)
     },
 
     _dispatchEvent (type, data) {
@@ -250,12 +250,16 @@ export default {
       switch (this.wxAdType) {
         case AdType.RewardedVideo:
           if (this._wxRewardedAd) {
-            this._wxRewardedAd.load()
+            this._wxRewardedAd.load().catch((err) => {
+              this._dispatchEvent(EventType.Error, err)
+            })
           }
           break
         case AdType.Interstitial:
           if (this._wxInterstitialAd) {
-            this._wxInterstitialAd.load()
+            this._wxInterstitialAd.load().catch((err) => {
+              this._dispatchEvent(EventType.Error, err)
+            })
           }
           break
       }
@@ -275,11 +279,7 @@ export default {
           }
           // eslint-disable-next-line handle-callback-err
           this._wxRewardedAd.show().catch((err) => {
-            this._wxRewardedAd.load().then(() => {
-              this._wxRewardedAd.show()
-            }).catch((err) => {
-              this._dispatchEvent(EventType.Error, err)
-            })
+            this._dispatchEvent(EventType.Error, err)
           })
           break
         case AdType.Interstitial:
@@ -288,11 +288,7 @@ export default {
           }
           // eslint-disable-next-line handle-callback-err
           this._wxInterstitialAd.show().catch((err) => {
-            this._wxInterstitialAd.load().then(() => {
-              this._wxInterstitialAd.show()
-            }).catch((err) => {
-              this._dispatchEvent(EventType.Error, err)
-            })
+            this._dispatchEvent(EventType.Error, err)
           })
           break
       }
@@ -326,8 +322,6 @@ export default {
           this._callServer()
         }
       })
-
-      this._wxRewardedAd.load().then(() => { }).catch((_) => { })
 
       this.loading = true
     },
@@ -345,7 +339,9 @@ export default {
         this._dispatchEvent(EventType.Load, {})
         if (this._userInvokeShowFlag) {
           this._userInvokeShowFlag = false
-          this._wxInterstitialAd.show()
+          this._wxInterstitialAd.show().catch((err) => {
+            this._dispatchEvent(EventType.Error, err)
+          })
         }
       })
 
@@ -358,7 +354,9 @@ export default {
         this._dispatchEvent(EventType.Close, res)
       })
 
-      this._wxInterstitialAd.load().then(() => { }).catch((_) => { })
+      this._wxInterstitialAd.load().catch((err) => {
+        this._dispatchEvent(EventType.Error, err)
+      })
 
       this.loading = true
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-alpha-4070620250731001",
+  "version": "2.0.2-alpha-4080120250820001",
   "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": "19d2e9fb70abf2e0f6bd14e7ea2074eccdc2b749"
+  "gitHead": "1b189efe8ae8539a5bc8263bccc28b25d9816771"
 }