From f392349da5a788eb398e25e9e7ea85ec2993ffd2 Mon Sep 17 00:00:00 2001
From: oliverppeng <oliverppeng@tencent.com>
Date: Mon, 7 Mar 2022 13:15:18 +0800
Subject: [PATCH 1/2] fix(popup): fix popup default slot

resolve #206
---
 example/pages/popup/popup.less |  5 ++++-
 example/pages/popup/popup.wxml | 10 +++++-----
 src/popup/popup.wxml           |  3 +--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/example/pages/popup/popup.less b/example/pages/popup/popup.less
index 8c9f817ae..6fe8d59f5 100644
--- a/example/pages/popup/popup.less
+++ b/example/pages/popup/popup.less
@@ -24,7 +24,6 @@ page .demo-block__oper {
   .block {
     width: 176rpx;
     height: 176rpx;
-    border-radius: 8rpx;
     background: #fff;
     color: #333;
     display: flex;
@@ -42,6 +41,10 @@ page .demo-block__oper {
       border-radius: 0;
     }
 
+    &--middle {
+      border-radius: 16rpx;
+    }
+
     &--top {
       width: 100vw;
       height: 35vh;
diff --git a/example/pages/popup/popup.wxml b/example/pages/popup/popup.wxml
index 27aafdf7e..4f4d40355 100644
--- a/example/pages/popup/popup.wxml
+++ b/example/pages/popup/popup.wxml
@@ -3,7 +3,7 @@
 <view class="tdesign-demo-popup">
   <t-demo title="01 类型" operList="{{operList}}" bindclickoper="clickHandle">
     <t-popup visible="{{top}}" bind:visible-change="onVisibleChange" placement="top">
-      <view slot="content" class="block block--top" />
+      <view class="block block--top" />
     </t-popup>
     <t-popup
       visible="{{bottom}}"
@@ -11,16 +11,16 @@
       placement="bottom"
       close-btn
     >
-      <view slot="content" class="block block--bottom" />
+      <view class="block block--bottom" />
     </t-popup>
     <t-popup visible="{{center}}" bind:visible-change="onVisibleChange" placement="center">
-      <view slot="content" class="block" />
+      <view class="block block--middle" />
     </t-popup>
     <t-popup visible="{{left}}" bind:visible-change="onVisibleChange" placement="left">
-      <view slot="content" class="block block--left" />
+      <view class="block block--left" />
     </t-popup>
     <t-popup visible="{{right}}" bind:visible-change="onVisibleChange" placement="right">
-      <view slot="content" class="block block--right" />
+      <view class="block block--right" />
     </t-popup>
   </t-demo>
 </view>
diff --git a/src/popup/popup.wxml b/src/popup/popup.wxml
index 3617db3a7..5c9813717 100644
--- a/src/popup/popup.wxml
+++ b/src/popup/popup.wxml
@@ -13,11 +13,10 @@
     style="z-index:{{zIndex -1}}"
   />
   <view class="{{classPrefix}}__content {{prefix}}-class-content" style="z-index:{{zIndex}}">
-    {{content}}
     <view class="{{classPrefix}}__close">
       <t-icon name="close" wx:if="{{closeBtn}}" bind:tap="onCloseClick" size="64rpx" />
       <slot name="closeBtn" class="{{classPrefix}}-slot" />
     </view>
-    <slot name="content" />
+    <slot />
   </view>
 </t-transition>

From 1907d0d42d513b9f825bc84afae26ef380fbdafa Mon Sep 17 00:00:00 2001
From: oliverppeng <oliverppeng@tencent.com>
Date: Mon, 7 Mar 2022 14:10:19 +0800
Subject: [PATCH 2/2] fix(popup): fix popup default slot

resolve #219
---
 src/popup/popup.wxml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/popup/popup.wxml b/src/popup/popup.wxml
index 5c9813717..87cb8bcbb 100644
--- a/src/popup/popup.wxml
+++ b/src/popup/popup.wxml
@@ -17,6 +17,7 @@
       <t-icon name="close" wx:if="{{closeBtn}}" bind:tap="onCloseClick" size="64rpx" />
       <slot name="closeBtn" class="{{classPrefix}}-slot" />
     </view>
+    <slot name="content" />
     <slot />
   </view>
 </t-transition>