From d048390edfc996dbb82e4bc3e5b91c42ef782ec8 Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Fri, 18 Feb 2022 11:49:04 +0800
Subject: [PATCH] fix(nvue3): ad ad-draw

---
 packages/uni-components/src/components/ad-draw.ts |  3 ++-
 .../uni-components/src/nvue/ad-draw/index.tsx     |  6 +++---
 packages/uni-components/src/nvue/ad/index.tsx     | 15 ++++++++++-----
 packages/uni-components/src/nvue/components.ts    |  4 ++++
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/uni-components/src/components/ad-draw.ts b/packages/uni-components/src/components/ad-draw.ts
index e2b7b1c1e..24a666b04 100644
--- a/packages/uni-components/src/components/ad-draw.ts
+++ b/packages/uni-components/src/components/ad-draw.ts
@@ -15,7 +15,8 @@ export function getAdData(
   }
 
   // TODO 缺少语法提示 getDrawAds
-  plus.ad.getAds(
+  // @ts-ignore
+  plus.ad.getDrawAds(
     {
       adpid: String(adpid),
       count: 3,
diff --git a/packages/uni-components/src/nvue/ad-draw/index.tsx b/packages/uni-components/src/nvue/ad-draw/index.tsx
index bcb8c638a..46451cf26 100644
--- a/packages/uni-components/src/nvue/ad-draw/index.tsx
+++ b/packages/uni-components/src/nvue/ad-draw/index.tsx
@@ -49,7 +49,7 @@ export default defineComponent({
     )
 
     const listeners = {
-      dislike(e: Event) {
+      onDislike(e: Event) {
         trigger(AdEventType.close, e)
       },
     }
@@ -68,7 +68,7 @@ export default defineComponent({
       const { data } = state
       return (
         <u-ad-draw
-          ref="ad"
+          ref={adRef}
           {...{ data, rendering: true }}
           {...listeners}
         ></u-ad-draw>
@@ -97,7 +97,7 @@ function _loadAdData(
     state.width,
     state.height,
     (res: any) => {
-      state.data = res.data
+      state.data = res
       trigger(AdEventType.load, {})
     },
     (err: any) => {
diff --git a/packages/uni-components/src/nvue/ad/index.tsx b/packages/uni-components/src/nvue/ad/index.tsx
index 9c10d6cc7..c70bc5ccf 100644
--- a/packages/uni-components/src/nvue/ad/index.tsx
+++ b/packages/uni-components/src/nvue/ad/index.tsx
@@ -64,17 +64,22 @@ export default defineComponent({
     })
 
     const listeners = {
-      downloadchange(e: Event) {
+      onDownloadchange(e: Event) {
         trigger(AdEventType.downloadchange, e)
       },
-      dislike(e: Event) {
+      onDislike(e: Event) {
         trigger(AdEventType.close, e)
       },
     }
 
     return () => {
-      const { data } = state
-      return <u-ad ref="ad" {...{ data, rendering: true }} {...listeners} />
+      return (
+        <u-ad
+          ref={adRef}
+          {...{ data: state.data, rendering: true }}
+          {...listeners}
+        />
+      )
     }
   },
 })
@@ -99,7 +104,7 @@ function _loadAdData(
       width: state.width,
     },
     (res: any) => {
-      state.data = res.data
+      state.data = res
       trigger(AdEventType.load, {})
     },
     (err: any) => {
diff --git a/packages/uni-components/src/nvue/components.ts b/packages/uni-components/src/nvue/components.ts
index c5d1fdd80..1f39c8430 100644
--- a/packages/uni-components/src/nvue/components.ts
+++ b/packages/uni-components/src/nvue/components.ts
@@ -18,6 +18,8 @@ import Icon from './icon'
 import Swiper from './swiper'
 import SwiperItem from './swiper-item'
 import RichText from './rich-text'
+import Ad from './ad'
+import AdDraw from './ad-draw'
 export default {
   Navigator,
   Label,
@@ -39,4 +41,6 @@ export default {
   Swiper,
   SwiperItem,
   RichText,
+  Ad,
+  AdDraw,
 }
-- 
GitLab