@dcloudio/uni-cli-shared 2.0.2-4020420240722004 → 2.0.2-4020920240930001

package/components/ad-fullscreen-video.vue

@@ -3,16 +3,22 @@
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
     <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <!-- #endif -->
+    <!-- #ifdef MP-ALIPAY -->
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
     <!-- #endif -->
   </view>
 </template>
 
 <script>
-  // #ifndef MP-WEIXIN
-  import adMixin from "./ad.mixin.js"
+  // #ifdef APP
+  import adMixin from "./ad.mixin.app.js"
   // #endif
   // #ifdef MP-WEIXIN
-  import adMixin from "./ad.mixin.mp.js"
+  import adMixin from "./ad.mixin.mp-weixin.js"
+  // #endif
+  // #ifdef MP-ALIPAY
+  import adMixin from "./ad.mixin.mp-alipay.js"
   // #endif
 
   export default {

package/components/ad-interstitial.vue

@@ -3,6 +3,9 @@
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
     <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <!-- #endif -->
+    <!-- #ifdef MP-ALIPAY -->
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
     <!-- #endif -->
     <!-- #ifdef H5 -->
     <div ref="container" />
@@ -12,13 +15,16 @@
 
 <script>
   // #ifdef APP
-  import adMixin from "./ad.mixin.js"
+  import adMixin from "./ad.mixin.app.js"
   // #endif
   // #ifdef H5
   import adMixin from "./ad-interstitial.web.js"
   // #endif
   // #ifdef MP-WEIXIN
-  import adMixin from "./ad.mixin.mp.js"
+  import adMixin from "./ad.mixin.mp-weixin.js"
+  // #endif
+  // #ifdef MP-ALIPAY
+  import adMixin from "./ad.mixin.mp-alipay.js"
   // #endif
 
   export default {

package/components/ad-rewarded-video.vue

@@ -3,19 +3,25 @@
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
     <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <!-- #endif -->
+    <!-- #ifdef MP-ALIPAY -->
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
     <!-- #endif -->
   </view>
 </template>
 
 <script>
   // #ifdef APP
-  import adMixin from "./ad.mixin.js"
+  import adMixin from "./ad.mixin.app.js"
   // #endif
   // #ifdef H5
   import adMixin from "./ad.mixin.web.js"
   // #endif
   // #ifdef MP-WEIXIN
-  import adMixin from "./ad.mixin.mp.js"
+  import adMixin from "./ad.mixin.mp-weixin.js"
+  // #endif
+  // #ifdef MP-ALIPAY
+  import adMixin from "./ad.mixin.mp-alipay.js"
   // #endif
 
   export default {

package/components/{ad.mixin.js → ad.mixin.app.js}

@@ -424,10 +424,13 @@ export default {
       if (this.preload) {
         this._loadAd()
       }
-    },
-    // 服务器回调透传参数，仅在创建广告实例时可传递参数，如果发生变化需要重新创建广告实例
-    urlCallback () {
-      this._removeInstance()
+    },
+    // 服务器回调透传参数，仅在创建广告实例时可传递参数，如果发生变化需要重新创建广告实例
+    urlCallback: {
+      deep: true,
+      handler () {
+        this._removeInstance()
+      }
     }
   },
   created () {

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

@@ -0,0 +1,111 @@
+const EventType = {
+  Load: 'load',
+  Close: 'close',
+  Error: 'error'
+}
+
+export default {
+  props: {
+    options: {
+      type: [Object, Array],
+      default () {
+        return {}
+      }
+    },
+    adpid: {
+      type: [Number, String],
+      default: ''
+    },
+    unitId: {
+      type: [Number, String],
+      default: ''
+    },
+    preload: {
+      type: [Boolean, String],
+      default: true
+    },
+    loadnext: {
+      type: [Boolean, String],
+      default: false
+    },
+    urlCallback: {
+      type: Object,
+      default () {
+        return {}
+      }
+    }
+  },
+  data () {
+    return {
+      loading: false,
+      errorMessage: null
+    }
+  },
+  created () {
+    this._ad = null
+  },
+  methods: {
+    load () {
+      if (this.loading) {
+        return
+      }
+      this._startLoading()
+    },
+
+    show () {
+      this.errorMessage = null
+      this._refAdPlugin.show()
+    },
+
+    _handleAdRef (c) {
+      // this._refAdPlugin = c
+      this._refAdPlugin = c.detail.__args__[0]
+      if (this.preload && this._canCreateAd()) {
+        this._startLoading()
+      }
+    },
+
+    _onclick () {
+      this.show()
+    },
+
+    _startLoading () {
+      this.loading = true
+      this.errorMessage = null
+      this._refAdPlugin.load()
+    },
+
+    _canCreateAd () {
+      let result = false
+      if (typeof this.adpid === 'string' && this.adpid.length > 0) {
+        result = true
+      } else if (typeof this.adpid === 'number') {
+        result = true
+      }
+      return result
+    },
+
+    _hasCallback () {
+      return (typeof this.urlCallback === 'object' && Object.keys(this.urlCallback).length > 0)
+    },
+
+    _onmpload (e) {
+      this.loading = false
+      this._dispatchEvent(EventType.Load, {})
+    },
+
+    _onmpclose (e) {
+      this._dispatchEvent(EventType.Close, e)
+    },
+
+    _onmperror (e) {
+      this.loading = false
+      this.errorMessage = JSON.stringify(e)
+      this._dispatchEvent(EventType.Error, e)
+    },
+
+    _dispatchEvent (type, data) {
+      this.$emit(type, data)
+    }
+  }
+}

package/components/{ad.mixin.mp.js → ad.mixin.mp-weixin.js}

@@ -43,11 +43,9 @@ export default {
   },
   created () {
     this._ad = null
-    setTimeout(() => {
-      if (this.preload && this._canCreateAd()) {
-        this.load()
-      }
-    }, 100)
+    if (this.preload && this._canCreateAd()) {
+      this.load()
+    }
   },
   methods: {
     load () {

package/components/uniad.vue

@@ -3,7 +3,6 @@
     <uniad-plugin
       class="uniad-plugin"
       :adpid="adpid"
-      :unit-id="unitId"
       @load="_onmpload"
       @close="_onmpclose"
       @error="_onmperror"
@@ -11,8 +10,13 @@
   </view>
 </template>
 
-<script>
-import adMixin from './ad.mixin.mp.js'
+<script>
+// #ifdef MP-WEIXIN
+import adMixin from "./ad.mixin.mp-weixin.js"
+// #endif
+// #ifdef MP-ALIPAY
+import adMixin from "./ad.mixin.mp-alipay.js"
+// #endif
 export default {
   name: 'Uniad',
   mixins: [adMixin],

package/license.md

@@ -0,0 +1 @@
+[https://uniapp.dcloud.net.cn/license.html ](https://uniapp.dcloud.net.cn/license.html )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-4020420240722004",
+  "version": "2.0.2-4020920240930001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -26,5 +26,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "2d3e029c00dc153d1f9b01b3cf4e697470e01087"
+  "gitHead": "25e144b4432447224b6a5f294e059882d74f3db7"
 }