ad: 支持微信

packages/uni-cli-shared/components/ad-fullscreen-video.vue

@@ -2,7 +2,7 @@
   <view @click="_onclick">
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
-    <uni-ad-plugin class="uni-ad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uni-ad-plugin>
+    <uniad-plugin class="uni-ad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
     <!-- #endif -->
   </view>
 </template>

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

@@ -2,7 +2,7 @@
   <view @click="_onclick">
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
-    <uni-ad-plugin class="uni-ad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uni-ad-plugin>
+    <uniad-plugin class="uni-ad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
     <!-- #endif -->
   </view>
 </template>

packages/uni-cli-shared/components/ad-rewarded-video.vue

@@ -2,7 +2,7 @@
   <view @click="_onclick">
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
-    <uni-ad-plugin class="uni-ad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uni-ad-plugin>
+    <uniad-plugin class="uni-ad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
     <!-- #endif -->
   </view>
 </template>

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

@@ -45,7 +45,14 @@ export default {
   },
   methods: {
     load () {
-      this.errorMessage = null
+      if (this.loading) {
+        return
+      }
+      this._startLoading()
+
+      setTimeout(() => {
+        this.loading = false
+      }, 3000)
     },
 
     show () {

packages/uni-cli-shared/lib/pages.js

@@ -519,7 +519,7 @@ function parseUsingAutoImportComponents (usingAutoImportComponents) {
 
 const BUILT_IN_COMPONENTS = ['page-meta', 'navigation-bar', 'uni-match-media']
 
-const BUILT_IN_EASYCOMS = ['unicloud-db', 'ad-rewarded-video', 'ad-fullscreen-video', 'ad-interstitial', 'ad-interactive']
+const BUILT_IN_EASYCOMS = ['unicloud-db', 'uniad', 'ad-rewarded-video', 'ad-fullscreen-video', 'ad-interstitial', 'ad-interactive']
 
 function isBuiltInComponent (name) { // uni-template-compiler/lib/util.js 识别微信内置组件
   return BUILT_IN_COMPONENTS.includes(name)

packages/uni-template-compiler/lib/index.js

@@ -15,7 +15,8 @@ const generateScript = require('./script/generate')
 const traverseTemplate = require('./template/traverse')
 const generateTemplate = require('./template/generate')
 
-const compilerModule = require('./module')
+const compilerModule = require('./module')
+// const compilerModuleUniad = require('./module.uniad')
 
 const compilerAlipayModule = require('./module-alipay')
 const compilerToutiaoModule = require('./module-toutiao')
@@ -90,7 +91,8 @@ module.exports = {
       return compileTemplate(source, options, compile)
     }
 
-    options.modules.push(compilerModule)
+    options.modules.push(compilerModule)
+    // options.modules.push(compilerModuleUniad)
 
     if (options.mp.platform === 'mp-alipay') {
       options.modules.push(compilerAlipayModule)

packages/uni-template-compiler/lib/module.js

@@ -15,9 +15,6 @@ module.exports = {
   preTransformNode (el, {
     warn
   }) {
-    if (process.env.UNI_PLATFORM === 'app-plus' && el.tag === 'ad') {
-      warn('app-vue平台, <ad> 组件暂不支持非 V3 编译, 详见: https://ask.dcloud.net.cn/article/36599')
-    }
     if (el.tag === 'slot' && !el.attrsMap.name) {
       el.attrsList.push({
         name: 'SLOT_DEFAULT',

packages/uni-template-compiler/lib/module.uniad.js

+const AD_COMPONENTS = ['uniad', 'ad-rewarded-video', 'ad-fullscreen-video', 'ad-interstitial']
+
+module.exports = {
+  preTransformNode (el, {
+    warn
+  }) {
+    if (process.env.UNI_PLATFORM === 'mp-weixin') {
+      if (el.tag === 'ad' && el.attrsMap.adpid) {
+        el.tag = 'uniad'
+      }
+      if (AD_COMPONENTS.indexOf(el.tag) > -1) {
+        process.env.USE_UNI_AD = true
+      }
+    }
+  }
+}

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

@@ -4,7 +4,7 @@ module.exports = function (appJson) {
   }
   if (!appJson.plugins['uni-ad']) {
     appJson.plugins['uni-ad'] = {
-      version: '1.0.2',
+      version: '1.0.3',
       provider: 'wx999bf02c8e05dfc9'
     }
   }
@@ -18,7 +18,7 @@ module.exports = function (appJson) {
   if (!appJson.usingComponents) {
     appJson.usingComponents = {}
   }
-  if (!appJson.usingComponents['uni-ad-plugin']) {
-    appJson.usingComponents['uni-ad-plugin'] = 'plugin://uni-ad/ad'
+  if (!appJson.usingComponents['uniad-plugin']) {
+    appJson.usingComponents['uniad-plugin'] = 'plugin://uni-ad/ad'
   }
 }