From 5036880fc037e5d112206b93a729f60be12bf8ab Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 07 十一月 2024 17:03:13 +0800
Subject: [PATCH] 2024.11.07 bug修复

---
 miniprogram_npm/tdesign-miniprogram/picker/picker.wxml |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/miniprogram_npm/tdesign-miniprogram/picker/picker.wxml b/miniprogram_npm/tdesign-miniprogram/picker/picker.wxml
index bb5cf44..c7131f8 100644
--- a/miniprogram_npm/tdesign-miniprogram/picker/picker.wxml
+++ b/miniprogram_npm/tdesign-miniprogram/picker/picker.wxml
@@ -1,29 +1,17 @@
 <wxs src="../common/utils.wxs" module="_" />
 
 <t-popup
+  wx:if="{{usePopup}}"
   class="class"
   visible="{{visible}}"
   placement="bottom"
+  usingCustomNavbar="{{usingCustomNavbar}}"
   bind:visible-change="onPopupChange"
   z-index="{{ popupProps.zIndex || defaultPopUpzIndex }}"
   overlay-props="{{ popupProps.overlayProps || defaultPopUpProps }}"
 >
-  <view slot="content" style="{{_._style([style, customStyle])}}" class="{{classPrefix}} {{prefix}}-class">
-    <view class="{{classPrefix}}__toolbar" wx:if="{{header}}">
-      <view class="{{classPrefix}}__cancel {{prefix}}-class-cancel" wx:if="{{cancelBtn}}" bindtap="onCancel"
-        >{{cancelBtn}}</view
-      >
-      <view class="{{classPrefix}}__title {{prefix}}-class-title">{{title}}</view>
-      <view class="{{classPrefix}}__confirm {{prefix}}-class-confirm" wx:if="{{confirmBtn}}" bindtap="onConfirm"
-        >{{confirmBtn}}</view
-      >
-    </view>
-    <slot name="header" />
-    <view class="{{_.cls(classPrefix + '__main', [])}}">
-      <slot />
-      <view class="{{classPrefix}}__mask {{classPrefix}}__mask--top" />
-      <view class="{{classPrefix}}__mask {{classPrefix}}__mask--bottom" />
-      <view class="{{classPrefix}}__indicator"></view>
-    </view>
-  </view>
+  <include src="./template.wxml" />
 </t-popup>
+<block wx:else>
+  <include src="./template.wxml" />
+</block>

--
Gitblit v1.9.3