From 819ae541367ed5d62ade805c589023b35713237c Mon Sep 17 00:00:00 2001 From: handongxun Date: Tue, 26 Apr 2022 16:37:18 +0800 Subject: [PATCH] =?UTF-8?q?ad:=20=E6=94=AF=E6=8C=81=E5=BE=AE=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ad-fullscreen-video.vue | 2 +- .../components/ad-interstitial.vue | 2 +- .../components/ad-rewarded-video.vue | 2 +- .../uni-cli-shared/components/ad.mixin.mp.js | 9 ++++++++- packages/uni-cli-shared/lib/pages.js | 2 +- packages/uni-template-compiler/lib/index.js | 6 ++++-- packages/uni-template-compiler/lib/module.js | 3 --- .../uni-template-compiler/lib/module.uniad.js | 16 ++++++++++++++++ .../lib/platforms/mp-weixin/app.json.uniad.js | 6 +++--- 9 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 packages/uni-template-compiler/lib/module.uniad.js diff --git a/packages/uni-cli-shared/components/ad-fullscreen-video.vue b/packages/uni-cli-shared/components/ad-fullscreen-video.vue index ce2763ec3..4c81942f4 100644 --- a/packages/uni-cli-shared/components/ad-fullscreen-video.vue +++ b/packages/uni-cli-shared/components/ad-fullscreen-video.vue @@ -2,7 +2,7 @@ - + diff --git a/packages/uni-cli-shared/components/ad-interstitial.vue b/packages/uni-cli-shared/components/ad-interstitial.vue index dcb58220d..c561793b5 100644 --- a/packages/uni-cli-shared/components/ad-interstitial.vue +++ b/packages/uni-cli-shared/components/ad-interstitial.vue @@ -2,7 +2,7 @@ - + diff --git a/packages/uni-cli-shared/components/ad-rewarded-video.vue b/packages/uni-cli-shared/components/ad-rewarded-video.vue index a1f138e26..3d81f81fc 100644 --- a/packages/uni-cli-shared/components/ad-rewarded-video.vue +++ b/packages/uni-cli-shared/components/ad-rewarded-video.vue @@ -2,7 +2,7 @@ - + diff --git a/packages/uni-cli-shared/components/ad.mixin.mp.js b/packages/uni-cli-shared/components/ad.mixin.mp.js index 46975dbea..808794052 100644 --- a/packages/uni-cli-shared/components/ad.mixin.mp.js +++ b/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 () { diff --git a/packages/uni-cli-shared/lib/pages.js b/packages/uni-cli-shared/lib/pages.js index af9538752..acf03c89e 100644 --- a/packages/uni-cli-shared/lib/pages.js +++ b/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) diff --git a/packages/uni-template-compiler/lib/index.js b/packages/uni-template-compiler/lib/index.js index 4e1ce7132..15ae48f40 100644 --- a/packages/uni-template-compiler/lib/index.js +++ b/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) diff --git a/packages/uni-template-compiler/lib/module.js b/packages/uni-template-compiler/lib/module.js index ef883e7c6..9a572f58f 100644 --- a/packages/uni-template-compiler/lib/module.js +++ b/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平台, 组件暂不支持非 V3 编译, 详见: https://ask.dcloud.net.cn/article/36599') - } if (el.tag === 'slot' && !el.attrsMap.name) { el.attrsList.push({ name: 'SLOT_DEFAULT', diff --git a/packages/uni-template-compiler/lib/module.uniad.js b/packages/uni-template-compiler/lib/module.uniad.js new file mode 100644 index 000000000..e0c08498e --- /dev/null +++ b/packages/uni-template-compiler/lib/module.uniad.js @@ -0,0 +1,16 @@ +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 + } + } + } +} diff --git a/packages/webpack-uni-pages-loader/lib/platforms/mp-weixin/app.json.uniad.js b/packages/webpack-uni-pages-loader/lib/platforms/mp-weixin/app.json.uniad.js index 9f6f69336..2575951db 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/mp-weixin/app.json.uniad.js +++ b/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' } } -- GitLab