From 376e3550f51ba3cb6d8426658b24e0cc7bc0293f Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Thu, 31 Oct 2024 14:24:04 +0800
Subject: [PATCH 1/6] feat: tag icon

---
 src/packages/tag/demos/taro/demo2.tsx | 7 ++++---
 src/packages/tag/tag.taro.tsx         | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/packages/tag/demos/taro/demo2.tsx b/src/packages/tag/demos/taro/demo2.tsx
index 09ba99c4a1..b23cc25211 100644
--- a/src/packages/tag/demos/taro/demo2.tsx
+++ b/src/packages/tag/demos/taro/demo2.tsx
@@ -2,6 +2,7 @@ import React from 'react'
 // import { Failure } from '@nutui/icons-react-taro'
 import { Cell, Tag } from '@nutui/nutui-react-taro'
 import Taro from '@tarojs/taro'
+import { Icon } from '@tarojs/components'
 
 const Demo2 = () => {
   return (
@@ -32,7 +33,7 @@ const Demo2 = () => {
               onClose={() => Taro.showToast({ title: 'Tag closed' })}
               type="primary"
             >
-              标签
+              标签0
             </Tag>
           }
         />
@@ -42,8 +43,8 @@ const Demo2 = () => {
             <Tag
               closeable
               // TODO: icon 适配
-              closeIcon="C"
-              // closeIcon={<Failure size={8} />}
+              // closeIcon="C"
+              closeIcon={<Icon type="search" color="red" />}
               onClose={() => Taro.showToast({ title: 'Tag closed' })}
               type="primary"
             >
diff --git a/src/packages/tag/tag.taro.tsx b/src/packages/tag/tag.taro.tsx
index b9ffcbe3d5..97efc2c750 100644
--- a/src/packages/tag/tag.taro.tsx
+++ b/src/packages/tag/tag.taro.tsx
@@ -5,7 +5,7 @@ import React, {
   ReactNode,
 } from 'react'
 import type { MouseEvent } from 'react'
-import { View, ITouchEvent, Text } from '@tarojs/components'
+import { View, ITouchEvent, Text, Icon } from '@tarojs/components'
 // import { Close } from '@nutui/icons-react-taro'
 import classNames from 'classnames'
 
@@ -147,7 +147,8 @@ export const Tag: FunctionComponent<Partial<TagProps>> = (props) => {
                 }}
                 className={`${classPrefix}-custom-icon`}
               >
-                X
+                -
+                <Icon type="search" color="red" />-
               </Text>
             )}
           </View>

From f9571dce962bc828b4a0ef4b9d29909f9b1761cb Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Fri, 8 Nov 2024 11:15:46 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8Dicon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/avatar/avatar.harmony.css   |  4 +-
 src/packages/avatar/avatar.scss          |  4 +-
 src/packages/avatar/avatar.taro.tsx      | 22 ++++---
 src/packages/avatar/demo.taro.tsx        | 15 ++---
 src/packages/avatar/demos/taro/demo2.tsx | 14 +----
 src/packages/avatar/demos/taro/demo3.tsx | 17 +----
 src/packages/avatar/demos/taro/demo4.tsx |  3 +-
 src/packages/avatar/demos/taro/demo6.tsx | 79 +++++++-----------------
 src/packages/avatar/demos/taro/demo7.tsx | 36 ++++-------
 src/packages/avatar/demos/taro/demo8.tsx |  7 +--
 10 files changed, 62 insertions(+), 139 deletions(-)

diff --git a/src/packages/avatar/avatar.harmony.css b/src/packages/avatar/avatar.harmony.css
index 8eff79debd..c175564690 100644
--- a/src/packages/avatar/avatar.harmony.css
+++ b/src/packages/avatar/avatar.harmony.css
@@ -104,8 +104,8 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 100%;
-  height: 100%;
+  width: 40px;
+  height: 40px;
 }
 .nut-avatar-large {
   display: flex;
diff --git a/src/packages/avatar/avatar.scss b/src/packages/avatar/avatar.scss
index e2647bef2a..443bef3860 100644
--- a/src/packages/avatar/avatar.scss
+++ b/src/packages/avatar/avatar.scss
@@ -40,8 +40,8 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    width: 100%;
-    height: 100%;
+    width: $avatar-normal-width;
+    height: $avatar-normal-height;
   }
 
   &-large {
diff --git a/src/packages/avatar/avatar.taro.tsx b/src/packages/avatar/avatar.taro.tsx
index d62751f851..df8b76418e 100644
--- a/src/packages/avatar/avatar.taro.tsx
+++ b/src/packages/avatar/avatar.taro.tsx
@@ -151,13 +151,15 @@ export const Avatar: FunctionComponent<
                   onError={errorEvent}
                 />
               )}
-              {React.isValidElement(icon)
-                ? React.cloneElement<any>(icon, {
+              {React.isValidElement(icon) ? (
+                <View className="nut-avatar-text">
+                  {React.cloneElement<any>(icon, {
                     ...icon.props,
                     className: `${icon.props.className || ''} nut-avatar-icon nut-avatar-${groupSize || size || 'normal'}-icon`,
                     style: { position: 'absolute' },
-                  })
-                : null}
+                  })}
+                </View>
+              ) : null}
               {children && (
                 <View
                   className={`nut-avatar-text nut-avatar-${groupSize || size || 'normal'}-text`}
@@ -165,11 +167,13 @@ export const Avatar: FunctionComponent<
                   {children}
                 </View>
               )}
-              {!src && !icon && !children && !harmonyAndRn() && (
-                <User
-                  className={`nut-avatar-icon nut-avatar-${groupSize || size || 'normal'}-icon`}
-                  style={{ position: 'absolute' }}
-                />
+              {!src && !icon && !children && (
+                <View className="nut-avatar-text">
+                  <User
+                    className={`nut-avatar-icon nut-avatar-${groupSize || size || 'normal'}-icon`}
+                    style={{ position: 'absolute' }}
+                  />
+                </View>
               )}
             </>
           )}
diff --git a/src/packages/avatar/demo.taro.tsx b/src/packages/avatar/demo.taro.tsx
index 2c49d50341..ce84cc4eca 100644
--- a/src/packages/avatar/demo.taro.tsx
+++ b/src/packages/avatar/demo.taro.tsx
@@ -13,13 +13,12 @@ import Demo6 from './demos/taro/demo6'
 import Demo7 from './demos/taro/demo7'
 import Demo8 from './demos/taro/demo8'
 import Demo9 from './demos/taro/demo9'
-import { harmonyAndRn } from '@/utils/platform-taro'
 
 const AvatarDemo = () => {
   const [translated] = useTranslate({
     'zh-CN': {
       '67f78db5': '支持三种尺寸：small、normal、large',
-      '3928b17e': '支持两种形状：square、round',
+      '3928b17e': '支持两种形状：square、round---',
       '049b6a97': '支持三种类型：图片、Icon 以及字符',
       a304dabf: 'Icon和字符型可以自定义图标颜色及背景色',
       '89bca4e7': '带徽标的头像',
@@ -65,14 +64,10 @@ const AvatarDemo = () => {
         <Demo2 />
         <View className="h2">{translated['049b6a97']}</View>
         <Demo3 />
-        {harmonyAndRn() ? null : (
-          <>
-            <View className="h2">{translated.a304dabf}</View>
-            <Demo4 />
-            <View className="h2">{translated['89bca4e7']}</View>
-            <Demo5 />
-          </>
-        )}
+        <View className="h2">{translated.a304dabf}</View>
+        <Demo4 />
+        <View className="h2">{translated['89bca4e7']}</View>
+        <Demo5 />
         <View className="h2">{translated.e981579e}</View>
         <Demo6 />
         <View className="h2">{translated.f645fc65}</View>
diff --git a/src/packages/avatar/demos/taro/demo2.tsx b/src/packages/avatar/demos/taro/demo2.tsx
index a7dac9fbdf..1a16eec983 100644
--- a/src/packages/avatar/demos/taro/demo2.tsx
+++ b/src/packages/avatar/demos/taro/demo2.tsx
@@ -1,22 +1,12 @@
 import React from 'react'
 import { Avatar, Cell } from '@nutui/nutui-react-taro'
 import { User } from '@nutui/icons-react-taro'
-import { harmonyAndRn } from '@/utils/platform-taro'
 
 const Demo2 = () => {
   return (
     <Cell className="cell-avatar">
-      {harmonyAndRn() ? (
-        <>
-          <Avatar shape="square">N</Avatar>
-          <Avatar shape="round">N</Avatar>
-        </>
-      ) : (
-        <>
-          <Avatar icon={<User />} shape="square" />
-          <Avatar icon={<User />} shape="round" />
-        </>
-      )}
+      <Avatar icon={<User />} shape="square" />
+      <Avatar icon={<User />} shape="round" />
     </Cell>
   )
 }
diff --git a/src/packages/avatar/demos/taro/demo3.tsx b/src/packages/avatar/demos/taro/demo3.tsx
index b88f641164..6c0f891e8b 100644
--- a/src/packages/avatar/demos/taro/demo3.tsx
+++ b/src/packages/avatar/demos/taro/demo3.tsx
@@ -1,24 +1,13 @@
 import React from 'react'
 import { Avatar, Cell } from '@nutui/nutui-react-taro'
 import { User } from '@nutui/icons-react-taro'
-import { harmonyAndRn } from '@/utils/platform-taro'
 
 const Demo3 = () => {
   return (
     <Cell className="cell-avatar">
-      {harmonyAndRn() ? (
-        <>
-          <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
-          <Avatar>N</Avatar>
-          <Avatar>N</Avatar>
-        </>
-      ) : (
-        <>
-          <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
-          <Avatar icon={<User />} />
-          <Avatar>N</Avatar>
-        </>
-      )}
+      <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
+      <Avatar icon={<User />} />
+      <Avatar>N</Avatar>
     </Cell>
   )
 }
diff --git a/src/packages/avatar/demos/taro/demo4.tsx b/src/packages/avatar/demos/taro/demo4.tsx
index f309b7cb19..aa942036ab 100644
--- a/src/packages/avatar/demos/taro/demo4.tsx
+++ b/src/packages/avatar/demos/taro/demo4.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import { Avatar, Cell } from '@nutui/nutui-react-taro'
+import { User } from '@nutui/icons-react-taro'
 
 const Demo4 = () => {
   return (
@@ -7,7 +8,7 @@ const Demo4 = () => {
       <Avatar
         color="#fff"
         background="var(--nutui-color-primary)"
-        // icon={<User />}
+        icon={<User />}
       />
       <Avatar
         color="var(--nutui-color-primary)"
diff --git a/src/packages/avatar/demos/taro/demo6.tsx b/src/packages/avatar/demos/taro/demo6.tsx
index 22622b239f..7bce72d9b9 100644
--- a/src/packages/avatar/demos/taro/demo6.tsx
+++ b/src/packages/avatar/demos/taro/demo6.tsx
@@ -7,66 +7,29 @@ const Demo6 = () => {
   return (
     <>
       <Cell>
-        {harmonyAndRn() ? (
-          <Avatar.Group gap="-4">
-            <Avatar
-              color="var(--nutui-color-primary)"
-              background={`${harmonyAndRn() ? '#eee' : 'var(--nutui-brand-2)'}`}
-            >
-              U
-            </Avatar>
-            <Avatar
-              color="var(--nutui-color-primary)"
-              background={`${harmonyAndRn() ? '#eee' : 'var(--nutui-brand-2)'}`}
-            >
-              U
-            </Avatar>
-            <Avatar
-              color="var(--nutui-color-primary)"
-              background={`${harmonyAndRn() ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
-            >
-              U
-            </Avatar>
-          </Avatar.Group>
-        ) : (
-          <Avatar.Group gap="-4">
-            <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
-            <Avatar icon={<User />} />
-            <Avatar
-              color="var(--nutui-color-primary)"
-              background={`${harmonyAndRn() ? '#eee' : 'var(--nutui-brand-2)'}`}
-            >
-              U
-            </Avatar>
-          </Avatar.Group>
-        )}
+        <Avatar.Group gap="-4">
+          <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
+          <Avatar icon={<User />} />
+          <Avatar
+            color="var(--nutui-color-primary)"
+            background={`${harmonyAndRn() ? '#eee' : 'var(--nutui-brand-2)'}`}
+          >
+            U
+          </Avatar>
+        </Avatar.Group>
       </Cell>
       <Cell>
-        {harmonyAndRn() ? (
-          <Avatar.Group max="3" maxColor="#fff" maxBackground="#498ff2">
-            <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
-            <Avatar size="normal">N</Avatar>
-            <Avatar
-              color="var(--nutui-color-primary)"
-              background={`${harmonyAndRn() ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
-            >
-              U
-            </Avatar>
-            <Avatar size="normal">N</Avatar>
-          </Avatar.Group>
-        ) : (
-          <Avatar.Group max="3" maxColor="#fff" maxBackground="#498ff2">
-            <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
-            <Avatar icon={<User />} />
-            <Avatar
-              color="var(--nutui-color-primary)"
-              background="var(--nutui-brand-2)"
-            >
-              U
-            </Avatar>
-            <Avatar icon={<User />} />
-          </Avatar.Group>
-        )}
+        <Avatar.Group max="3" maxColor="#fff" maxBackground="#498ff2">
+          <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
+          <Avatar icon={<User />} />
+          <Avatar
+            color="var(--nutui-color-primary)"
+            background={`${harmonyAndRn() ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
+          >
+            U
+          </Avatar>
+          <Avatar icon={<User />} />
+        </Avatar.Group>
       </Cell>
     </>
   )
diff --git a/src/packages/avatar/demos/taro/demo7.tsx b/src/packages/avatar/demos/taro/demo7.tsx
index bea73ff22a..d8b974f234 100644
--- a/src/packages/avatar/demos/taro/demo7.tsx
+++ b/src/packages/avatar/demos/taro/demo7.tsx
@@ -6,31 +6,17 @@ import { harmonyAndRn } from '@/utils/platform-taro'
 const Demo7 = () => {
   return (
     <Cell className="cell-avatar">
-      {harmonyAndRn() ? (
-        <Avatar.Group max="3" level="right" maxContent="...">
-          <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
-          <Avatar>N</Avatar>
-          <Avatar
-            color="var(--nutui-color-primary)"
-            background={`${harmonyAndRn() ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
-          >
-            U
-          </Avatar>
-          <Avatar>N</Avatar>
-        </Avatar.Group>
-      ) : (
-        <Avatar.Group max="3" level="right" maxContent="...">
-          <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
-          <Avatar icon={<User />} />
-          <Avatar
-            color="var(--nutui-color-primary)"
-            background="var(--nutui-brand-2)"
-          >
-            U
-          </Avatar>
-          <Avatar icon={<User />} />
-        </Avatar.Group>
-      )}
+      <Avatar.Group max="3" level="right" maxContent="...">
+        <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
+        <Avatar icon={<User />} />
+        <Avatar
+          color="var(--nutui-color-primary)"
+          background={`${harmonyAndRn() ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
+        >
+          U
+        </Avatar>
+        <Avatar icon={<User />} />
+      </Avatar.Group>
     </Cell>
   )
 }
diff --git a/src/packages/avatar/demos/taro/demo8.tsx b/src/packages/avatar/demos/taro/demo8.tsx
index f634a26a9e..510b181a20 100644
--- a/src/packages/avatar/demos/taro/demo8.tsx
+++ b/src/packages/avatar/demos/taro/demo8.tsx
@@ -2,7 +2,6 @@ import React from 'react'
 import { Avatar, Cell } from '@nutui/nutui-react-taro'
 import { User } from '@nutui/icons-react-taro'
 import Taro from '@tarojs/taro'
-import { harmonyAndRn } from '@/utils/platform-taro'
 
 const Demo8 = () => {
   const activeAvatar = () => {
@@ -10,11 +9,7 @@ const Demo8 = () => {
   }
   return (
     <Cell className="cell-avatar">
-      {harmonyAndRn() ? (
-        <Avatar>N</Avatar>
-      ) : (
-        <Avatar icon={<User />} onClick={activeAvatar} />
-      )}
+      <Avatar icon={<User />} onClick={activeAvatar} />
     </Cell>
   )
 }

From 513da87348ce203bde9ad1babc53ab4cbdd74d90 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Fri, 8 Nov 2024 20:36:46 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E7=AE=80=E5=8C=96=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?,=E9=80=82=E9=85=8D=E9=B8=BF=E8=92=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/avatar/avatar.harmony.css     | 48 ++--------------
 src/packages/avatar/avatar.scss            | 67 +++-------------------
 src/packages/avatar/avatar.taro.tsx        |  2 -
 src/packages/avatar/demo.taro.tsx          |  2 +-
 src/packages/skeleton/demos/taro/demo5.tsx |  9 +--
 5 files changed, 15 insertions(+), 113 deletions(-)

diff --git a/src/packages/avatar/avatar.harmony.css b/src/packages/avatar/avatar.harmony.css
index c175564690..887a5d4a1d 100644
--- a/src/packages/avatar/avatar.harmony.css
+++ b/src/packages/avatar/avatar.harmony.css
@@ -73,6 +73,11 @@
 .nut-avatar {
   position: relative;
   flex: 0 0 auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 40px;
+  height: 40px;
 }
 .nut-avatar-round {
   border-radius: 999px;
@@ -96,21 +101,12 @@
 .nut-avatar-icon {
   background-size: 100% 100%;
 }
-.nut-avatar .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
 .nut-avatar-text {
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 40px;
-  height: 40px;
 }
 .nut-avatar-large {
-  display: flex;
-  justify-content: center;
-  align-items: center;
   width: 60px;
   height: 60px;
 }
@@ -118,53 +114,19 @@
   width: 60px;
   height: 60px;
 }
-.nut-avatar-large-img-image {
-  width: 60px;
-  height: 60px;
-}
 .nut-avatar-large-icon {
   width: 60px;
   height: 60px;
 }
-.nut-avatar-large .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
 .nut-avatar-large-text {
   width: 60px;
   height: 60px;
 }
 .nut-avatar-small {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 32px;
-  height: 32px;
-}
-.nut-avatar-small-img-image {
   width: 32px;
   height: 32px;
 }
 .nut-avatar-small-text {
   width: 32px;
   height: 32px;
-}
-.nut-avatar-normal {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 40px;
-  height: 40px;
-}
-.nut-avatar-normal-img-image {
-  width: 40px;
-  height: 40px;
-}
-.nut-avatar-normal .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
-.nut-avatar-normal-text {
-  width: 40px;
-  height: 40px;
 }
\ No newline at end of file
diff --git a/src/packages/avatar/avatar.scss b/src/packages/avatar/avatar.scss
index 443bef3860..f3480990ce 100644
--- a/src/packages/avatar/avatar.scss
+++ b/src/packages/avatar/avatar.scss
@@ -4,6 +4,13 @@
 .nut-avatar {
   position: relative;
   flex: 0 0 auto; // 防止被压缩
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: $avatar-normal-width;
+  height: $avatar-normal-height;
+
   &-round {
     border-radius: 999px;
     overflow: hidden;
@@ -31,45 +38,23 @@
     background-size: 100% 100%;
   }
 
-  .nut-icon-img {
-    width: 100%;
-    height: 100%;
-  }
-
   &-text {
     display: flex;
     justify-content: center;
     align-items: center;
-    width: $avatar-normal-width;
-    height: $avatar-normal-height;
   }
 
   &-large {
-    display: flex;
-    justify-content: center;
-    align-items: center;
     width: $avatar-large-width;
     height: $avatar-large-height;
-
     &-img {
       width: $avatar-large-width;
       height: $avatar-large-height;
-      &-image {
-        width: $avatar-large-width;
-        height: $avatar-large-height;
-      }
     }
-
     &-icon {
       width: $avatar-large-width;
       height: $avatar-large-height;
     }
-
-    .nut-icon-img {
-      width: 100%;
-      height: 100%;
-    }
-
     &-text {
       width: $avatar-large-width;
       height: $avatar-large-height;
@@ -77,51 +62,13 @@
   }
 
   &-small {
-    display: flex;
-    justify-content: center;
-    align-items: center;
     width: $avatar-small-width;
     height: $avatar-small-height;
-
-    &-img-image {
-      width: $avatar-small-width;
-      height: $avatar-small-height;
-    }
-    &-icon {
-      // width: $avatar-small-width;
-      // height: $avatar-small-height;
-    }
     &-text {
       width: $avatar-small-width;
       height: $avatar-small-height;
     }
   }
-
-  &-normal {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: $avatar-normal-width;
-    height: $avatar-normal-height;
-
-    &-img-image {
-      width: $avatar-normal-width;
-      height: $avatar-normal-height;
-    }
-
-    &-icon {
-    }
-
-    .nut-icon-img {
-      width: 100%;
-      height: 100%;
-    }
-
-    &-text {
-      width: $avatar-normal-width;
-      height: $avatar-normal-height;
-    }
-  }
 }
 
 // [dir='rtl'] .nut-avatar,
diff --git a/src/packages/avatar/avatar.taro.tsx b/src/packages/avatar/avatar.taro.tsx
index df8b76418e..3ce497d516 100644
--- a/src/packages/avatar/avatar.taro.tsx
+++ b/src/packages/avatar/avatar.taro.tsx
@@ -156,7 +156,6 @@ export const Avatar: FunctionComponent<
                   {React.cloneElement<any>(icon, {
                     ...icon.props,
                     className: `${icon.props.className || ''} nut-avatar-icon nut-avatar-${groupSize || size || 'normal'}-icon`,
-                    style: { position: 'absolute' },
                   })}
                 </View>
               ) : null}
@@ -171,7 +170,6 @@ export const Avatar: FunctionComponent<
                 <View className="nut-avatar-text">
                   <User
                     className={`nut-avatar-icon nut-avatar-${groupSize || size || 'normal'}-icon`}
-                    style={{ position: 'absolute' }}
                   />
                 </View>
               )}
diff --git a/src/packages/avatar/demo.taro.tsx b/src/packages/avatar/demo.taro.tsx
index ce84cc4eca..932dc07753 100644
--- a/src/packages/avatar/demo.taro.tsx
+++ b/src/packages/avatar/demo.taro.tsx
@@ -18,7 +18,7 @@ const AvatarDemo = () => {
   const [translated] = useTranslate({
     'zh-CN': {
       '67f78db5': '支持三种尺寸：small、normal、large',
-      '3928b17e': '支持两种形状：square、round---',
+      '3928b17e': '支持两种形状：square、round',
       '049b6a97': '支持三种类型：图片、Icon 以及字符',
       a304dabf: 'Icon和字符型可以自定义图标颜色及背景色',
       '89bca4e7': '带徽标的头像',
diff --git a/src/packages/skeleton/demos/taro/demo5.tsx b/src/packages/skeleton/demos/taro/demo5.tsx
index 95f67948cf..1bd665c329 100644
--- a/src/packages/skeleton/demos/taro/demo5.tsx
+++ b/src/packages/skeleton/demos/taro/demo5.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Image, Skeleton, Switch } from '@nutui/nutui-react-taro'
+import { Avatar, Skeleton, Switch } from '@nutui/nutui-react-taro'
 import React, { useState } from 'react'
 import { View, Text } from '@tarojs/components'
 import pxTransform from '@/utils/px-transform'
@@ -27,12 +27,7 @@ const Demo5 = () => {
             className="nut-skeleton-content-avatar"
             style={{ marginRight: '20px' }}
             size="50"
-            icon={
-              <Image
-                loading={false}
-                src="https://img14.360buyimg.com/imagetools/jfs/t1/167902/2/8762/791358/603742d7E9b4275e3/e09d8f9a8bf4c0ef.png"
-              />
-            }
+            src="https://img14.360buyimg.com/imagetools/jfs/t1/167902/2/8762/791358/603742d7E9b4275e3/e09d8f9a8bf4c0ef.png"
           />
           <View className="nut-skeleton-content-line">
             <Text>NutUI-React</Text>

From bd8c1ba6cd3d3c0f10355ddf6afb7bdeee6836ff Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Fri, 8 Nov 2024 20:42:38 +0800
Subject: [PATCH 4/6] fix: merge next

---
 src/packages/input/input.harmony.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/packages/input/input.harmony.css b/src/packages/input/input.harmony.css
index f505097aab..47289dbf35 100644
--- a/src/packages/input/input.harmony.css
+++ b/src/packages/input/input.harmony.css
@@ -43,4 +43,8 @@
   background: none;
   opacity: 1;
   -webkit-text-fill-color: #c2c4cc;
+}
+
+.nut-input-clear {
+  flex: 0;
 }
\ No newline at end of file

From a89bdd97153ea6d7342a9ad4985552f3166f91f7 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Sat, 9 Nov 2024 18:22:10 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9group=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/avatar/avatar.taro.tsx      | 1 +
 src/packages/avatar/demos/taro/demo4.tsx | 9 +++++----
 src/packages/avatar/demos/taro/demo6.tsx | 4 ++--
 src/packages/avatar/demos/taro/demo7.tsx | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/packages/avatar/avatar.taro.tsx b/src/packages/avatar/avatar.taro.tsx
index 3ce497d516..5622335872 100644
--- a/src/packages/avatar/avatar.taro.tsx
+++ b/src/packages/avatar/avatar.taro.tsx
@@ -178,6 +178,7 @@ export const Avatar: FunctionComponent<
           {showMax && (
             <View
               className={`nut-avatar-text nut-avatar-${groupSize || 'normal'}-text`}
+              style={{ ...maxStyles }}
             >
               {propAvatarGroup?.maxContent
                 ? propAvatarGroup?.maxContent
diff --git a/src/packages/avatar/demos/taro/demo4.tsx b/src/packages/avatar/demos/taro/demo4.tsx
index aa942036ab..200ed1879c 100644
--- a/src/packages/avatar/demos/taro/demo4.tsx
+++ b/src/packages/avatar/demos/taro/demo4.tsx
@@ -1,18 +1,19 @@
 import React from 'react'
 import { Avatar, Cell } from '@nutui/nutui-react-taro'
 import { User } from '@nutui/icons-react-taro'
+import { harmonyAndRn } from '@/utils/platform-taro'
 
 const Demo4 = () => {
   return (
     <Cell className="cell-avatar">
       <Avatar
-        color="#fff"
-        background="var(--nutui-color-primary)"
+        color="#ffffff"
+        background={`${harmonyAndRn() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
         icon={<User />}
       />
       <Avatar
-        color="var(--nutui-color-primary)"
-        background="var(--nutui-color-primary-light-pressed)"
+        color={`${harmonyAndRn() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
+        background={`${harmonyAndRn() ? '#ffebf1' : 'var(--nutui-color-primary-light-pressed)'}`}
       >
         U
       </Avatar>
diff --git a/src/packages/avatar/demos/taro/demo6.tsx b/src/packages/avatar/demos/taro/demo6.tsx
index 7bce72d9b9..9f269e45bf 100644
--- a/src/packages/avatar/demos/taro/demo6.tsx
+++ b/src/packages/avatar/demos/taro/demo6.tsx
@@ -11,7 +11,7 @@ const Demo6 = () => {
           <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
           <Avatar icon={<User />} />
           <Avatar
-            color="var(--nutui-color-primary)"
+            color={`${harmonyAndRn() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
             background={`${harmonyAndRn() ? '#eee' : 'var(--nutui-brand-2)'}`}
           >
             U
@@ -23,7 +23,7 @@ const Demo6 = () => {
           <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
           <Avatar icon={<User />} />
           <Avatar
-            color="var(--nutui-color-primary)"
+            color={`${harmonyAndRn() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
             background={`${harmonyAndRn() ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
           >
             U
diff --git a/src/packages/avatar/demos/taro/demo7.tsx b/src/packages/avatar/demos/taro/demo7.tsx
index d8b974f234..bcc5697ce7 100644
--- a/src/packages/avatar/demos/taro/demo7.tsx
+++ b/src/packages/avatar/demos/taro/demo7.tsx
@@ -10,7 +10,7 @@ const Demo7 = () => {
         <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
         <Avatar icon={<User />} />
         <Avatar
-          color="var(--nutui-color-primary)"
+          color={`${harmonyAndRn() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
           background={`${harmonyAndRn() ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
         >
           U

From a5bc46dc62a56f14748c518f48b57799dcc17ec2 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Mon, 11 Nov 2024 22:23:52 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/avatar/avatar.taro.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/packages/avatar/avatar.taro.tsx b/src/packages/avatar/avatar.taro.tsx
index 5622335872..6948858eb7 100644
--- a/src/packages/avatar/avatar.taro.tsx
+++ b/src/packages/avatar/avatar.taro.tsx
@@ -136,7 +136,6 @@ export const Avatar: FunctionComponent<
       {(showMax || !groupMax || avatarIndex <= groupMax) && (
         <View
           className={cls}
-          // {...rest}
           style={!showMax ? styles : maxStyles}
           onClick={clickAvatar}
           ref={avatarRef}
@@ -147,7 +146,7 @@ export const Avatar: FunctionComponent<
                 <Image
                   className={`nut-avatar-img nut-avatar-${groupSize || size || 'normal'}-img`}
                   src={src}
-                  style={{ objectFit: fit, ...styles }}
+                  style={{ objectFit: fit }}
                   onError={errorEvent}
                 />
               )}