uniapp-dyckui 4.1.8 → 4.1.10

package/src/components/MyComs/Dialog/index.vue

@@ -4,20 +4,22 @@
       <!-- 上部分内容 -->
       <view class="dialog-content">
         <view class="dialog-icon">
-          <!-- 图标插槽包装器 -->
-          <slot name="icon">
-            <!-- 自定义字体图标 -->
-            <text v-if="customIcon" class="iconfont dialog-icon-custom">{{ customIcon }}</text>
-            <!-- 根据图标类型显示字体图标 -->
-            <text v-else-if="iconType === 'phone'" class="iconfont dialog-button-primary icon-shouji" />
-            <text v-else-if="iconType === 'screen'" class="iconfont dialog-button-primary icon-xianshiqi" />
-            <text v-else-if="iconType === 'links'" class="iconfont dialog-button-primary icon-xianshiqi1" />
-            <text v-else-if="iconType === 'links2'" class="iconfont dialog-button-primary icon-lianjiewangzhi" />
-            <!-- 兼容旧版本的图片图标 -->
-            <image v-else-if="icon" :src="icon" alt="dialog-icon" />
-            <!-- 默认图标 -->
-            <view v-else class="default-icon" />
-          </slot>
+          <view class="dialog-icon-item">
+            <!-- 图标插槽包装器 -->
+            <slot name="icon">
+              <!-- 自定义字体图标 -->
+              <text v-if="customIcon" class="iconfont dialog-icon-custom">{{ customIcon }}</text>
+              <!-- 根据图标类型显示字体图标 -->
+              <text v-else-if="iconType === 'phone'" class="iconfont dialog-button-primary icon-shouji" />
+              <text v-else-if="iconType === 'screen'" class="iconfont dialog-button-primary icon-xianshiqi" />
+              <text v-else-if="iconType === 'links'" class="iconfont dialog-button-primary icon-xianshiqi1" />
+              <text v-else-if="iconType === 'links2'" class="iconfont dialog-button-primary icon-lianjiewangzhi" />
+              <!-- 兼容旧版本的图片图标 -->
+              <image v-else-if="icon" :src="icon" alt="dialog-icon" />
+              <!-- 默认图标 -->
+              <view v-else class="default-icon" />
+            </slot>
+          </view>
         </view>
         <view class="dialog-title">
           {{ title }}
@@ -32,7 +34,7 @@
       <view class="dialog-buttons">
         <!-- 类型1: 取消和打开app -->
         <template v-if="type === 'open-app'">
-          <view class="dialog-button dialog-button-cancel" @click="handleCancel">
+          <view class="dialog-button dialog-button-cancel dialog-button-line" @click="handleCancel">
             取消
           </view>
           <view class="dialog-button dialog-button-primary" @click="handleConfirm">
@@ -49,7 +51,7 @@
 
         <!-- 类型3: 取消和继续访问 -->
         <template v-else-if="type === 'continue'">
-          <view class="dialog-button dialog-button-cancel" @click="handleCancel">
+          <view class="dialog-button dialog-button-cancel dialog-button-line" @click="handleCancel">
             取消
           </view>
           <view class="dialog-button dialog-button-primary" @click="handleConfirm">
@@ -184,24 +186,14 @@ function handleCancel() {
 }
 
 /* 图标 */
-.dialog-icon {
+.dialog-icon-item {
   margin-bottom: 40rpx;
   display: flex;
   justify-content: center;
   align-items: center;
-  display: inline-block;
   border-radius: 50%;
   border: 2rpx solid rgb(151, 150, 150);
-}
-
-/* 确保dialog-icon容器内的所有直接子元素都应用相同的基础样式 */
-.dialog-icon > * {
-  width: 120rpx;
-  height: 120rpx;
-  font-size: 80rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  display: inline-block;
 }
 
 .dialog-icon image {
@@ -210,7 +202,12 @@ function handleCancel() {
 
 /* 字体图标样式 */
 .dialog-icon .iconfont {
-  /* 已通过 .dialog-icon > * 应用基础样式 */
+  width: 120rpx;
+  height: 120rpx;
+  font-size: 80rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 /* 自定义字体图标 */
@@ -259,6 +256,7 @@ function handleCancel() {
   color: #666;
   margin: 0;
   line-height: 1.5;
+  display: block;
 }
 
 /* 分割线 */
@@ -307,6 +305,9 @@ function handleCancel() {
 .dialog-button-primary {
   color: #00599c;
 }
+.dialog-button-line {
+  border-right: 3rpx solid #e5e5e5;
+}
 
 .dialog-button-primary:hover {
   background-color: #f0f9ff;

package/src/components/MyComs/index.ts

@@ -2,6 +2,7 @@
 
 // 基础组件
 import Button from './Button/index.vue'
+
 import Dialog from './Dialog/index.vue'
 import Divider from './Divider/index.vue'
 // 导出组合式函数
@@ -9,19 +10,21 @@ import { useDropdownSelect } from './DropdownSelect/dropdownSelect'
 // 表单组件
 import DropdownSelect from './DropdownSelect/index.vue'
 import { useDropdownWithBadge } from './DropdownWithBadge/dropdownWithBadge'
-
 import DropdownWithBadge from './DropdownWithBadge/index.vue'
+
 // 筛选组件
 import FilterDrawer from './FilterDrawer/index.vue'
-
 import { useFilterDrawer } from './FilterDrawer/useFilterDrawer'
+
 // 交互组件
 import InfiniteScroll from './InfiniteScroll/index.vue'
 import Popup from './Popup/index.vue'
-
 import PullRefresh from './PullRefresh/index.vue'
+
 import Swiper from './Swiper/index.vue'
 import Toast from './Toast/index.vue'
+// 导入字体图标样式
+import '@/assets/font/iconfont.css'
 
 export type { DropdownSelectEmits, DropdownSelectProps } from './DropdownSelect/type'