eslint: ad-component

.eslintignore

@@ -36,3 +36,7 @@ node_modules
 automator.js
 uni.automator.js
 uni-polyfill.js
+packages/uni-cli-shared/components/ad-full-screen-video.vue
+packages/uni-cli-shared/components/ad-interactive.vue
+packages/uni-cli-shared/components/ad-interstitial.vue
+packages/uni-cli-shared/components/ad-rewarded-video.vue

packages/uni-cli-shared/components/ad-interactive.vue

 <template>
   <view @click="onclick">
-    <slot :options="options" :data="adData" />
+    <slot
+      :options="options"
+      :data="adData"
+    />
   </view>
 </template>
 
 <script>
-  const AD_URL = 'https://wxac1.dcloud.net.cn/tuiaApplet/acs'
-  const AD_REPORT_URL = 'https://wxac1.dcloud.net.cn/tuiaApplet/acs'
-  const WEBVIEW_PATH = '/uni_modules/uni-ad-interactive/pages/uni-ad-interactive/uni-ad-interactive'
+const AD_URL = 'https://wxac1.dcloud.net.cn/tuiaApplet/acs'
+const AD_REPORT_URL = 'https://wxac1.dcloud.net.cn/tuiaApplet/acs'
+const WEBVIEW_PATH = '/uni_modules/uni-ad-interactive/pages/uni-ad-interactive/uni-ad-interactive'
 
-  const events = {
-    load: 'load',
-    close: 'close',
-    error: 'error'
-  }
+const events = {
+  load: 'load',
+  close: 'close',
+  error: 'error'
+}
 
-  const OpenTypes = {
-    Interactive: 'interactive'
-  }
+const OpenTypes = {
+  Interactive: 'interactive'
+}
 
-  export default {
-    name: 'AdInteractive',
-    props: {
-      options: {
-        type: [Object, Array],
-        default () {
-          return {}
-        }
-      },
-      adpid: {
-        type: [Number, String],
-        default: ''
-      },
-      openUrl: {
-        type: String,
-        default: WEBVIEW_PATH
+export default {
+  name: 'AdInteractive',
+  props: {
+    options: {
+      type: [Object, Array],
+      default () {
+        return {}
       }
     },
-    data() {
-      return {
-        adData: {}
-      }
+    adpid: {
+      type: [Number, String],
+      default: ''
     },
-    created() {
-      this._uniAdPlugin = null
-      this._interactiveUrl = null
-      if (this.openType == OpenTypes.Interactive) {
-        this.getAdData()
+    openUrl: {
+      type: String,
+      default: WEBVIEW_PATH
+    }
+  },
+  data () {
+    return {
+      adData: {}
+    }
+  },
+  created () {
+    this._uniAdPlugin = null
+    this._interactiveUrl = null
+    if (this.openType === OpenTypes.Interactive) {
+      this.getAdData()
+    }
+  },
+  methods: {
+    show () {
+      if (this._uniAdPlugin === null) {
+        this._uniAdPlugin = this.selectComponent('.uni-ad-plugin')
       }
+      this._uniAdPlugin.show()
     },
-    methods: {
-      show() {
-        if (this._uniAdPlugin == null) {
-          this._uniAdPlugin = this.selectComponent('.uni-ad-plugin')
-        }
-        this._uniAdPlugin.show()
-      },
-      getAdData() {
-        if (!this.adpid) {
-          this.$emit(events.error, {
-            code: -5002,
-            message: 'invalid adpid'
-          })
-          return
-        }
-      
-        uni.request({
-          url: AD_URL,
-          method: 'POST',
-          data: {
-            adpid: this.adpid
-          },
-          timeout: 5000,
-          dataType: 'json',
-          success: (res) => {
-            console.log(res.data)
-      
-            if (res.statusCode !== 200) {
-              this.$emit(events.error, {
-                code: res.statusCode,
-                message: res.statusCode
-              })
-              return
-            }
-      
-            const responseData = res.data;
-            if (responseData.ret == 0) {
-              this._interactiveUrl = responseData.data.adp_url
-              this.adData.imgUrl = responseData.data.icon_url
-              this.adData.openUrl = this.openUrl + "?url=" + encodeURIComponent(this._interactiveUrl)
-              this.$emit(events.load, {})
-            } else {
-              this.$emit(events.error, {
-                code: responseData.ret,
-                message: responseData.msg
-              })
-            }
-          },
-          fail: (err) => {
+    getAdData () {
+      if (!this.adpid) {
+        this.$emit(events.error, {
+          code: -5002,
+          message: 'invalid adpid'
+        })
+        return
+      }
+
+      uni.request({
+        url: AD_URL,
+        method: 'POST',
+        data: {
+          adpid: this.adpid
+        },
+        timeout: 5000,
+        dataType: 'json',
+        success: (res) => {
+          console.log(res.data)
+
+          if (res.statusCode !== 200) {
             this.$emit(events.error, {
-              code: '',
-              message: err.errMsg
+              code: res.statusCode,
+              message: res.statusCode
             })
+            return
           }
-        })
-      },
-      onclick() {
-        if (this.openType != OpenTypes.Interactive || !this._interactiveUrl) {
-          return
-        }
-      
-        uni.navigateTo({
-          url: this.adData.openUrl
-        })
-      
-        this._report()
-      },
-      _report() {
-        uni.request({
-          url: AD_REPORT_URL,
-          data: {
-            adpid: this.adpid,
-            t: '10019'
-          },
-          timeout: 5000,
-          dataType: 'json',
-          success: (res) => {
-          },
-          fail: (err) => {
+
+          const responseData = res.data
+          if (responseData.ret === 0) {
+            this._interactiveUrl = responseData.data.adp_url
+            this.adData.imgUrl = responseData.data.icon_url
+            this.adData.openUrl = this.openUrl + '?url=' + encodeURIComponent(this._interactiveUrl)
+            this.$emit(events.load, {})
+          } else {
+            this.$emit(events.error, {
+              code: responseData.ret,
+              message: responseData.msg
+            })
           }
-        })
+        },
+        fail: (err) => {
+          this.$emit(events.error, {
+            code: '',
+            message: err.errMsg
+          })
+        }
+      })
+    },
+    onclick () {
+      if (this.openType !== OpenTypes.Interactive || !this._interactiveUrl) {
+        return
       }
+
+      uni.navigateTo({
+        url: this.adData.openUrl
+      })
+
+      this._report()
+    },
+    _report () {
+      uni.request({
+        url: AD_REPORT_URL,
+        data: {
+          adpid: this.adpid,
+          t: '10019'
+        },
+        timeout: 5000,
+        dataType: 'json'
+      })
     }
   }
+}
 </script>
 
 <style>

packages/uni-cli-shared/components/ad.mixin.js

 const ADType = {
-  RewardedVideo: "RewardedVideo",
-  FullScreenVideo: "FullScreenVideo",
-  Interstitial: "Interstitial"
+  RewardedVideo: 'RewardedVideo',
+  FullScreenVideo: 'FullScreenVideo',
+  Interstitial: 'Interstitial'
 }
 
 const EventType = {
@@ -19,8 +19,7 @@ const ProviderType = {
 const RETRY_COUNT = 1
 
 class AdBase {
-
-  constructor(adInstance, options = {}, interstitial) {
+  constructor (adInstance, options = {}, interstitial) {
     this._isLoad = false
     this._isLoading = false
     this._isPlaying = false
@@ -80,23 +79,23 @@ class AdBase {
     })
   }
 
-  get isExpired() {
+  get isExpired () {
     return (this._lastLoadTime !== 0 && (Math.abs(Date.now() - this._lastLoadTime) > EXPIRED_TIME))
   }
 
-  get isLoad() {
+  get isLoad () {
     return this._isLoad
   }
 
-  get isLoading() {
+  get isLoading () {
     return this._isLoading
   }
 
-  getProvider() {
+  getProvider () {
     return this._ad.getProvider()
   }
 
-  load(onload, onerror) {
+  load (onload, onerror) {
     this._loadCallback = onload
     this._errorCallback = onerror
 
@@ -119,7 +118,7 @@ class AdBase {
     this._loadAd()
   }
 
-  show(onclose, onshow) {
+  show (onclose, onshow) {
     this._closeCallback = onclose
 
     if (this._isLoading || this._isPlaying || !this._isLoad) {
@@ -155,13 +154,13 @@ class AdBase {
     }
   }
 
-  onLoad(e) {
+  onLoad (e) {
     if (this._loadCallback != null) {
       this._loadCallback()
     }
   }
 
-  onClose(e) {
+  onClose (e) {
     if (this._closeCallback != null) {
       this._closeCallback({
         isEnded: e.isEnded
@@ -169,17 +168,17 @@ class AdBase {
     }
   }
 
-  onError(e) {
+  onError (e) {
     if (this._errorCallback != null) {
       this._errorCallback(e)
     }
   }
 
-  destroy() {
+  destroy () {
     this._ad.destroy()
   }
 
-  _loadAd() {
+  _loadAd () {
     this._isLoad = false
     this._isLoading = true
     this._lastError = null
@@ -188,31 +187,30 @@ class AdBase {
 }
 
 class RewardedVideo extends AdBase {
-  constructor(options = {}) {
+  constructor (options = {}) {
     super(plus.ad.createRewardedVideoAd(options), options)
   }
 }
 
 class FullScreenVideo extends AdBase {
-  constructor(options = {}) {
+  constructor (options = {}) {
     super(plus.ad.createFullScreenVideoAd(options), options)
   }
 }
 
 class Interstitial extends AdBase {
-  constructor(options = {}, interstitial) {
+  constructor (options = {}, interstitial) {
     super(plus.ad.createInterstitialAd(options), options, interstitial)
   }
 }
 
 class AdHelper {
-
-  constructor(adType) {
+  constructor (adType) {
     this._ads = {}
     this._adType = adType
   }
 
-  load(options, onload, onerror) {
+  load (options, onload, onerror) {
     if (!options.adpid || this.isBusy(options.adpid)) {
       return
     }
@@ -220,8 +218,8 @@ class AdHelper {
     this.get(options).load(onload, onerror)
   }
 
-  show(options, onload, onerror, onclose, onshow) {
-    let ad = this.get(options)
+  show (options, onload, onerror, onclose, onshow) {
+    const ad = this.get(options)
 
     if (ad.isLoad) {
       ad.show((e) => {
@@ -244,8 +242,8 @@ class AdHelper {
   }
 
   // 底价预载逻辑
-  loadWaterfall(options, onload, onfail, index = 0) {
-    let {
+  loadWaterfall (options, onload, onfail, index = 0) {
+    const {
       adpid,
       urlCallback
     } = options
@@ -253,28 +251,28 @@ class AdHelper {
       return
     }
 
-    let options2 = {
+    const options2 = {
       adpid: adpid[index],
       urlCallback,
       retry: false
-    };
+    }
 
     this.load(options2, (res) => {
-      onload(options2);
+      onload(options2)
     }, (err) => {
-      index++;
+      index++
       if (index >= adpid.length) {
-        onfail(err);
+        onfail(err)
       } else {
-        console.log('loadWaterfall::index=' + index);
-        this.loadWaterfall(options, onload, onfail, index);
+        console.log('loadWaterfall::index=' + index)
+        this.loadWaterfall(options, onload, onfail, index)
       }
-    });
+    })
   }
 
   // 底价逻辑，失败后下一个，无重试机制
-  showWaterfall(options, onload, onfail, onclose, onshow, index = 0) {
-    let {
+  showWaterfall (options, onload, onfail, onclose, onshow, index = 0) {
+    const {
       adpid,
       urlCallback
     } = options
@@ -282,70 +280,69 @@ class AdHelper {
       return
     }
 
-    let options2 = {
+    const options2 = {
       adpid: adpid[index],
       urlCallback,
       retry: false
-    };
+    }
 
     this.show(options2, () => {
-      onload();
+      onload()
     }, (err) => {
-      index++;
+      index++
       if (index >= adpid.length) {
-        onfail(err);
+        onfail(err)
       } else {
-        this.showWaterfall(options, onload, onfail, onclose, onshow, index);
+        this.showWaterfall(options, onload, onfail, onclose, onshow, index)
       }
     }, (res) => {
-      onclose(res);
+      onclose(res)
     }, () => {
-      onshow();
-    });
+      onshow()
+    })
   }
 
   // 预载底价瀑布流
-  preloadWaterfall(options, index = 0, step = 1) {
+  preloadWaterfall (options, index = 0, step = 1) {
     if (step === 1) {
       this.loadWaterfall(options, (res) => {
-        console.log("preloadWaterfall.success::", res);
+        console.log('preloadWaterfall.success::', res)
       }, (err) => {
-        console.log("loadWaterfall.fail", err);
+        console.log('loadWaterfall.fail', err)
       })
-      return;
+      return
     }
 
-    let {
+    const {
       adpid,
       urlCallback
     } = options
-    let ads = [];
     for (let i = 0; i < step; i++) {
       if (index < adpid.length) {
-        let options2 = {
+        const options2 = {
           adpid: adpid[index],
           urlCallback
-        };
+        }
         this.loadWaterfall(options2, (res) => {
-          console.log("preloadWaterfall.success::", res);
+          console.log('preloadWaterfall.success::', res)
         }, (err) => {
-          console.log("loadWaterfall.fail", err);
-          this.preloadWaterfall(options, index, step);
+          console.log('loadWaterfall.fail', err)
+          this.preloadWaterfall(options, index, step)
         })
-        index++;
+        index++
       } else {
-        break;
+        break
       }
     }
   }
 
-  isBusy(adpid) {
+  isBusy (adpid) {
     return (this._ads[adpid] && this._ads[adpid].isLoading)
   }
 
-  get(options) {
+  get (options) {
     const {
-      adpid,
+      adpid
     } = options
 
     if (!this._ads[adpid]) {
@@ -355,18 +352,18 @@ class AdHelper {
     return this._ads[adpid]
   }
 
-  remove(adpid) {
+  remove (adpid) {
     if (this._ads[adpid]) {
       this._ads[adpid].destroy()
       delete this._ads[adpid]
     }
   }
 
-  _createInstance(options) {
+  _createInstance (options) {
     const adType = options.adType || this._adType
     delete options.adType
 
-    let ad = null;
+    let ad = null
     if (adType === ADType.RewardedVideo) {
       ad = new RewardedVideo(options)
     } else if (adType === ADType.FullScreenVideo) {
@@ -410,25 +407,25 @@ export default {
       }
     }
   },
-  data() {
+  data () {
     return {
       loading: false,
       errorMessage: null
     }
   },
   watch: {
-    adpid(newValue, oldValue) {
+    adpid (newValue, oldValue) {
       this._removeInstance(oldValue)
       if (this.preload) {
         this._loadAd()
       }
     },
     // 服务器回调透传参数，仅在创建广告实例时可传递参数，如果发生变化需要重新创建广告实例
-    urlCallback() {
+    urlCallback () {
       this._removeInstance()
     }
   },
-  created() {
+  created () {
     this._adHelper = new AdHelper(this.adType)
 
     setTimeout(() => {
@@ -438,9 +435,9 @@ export default {
     }, 100)
   },
   methods: {
-    load() {
+    load () {
       this._startLoading()
-      const invoke = this._isWaterfall() ? "loadWaterfall" : "load"
+      const invoke = this._isWaterfall() ? 'loadWaterfall' : 'load'
       this._adHelper[invoke](this._getAdOptions(), () => {
         this._onLoad()
       }, (err) => {
@@ -448,9 +445,9 @@ export default {
       })
     },
 
-    show() {
+    show () {
       this._startLoading()
-      const invoke = this._isWaterfall() ? "showWaterfall" : "show"
+      const invoke = this._isWaterfall() ? 'showWaterfall' : 'show'
       this._adHelper[invoke](this._getAdOptions(), () => {
         this._onLoad()
       }, (err) => {
@@ -467,30 +464,30 @@ export default {
       })
     },
 
-    _loadAd() {
+    _loadAd () {
       if (this._canCreateAd()) {
         this.load()
       }
     },
 
-    _onclick() {
+    _onclick () {
       if (!this.disabled) {
         this.show()
       }
     },
 
-    _getAdOptions() {
+    _getAdOptions () {
       return {
         adpid: this.adpid,
         urlCallback: this.urlCallback
       }
     },
 
-    _isWaterfall() {
+    _isWaterfall () {
       return (Array.isArray(this.adpid) && this.adpid.length > 0)
     },
 
-    _canCreateAd() {
+    _canCreateAd () {
       let result = false
       if (Array.isArray(this.adpid) && this.adpid.length > 0) {
         result = true
@@ -502,8 +499,8 @@ export default {
       return result
     },
 
-    _removeInstance(adpid) {
-      let id = adpid || this.adpid
+    _removeInstance (adpid) {
+      const id = adpid || this.adpid
       if (Array.isArray(id)) {
         id.forEach((item) => {
           this._adHelper.remove(item)
@@ -513,23 +510,23 @@ export default {
       }
     },
 
-    _startLoading() {
+    _startLoading () {
       this.loading = true
       this.errorMessage = null
     },
 
-    _onLoad(err) {
+    _onLoad () {
       this.loading = false
       this._dispatchEvent(EventType.Load, {})
     },
 
-    _onLoadFail(err) {
+    _onLoadFail (err) {
       this.loading = false
       this.errorMessage = JSON.stringify(err)
       this._dispatchEvent(EventType.Error, err)
     },
 
-    _dispatchEvent(type, data) {
+    _dispatchEvent (type, data) {
       this.$emit(type, {
         detail: data
       })

packages/uni-cli-shared/components/ad.mixin.mp.js

@@ -29,56 +29,56 @@ export default {
       default: false
     }
   },
-  data() {
+  data () {
     return {
       loading: false,
       errorMessage: null
     }
   },
-  created() {
+  created () {
     this._ad = null
     setTimeout(() => {
       if (this.preload && this._canCreateAd()) {
-        this.load();
+        this.load()
       }
     }, 100)
   },
   methods: {
-    load() {
+    load () {
       this.errorMessage = null
     },
 
-    show() {
+    show () {
       this.errorMessage = null
-      this._ad = this.selectComponent('.uni-ad');
-      this._ad.show();
+      this._ad = this.selectComponent('.uni-ad')
+      this._ad.show()
     },
 
-    _onclick() {
+    _onclick () {
       this.show()
     },
 
-    _startLoading() {
+    _startLoading () {
       this.loading = true
       this.errorMessage = null
     },
 
-    _onmpload(e) {
+    _onmpload (e) {
       this.loading = false
       this._dispatchEvent(EventType.Load, {})
     },
 
-    _onmpclose(e) {
+    _onmpclose (e) {
       this._dispatchEvent(EventType.Close, e.detail)
     },
 
-    _onmperror(e) {
+    _onmperror (e) {
       this.loading = false
       this.errorMessage = JSON.stringify(e.detail)
       this._dispatchEvent(EventType.Error, e.detail)
     },
 
-    _dispatchEvent(type, data) {
+    _dispatchEvent (type, data) {
       this.$emit(type, {
         detail: data
       })

packages/uni-cli-shared/components/uniad.vue

 <template>
   <view @click="onclick">
-    <uni-ad-plugin class="uni-ad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uni-ad-plugin>
+    <uni-ad-plugin
+      class="uni-ad-plugin"
+      :adpid="adpid"
+      :unit-id="unitId"
+      @load="_onmpload"
+      @close="_onmpclose"
+      @error="_onmperror"
+    />
   </view>
 </template>
 
 <script>
-  import adMixin from "./ad.mixin.mp.js"
-  export default {
-    name: 'UniAd',
-    mixins: [adMixin],
-    props: {
-    },
-    methods: {
-    }
+import adMixin from './ad.mixin.mp.js'
+export default {
+  name: 'UniAd',
+  mixins: [adMixin],
+  props: {
+  },
+  methods: {
   }
+}
 </script>

packages/webpack-uni-pages-loader/lib/platforms/mp-weixin/app.json.uniad.js

-module.exports = function(appJson) {
+module.exports = function (appJson) {
   if (!appJson.plugins) {
     appJson.plugins = {}
   }
   if (!appJson.plugins['uni-ad']) {
     appJson.plugins['uni-ad'] = {
-      "version": "1.0.2",
-      "provider": "wx999bf02c8e05dfc9"
+      version: '1.0.2',
+      provider: 'wx999bf02c8e05dfc9'
     }
   }
   if (!appJson.plugins['coral-adv']) {
     appJson.plugins['coral-adv'] = {
-      "version": "1.0.7",
-      "provider": "wx0e203209e27b1e66"
+      version: '1.0.7',
+      provider: 'wx0e203209e27b1e66'
     }
   }