Merge branch 'dev' into alpha

# Conflicts:
#	packages/uni-cli-shared/components/ad-interactive.vue
#	packages/uni-cli-shared/components/ad.mixin.js

.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

@@ -48,13 +48,13 @@ export default {
   created () {
     this._uniAdPlugin = null
     this._interactiveUrl = null
-    if (this.openType == OpenTypes.Interactive) {
+    if (this.openType === OpenTypes.Interactive) {
       this.getAdData()
     }
   },
   methods: {
     show () {
-      if (this._uniAdPlugin == null) {
+      if (this._uniAdPlugin === null) {
         this._uniAdPlugin = this.selectComponent('.uni-ad-plugin')
       }
       this._uniAdPlugin.show()
@@ -88,7 +88,7 @@ export default {
           }
 
           const responseData = res.data
-          if (responseData.ret == 0) {
+          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)
@@ -109,7 +109,7 @@ export default {
       })
     },
     onclick () {
-      if (this.openType != OpenTypes.Interactive || !this._interactiveUrl) {
+      if (this.openType !== OpenTypes.Interactive || !this._interactiveUrl) {
         return
       }
 
@@ -127,11 +127,7 @@ export default {
           t: '10019'
         },
         timeout: 5000,
-        dataType: 'json',
-        success: (res) => {
-        },
-        fail: (err) => {
-        }
+        dataType: 'json'
       })
     }
   }

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

@@ -317,7 +317,6 @@ class AdHelper {
       adpid,
       urlCallback
     } = options
-    const ads = []
     for (let i = 0; i < step; i++) {
       if (index < adpid.length) {
         const options2 = {
@@ -516,7 +515,7 @@ export default {
       this.errorMessage = null
     },
 
-    _onLoad (err) {
+    _onLoad () {
       this.loading = false
       this._dispatchEvent(EventType.Load, {})
     },