@dcloudio/uni-cli-shared 2.0.1-alpha-34920220508001 → 2.0.1-alpha-34920220512001

package/components/ad.mixin.js

@@ -213,6 +213,7 @@ class AdHelper {
     const ad = this.get(options)
 
     if (ad.isLoad) {
+      this._lastWaterfallIndex = -1
       ad.show((e) => {
         onclose && onclose(e)
       }, () => {
@@ -220,6 +221,7 @@ class AdHelper {
       })
     } else {
       ad.load(() => {
+        this._lastWaterfallIndex = -1
         onload && onload()
         ad.show((e) => {
           onclose && onclose(e)
@@ -242,16 +244,14 @@ class AdHelper {
       return
     }
 
-    if (index === 0) {
-      this._lastWaterfallIndex = -1
-    }
-
     const options2 = {
       adpid: adpid[index],
       urlCallback,
       retry: false
     }
 
+    console.log('ad.loadWaterfall::index=' + index)
+
     this.load(options2, (res) => {
       this._lastWaterfallIndex = index
       onload(options2)
@@ -260,7 +260,6 @@ class AdHelper {
       if (index >= adpid.length) {
         onfail(err)
       } else {
-        console.log('loadWaterfall::index=' + index)
         this.loadWaterfall(options, onload, onfail, index)
       }
     })
@@ -276,17 +275,18 @@ class AdHelper {
       return
     }
 
-    let idx = index
     if (this._lastWaterfallIndex > -1) {
-      idx = this._lastWaterfallIndex
+      index = this._lastWaterfallIndex
     }
 
     const options2 = {
-      adpid: adpid[idx],
+      adpid: adpid[index],
       urlCallback,
       retry: false
     }
 
+    console.log('ad.showWaterfall::index=' + index)
+
     this.show(options2, () => {
       onload()
     }, (err) => {
@@ -444,6 +444,9 @@ export default {
   },
   methods: {
     load () {
+      if (this.isLoading) {
+        return
+      }
       this._startLoading()
       const invoke = this._isWaterfall() ? 'loadWaterfall' : 'load'
       this._adHelper[invoke](this._getAdOptions(), () => {
@@ -454,6 +457,9 @@ export default {
     },
 
     show () {
+      if (this.isLoading) {
+        return
+      }
       this._startLoading()
       const invoke = this._isWaterfall() ? 'showWaterfall' : 'show'
       this._adHelper[invoke](this._getAdOptions(), () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-alpha-34920220508001",
+  "version": "2.0.1-alpha-34920220512001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -23,5 +23,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "332c89c762a3548396dce5fab244f0817d136a55"
+  "gitHead": "f1e8a95ca6df4b7634ed03d42e91e8a524e62b3d"
 }