From d11473e6f128fa1a8a94ececa386c9102743b5fc Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Tue, 29 Apr 2025 18:03:48 +0800
Subject: [PATCH 01/13] =?UTF-8?q?feat(actionsheet):=20v15=20H5=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/actionsheet/actionsheet.scss   | 40 ++++++++--
 src/packages/actionsheet/actionsheet.tsx    | 17 +++--
 src/packages/actionsheet/demo.tsx           |  4 +-
 src/packages/actionsheet/demos/h5/demo1.tsx | 12 +--
 src/packages/actionsheet/demos/h5/demo2.tsx | 21 +++---
 src/packages/actionsheet/demos/h5/demo3.tsx | 20 ++---
 src/packages/actionsheet/demos/h5/demo4.tsx |  4 +-
 src/packages/actionsheet/demos/h5/demo5.tsx | 29 +++++--
 src/packages/actionsheet/demos/h5/demo6.tsx | 84 ++++++++++++++++-----
 src/packages/actionsheet/demos/h5/demo7.tsx | 39 ++++++++++
 src/styles/variables.scss                   |  4 +-
 11 files changed, 204 insertions(+), 70 deletions(-)
 create mode 100644 src/packages/actionsheet/demos/h5/demo7.tsx

diff --git a/src/packages/actionsheet/actionsheet.scss b/src/packages/actionsheet/actionsheet.scss
index 10c15a1b49..fcf17d0c26 100644
--- a/src/packages/actionsheet/actionsheet.scss
+++ b/src/packages/actionsheet/actionsheet.scss
@@ -2,12 +2,31 @@
 
 .nut-actionsheet {
   text-align: center;
-
+  padding: 16px;
+  &-bottom {
+    padding-bottom: 34px;
+  }
   &.nut-popup {
     min-height: 10%;
     background-color: $actionsheet-background-color;
   }
-
+  &-bottom-title,
+  &-top-title {
+    font-size: 16px;
+    font-weight: 600;
+    color: rgb(26, 26, 26);
+    justify-content: center;
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+  }
+  &-top-title {
+    justify-content: space-between;
+  }
+  &-close-icon {
+    width: 16px;
+    height: 16px;
+  }
   .nut-popup-title {
     border-bottom: 1px solid $actionsheet-border-color;
   }
@@ -23,12 +42,14 @@
   &-cancel,
   &-item {
     display: block;
-    padding: 10px;
     text-align: $actionsheet-item-text-align;
     line-height: $actionsheet-item-line-height;
     font-size: $font-size-base;
     color: $actionsheet-item-color;
     cursor: pointer;
+    &-border {
+      border-bottom: 0.5px solid #c2c4cc;
+    }
     &-name {
       text-align: $actionsheet-item-text-align;
       line-height: $actionsheet-item-line-height;
@@ -54,9 +75,16 @@
   }
 
   &-cancel {
-    margin-top: 5px;
-    border-top: 1px solid $actionsheet-border-color;
-    border-radius: $actionsheet-border-radius;
+    border: 0.5px solid #c2c4cc;
+    border-width: 0.5px;
+    border-radius: 8px;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 16px;
+    color: rgb(26, 26, 26);
+    margin-top: 16px;
   }
 
   &-safe-area {
diff --git a/src/packages/actionsheet/actionsheet.tsx b/src/packages/actionsheet/actionsheet.tsx
index 41904455a9..6738933af8 100644
--- a/src/packages/actionsheet/actionsheet.tsx
+++ b/src/packages/actionsheet/actionsheet.tsx
@@ -1,4 +1,5 @@
 import React, { FunctionComponent } from 'react'
+import { Close } from '@nutui/icons-react'
 import Popup from '@/packages/popup/index'
 import { ComponentDefaults } from '@/utils/typings'
 import { mergeProps } from '@/utils/merge-props'
@@ -11,6 +12,7 @@ const defaultProps = {
   options: [],
   optionKey: { name: 'name', description: 'description' },
   cancelText: '',
+  position: 'bottom',
   onCancel: () => {},
   onSelect: () => {},
 } as unknown as WebActionSheetProps
@@ -30,6 +32,7 @@ export const ActionSheet: FunctionComponent<
     visible,
     className,
     style,
+    position,
     ...rest
   } = mergeProps(defaultProps, props)
 
@@ -53,22 +56,26 @@ export const ActionSheet: FunctionComponent<
       {...rest}
       round
       visible={visible}
-      position="bottom"
-      title={title}
+      position={position}
       description={description}
-      className={classPrefix}
+      className={`${classPrefix} ${classPrefix}-${position}`}
       onClose={() => {
-        onCancel && onCancel()
+        onCancel?.()
       }}
+      closeable={position === 'top'}
+      closeIcon={<Close className={`${classPrefix}-close-icon`} />}
     >
       <div className={`${className}`} style={style}>
+        {title && (
+          <div className={`${classPrefix}-${position}-title`}>{title}</div>
+        )}
         {options.length ? (
           <div className={`${classPrefix}-list`}>
             {options.map((item, index) => {
               const statusClass = `${item.disabled ? `${classPrefix}-item-disabled` : ''} ${item.danger ? `${classPrefix}-item-danger` : ''}`
               return (
                 <div
-                  className={`${classPrefix}-item ${statusClass}`}
+                  className={`${classPrefix}-item ${statusClass} ${index !== options.length - 1 ? `${classPrefix}-item-border` : ''}`}
                   key={index}
                   onClick={() => chooseItem(item, index)}
                 >
diff --git a/src/packages/actionsheet/demo.tsx b/src/packages/actionsheet/demo.tsx
index db9d0fcf43..2702176d22 100644
--- a/src/packages/actionsheet/demo.tsx
+++ b/src/packages/actionsheet/demo.tsx
@@ -7,6 +7,7 @@ import Demo3 from './demos/h5/demo3'
 import Demo4 from './demos/h5/demo4'
 import Demo5 from './demos/h5/demo5'
 import Demo6 from './demos/h5/demo6'
+import Demo7 from './demos/h5/demo7'
 
 const ActionSheetDemo = () => {
   const [translated] = useTranslate({
@@ -41,8 +42,9 @@ const ActionSheetDemo = () => {
         <Demo4 />
         <h2>{translated.c3a08065}</h2>
         <Demo5 />
-        <h2>{translated.c3a08066}</h2>
         <Demo6 />
+        <h2>{translated.c3a08066}</h2>
+        <Demo7 />
       </div>
     </>
   )
diff --git a/src/packages/actionsheet/demos/h5/demo1.tsx b/src/packages/actionsheet/demos/h5/demo1.tsx
index 6b36ced9bc..75595a5808 100644
--- a/src/packages/actionsheet/demos/h5/demo1.tsx
+++ b/src/packages/actionsheet/demos/h5/demo1.tsx
@@ -1,18 +1,18 @@
 import React, { useState } from 'react'
 import { ActionSheet, Cell } from '@nutui/nutui-react'
 
-const Demo1 = () => {
+const Demo = () => {
   const [val, setVal] = useState('')
   const [isVisible, setIsVisible] = useState(false)
   const options = [
     {
-      name: '权限设置',
+      name: '分享给朋友',
     },
     {
-      name: '重命名',
+      name: '添加到收藏夹',
     },
     {
-      name: '删除',
+      name: '复制商品链接',
     },
   ]
 
@@ -28,13 +28,13 @@ const Demo1 = () => {
         <div style={{ marginInlineStart: '10px', color: '#999' }}>{val}</div>
       </Cell>
       <ActionSheet
-        title="标题"
         visible={isVisible}
         options={options}
         onSelect={handleSelect}
         onCancel={() => setIsVisible(false)}
+        cancelText="取消"
       />
     </>
   )
 }
-export default Demo1
+export default Demo
diff --git a/src/packages/actionsheet/demos/h5/demo2.tsx b/src/packages/actionsheet/demos/h5/demo2.tsx
index cd8b693e5a..933c038718 100644
--- a/src/packages/actionsheet/demos/h5/demo2.tsx
+++ b/src/packages/actionsheet/demos/h5/demo2.tsx
@@ -1,39 +1,38 @@
 import React, { useState } from 'react'
 import { ActionSheet, Cell } from '@nutui/nutui-react'
 
-const Demo2 = () => {
-  const [isVisible, setIsVisible] = useState(false)
+const Demo = () => {
   const [val, setVal] = useState('')
+  const [isVisible, setIsVisible] = useState(false)
   const options = [
     {
-      name: '权限设置',
+      name: '分享给朋友',
     },
     {
-      name: '重命名',
-    },
-    {
-      name: '删除',
+      name: '添加到收藏夹',
     },
   ]
+
   const handleSelect = (item: any) => {
     setVal(item.name)
     setIsVisible(false)
   }
+
   return (
     <>
       <Cell onClick={() => setIsVisible(!isVisible)}>
-        <span>展示取消按钮</span>
+        <span>展示标题</span>
         <div style={{ marginInlineStart: '10px', color: '#999' }}>{val}</div>
       </Cell>
-
       <ActionSheet
+        title="标题"
         visible={isVisible}
-        cancelText="取消"
         options={options}
         onSelect={handleSelect}
         onCancel={() => setIsVisible(false)}
+        cancelText="取消"
       />
     </>
   )
 }
-export default Demo2
+export default Demo
diff --git a/src/packages/actionsheet/demos/h5/demo3.tsx b/src/packages/actionsheet/demos/h5/demo3.tsx
index dcd02b3132..b48dfa5340 100644
--- a/src/packages/actionsheet/demos/h5/demo3.tsx
+++ b/src/packages/actionsheet/demos/h5/demo3.tsx
@@ -1,19 +1,15 @@
 import React, { useState } from 'react'
 import { ActionSheet, Cell } from '@nutui/nutui-react'
 
-const Demo3 = () => {
+const Demo = () => {
   const [isVisible, setIsVisible] = useState(false)
   const [val, setVal] = useState('')
-  const options: Record<string, string>[] = [
+  const options = [
     {
-      name: '权限设置',
+      name: '分享给朋友',
     },
     {
-      name: '重命名',
-    },
-    {
-      name: '删除',
-      description: '删除后无法恢复',
+      name: '添加到收藏夹',
     },
   ]
 
@@ -25,14 +21,14 @@ const Demo3 = () => {
   return (
     <>
       <Cell onClick={() => setIsVisible(!isVisible)}>
-        <span>展示描述信息</span>
+        <span>顶部弹出</span>
         <div style={{ marginInlineStart: '10px', color: '#999' }}>{val}</div>
       </Cell>
       <ActionSheet
+        position="top"
         visible={isVisible}
         title="标题"
-        description="请选择操作动作"
-        cancelText="取消"
+        // description="请选择操作动作"
         options={options}
         onSelect={handleSelect}
         onCancel={() => setIsVisible(false)}
@@ -40,4 +36,4 @@ const Demo3 = () => {
     </>
   )
 }
-export default Demo3
+export default Demo
diff --git a/src/packages/actionsheet/demos/h5/demo4.tsx b/src/packages/actionsheet/demos/h5/demo4.tsx
index 7a6d6a2931..d8d9623c57 100644
--- a/src/packages/actionsheet/demos/h5/demo4.tsx
+++ b/src/packages/actionsheet/demos/h5/demo4.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import { ActionSheet, Cell } from '@nutui/nutui-react'
 
-const Demo4 = () => {
+const Demo = () => {
   const [isVisible, setIsVisible] = useState(false)
   const optionsThree: Record<string, string | boolean>[] = [
     {
@@ -30,4 +30,4 @@ const Demo4 = () => {
     </>
   )
 }
-export default Demo4
+export default Demo
diff --git a/src/packages/actionsheet/demos/h5/demo5.tsx b/src/packages/actionsheet/demos/h5/demo5.tsx
index 678032affa..1220d56bac 100644
--- a/src/packages/actionsheet/demos/h5/demo5.tsx
+++ b/src/packages/actionsheet/demos/h5/demo5.tsx
@@ -1,12 +1,13 @@
 import React, { useState } from 'react'
-import { ActionSheet, Cell } from '@nutui/nutui-react'
+import { ActionSheet, Cell, Image } from '@nutui/nutui-react'
 
-const Demo5 = () => {
+const Demo = () => {
   const [isVisible, setIsVisible] = useState(false)
+  const itemStyle = { display: 'flex', alignItems: 'center', height: 52 }
   return (
     <>
       <Cell onClick={() => setIsVisible(!isVisible)}>
-        <span>自定义内容</span>
+        <span>自定义内容1</span>
       </Cell>
       <ActionSheet
         visible={isVisible}
@@ -16,10 +17,26 @@ const Demo5 = () => {
         }}
         onCancel={() => setIsVisible(false)}
       >
-        <div style={{ textAlign: 'left', padding: '10px 20px' }}>新建表格</div>
-        <div style={{ textAlign: 'left', padding: '10px 20px' }}>新建文档</div>
+        <div style={{ ...itemStyle, borderBottom: '0.5px solid #c2c4cc' }}>
+          <Image
+            src="https://img20.360buyimg.com/img/jfs/t1/298387/38/1291/2642/68106cb8Fa0bc75fe/91a0135a25729d88.png"
+            width={20}
+            height={20}
+            style={{ marginRight: 8 }}
+          />
+          加密呼叫（86）18888888888
+        </div>
+        <div style={itemStyle}>
+          <Image
+            src="https://img11.360buyimg.com/img/jfs/t1/270315/26/29639/1865/68106d4cFc40d2a06/ddffb93564a1f495.png"
+            width={20}
+            height={20}
+            style={{ marginRight: 8 }}
+          />
+          在线客服
+        </div>
       </ActionSheet>
     </>
   )
 }
-export default Demo5
+export default Demo
diff --git a/src/packages/actionsheet/demos/h5/demo6.tsx b/src/packages/actionsheet/demos/h5/demo6.tsx
index 112b168a8b..b698dbf92b 100644
--- a/src/packages/actionsheet/demos/h5/demo6.tsx
+++ b/src/packages/actionsheet/demos/h5/demo6.tsx
@@ -1,39 +1,85 @@
-import React, { useState } from 'react'
-import { ActionSheet, Cell } from '@nutui/nutui-react'
+import React, { CSSProperties, useState } from 'react'
+import { ActionSheet, Cell, Image } from '@nutui/nutui-react'
 
-const Demo6 = () => {
+const Demo = () => {
   const [isVisible, setIsVisible] = useState(false)
-  const options: Record<string, string | boolean>[] = [
+
+  const menuItems = [
+    {
+      imgUrl:
+        'https://img30.360buyimg.com/img/jfs/t1/299968/23/743/5275/68109db2F9215132b/fbd319950809ce50.png',
+      text: '付款码',
+    },
     {
-      title: '权限设置',
+      imgUrl:
+        'https://img20.360buyimg.com/img/jfs/t1/297408/33/1417/5099/6810a064F1f30bf4e/e9b3bbb0a45fdc14.png',
+      text: '扫一扫',
     },
     {
-      title: '重命名',
+      imgUrl:
+        'https://img20.360buyimg.com/img/jfs/t1/245714/27/28464/4576/6810a07fFc4c1c1cc/48fcb0ea90ddeefd.png',
+      text: '乘车码',
     },
     {
-      title: '删除',
-      disabled: true,
+      imgUrl:
+        'https://img20.360buyimg.com/img/jfs/t1/294415/36/1399/5281/6810a1b8Faa5feebe/f52259f67396db62.png',
+      text: 'NFC',
+    },
+    {
+      imgUrl:
+        'https://img14.360buyimg.com/img/jfs/t1/280555/29/25424/4649/6810a0cfF2c4557bd/84ed54ecb9764107.png',
+      text: '录入条码',
+    },
+    {
+      imgUrl:
+        'https://img20.360buyimg.com/img/jfs/t1/302991/1/742/5953/6810a0e6F2ed90b17/17744ec1d19e212d.png',
+      text: '扫描历史',
+    },
+    {
+      imgUrl:
+        'https://img12.360buyimg.com/img/jfs/t1/270335/38/29480/5484/6810a0f8F5c08ea36/ff9ac40d01ffa1cc.png',
+      text: 'AR扫描',
     },
   ]
-  const optionKey = {
-    name: 'title',
+
+  const itemStyle: CSSProperties = {
+    width: 50,
+    height: 72,
+    display: 'flex',
+    flexWrap: 'wrap',
+    justifyContent: 'center',
+    margin: '0 16px 16px',
   }
+
   return (
     <>
       <Cell onClick={() => setIsVisible(!isVisible)}>
-        <span>自定义key</span>
+        <span>自定义内容2</span>
       </Cell>
       <ActionSheet
+        title="标题"
+        position="top"
         visible={isVisible}
-        cancelText="取消"
-        optionKey={optionKey}
-        options={options}
-        onSelect={() => {
-          setIsVisible(false)
-        }}
+        onSelect={() => setIsVisible(false)}
         onCancel={() => setIsVisible(false)}
-      />
+      >
+        <div style={{ padding: '0', display: 'flex', flexWrap: 'wrap' }}>
+          {menuItems.map((item, index) => (
+            <div
+              key={index}
+              style={{
+                ...itemStyle,
+              }}
+            >
+              <Image src={item.imgUrl} width={50} height={50} />
+              <div style={{ fontSize: 12, color: '#1a1a1a', marginTop: 10 }}>
+                {item.text}
+              </div>
+            </div>
+          ))}
+        </div>
+      </ActionSheet>
     </>
   )
 }
-export default Demo6
+export default Demo
diff --git a/src/packages/actionsheet/demos/h5/demo7.tsx b/src/packages/actionsheet/demos/h5/demo7.tsx
new file mode 100644
index 0000000000..e92190f08c
--- /dev/null
+++ b/src/packages/actionsheet/demos/h5/demo7.tsx
@@ -0,0 +1,39 @@
+import React, { useState } from 'react'
+import { ActionSheet, Cell } from '@nutui/nutui-react'
+
+const Demo = () => {
+  const [isVisible, setIsVisible] = useState(false)
+  const options: Record<string, string | boolean>[] = [
+    {
+      title: '分享给朋友',
+    },
+    {
+      title: '添加到收藏夹',
+    },
+    {
+      title: '复制商品链接',
+      disabled: true,
+    },
+  ]
+  const optionKey = {
+    name: 'title',
+  }
+  return (
+    <>
+      <Cell onClick={() => setIsVisible(!isVisible)}>
+        <span>自定义key</span>
+      </Cell>
+      <ActionSheet
+        visible={isVisible}
+        cancelText="取消"
+        optionKey={optionKey}
+        options={options}
+        onSelect={() => {
+          setIsVisible(false)
+        }}
+        onCancel={() => setIsVisible(false)}
+      />
+    </>
+  )
+}
+export default Demo
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 095ae69393..1ea0fa79a1 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -666,7 +666,7 @@ $actionsheet-border-color: var(
 $actionsheet-border-radius: var(--nutui-actionsheet-border-radius, 0) !default;
 $actionsheet-item-text-align: var(
   --nutui-actionsheet-item-text-align,
-  center
+  left
 ) !default;
 $actionsheet-item-border-bottom: var(
   --nutui-actionsheet-item-border-bottom,
@@ -674,7 +674,7 @@ $actionsheet-item-border-bottom: var(
 ) !default;
 $actionsheet-item-line-height: var(
   --nutui-actionsheet-item-line-height,
-  24px
+  52px
 ) !default;
 $actionsheet-item-color: var(
   --nutui-actionsheet-item-color,

From 017b6177614d6e4a5548025faafe08fcf0dea53a Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Tue, 29 Apr 2025 20:03:05 +0800
Subject: [PATCH 02/13] =?UTF-8?q?feat(actionsheet):=20v15=20taro=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/actionsheet/actionsheet.scss     |  2 +
 src/packages/actionsheet/actionsheet.taro.tsx | 17 +++--
 src/packages/actionsheet/demo.taro.tsx        |  4 +-
 src/packages/actionsheet/demos/h5/demo3.tsx   |  1 -
 src/packages/actionsheet/demos/taro/demo1.tsx |  8 +-
 src/packages/actionsheet/demos/taro/demo2.tsx | 12 ++-
 src/packages/actionsheet/demos/taro/demo3.tsx | 15 ++--
 src/packages/actionsheet/demos/taro/demo5.tsx | 31 +++++---
 src/packages/actionsheet/demos/taro/demo6.tsx | 75 ++++++++++++++-----
 src/packages/actionsheet/demos/taro/demo7.tsx | 40 ++++++++++
 10 files changed, 150 insertions(+), 55 deletions(-)
 create mode 100644 src/packages/actionsheet/demos/taro/demo7.tsx

diff --git a/src/packages/actionsheet/actionsheet.scss b/src/packages/actionsheet/actionsheet.scss
index fcf17d0c26..00f19d0323 100644
--- a/src/packages/actionsheet/actionsheet.scss
+++ b/src/packages/actionsheet/actionsheet.scss
@@ -2,7 +2,9 @@
 
 .nut-actionsheet {
   text-align: center;
+  box-sizing: border-box;
   padding: 16px;
+  width: 100%;
   &-bottom {
     padding-bottom: 34px;
   }
diff --git a/src/packages/actionsheet/actionsheet.taro.tsx b/src/packages/actionsheet/actionsheet.taro.tsx
index 3508bff770..1944225858 100644
--- a/src/packages/actionsheet/actionsheet.taro.tsx
+++ b/src/packages/actionsheet/actionsheet.taro.tsx
@@ -1,5 +1,6 @@
 import React, { FunctionComponent } from 'react'
 import { View } from '@tarojs/components'
+import { Close } from '@nutui/icons-react-taro'
 import Popup from '@/packages/popup/index.taro'
 import { ComponentDefaults } from '@/utils/typings'
 import { mergeProps } from '@/utils/merge-props'
@@ -12,6 +13,7 @@ const defaultProps = {
   options: [],
   optionKey: { name: 'name', description: 'description' },
   cancelText: '',
+  position: 'bottom',
   onCancel: () => {},
   onSelect: () => {},
 } as unknown as TaroActionSheetProps
@@ -31,6 +33,7 @@ export const ActionSheet: FunctionComponent<
     visible,
     className,
     style,
+    position,
     ...rest
   } = mergeProps(defaultProps, props)
 
@@ -54,22 +57,26 @@ export const ActionSheet: FunctionComponent<
       {...rest}
       round
       visible={visible}
-      position="bottom"
-      title={title}
+      position={position}
       description={description}
-      className={classPrefix}
+      className={`${classPrefix} ${classPrefix}-${position}`}
       onClose={() => {
-        onCancel && onCancel()
+        onCancel?.()
       }}
+      closeable={position === 'top'}
+      closeIcon={<Close className={`${classPrefix}-close-icon`} />}
     >
       <View className={`${className}`} style={style}>
+        {title && (
+          <View className={`${classPrefix}-${position}-title`}>{title}</View>
+        )}
         {options.length ? (
           <View className={`${classPrefix}-list`}>
             {options.map((item, index) => {
               const statusClass = `${item.disabled ? `${classPrefix}-item-disabled` : ''} ${item.danger ? `${classPrefix}-item-danger` : ''}`
               return (
                 <View
-                  className={`${classPrefix}-item ${statusClass}`}
+                  className={`${classPrefix}-item ${statusClass} ${index !== options.length - 1 ? `${classPrefix}-item-border` : ''}`}
                   key={index}
                   onClick={() => chooseItem(item, index)}
                 >
diff --git a/src/packages/actionsheet/demo.taro.tsx b/src/packages/actionsheet/demo.taro.tsx
index 0904583460..9b4b47edac 100644
--- a/src/packages/actionsheet/demo.taro.tsx
+++ b/src/packages/actionsheet/demo.taro.tsx
@@ -10,6 +10,7 @@ import Demo3 from './demos/taro/demo3'
 import Demo4 from './demos/taro/demo4'
 import Demo5 from './demos/taro/demo5'
 import Demo6 from './demos/taro/demo6'
+import Demo7 from './demos/taro/demo7'
 
 const ActionSheetDemo = () => {
   const [translated] = useTranslate({
@@ -45,8 +46,9 @@ const ActionSheetDemo = () => {
         <Demo4 />
         <View className="h2">{translated.c3a08065}</View>
         <Demo5 />
-        <View className="h2">{translated.c3a08066}</View>
         <Demo6 />
+        <View className="h2">{translated.c3a08066}</View>
+        <Demo7 />
       </ScrollView>
     </>
   )
diff --git a/src/packages/actionsheet/demos/h5/demo3.tsx b/src/packages/actionsheet/demos/h5/demo3.tsx
index b48dfa5340..d862ad562a 100644
--- a/src/packages/actionsheet/demos/h5/demo3.tsx
+++ b/src/packages/actionsheet/demos/h5/demo3.tsx
@@ -28,7 +28,6 @@ const Demo = () => {
         position="top"
         visible={isVisible}
         title="标题"
-        // description="请选择操作动作"
         options={options}
         onSelect={handleSelect}
         onCancel={() => setIsVisible(false)}
diff --git a/src/packages/actionsheet/demos/taro/demo1.tsx b/src/packages/actionsheet/demos/taro/demo1.tsx
index 483ba8f250..44b8dce12c 100644
--- a/src/packages/actionsheet/demos/taro/demo1.tsx
+++ b/src/packages/actionsheet/demos/taro/demo1.tsx
@@ -7,13 +7,13 @@ const Demo1 = () => {
   const [isVisible, setIsVisible] = useState(false)
   const options = [
     {
-      name: '权限设置',
+      name: '分享给朋友',
     },
     {
-      name: '重命名',
+      name: '添加到收藏夹',
     },
     {
-      name: '删除',
+      name: '复制商品链接',
     },
   ]
 
@@ -31,11 +31,11 @@ const Demo1 = () => {
         </View>
       </Cell>
       <ActionSheet
-        title="标题"
         visible={isVisible}
         options={options}
         onSelect={handleSelect}
         onCancel={() => setIsVisible(false)}
+        cancelText="取消"
       />
     </>
   )
diff --git a/src/packages/actionsheet/demos/taro/demo2.tsx b/src/packages/actionsheet/demos/taro/demo2.tsx
index 695471ecd9..24a84a1b2a 100644
--- a/src/packages/actionsheet/demos/taro/demo2.tsx
+++ b/src/packages/actionsheet/demos/taro/demo2.tsx
@@ -7,13 +7,10 @@ const Demo2 = () => {
   const [val, setVal] = useState('')
   const options = [
     {
-      name: '权限设置',
+      name: '分享给朋友',
     },
     {
-      name: '重命名',
-    },
-    {
-      name: '删除',
+      name: '添加到收藏夹',
     },
   ]
   const handleSelect = (item: any) => {
@@ -23,17 +20,18 @@ const Demo2 = () => {
   return (
     <>
       <Cell onClick={() => setIsVisible(!isVisible)}>
-        <View>展示取消按钮</View>
+        <View>展示标题</View>
         <View style={{ marginLeft: pxTransform(10), color: '#999' }}>
           {val}
         </View>
       </Cell>
       <ActionSheet
+        title="标题"
         visible={isVisible}
-        cancelText="取消"
         options={options}
         onSelect={handleSelect}
         onCancel={() => setIsVisible(false)}
+        cancelText="取消"
       />
     </>
   )
diff --git a/src/packages/actionsheet/demos/taro/demo3.tsx b/src/packages/actionsheet/demos/taro/demo3.tsx
index 37d37b2e6d..c4cd152e14 100644
--- a/src/packages/actionsheet/demos/taro/demo3.tsx
+++ b/src/packages/actionsheet/demos/taro/demo3.tsx
@@ -5,16 +5,12 @@ import { View } from '@tarojs/components'
 const Demo3 = () => {
   const [isVisible, setIsVisible] = useState(false)
   const [val, setVal] = useState('')
-  const options: Record<string, string>[] = [
+  const options = [
     {
-      name: '权限设置',
+      name: '分享给朋友',
     },
     {
-      name: '重命名',
-    },
-    {
-      name: '删除',
-      description: '删除后无法恢复',
+      name: '添加到收藏夹',
     },
   ]
   const handleSelect = (item: any) => {
@@ -24,16 +20,15 @@ const Demo3 = () => {
   return (
     <>
       <Cell onClick={() => setIsVisible(!isVisible)}>
-        <View>展示描述信息</View>
+        <View>顶部弹出</View>
         <View style={{ marginLeft: pxTransform(10), color: '#999' }}>
           {val}
         </View>
       </Cell>
       <ActionSheet
+        position="top"
         visible={isVisible}
         title="标题"
-        description="请选择操作动作"
-        cancelText="取消"
         options={options}
         onSelect={handleSelect}
         onCancel={() => setIsVisible(false)}
diff --git a/src/packages/actionsheet/demos/taro/demo5.tsx b/src/packages/actionsheet/demos/taro/demo5.tsx
index 4d8c230170..03101317e0 100644
--- a/src/packages/actionsheet/demos/taro/demo5.tsx
+++ b/src/packages/actionsheet/demos/taro/demo5.tsx
@@ -1,18 +1,15 @@
-import React, { CSSProperties, useState } from 'react'
-import { ActionSheet, Cell, pxTransform } from '@nutui/nutui-react-taro'
+import React, { useState } from 'react'
+import { ActionSheet, Cell, Image } from '@nutui/nutui-react-taro'
 import { View } from '@tarojs/components'
 
 const Demo5 = () => {
   const [isVisible, setIsVisible] = useState(false)
-  const viewStyle: CSSProperties = {
-    textAlign: 'left',
-    paddingLeft: pxTransform(20),
-    paddingTop: pxTransform(10),
-  }
+  const itemStyle = { display: 'flex', alignItems: 'center', height: '52px' }
+
   return (
     <>
       <Cell onClick={() => setIsVisible(!isVisible)}>
-        <View>自定义内容</View>
+        <View>自定义内容1</View>
       </Cell>
       <ActionSheet
         visible={isVisible}
@@ -22,8 +19,22 @@ const Demo5 = () => {
         }}
         onCancel={() => setIsVisible(false)}
       >
-        <View style={viewStyle}>新建表格</View>
-        <View style={viewStyle}>新建文档</View>
+        <View style={{ ...itemStyle, borderBottom: '0.5px solid #c2c4cc' }}>
+          <Image
+            src="https://img20.360buyimg.com/img/jfs/t1/298387/38/1291/2642/68106cb8Fa0bc75fe/91a0135a25729d88.png"
+            width={20}
+            height={20}
+          />
+          <View style={{ marginLeft: 8 }}>加密呼叫（86）18888888888</View>
+        </View>
+        <View style={itemStyle}>
+          <Image
+            src="https://img11.360buyimg.com/img/jfs/t1/270315/26/29639/1865/68106d4cFc40d2a06/ddffb93564a1f495.png"
+            width={20}
+            height={20}
+          />
+          <View style={{ marginLeft: 8 }}>在线客服</View>
+        </View>
       </ActionSheet>
     </>
   )
diff --git a/src/packages/actionsheet/demos/taro/demo6.tsx b/src/packages/actionsheet/demos/taro/demo6.tsx
index 633e527dfc..f353f9aa3e 100644
--- a/src/packages/actionsheet/demos/taro/demo6.tsx
+++ b/src/packages/actionsheet/demos/taro/demo6.tsx
@@ -1,39 +1,80 @@
-import React, { useState } from 'react'
-import { ActionSheet, Cell } from '@nutui/nutui-react-taro'
+import React, { CSSProperties, useState } from 'react'
+import { ActionSheet, Cell, Image } from '@nutui/nutui-react-taro'
 import { View } from '@tarojs/components'
 
 const Demo6 = () => {
   const [isVisible, setIsVisible] = useState(false)
-  const options: Record<string, string | boolean>[] = [
+
+  const menuItems = [
+    {
+      imgUrl:
+        'https://img30.360buyimg.com/img/jfs/t1/299968/23/743/5275/68109db2F9215132b/fbd319950809ce50.png',
+      text: '付款码',
+    },
     {
-      title: '权限设置',
+      imgUrl:
+        'https://img20.360buyimg.com/img/jfs/t1/297408/33/1417/5099/6810a064F1f30bf4e/e9b3bbb0a45fdc14.png',
+      text: '扫一扫',
     },
     {
-      title: '重命名',
+      imgUrl:
+        'https://img20.360buyimg.com/img/jfs/t1/245714/27/28464/4576/6810a07fFc4c1c1cc/48fcb0ea90ddeefd.png',
+      text: '乘车码',
     },
     {
-      title: '删除',
-      disabled: true,
+      imgUrl:
+        'https://img20.360buyimg.com/img/jfs/t1/294415/36/1399/5281/6810a1b8Faa5feebe/f52259f67396db62.png',
+      text: 'NFC',
+    },
+    {
+      imgUrl:
+        'https://img14.360buyimg.com/img/jfs/t1/280555/29/25424/4649/6810a0cfF2c4557bd/84ed54ecb9764107.png',
+      text: '录入条码',
+    },
+    {
+      imgUrl:
+        'https://img20.360buyimg.com/img/jfs/t1/302991/1/742/5953/6810a0e6F2ed90b17/17744ec1d19e212d.png',
+      text: '扫描历史',
+    },
+    {
+      imgUrl:
+        'https://img12.360buyimg.com/img/jfs/t1/270335/38/29480/5484/6810a0f8F5c08ea36/ff9ac40d01ffa1cc.png',
+      text: 'AR扫描',
     },
   ]
-  const optionKey = {
-    name: 'title',
+
+  const itemStyle: CSSProperties = {
+    width: 50,
+    height: 72,
+    display: 'flex',
+    flexWrap: 'wrap',
+    justifyContent: 'center',
+    margin: '0 16px 16px',
   }
+
   return (
     <>
       <Cell onClick={() => setIsVisible(!isVisible)}>
-        <View>自定义key</View>
+        <View>自定义内容2</View>
       </Cell>
       <ActionSheet
+        title="标题"
+        position="top"
         visible={isVisible}
-        cancelText="取消"
-        optionKey={optionKey}
-        options={options}
-        onSelect={() => {
-          setIsVisible(false)
-        }}
+        onSelect={() => setIsVisible(false)}
         onCancel={() => setIsVisible(false)}
-      />
+      >
+        <View style={{ padding: '0', display: 'flex', flexWrap: 'wrap' }}>
+          {menuItems.map((item, index) => (
+            <View key={index} style={itemStyle}>
+              <Image src={item.imgUrl} width={50} height={50} />
+              <View style={{ fontSize: 12, color: '#1a1a1a', marginTop: 10 }}>
+                {item.text}
+              </View>
+            </View>
+          ))}
+        </View>
+      </ActionSheet>
     </>
   )
 }
diff --git a/src/packages/actionsheet/demos/taro/demo7.tsx b/src/packages/actionsheet/demos/taro/demo7.tsx
new file mode 100644
index 0000000000..acf66e6956
--- /dev/null
+++ b/src/packages/actionsheet/demos/taro/demo7.tsx
@@ -0,0 +1,40 @@
+import React, { useState } from 'react'
+import { ActionSheet, Cell } from '@nutui/nutui-react-taro'
+import { View } from '@tarojs/components'
+
+const Demo = () => {
+  const [isVisible, setIsVisible] = useState(false)
+  const options: Record<string, string | boolean>[] = [
+    {
+      title: '分享给朋友',
+    },
+    {
+      title: '添加到收藏夹',
+    },
+    {
+      title: '复制商品链接',
+      disabled: true,
+    },
+  ]
+  const optionKey = {
+    name: 'title',
+  }
+  return (
+    <>
+      <Cell onClick={() => setIsVisible(!isVisible)}>
+        <View>自定义key</View>
+      </Cell>
+      <ActionSheet
+        visible={isVisible}
+        cancelText="取消"
+        optionKey={optionKey}
+        options={options}
+        onSelect={() => {
+          setIsVisible(false)
+        }}
+        onCancel={() => setIsVisible(false)}
+      />
+    </>
+  )
+}
+export default Demo

From 175a6db5ab6961d8c2973f797aabf91a68b977d9 Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Wed, 30 Apr 2025 10:28:19 +0800
Subject: [PATCH 03/13] =?UTF-8?q?feat(actionsheet):=20v15=20harmony?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/actionsheet/actionsheet.scss     | 8 +++++++-
 src/packages/actionsheet/demos/taro/demo5.tsx | 6 ++++--
 src/packages/actionsheet/demos/taro/demo6.tsx | 5 ++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/packages/actionsheet/actionsheet.scss b/src/packages/actionsheet/actionsheet.scss
index 00f19d0323..25222d2fbf 100644
--- a/src/packages/actionsheet/actionsheet.scss
+++ b/src/packages/actionsheet/actionsheet.scss
@@ -51,6 +51,9 @@
     cursor: pointer;
     &-border {
       border-bottom: 0.5px solid #c2c4cc;
+      /* #ifdef harmony */
+      border-width: 1px;
+      /* #endif */
     }
     &-name {
       text-align: $actionsheet-item-text-align;
@@ -78,13 +81,16 @@
 
   &-cancel {
     border: 0.5px solid #c2c4cc;
-    border-width: 0.5px;
+    /* #ifdef harmony */
+    border-width: 1px;
+    /* #endif */
     border-radius: 8px;
     height: 40px;
     display: flex;
     align-items: center;
     justify-content: center;
     font-size: 16px;
+    line-height: 40px;
     color: rgb(26, 26, 26);
     margin-top: 16px;
   }
diff --git a/src/packages/actionsheet/demos/taro/demo5.tsx b/src/packages/actionsheet/demos/taro/demo5.tsx
index 03101317e0..12ddee6cfd 100644
--- a/src/packages/actionsheet/demos/taro/demo5.tsx
+++ b/src/packages/actionsheet/demos/taro/demo5.tsx
@@ -4,7 +4,7 @@ import { View } from '@tarojs/components'
 
 const Demo5 = () => {
   const [isVisible, setIsVisible] = useState(false)
-  const itemStyle = { display: 'flex', alignItems: 'center', height: '52px' }
+  const itemStyle = { display: 'flex', alignItems: 'center', height: 52 }
 
   return (
     <>
@@ -19,7 +19,9 @@ const Demo5 = () => {
         }}
         onCancel={() => setIsVisible(false)}
       >
-        <View style={{ ...itemStyle, borderBottom: '0.5px solid #c2c4cc' }}>
+        <View
+          style={{ ...itemStyle, borderColor: '#c2c4cc', borderBottomWidth: 1 }}
+        >
           <Image
             src="https://img20.360buyimg.com/img/jfs/t1/298387/38/1291/2642/68106cb8Fa0bc75fe/91a0135a25729d88.png"
             width={20}
diff --git a/src/packages/actionsheet/demos/taro/demo6.tsx b/src/packages/actionsheet/demos/taro/demo6.tsx
index f353f9aa3e..98db7a1e9d 100644
--- a/src/packages/actionsheet/demos/taro/demo6.tsx
+++ b/src/packages/actionsheet/demos/taro/demo6.tsx
@@ -49,7 +49,10 @@ const Demo6 = () => {
     display: 'flex',
     flexWrap: 'wrap',
     justifyContent: 'center',
-    margin: '0 16px 16px',
+    marginTop: 0,
+    marginBottom: 16,
+    marginLeft: 16,
+    marginRight: 16,
   }
 
   return (

From 5d8dd8bf94a131d0dd7db22504a77509317ee4ee Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Wed, 30 Apr 2025 13:55:49 +0800
Subject: [PATCH 04/13] =?UTF-8?q?feat(actionsheet):=20v15=20harmony?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/actionsheet/actionsheet.scss |  7 ++-----
 src/packages/actionsheet/doc.en-US.md     | 10 +++++-----
 src/packages/actionsheet/doc.md           | 10 +++++-----
 src/packages/actionsheet/doc.taro.md      | 10 +++++-----
 src/packages/actionsheet/doc.zh-TW.md     | 10 +++++-----
 src/styles/variables-jmapp.scss           | 11 +++++++----
 src/styles/variables-jrkf.scss            | 11 +++++++----
 src/styles/variables.scss                 | 13 ++++++++-----
 8 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/packages/actionsheet/actionsheet.scss b/src/packages/actionsheet/actionsheet.scss
index 25222d2fbf..8777251e8d 100644
--- a/src/packages/actionsheet/actionsheet.scss
+++ b/src/packages/actionsheet/actionsheet.scss
@@ -29,9 +29,6 @@
     width: 16px;
     height: 16px;
   }
-  .nut-popup-title {
-    border-bottom: 1px solid $actionsheet-border-color;
-  }
 
   &-list {
     display: block;
@@ -50,7 +47,7 @@
     color: $actionsheet-item-color;
     cursor: pointer;
     &-border {
-      border-bottom: 0.5px solid #c2c4cc;
+      border-bottom: $actionsheet-item-border-bottom;
       /* #ifdef harmony */
       border-width: 1px;
       /* #endif */
@@ -84,7 +81,7 @@
     /* #ifdef harmony */
     border-width: 1px;
     /* #endif */
-    border-radius: 8px;
+    border-radius: $actionsheet-border-radius;
     height: 40px;
     display: flex;
     align-items: center;
diff --git a/src/packages/actionsheet/doc.en-US.md b/src/packages/actionsheet/doc.en-US.md
index 8eb4c2b979..630208dd06 100644
--- a/src/packages/actionsheet/doc.en-US.md
+++ b/src/packages/actionsheet/doc.en-US.md
@@ -82,11 +82,11 @@ The component provides the following CSS variables, which can be used to customi
 | Name | Description | Default Value |
 | --- | --- | --- |
 | \--nutui-actionsheet-background-color | the backgroundColor of actionsheet panel | `$color-background-overlay` |
-| \--nutui-actionsheet-border-radius | the borderRadius of list and cancel button | `0` |
-| \--nutui-actionsheet-border-color | title border-bottom and cancle border-top | `#F7F8FC` |
-| \--nutui-actionsheet-item-text-align | item text align | `center` |
-| \--nutui-actionsheet-item-border-bottom | item border bottom | `none` |
-| \--nutui-actionsheet-item-line-height | item line height | `24px` |
+| \--nutui-actionsheet-border-radius | the borderRadius of list and cancel button | `$radius-l` |
+| \--nutui-actionsheet-cancel-border | cancel button border | `0.5px solid #c2c4cc` |
+| \--nutui-actionsheet-item-text-align | item text align | `left` |
+| \--nutui-actionsheet-item-border-bottom | item border bottom | `0.5px solid #c2c4cc` |
+| \--nutui-actionsheet-item-line-height | item line height | `52px` |
 | \--nutui-actionsheet-item-color | item color | `$color-title` |
 | \--nutui-actionsheet-item-danger | item danger color | `$color-primary` |
 
diff --git a/src/packages/actionsheet/doc.md b/src/packages/actionsheet/doc.md
index 2c2a93bc21..ef1fa87532 100644
--- a/src/packages/actionsheet/doc.md
+++ b/src/packages/actionsheet/doc.md
@@ -91,11 +91,11 @@ import { ActionSheet } from '@nutui/nutui-react'
 | 名称 | 说明 | 默认值 |
 | --- | --- | --- |
 | \--nutui-actionsheet-background-color | 背景色 | `$color-background-overlay` |
-| \--nutui-actionsheet-border-radius | 列表和取消按钮圆角 | `0` |
-| \--nutui-actionsheet-border-color | 标题和取消位置的border色值 | `#F7F8FC` |
-| \--nutui-actionsheet-item-text-align | 列表项的文字对齐方式 | `center` |
-| \--nutui-actionsheet-item-border-bottom | 列表项的底部border | `none` |
-| \--nutui-actionsheet-item-line-height | 列表项行高 | `24px` |
+| \--nutui-actionsheet-border-radius | 列表和取消按钮圆角 | `$radius-l` |
+| \--nutui-actionsheet-cancel-border | 取消位置的border | `0.5px solid #c2c4cc` |
+| \--nutui-actionsheet-item-text-align | 列表项的文字对齐方式 | `left` |
+| \--nutui-actionsheet-item-border-bottom | 列表项的底部border | `0.5px solid #c2c4cc` |
+| \--nutui-actionsheet-item-line-height | 列表项行高 | `52px` |
 | \--nutui-actionsheet-item-color | 列表项字色 | `$color-title` |
 | \--nutui-actionsheet-item-danger | 列表项danger字色 | `$color-primary` |
 
diff --git a/src/packages/actionsheet/doc.taro.md b/src/packages/actionsheet/doc.taro.md
index b5acfb6c27..28e2273fda 100644
--- a/src/packages/actionsheet/doc.taro.md
+++ b/src/packages/actionsheet/doc.taro.md
@@ -91,11 +91,11 @@ import { ActionSheet } from '@nutui/nutui-react-taro'
 | 名称 | 说明 | 默认值 |
 | --- | --- | --- |
 | \--nutui-actionsheet-background-color | 背景色 | `$color-background-overlay` |
-| \--nutui-actionsheet-border-radius | 列表和取消按钮圆角 | `0` |
-| \--nutui-actionsheet-border-color | 标题和取消位置的border色值 | `#f6f6f6` |
-| \--nutui-actionsheet-item-text-align | 列表项的文字对齐方式 | `center` |
-| \--nutui-actionsheet-item-border-bottom | 列表项的底部border | `none` |
-| \--nutui-actionsheet-item-line-height | 列表项行高 | `24px` |
+| \--nutui-actionsheet-border-radius | 列表和取消按钮圆角 | `$radius-l` |
+| \--nutui-actionsheet-cancel-border, | 取消位置的border | `0.5px solid #c2c4cc` |
+| \--nutui-actionsheet-item-text-align | 列表项的文字对齐方式 | `left` |
+| \--nutui-actionsheet-item-border-bottom | 列表项的底部border | `0.5px solid #c2c4cc` |
+| \--nutui-actionsheet-item-line-height | 列表项行高 | `52px` |
 | \--nutui-actionsheet-item-color | 列表项字色 | `$color-title` |
 | \--nutui-actionsheet-item-danger | 列表项danger字色 | `$color-primary` |
 
diff --git a/src/packages/actionsheet/doc.zh-TW.md b/src/packages/actionsheet/doc.zh-TW.md
index 292f95a97c..99f8103869 100644
--- a/src/packages/actionsheet/doc.zh-TW.md
+++ b/src/packages/actionsheet/doc.zh-TW.md
@@ -91,11 +91,11 @@ import { ActionSheet } from '@nutui/nutui-react'
 | 名稱 | 說明 | 預設值 |
 | --- | --- | --- |
 | \--nutui-actionsheet-background-color | 背景色 | `$color-background-overlay` |
-| \--nutui-actionsheet-border-radius | 列錶和取消按鈕圓角 | `0` |
-| \--nutui-actionsheet-border-color | 標題和取消位置的border色值 | `#F7F8FC` |
-| \--nutui-actionsheet-item-text-align | 列錶項的文字對齊方式 | center |
-| \--nutui-actionsheet-item-border-bottom | 列錶項的底部border | `none` |
-| \--nutui-actionsheet-item-line-height | 列錶項行高 | `24px` |
+| \--nutui-actionsheet-border-radius | 列錶和取消按鈕圓角 | `$radius-l` |
+| \--nutui-actionsheet-cancel-border, | 取消位置的border | `0.5px solid #c2c4cc` |
+| \--nutui-actionsheet-item-text-align | 列錶項的文字對齊方式 | left |
+| \--nutui-actionsheet-item-border-bottom | 列錶項的底部border | `0.5px solid #c2c4cc` |
+| \--nutui-actionsheet-item-line-height | 列錶項行高 | `52px` |
 | \--nutui-actionsheet-item-color | 列錶項字色 | `$color-title` |
 | \--nutui-actionsheet-item-danger | 列錶項danger字色 | `$color-primary` |
 
diff --git a/src/styles/variables-jmapp.scss b/src/styles/variables-jmapp.scss
index c84de5194a..a5b66d6658 100644
--- a/src/styles/variables-jmapp.scss
+++ b/src/styles/variables-jmapp.scss
@@ -702,22 +702,25 @@ $actionsheet-background-color: var(
   --nutui-actionsheet-background-color,
   $color-background
 ) !default;
-$actionsheet-border-color: var(--nutui-actionsheet-border-color, none) !default;
+$actionsheet-cancel-border: var(
+  --nutui-actionsheet-cancel-border,
+  0.5px solid #c2c4cc
+) !default;
 $actionsheet-border-radius: var(
   --nutui-actionsheet-border-radius,
   $radius-l
 ) !default;
 $actionsheet-item-text-align: var(
   --nutui-actionsheet-item-text-align,
-  center
+  celeftnter
 ) !default;
 $actionsheet-item-border-bottom: var(
   --nutui-actionsheet-item-border-bottom,
-  none
+  0.5px solid #c2c4cc
 ) !default;
 $actionsheet-item-line-height: var(
   --nutui-actionsheet-item-line-height,
-  24px
+  52px
 ) !default;
 $actionsheet-item-color: var(
   --nutui-actionsheet-item-color,
diff --git a/src/styles/variables-jrkf.scss b/src/styles/variables-jrkf.scss
index b5a0ba6295..d19c1de38c 100644
--- a/src/styles/variables-jrkf.scss
+++ b/src/styles/variables-jrkf.scss
@@ -782,22 +782,25 @@ $actionsheet-background-color: var(
   --nutui-actionsheet-background-color,
   $color-surface-1
 ) !default;
-$actionsheet-border-color: var(--nutui-actionsheet-border-color, none) !default;
+$actionsheet-cancel-border: var(
+  --nutui-actionsheet-cancel-border,
+  0.5px solid #c2c4cc
+) !default;
 $actionsheet-border-radius: var(
   --nutui-actionsheet-border-radius,
   $radius-l
 ) !default;
 $actionsheet-item-text-align: var(
   --nutui-actionsheet-item-text-align,
-  center
+  left
 ) !default;
 $actionsheet-item-border-bottom: var(
   --nutui-actionsheet-item-border-bottom,
-  none
+  0.5px solid #c2c4cc
 ) !default;
 $actionsheet-item-line-height: var(
   --nutui-actionsheet-item-line-height,
-  24px
+  52px
 ) !default;
 $actionsheet-item-color: var(
   --nutui-actionsheet-item-color,
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 1ea0fa79a1..427512ab29 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -659,18 +659,21 @@ $actionsheet-background-color: var(
   --nutui-actionsheet-background-color,
   $color-background-overlay
 ) !default;
-$actionsheet-border-color: var(
-  --nutui-actionsheet-border-color,
-  $color-border
+$actionsheet-cancel-border: var(
+  --nutui-actionsheet-cancel-border,
+  0.5px solid #c2c4cc
+) !default;
+$actionsheet-border-radius: var(
+  --nutui-actionsheet-border-radius,
+  $radius-l
 ) !default;
-$actionsheet-border-radius: var(--nutui-actionsheet-border-radius, 0) !default;
 $actionsheet-item-text-align: var(
   --nutui-actionsheet-item-text-align,
   left
 ) !default;
 $actionsheet-item-border-bottom: var(
   --nutui-actionsheet-item-border-bottom,
-  none
+  0.5px solid #c2c4cc
 ) !default;
 $actionsheet-item-line-height: var(
   --nutui-actionsheet-item-line-height,

From 4880128eb04d3ac626333580eed511c15a1f1dae Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Wed, 30 Apr 2025 14:05:21 +0800
Subject: [PATCH 05/13] =?UTF-8?q?feat(actionsheet):=20v15=20harmony?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/variables-jmapp.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/variables-jmapp.scss b/src/styles/variables-jmapp.scss
index a5b66d6658..5a7d04212f 100644
--- a/src/styles/variables-jmapp.scss
+++ b/src/styles/variables-jmapp.scss
@@ -712,7 +712,7 @@ $actionsheet-border-radius: var(
 ) !default;
 $actionsheet-item-text-align: var(
   --nutui-actionsheet-item-text-align,
-  celeftnter
+  left
 ) !default;
 $actionsheet-item-border-bottom: var(
   --nutui-actionsheet-item-border-bottom,

From b84bdb07458b86ae7f7b0b74139182a0f906099a Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Wed, 30 Apr 2025 14:06:15 +0800
Subject: [PATCH 06/13] feat(actionsheet): v15 config tag

---
 src/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config.json b/src/config.json
index 7ad5b51431..49c7cb2032 100644
--- a/src/config.json
+++ b/src/config.json
@@ -843,7 +843,7 @@
           "sort": 11,
           "show": true,
           "taro": true,
-          "v15": 2,
+          "v15": 1,
           "author": "dsj",
           "dd": true
         },

From 7b10c15fe0f8701dac4a48b2731c90da0b56e870 Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Tue, 6 May 2025 18:32:29 +0800
Subject: [PATCH 07/13] fix: review

---
 src/packages/actionsheet/demos/h5/demo1.tsx   |  1 -
 src/packages/actionsheet/demos/h5/demo5.tsx   | 17 ++++-------------
 src/packages/actionsheet/demos/taro/demo5.tsx | 15 ++++-----------
 src/styles/variables-jmapp.scss               |  4 ++--
 src/styles/variables-jrkf.scss                |  4 ++--
 5 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/packages/actionsheet/demos/h5/demo1.tsx b/src/packages/actionsheet/demos/h5/demo1.tsx
index 75595a5808..cbab474375 100644
--- a/src/packages/actionsheet/demos/h5/demo1.tsx
+++ b/src/packages/actionsheet/demos/h5/demo1.tsx
@@ -32,7 +32,6 @@ const Demo = () => {
         options={options}
         onSelect={handleSelect}
         onCancel={() => setIsVisible(false)}
-        cancelText="取消"
       />
     </>
   )
diff --git a/src/packages/actionsheet/demos/h5/demo5.tsx b/src/packages/actionsheet/demos/h5/demo5.tsx
index 1220d56bac..f11f7d9542 100644
--- a/src/packages/actionsheet/demos/h5/demo5.tsx
+++ b/src/packages/actionsheet/demos/h5/demo5.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react'
-import { ActionSheet, Cell, Image } from '@nutui/nutui-react'
+import { ActionSheet, Cell } from '@nutui/nutui-react'
+import { Dongdong, Message } from '@nutui/icons-react'
 
 const Demo = () => {
   const [isVisible, setIsVisible] = useState(false)
@@ -18,21 +19,11 @@ const Demo = () => {
         onCancel={() => setIsVisible(false)}
       >
         <div style={{ ...itemStyle, borderBottom: '0.5px solid #c2c4cc' }}>
-          <Image
-            src="https://img20.360buyimg.com/img/jfs/t1/298387/38/1291/2642/68106cb8Fa0bc75fe/91a0135a25729d88.png"
-            width={20}
-            height={20}
-            style={{ marginRight: 8 }}
-          />
+          <Dongdong width={20} height={20} style={{ marginRight: 8 }} />
           加密呼叫（86）18888888888
         </div>
         <div style={itemStyle}>
-          <Image
-            src="https://img11.360buyimg.com/img/jfs/t1/270315/26/29639/1865/68106d4cFc40d2a06/ddffb93564a1f495.png"
-            width={20}
-            height={20}
-            style={{ marginRight: 8 }}
-          />
+          <Message width={20} height={20} style={{ marginRight: 8 }} />
           在线客服
         </div>
       </ActionSheet>
diff --git a/src/packages/actionsheet/demos/taro/demo5.tsx b/src/packages/actionsheet/demos/taro/demo5.tsx
index 12ddee6cfd..8f338d2041 100644
--- a/src/packages/actionsheet/demos/taro/demo5.tsx
+++ b/src/packages/actionsheet/demos/taro/demo5.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
-import { ActionSheet, Cell, Image } from '@nutui/nutui-react-taro'
+import { ActionSheet, Cell } from '@nutui/nutui-react-taro'
 import { View } from '@tarojs/components'
+import { Dongdong, Message } from '@nutui/icons-react-taro'
 
 const Demo5 = () => {
   const [isVisible, setIsVisible] = useState(false)
@@ -22,19 +23,11 @@ const Demo5 = () => {
         <View
           style={{ ...itemStyle, borderColor: '#c2c4cc', borderBottomWidth: 1 }}
         >
-          <Image
-            src="https://img20.360buyimg.com/img/jfs/t1/298387/38/1291/2642/68106cb8Fa0bc75fe/91a0135a25729d88.png"
-            width={20}
-            height={20}
-          />
+          <Dongdong width={20} height={20} />
           <View style={{ marginLeft: 8 }}>加密呼叫（86）18888888888</View>
         </View>
         <View style={itemStyle}>
-          <Image
-            src="https://img11.360buyimg.com/img/jfs/t1/270315/26/29639/1865/68106d4cFc40d2a06/ddffb93564a1f495.png"
-            width={20}
-            height={20}
-          />
+          <Message width={20} height={20} />
           <View style={{ marginLeft: 8 }}>在线客服</View>
         </View>
       </ActionSheet>
diff --git a/src/styles/variables-jmapp.scss b/src/styles/variables-jmapp.scss
index 5a7d04212f..a31fa920fb 100644
--- a/src/styles/variables-jmapp.scss
+++ b/src/styles/variables-jmapp.scss
@@ -704,7 +704,7 @@ $actionsheet-background-color: var(
 ) !default;
 $actionsheet-cancel-border: var(
   --nutui-actionsheet-cancel-border,
-  0.5px solid #c2c4cc
+  none
 ) !default;
 $actionsheet-border-radius: var(
   --nutui-actionsheet-border-radius,
@@ -716,7 +716,7 @@ $actionsheet-item-text-align: var(
 ) !default;
 $actionsheet-item-border-bottom: var(
   --nutui-actionsheet-item-border-bottom,
-  0.5px solid #c2c4cc
+  none
 ) !default;
 $actionsheet-item-line-height: var(
   --nutui-actionsheet-item-line-height,
diff --git a/src/styles/variables-jrkf.scss b/src/styles/variables-jrkf.scss
index d19c1de38c..022f52dcd1 100644
--- a/src/styles/variables-jrkf.scss
+++ b/src/styles/variables-jrkf.scss
@@ -784,7 +784,7 @@ $actionsheet-background-color: var(
 ) !default;
 $actionsheet-cancel-border: var(
   --nutui-actionsheet-cancel-border,
-  0.5px solid #c2c4cc
+  none
 ) !default;
 $actionsheet-border-radius: var(
   --nutui-actionsheet-border-radius,
@@ -796,7 +796,7 @@ $actionsheet-item-text-align: var(
 ) !default;
 $actionsheet-item-border-bottom: var(
   --nutui-actionsheet-item-border-bottom,
-  0.5px solid #c2c4cc
+  none
 ) !default;
 $actionsheet-item-line-height: var(
   --nutui-actionsheet-item-line-height,

From bd0a10210cfd302c1ad10ff29c160665cd9ce2ca Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Tue, 6 May 2025 18:39:58 +0800
Subject: [PATCH 08/13] fix: review

---
 src/styles/variables-jrkf.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/styles/variables-jrkf.scss b/src/styles/variables-jrkf.scss
index 022f52dcd1..bfb30ae120 100644
--- a/src/styles/variables-jrkf.scss
+++ b/src/styles/variables-jrkf.scss
@@ -782,6 +782,7 @@ $actionsheet-background-color: var(
   --nutui-actionsheet-background-color,
   $color-surface-1
 ) !default;
+$actionsheet-border-color: var(--nutui-actionsheet-border-color, none) !default;
 $actionsheet-cancel-border: var(
   --nutui-actionsheet-cancel-border,
   none
@@ -792,7 +793,7 @@ $actionsheet-border-radius: var(
 ) !default;
 $actionsheet-item-text-align: var(
   --nutui-actionsheet-item-text-align,
-  left
+  center
 ) !default;
 $actionsheet-item-border-bottom: var(
   --nutui-actionsheet-item-border-bottom,
@@ -800,7 +801,7 @@ $actionsheet-item-border-bottom: var(
 ) !default;
 $actionsheet-item-line-height: var(
   --nutui-actionsheet-item-line-height,
-  52px
+  24px
 ) !default;
 $actionsheet-item-color: var(
   --nutui-actionsheet-item-color,

From 5cddeb60ddaa30661fd06c040306a8449ae091f7 Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Tue, 6 May 2025 18:42:34 +0800
Subject: [PATCH 09/13] fix: review

---
 src/styles/variables-jmapp.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/styles/variables-jmapp.scss b/src/styles/variables-jmapp.scss
index a31fa920fb..4ecb64920a 100644
--- a/src/styles/variables-jmapp.scss
+++ b/src/styles/variables-jmapp.scss
@@ -702,6 +702,7 @@ $actionsheet-background-color: var(
   --nutui-actionsheet-background-color,
   $color-background
 ) !default;
+$actionsheet-border-color: var(--nutui-actionsheet-border-color, none) !default;
 $actionsheet-cancel-border: var(
   --nutui-actionsheet-cancel-border,
   none
@@ -712,7 +713,7 @@ $actionsheet-border-radius: var(
 ) !default;
 $actionsheet-item-text-align: var(
   --nutui-actionsheet-item-text-align,
-  left
+  center
 ) !default;
 $actionsheet-item-border-bottom: var(
   --nutui-actionsheet-item-border-bottom,
@@ -720,7 +721,7 @@ $actionsheet-item-border-bottom: var(
 ) !default;
 $actionsheet-item-line-height: var(
   --nutui-actionsheet-item-line-height,
-  52px
+  24px
 ) !default;
 $actionsheet-item-color: var(
   --nutui-actionsheet-item-color,

From 08339ec78e9eb7cc51c17b2dd9892a467a0e1282 Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Tue, 6 May 2025 20:25:48 +0800
Subject: [PATCH 10/13] fix: review

---
 src/packages/actionsheet/actionsheet.scss | 15 +--------
 src/packages/actionsheet/actionsheet.tsx  |  5 +--
 src/packages/popup/popup.scss             | 23 +++++++++-----
 src/packages/popup/popup.tsx              | 38 ++++++++++-------------
 4 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/src/packages/actionsheet/actionsheet.scss b/src/packages/actionsheet/actionsheet.scss
index 8777251e8d..9b4d49e995 100644
--- a/src/packages/actionsheet/actionsheet.scss
+++ b/src/packages/actionsheet/actionsheet.scss
@@ -3,7 +3,7 @@
 .nut-actionsheet {
   text-align: center;
   box-sizing: border-box;
-  padding: 16px;
+  padding: 0 16px 16px 16px;
   width: 100%;
   &-bottom {
     padding-bottom: 34px;
@@ -12,19 +12,6 @@
     min-height: 10%;
     background-color: $actionsheet-background-color;
   }
-  &-bottom-title,
-  &-top-title {
-    font-size: 16px;
-    font-weight: 600;
-    color: rgb(26, 26, 26);
-    justify-content: center;
-    margin-bottom: 16px;
-    display: flex;
-    align-items: center;
-  }
-  &-top-title {
-    justify-content: space-between;
-  }
   &-close-icon {
     width: 16px;
     height: 16px;
diff --git a/src/packages/actionsheet/actionsheet.tsx b/src/packages/actionsheet/actionsheet.tsx
index 6738933af8..6e4d494c7d 100644
--- a/src/packages/actionsheet/actionsheet.tsx
+++ b/src/packages/actionsheet/actionsheet.tsx
@@ -54,6 +54,7 @@ export const ActionSheet: FunctionComponent<
   return (
     <Popup
       {...rest}
+      title={title}
       round
       visible={visible}
       position={position}
@@ -66,9 +67,9 @@ export const ActionSheet: FunctionComponent<
       closeIcon={<Close className={`${classPrefix}-close-icon`} />}
     >
       <div className={`${className}`} style={style}>
-        {title && (
+        {/* {title && (
           <div className={`${classPrefix}-${position}-title`}>{title}</div>
-        )}
+        )} */}
         {options.length ? (
           <div className={`${classPrefix}-list`}>
             {options.map((item, index) => {
diff --git a/src/packages/popup/popup.scss b/src/packages/popup/popup.scss
index e14b25a059..560f4ca3cc 100644
--- a/src/packages/popup/popup.scss
+++ b/src/packages/popup/popup.scss
@@ -24,13 +24,6 @@
       align-items: center;
     }
 
-    &-title {
-      color: $color-title;
-      font-weight: $font-weight-bold;
-      font-size: $popup-title-font-size;
-      line-height: $popup-title-font-size;
-    }
-
     &-description {
       color: $color-text;
       font-size: $popup-description-font-size;
@@ -77,7 +70,21 @@
       }
     }
   }
-
+  &-bottom-title,
+  &-top-title {
+    padding-top: $popup-title-padding;
+    color: $color-title;
+    font-weight: $font-weight-bold;
+    font-size: $popup-title-font-size;
+    line-height: $popup-title-font-size;
+    justify-content: center;
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+  }
+  &-top-title {
+    justify-content: space-between;
+  }
   &-center {
     top: 50%;
     left: 50%;
diff --git a/src/packages/popup/popup.tsx b/src/packages/popup/popup.tsx
index 1328c667d5..7a2ad7d326 100644
--- a/src/packages/popup/popup.tsx
+++ b/src/packages/popup/popup.tsx
@@ -146,28 +146,22 @@ export const Popup: FunctionComponent<
   const renderTitle = () => {
     if (left || title || description) {
       return (
-        <div className={`${classPrefix}-title`}>
-          {position === 'bottom' && (
-            <>
-              {left && (
-                <div className={`${classPrefix}-title-left`}>{left}</div>
-              )}
-              {(title || description) && (
-                <div className={`${classPrefix}-title-wrapper`}>
-                  {title && (
-                    <div className={`${classPrefix}-title-title`}>{title}</div>
-                  )}
-                  {description && (
-                    <div
-                      className={`${classPrefix}-title-description ${title ? `${classPrefix}-title-description-gap` : ''}`}
-                    >
-                      {description}
-                    </div>
-                  )}
-                </div>
-              )}
-            </>
-          )}
+        <div className={`${classPrefix}-${position}-title`}>
+          <>
+            {left && <div className={`${classPrefix}-title-left`}>{left}</div>}
+            {(title || description) && (
+              <div className={`${classPrefix}-title-wrapper`}>
+                {title}
+                {description && (
+                  <div
+                    className={`${classPrefix}-title-description ${title ? `${classPrefix}-title-description-gap` : ''}`}
+                  >
+                    {description}
+                  </div>
+                )}
+              </div>
+            )}
+          </>
           {renderCloseIcon()}
         </div>
       )

From 78dc90d6abca22f4830248163a3b3f3a57435341 Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Wed, 7 May 2025 10:30:11 +0800
Subject: [PATCH 11/13] fix: review

---
 src/packages/actionsheet/actionsheet.scss     |  5 ++-
 src/packages/actionsheet/actionsheet.taro.tsx |  4 +-
 .../__snapshots__/address.spec.tsx.snap       | 12 ++---
 src/packages/popup/popup.scss                 |  6 ---
 src/packages/popup/popup.taro.tsx             | 44 +++++++++----------
 src/packages/popup/popup.tsx                  |  6 ++-
 .../__snapshots__/skeleton.spec.tsx.snap      | 28 ------------
 .../__snapshots__/timeselect.spec.tsx.snap    |  2 +-
 8 files changed, 36 insertions(+), 71 deletions(-)
 delete mode 100644 src/packages/skeleton/__test__/__snapshots__/skeleton.spec.tsx.snap

diff --git a/src/packages/actionsheet/actionsheet.scss b/src/packages/actionsheet/actionsheet.scss
index 9b4d49e995..c9e21cffde 100644
--- a/src/packages/actionsheet/actionsheet.scss
+++ b/src/packages/actionsheet/actionsheet.scss
@@ -3,7 +3,10 @@
 .nut-actionsheet {
   text-align: center;
   box-sizing: border-box;
-  padding: 0 16px 16px 16px;
+  padding: 16px;
+  .nut-popup-title {
+    padding: 0;
+  }
   width: 100%;
   &-bottom {
     padding-bottom: 34px;
diff --git a/src/packages/actionsheet/actionsheet.taro.tsx b/src/packages/actionsheet/actionsheet.taro.tsx
index 1944225858..a2b132cbc9 100644
--- a/src/packages/actionsheet/actionsheet.taro.tsx
+++ b/src/packages/actionsheet/actionsheet.taro.tsx
@@ -55,6 +55,7 @@ export const ActionSheet: FunctionComponent<
   return (
     <Popup
       {...rest}
+      title={title}
       round
       visible={visible}
       position={position}
@@ -67,9 +68,6 @@ export const ActionSheet: FunctionComponent<
       closeIcon={<Close className={`${classPrefix}-close-icon`} />}
     >
       <View className={`${className}`} style={style}>
-        {title && (
-          <View className={`${classPrefix}-${position}-title`}>{title}</View>
-        )}
         {options.length ? (
           <View className={`${classPrefix}-list`}>
             {options.map((item, index) => {
diff --git a/src/packages/address/__test__/__snapshots__/address.spec.tsx.snap b/src/packages/address/__test__/__snapshots__/address.spec.tsx.snap
index f614bc284b..1a2ee7b8ce 100644
--- a/src/packages/address/__test__/__snapshots__/address.spec.tsx.snap
+++ b/src/packages/address/__test__/__snapshots__/address.spec.tsx.snap
@@ -1,13 +1,13 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`Address: exist defaultIcon & selectIcon 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">请选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-address "><ul class="nut-address-exist"><li class="nut-address-exist-item "><div class="default">123</div><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市次渠镇通州区</div></div></li><li class="nut-address-exist-item "><div class="default">123</div><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>钓鱼岛钓鱼岛全区</div></div></li><li class="nut-address-exist-item active"><div class="select">456</div><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市大兴区科创十一街18号院京东大厦</div></div></li></ul></div></div>"`;
+exports[`Address: exist defaultIcon & selectIcon 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title nut-popup-bottom-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">请选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-address "><ul class="nut-address-exist"><li class="nut-address-exist-item "><div class="default">123</div><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市次渠镇通州区</div></div></li><li class="nut-address-exist-item "><div class="default">123</div><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>钓鱼岛钓鱼岛全区</div></div></li><li class="nut-address-exist-item active"><div class="select">456</div><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市大兴区科创十一街18号院京东大厦</div></div></li></ul></div></div>"`;
 
-exports[`Address: show custom 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-cascader"><div class="nut-tabs nut-tabs-horizontal"><div class="nut-tabs-titles nut-tabs-titles-line nut-tabs-titles-scrollable"><div class="nut-tabs-titles-item nut-tabs-titles-item-active"><div class="nut-tabs-titles-item-line nut-tabs-titles-item-line-horizontal"></div><div class="nut-tabs-titles-item-text">请选择</div></div></div><div class="nut-tabs-content-wrap"><div class="nut-tabs-content" style="transform: translate3d(-0%, 0, 0); transition-duration: 300ms;"><div class="nut-tabpane"><div class="nut-cascader-pane"><div class="nut-cascader-item"><div class="nut-cascader-item-title">浙江</div></div><div class="disabled nut-cascader-item"><div class="nut-cascader-item-title">湖南</div></div><div class="nut-cascader-item"><div class="nut-cascader-item-title">福建</div></div></div></div></div></div></div></div></div>"`;
+exports[`Address: show custom 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title nut-popup-bottom-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-cascader"><div class="nut-tabs nut-tabs-horizontal"><div class="nut-tabs-titles nut-tabs-titles-line nut-tabs-titles-scrollable"><div class="nut-tabs-titles-item nut-tabs-titles-item-active"><div class="nut-tabs-titles-item-line nut-tabs-titles-item-line-horizontal"></div><div class="nut-tabs-titles-item-text">请选择</div></div></div><div class="nut-tabs-content-wrap"><div class="nut-tabs-content" style="transform: translate3d(-0%, 0, 0); transition-duration: 300ms;"><div class="nut-tabpane"><div class="nut-cascader-pane"><div class="nut-cascader-item"><div class="nut-cascader-item-title">浙江</div></div><div class="disabled nut-cascader-item"><div class="nut-cascader-item-title">湖南</div></div><div class="nut-cascader-item"><div class="nut-cascader-item-title">福建</div></div></div></div></div></div></div></div></div>"`;
 
-exports[`Address: show custom 2`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-left"><div class="nut-address-left-icon"><svg class="nut-icon nut-icon-ArrowLeft " style="color: #cccccc;" xmlns="http://www.w3.org/2000/svg" color="#cccccc" viewBox="0 0 1024 1024" aria-labelledby="ArrowLeft" role="presentation"><path d="M661.33 153.81a10.67 10.67 0 0 0-18.13-7.68L277.33 512 643.2 877.87a10.67 10.67 0 0 0 18.13-7.68v-60.38a10.03 10.03 0 0 0-3.2-7.46L367.79 512l290.34-290.35a10.88 10.88 0 0 0 3.2-7.46z" fill="currentColor"></path></svg></div></div><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-cascader"><div class="nut-tabs nut-tabs-horizontal"><div class="nut-tabs-titles nut-tabs-titles-line nut-tabs-titles-scrollable"><div class="nut-tabs-titles-item nut-tabs-titles-item-active"><div class="nut-tabs-titles-item-line nut-tabs-titles-item-line-horizontal"></div><div class="nut-tabs-titles-item-text">请选择</div></div></div><div class="nut-tabs-content-wrap"><div class="nut-tabs-content" style="transform: translate3d(-0%, 0, 0); transition-duration: 300ms;"><div class="nut-tabpane"><div class="nut-cascader-pane"><div class="nut-cascader-item"><div class="nut-cascader-item-title">浙江</div></div><div class="disabled nut-cascader-item"><div class="nut-cascader-item-title">湖南</div></div><div class="nut-cascader-item"><div class="nut-cascader-item-title">福建</div></div></div></div></div></div></div></div></div>"`;
+exports[`Address: show custom 2`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title nut-popup-bottom-title"><div class="nut-popup-title-left"><div class="nut-address-left-icon"><svg class="nut-icon nut-icon-ArrowLeft " style="color: #cccccc;" xmlns="http://www.w3.org/2000/svg" color="#cccccc" viewBox="0 0 1024 1024" aria-labelledby="ArrowLeft" role="presentation"><path d="M661.33 153.81a10.67 10.67 0 0 0-18.13-7.68L277.33 512 643.2 877.87a10.67 10.67 0 0 0 18.13-7.68v-60.38a10.03 10.03 0 0 0-3.2-7.46L367.79 512l290.34-290.35a10.88 10.88 0 0 0 3.2-7.46z" fill="currentColor"></path></svg></div></div><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-cascader"><div class="nut-tabs nut-tabs-horizontal"><div class="nut-tabs-titles nut-tabs-titles-line nut-tabs-titles-scrollable"><div class="nut-tabs-titles-item nut-tabs-titles-item-active"><div class="nut-tabs-titles-item-line nut-tabs-titles-item-line-horizontal"></div><div class="nut-tabs-titles-item-text">请选择</div></div></div><div class="nut-tabs-content-wrap"><div class="nut-tabs-content" style="transform: translate3d(-0%, 0, 0); transition-duration: 300ms;"><div class="nut-tabpane"><div class="nut-cascader-pane"><div class="nut-cascader-item"><div class="nut-cascader-item-title">浙江</div></div><div class="disabled nut-cascader-item"><div class="nut-cascader-item-title">湖南</div></div><div class="nut-cascader-item"><div class="nut-cascader-item-title">福建</div></div></div></div></div></div></div></div></div>"`;
 
-exports[`Address: show custom icon 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-left"><div class="nut-address-left-icon"><svg class="nut-icon nut-icon-Star " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" aria-labelledby="Star" role="presentation"><path d="M24 0a1.5 1.5 0 0 1 1.296.745l7.316 12.56 14.206 3.077a1.5 1.5 0 0 1 .8 2.465l-9.684 10.84 1.464 14.462a1.5 1.5 0 0 1-2.097 1.524L24 39.81l-13.3 5.862a1.5 1.5 0 0 1-2.098-1.524l1.464-14.462-9.685-10.84a1.5 1.5 0 0 1 .802-2.465l14.205-3.076L22.704.746A1.5 1.5 0 0 1 24 0m0 4.48-6.352 10.907a1.5 1.5 0 0 1-.979.71L4.334 18.77l8.41 9.412a1.5 1.5 0 0 1 .373 1.15L11.846 41.89l11.55-5.09a1.5 1.5 0 0 1 1.209 0l11.549 5.09-1.271-12.558a1.5 1.5 0 0 1 .373-1.15l8.41-9.412-12.335-2.671a1.5 1.5 0 0 1-.979-.711z" fill="currentColor"></path></svg></div></div><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-cascader"><div class="nut-tabs nut-tabs-horizontal"><div class="nut-tabs-titles nut-tabs-titles-line nut-tabs-titles-scrollable"><div class="nut-tabs-titles-item nut-tabs-titles-item-active"><div class="nut-tabs-titles-item-line nut-tabs-titles-item-line-horizontal"></div><div class="nut-tabs-titles-item-text">请选择</div></div></div><div class="nut-tabs-content-wrap"><div class="nut-tabs-content" style="transform: translate3d(-0%, 0, 0); transition-duration: 300ms;"><div class="nut-tabpane"><div class="nut-cascader-pane"><div class="nut-cascader-item"><div class="nut-cascader-item-title">浙江</div></div><div class="disabled nut-cascader-item"><div class="nut-cascader-item-title">湖南</div></div><div class="nut-cascader-item"><div class="nut-cascader-item-title">福建</div></div></div></div></div></div></div></div></div>"`;
+exports[`Address: show custom icon 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title nut-popup-bottom-title"><div class="nut-popup-title-left"><div class="nut-address-left-icon"><svg class="nut-icon nut-icon-Star " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" aria-labelledby="Star" role="presentation"><path d="M24 0a1.5 1.5 0 0 1 1.296.745l7.316 12.56 14.206 3.077a1.5 1.5 0 0 1 .8 2.465l-9.684 10.84 1.464 14.462a1.5 1.5 0 0 1-2.097 1.524L24 39.81l-13.3 5.862a1.5 1.5 0 0 1-2.098-1.524l1.464-14.462-9.685-10.84a1.5 1.5 0 0 1 .802-2.465l14.205-3.076L22.704.746A1.5 1.5 0 0 1 24 0m0 4.48-6.352 10.907a1.5 1.5 0 0 1-.979.71L4.334 18.77l8.41 9.412a1.5 1.5 0 0 1 .373 1.15L11.846 41.89l11.55-5.09a1.5 1.5 0 0 1 1.209 0l11.549 5.09-1.271-12.558a1.5 1.5 0 0 1 .373-1.15l8.41-9.412-12.335-2.671a1.5 1.5 0 0 1-.979-.711z" fill="currentColor"></path></svg></div></div><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-cascader"><div class="nut-tabs nut-tabs-horizontal"><div class="nut-tabs-titles nut-tabs-titles-line nut-tabs-titles-scrollable"><div class="nut-tabs-titles-item nut-tabs-titles-item-active"><div class="nut-tabs-titles-item-line nut-tabs-titles-item-line-horizontal"></div><div class="nut-tabs-titles-item-text">请选择</div></div></div><div class="nut-tabs-content-wrap"><div class="nut-tabs-content" style="transform: translate3d(-0%, 0, 0); transition-duration: 300ms;"><div class="nut-tabpane"><div class="nut-cascader-pane"><div class="nut-cascader-item"><div class="nut-cascader-item-title">浙江</div></div><div class="disabled nut-cascader-item"><div class="nut-cascader-item-title">湖南</div></div><div class="nut-cascader-item"><div class="nut-cascader-item-title">福建</div></div></div></div></div></div></div></div></div>"`;
 
-exports[`Address: show custom icon 2`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">请选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-address "><ul class="nut-address-exist"><li class="nut-address-exist-item active"><svg class="nut-icon nut-icon-Check " style="color: var(--nutui-color-primary);" xmlns="http://www.w3.org/2000/svg" color="var(--nutui-color-primary)" viewBox="0 0 49 48" aria-labelledby="Check" role="presentation"><path d="M45.121 16.121 47.243 14 43 9.757l-2.121 2.122L19 33.757 7.121 21.88 5 19.757.757 24l2.122 2.121L14.757 38l2.122 2.121L19 42.243l2.121-2.122L23.243 38z" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市次渠镇通州区</div></div></li><li class="nut-address-exist-item "><svg class="nut-icon nut-icon-Location " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Location" role="presentation"><path d="M533.33 1024s448-232.53 448-576c0-247.47-200.53-448-448-448s-448 200.53-448 448c0 343.47 448 576 448 576m181.12-206.72c-52.91 47.57-105.81 85.33-145.92 111.36a893.32 893.32 0 0 1-35.2 21.76 1148.76 1148.76 0 0 1-181.12-133.12C244.05 719.79 149.33 591.79 149.33 448c0-212.05 171.95-384 384-384s384 171.95 384 384c0 143.79-94.72 271.79-202.88 369.28M533.33 640a192 192 0 1 0-.02-384.02 192 192 0 0 0 .02 384.02m0-64c-70.61 0-128-57.39-128-128s57.39-128 128-128 128 57.39 128 128-57.39 128-128 128" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>钓鱼岛钓鱼岛全区</div></div></li><li class="nut-address-exist-item "><svg class="nut-icon nut-icon-Location " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Location" role="presentation"><path d="M533.33 1024s448-232.53 448-576c0-247.47-200.53-448-448-448s-448 200.53-448 448c0 343.47 448 576 448 576m181.12-206.72c-52.91 47.57-105.81 85.33-145.92 111.36a893.32 893.32 0 0 1-35.2 21.76 1148.76 1148.76 0 0 1-181.12-133.12C244.05 719.79 149.33 591.79 149.33 448c0-212.05 171.95-384 384-384s384 171.95 384 384c0 143.79-94.72 271.79-202.88 369.28M533.33 640a192 192 0 1 0-.02-384.02 192 192 0 0 0 .02 384.02m0-64c-70.61 0-128-57.39-128-128s57.39-128 128-128 128 57.39 128 128-57.39 128-128 128" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市大兴区科创十一街18号院京东大厦</div></div></li></ul><div class="nut-address-footer"><div class="nut-address-footer-btn">选择其他地址</div></div></div></div>"`;
+exports[`Address: show custom icon 2`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title nut-popup-bottom-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">请选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-address "><ul class="nut-address-exist"><li class="nut-address-exist-item active"><svg class="nut-icon nut-icon-Check " style="color: var(--nutui-color-primary);" xmlns="http://www.w3.org/2000/svg" color="var(--nutui-color-primary)" viewBox="0 0 49 48" aria-labelledby="Check" role="presentation"><path d="M45.121 16.121 47.243 14 43 9.757l-2.121 2.122L19 33.757 7.121 21.88 5 19.757.757 24l2.122 2.121L14.757 38l2.122 2.121L19 42.243l2.121-2.122L23.243 38z" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市次渠镇通州区</div></div></li><li class="nut-address-exist-item "><svg class="nut-icon nut-icon-Location " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Location" role="presentation"><path d="M533.33 1024s448-232.53 448-576c0-247.47-200.53-448-448-448s-448 200.53-448 448c0 343.47 448 576 448 576m181.12-206.72c-52.91 47.57-105.81 85.33-145.92 111.36a893.32 893.32 0 0 1-35.2 21.76 1148.76 1148.76 0 0 1-181.12-133.12C244.05 719.79 149.33 591.79 149.33 448c0-212.05 171.95-384 384-384s384 171.95 384 384c0 143.79-94.72 271.79-202.88 369.28M533.33 640a192 192 0 1 0-.02-384.02 192 192 0 0 0 .02 384.02m0-64c-70.61 0-128-57.39-128-128s57.39-128 128-128 128 57.39 128 128-57.39 128-128 128" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>钓鱼岛钓鱼岛全区</div></div></li><li class="nut-address-exist-item "><svg class="nut-icon nut-icon-Location " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Location" role="presentation"><path d="M533.33 1024s448-232.53 448-576c0-247.47-200.53-448-448-448s-448 200.53-448 448c0 343.47 448 576 448 576m181.12-206.72c-52.91 47.57-105.81 85.33-145.92 111.36a893.32 893.32 0 0 1-35.2 21.76 1148.76 1148.76 0 0 1-181.12-133.12C244.05 719.79 149.33 591.79 149.33 448c0-212.05 171.95-384 384-384s384 171.95 384 384c0 143.79-94.72 271.79-202.88 369.28M533.33 640a192 192 0 1 0-.02-384.02 192 192 0 0 0 .02 384.02m0-64c-70.61 0-128-57.39-128-128s57.39-128 128-128 128 57.39 128 128-57.39 128-128 128" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市大兴区科创十一街18号院京东大厦</div></div></li></ul><div class="nut-address-footer"><div class="nut-address-footer-btn">选择其他地址</div></div></div></div>"`;
 
-exports[`Address: show exist 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-address "><ul class="nut-address-exist"><li class="nut-address-exist-item active"><svg class="nut-icon nut-icon-Check " style="color: var(--nutui-color-primary);" xmlns="http://www.w3.org/2000/svg" color="var(--nutui-color-primary)" viewBox="0 0 49 48" aria-labelledby="Check" role="presentation"><path d="M45.121 16.121 47.243 14 43 9.757l-2.121 2.122L19 33.757 7.121 21.88 5 19.757.757 24l2.122 2.121L14.757 38l2.122 2.121L19 42.243l2.121-2.122L23.243 38z" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市次渠镇通州区</div></div></li><li class="nut-address-exist-item "><svg class="nut-icon nut-icon-Location " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Location" role="presentation"><path d="M533.33 1024s448-232.53 448-576c0-247.47-200.53-448-448-448s-448 200.53-448 448c0 343.47 448 576 448 576m181.12-206.72c-52.91 47.57-105.81 85.33-145.92 111.36a893.32 893.32 0 0 1-35.2 21.76 1148.76 1148.76 0 0 1-181.12-133.12C244.05 719.79 149.33 591.79 149.33 448c0-212.05 171.95-384 384-384s384 171.95 384 384c0 143.79-94.72 271.79-202.88 369.28M533.33 640a192 192 0 1 0-.02-384.02 192 192 0 0 0 .02 384.02m0-64c-70.61 0-128-57.39-128-128s57.39-128 128-128 128 57.39 128 128-57.39 128-128 128" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>钓鱼岛钓鱼岛全区</div></div></li><li class="nut-address-exist-item "><svg class="nut-icon nut-icon-Location " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Location" role="presentation"><path d="M533.33 1024s448-232.53 448-576c0-247.47-200.53-448-448-448s-448 200.53-448 448c0 343.47 448 576 448 576m181.12-206.72c-52.91 47.57-105.81 85.33-145.92 111.36a893.32 893.32 0 0 1-35.2 21.76 1148.76 1148.76 0 0 1-181.12-133.12C244.05 719.79 149.33 591.79 149.33 448c0-212.05 171.95-384 384-384s384 171.95 384 384c0 143.79-94.72 271.79-202.88 369.28M533.33 640a192 192 0 1 0-.02-384.02 192 192 0 0 0 .02 384.02m0-64c-70.61 0-128-57.39-128-128s57.39-128 128-128 128 57.39 128 128-57.39 128-128 128" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市大兴区科创十一街18号院京东大厦</div></div></li></ul></div></div>"`;
+exports[`Address: show exist 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title nut-popup-bottom-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-address "><ul class="nut-address-exist"><li class="nut-address-exist-item active"><svg class="nut-icon nut-icon-Check " style="color: var(--nutui-color-primary);" xmlns="http://www.w3.org/2000/svg" color="var(--nutui-color-primary)" viewBox="0 0 49 48" aria-labelledby="Check" role="presentation"><path d="M45.121 16.121 47.243 14 43 9.757l-2.121 2.122L19 33.757 7.121 21.88 5 19.757.757 24l2.122 2.121L14.757 38l2.122 2.121L19 42.243l2.121-2.122L23.243 38z" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市次渠镇通州区</div></div></li><li class="nut-address-exist-item "><svg class="nut-icon nut-icon-Location " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Location" role="presentation"><path d="M533.33 1024s448-232.53 448-576c0-247.47-200.53-448-448-448s-448 200.53-448 448c0 343.47 448 576 448 576m181.12-206.72c-52.91 47.57-105.81 85.33-145.92 111.36a893.32 893.32 0 0 1-35.2 21.76 1148.76 1148.76 0 0 1-181.12-133.12C244.05 719.79 149.33 591.79 149.33 448c0-212.05 171.95-384 384-384s384 171.95 384 384c0 143.79-94.72 271.79-202.88 369.28M533.33 640a192 192 0 1 0-.02-384.02 192 192 0 0 0 .02 384.02m0-64c-70.61 0-128-57.39-128-128s57.39-128 128-128 128 57.39 128 128-57.39 128-128 128" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>钓鱼岛钓鱼岛全区</div></div></li><li class="nut-address-exist-item "><svg class="nut-icon nut-icon-Location " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Location" role="presentation"><path d="M533.33 1024s448-232.53 448-576c0-247.47-200.53-448-448-448s-448 200.53-448 448c0 343.47 448 576 448 576m181.12-206.72c-52.91 47.57-105.81 85.33-145.92 111.36a893.32 893.32 0 0 1-35.2 21.76 1148.76 1148.76 0 0 1-181.12-133.12C244.05 719.79 149.33 591.79 149.33 448c0-212.05 171.95-384 384-384s384 171.95 384 384c0 143.79-94.72 271.79-202.88 369.28M533.33 640a192 192 0 1 0-.02-384.02 192 192 0 0 0 .02 384.02m0-64c-70.61 0-128-57.39-128-128s57.39-128 128-128 128 57.39 128 128-57.39 128-128 128" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市大兴区科创十一街18号院京东大厦</div></div></li></ul></div></div>"`;
diff --git a/src/packages/popup/popup.scss b/src/packages/popup/popup.scss
index 560f4ca3cc..78c22bd8ad 100644
--- a/src/packages/popup/popup.scss
+++ b/src/packages/popup/popup.scss
@@ -9,13 +9,8 @@
   font-size: $font-size-base;
 
   &-title {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
     border-bottom: $popup-title-border-bottom;
     padding: $popup-title-padding;
-    position: relative;
 
     &-wrapper {
       display: flex;
@@ -72,7 +67,6 @@
   }
   &-bottom-title,
   &-top-title {
-    padding-top: $popup-title-padding;
     color: $color-title;
     font-weight: $font-weight-bold;
     font-size: $popup-title-font-size;
diff --git a/src/packages/popup/popup.taro.tsx b/src/packages/popup/popup.taro.tsx
index 90a33b2858..28ee392732 100644
--- a/src/packages/popup/popup.taro.tsx
+++ b/src/packages/popup/popup.taro.tsx
@@ -149,30 +149,26 @@ export const Popup: FunctionComponent<
   const renderTitle = () => {
     if (left || title || description) {
       return (
-        <View className={`${classPrefix}-title`}>
-          {position === 'bottom' && (
-            <>
-              {left && (
-                <View className={`${classPrefix}-title-left`}>{left}</View>
-              )}
-              {(title || description) && (
-                <View className={`${classPrefix}-title-wrapper`}>
-                  {title && (
-                    <View className={`${classPrefix}-title-title`}>
-                      {title}
-                    </View>
-                  )}
-                  {description && (
-                    <View
-                      className={`${classPrefix}-title-description ${title ? `${classPrefix}-title-description-gap` : ''}`}
-                    >
-                      {description}
-                    </View>
-                  )}
-                </View>
-              )}
-            </>
-          )}
+        <View
+          className={`${classPrefix}-title ${classPrefix}-${position}-title`}
+        >
+          <>
+            {left && (
+              <View className={`${classPrefix}-title-left`}>{left}</View>
+            )}
+            {(title || description) && (
+              <View className={`${classPrefix}-title-wrapper`}>
+                <View className={`${classPrefix}-title-title`}>{title}</View>
+                {description && (
+                  <View
+                    className={`${classPrefix}-title-description ${title ? `${classPrefix}-title-description-gap` : ''}`}
+                  >
+                    {description}
+                  </View>
+                )}
+              </View>
+            )}
+          </>
           {renderCloseIcon()}
         </View>
       )
diff --git a/src/packages/popup/popup.tsx b/src/packages/popup/popup.tsx
index 7a2ad7d326..f327249fcb 100644
--- a/src/packages/popup/popup.tsx
+++ b/src/packages/popup/popup.tsx
@@ -146,12 +146,14 @@ export const Popup: FunctionComponent<
   const renderTitle = () => {
     if (left || title || description) {
       return (
-        <div className={`${classPrefix}-${position}-title`}>
+        <div
+          className={`${classPrefix}-title ${classPrefix}-${position}-title`}
+        >
           <>
             {left && <div className={`${classPrefix}-title-left`}>{left}</div>}
             {(title || description) && (
               <div className={`${classPrefix}-title-wrapper`}>
-                {title}
+                <div className={`${classPrefix}-title-title`}>{title}</div>
                 {description && (
                   <div
                     className={`${classPrefix}-title-description ${title ? `${classPrefix}-title-description-gap` : ''}`}
diff --git a/src/packages/skeleton/__test__/__snapshots__/skeleton.spec.tsx.snap b/src/packages/skeleton/__test__/__snapshots__/skeleton.spec.tsx.snap
deleted file mode 100644
index 57ace4ca5d..0000000000
--- a/src/packages/skeleton/__test__/__snapshots__/skeleton.spec.tsx.snap
+++ /dev/null
@@ -1,28 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`should change avatar shape when using avatarShape prop 1`] = `
-<div
-  class="nut-avatar nut-avatar-normal nut-avatar-square nut-avatar nut-skeleton-content-avatar avatar-square"
-  style="width: 50px; height: 50px; background-color: #eee; color: #666;"
-/>
-`;
-
-exports[`should change avatar size when using avatarSize prop 1`] = `
-<div>
-  <div
-    class="nut-skeleton"
-  >
-    <div
-      class="nut-skeleton-content"
-    >
-      <div
-        class="nut-avatar nut-avatar-normal nut-avatar-round nut-avatar-normal-round nut-avatar nut-skeleton-content-avatar avatar-round"
-        style="width: 20px; height: 20px; background-color: #eee; color: #666;"
-      />
-      <div
-        class="nut-skeleton-content-block"
-      />
-    </div>
-  </div>
-</div>
-`;
diff --git a/src/packages/timeselect/__test__/__snapshots__/timeselect.spec.tsx.snap b/src/packages/timeselect/__test__/__snapshots__/timeselect.spec.tsx.snap
index b56c82fbe3..8a2e2707fc 100644
--- a/src/packages/timeselect/__test__/__snapshots__/timeselect.spec.tsx.snap
+++ b/src/packages/timeselect/__test__/__snapshots__/timeselect.spec.tsx.snap
@@ -1,3 +1,3 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`timeselect props test 1`] = `"<div><div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">取件时间</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-timeselect"><div class="nut-timeselect-content"><div class="nut-timeselect-content-left"><div class="nut-timepannel active">520</div><div class="nut-timepannel">521</div></div><div class="nut-timedetail"><span class="nut-timedetail-item">09:00-10:00</span><span class="nut-timedetail-item">10:00-11:00</span><span class="nut-timedetail-item">11:00-12:00</span></div></div></div></div></div>"`;
+exports[`timeselect props test 1`] = `"<div><div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title nut-popup-bottom-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">取件时间</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-timeselect"><div class="nut-timeselect-content"><div class="nut-timeselect-content-left"><div class="nut-timepannel active">520</div><div class="nut-timepannel">521</div></div><div class="nut-timedetail"><span class="nut-timedetail-item">09:00-10:00</span><span class="nut-timedetail-item">10:00-11:00</span><span class="nut-timedetail-item">11:00-12:00</span></div></div></div></div></div>"`;

From 7c2eebc04f23cfba881e68f02aca2198c74b15ad Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Wed, 7 May 2025 17:30:58 +0800
Subject: [PATCH 12/13] fix: review

---
 src/packages/actionsheet/demos/taro/demo1.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/packages/actionsheet/demos/taro/demo1.tsx b/src/packages/actionsheet/demos/taro/demo1.tsx
index 44b8dce12c..5132e8432b 100644
--- a/src/packages/actionsheet/demos/taro/demo1.tsx
+++ b/src/packages/actionsheet/demos/taro/demo1.tsx
@@ -35,7 +35,6 @@ const Demo1 = () => {
         options={options}
         onSelect={handleSelect}
         onCancel={() => setIsVisible(false)}
-        cancelText="取消"
       />
     </>
   )

From 6d9ec98aa51797af2f50d4e2c843e025672e1efb Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Sat, 24 May 2025 16:51:34 +0800
Subject: [PATCH 13/13] chore: cr adjust

---
 src/packages/actionsheet/actionsheet.scss     | 2 +-
 src/packages/actionsheet/actionsheet.taro.tsx | 6 +++++-
 src/packages/actionsheet/actionsheet.tsx      | 6 +++++-
 src/packages/popup/popup.taro.tsx             | 8 ++++++--
 src/packages/popup/popup.tsx                  | 8 ++++++--
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/packages/actionsheet/actionsheet.scss b/src/packages/actionsheet/actionsheet.scss
index c9e21cffde..fde0e322c2 100644
--- a/src/packages/actionsheet/actionsheet.scss
+++ b/src/packages/actionsheet/actionsheet.scss
@@ -78,7 +78,7 @@
     justify-content: center;
     font-size: 16px;
     line-height: 40px;
-    color: rgb(26, 26, 26);
+    color: $color-title;
     margin-top: 16px;
   }
 
diff --git a/src/packages/actionsheet/actionsheet.taro.tsx b/src/packages/actionsheet/actionsheet.taro.tsx
index a2b132cbc9..0341722005 100644
--- a/src/packages/actionsheet/actionsheet.taro.tsx
+++ b/src/packages/actionsheet/actionsheet.taro.tsx
@@ -1,6 +1,7 @@
 import React, { FunctionComponent } from 'react'
 import { View } from '@tarojs/components'
 import { Close } from '@nutui/icons-react-taro'
+import classNames from 'classnames'
 import Popup from '@/packages/popup/index.taro'
 import { ComponentDefaults } from '@/utils/typings'
 import { mergeProps } from '@/utils/merge-props'
@@ -74,7 +75,10 @@ export const ActionSheet: FunctionComponent<
               const statusClass = `${item.disabled ? `${classPrefix}-item-disabled` : ''} ${item.danger ? `${classPrefix}-item-danger` : ''}`
               return (
                 <View
-                  className={`${classPrefix}-item ${statusClass} ${index !== options.length - 1 ? `${classPrefix}-item-border` : ''}`}
+                  className={classNames(`${classPrefix}-item`, statusClass, {
+                    [`${classPrefix}-item-border`]:
+                      index !== options.length - 1,
+                  })}
                   key={index}
                   onClick={() => chooseItem(item, index)}
                 >
diff --git a/src/packages/actionsheet/actionsheet.tsx b/src/packages/actionsheet/actionsheet.tsx
index 6e4d494c7d..b02b56c166 100644
--- a/src/packages/actionsheet/actionsheet.tsx
+++ b/src/packages/actionsheet/actionsheet.tsx
@@ -1,5 +1,6 @@
 import React, { FunctionComponent } from 'react'
 import { Close } from '@nutui/icons-react'
+import classNames from 'classnames'
 import Popup from '@/packages/popup/index'
 import { ComponentDefaults } from '@/utils/typings'
 import { mergeProps } from '@/utils/merge-props'
@@ -76,7 +77,10 @@ export const ActionSheet: FunctionComponent<
               const statusClass = `${item.disabled ? `${classPrefix}-item-disabled` : ''} ${item.danger ? `${classPrefix}-item-danger` : ''}`
               return (
                 <div
-                  className={`${classPrefix}-item ${statusClass} ${index !== options.length - 1 ? `${classPrefix}-item-border` : ''}`}
+                  className={classNames(`${classPrefix}-item`, statusClass, {
+                    [`${classPrefix}-item-border`]:
+                      index !== options.length - 1,
+                  })}
                   key={index}
                   onClick={() => chooseItem(item, index)}
                 >
diff --git a/src/packages/popup/popup.taro.tsx b/src/packages/popup/popup.taro.tsx
index 28ee392732..a552f2742e 100644
--- a/src/packages/popup/popup.taro.tsx
+++ b/src/packages/popup/popup.taro.tsx
@@ -158,10 +158,14 @@ export const Popup: FunctionComponent<
             )}
             {(title || description) && (
               <View className={`${classPrefix}-title-wrapper`}>
-                <View className={`${classPrefix}-title-title`}>{title}</View>
+                {title && (
+                  <View className={`${classPrefix}-title-title`}>{title}</View>
+                )}
                 {description && (
                   <View
-                    className={`${classPrefix}-title-description ${title ? `${classPrefix}-title-description-gap` : ''}`}
+                    className={classNames(`${classPrefix}-title-description`, {
+                      [`${classPrefix}-title-description-gap`]: title,
+                    })}
                   >
                     {description}
                   </View>
diff --git a/src/packages/popup/popup.tsx b/src/packages/popup/popup.tsx
index f327249fcb..8bd962a3f2 100644
--- a/src/packages/popup/popup.tsx
+++ b/src/packages/popup/popup.tsx
@@ -153,10 +153,14 @@ export const Popup: FunctionComponent<
             {left && <div className={`${classPrefix}-title-left`}>{left}</div>}
             {(title || description) && (
               <div className={`${classPrefix}-title-wrapper`}>
-                <div className={`${classPrefix}-title-title`}>{title}</div>
+                {title && (
+                  <div className={`${classPrefix}-title-title`}>{title}</div>
+                )}
                 {description && (
                   <div
-                    className={`${classPrefix}-title-description ${title ? `${classPrefix}-title-description-gap` : ''}`}
+                    className={classNames(`${classPrefix}-title-description`, {
+                      [`${classPrefix}-title-description-gap`]: title,
+                    })}
                   >
                     {description}
                   </div>