From 569074199e21fefaa9b19b387cc66941a1f70cd0 Mon Sep 17 00:00:00 2001
From: songchenglin3 <353833373@qq.com>
Date: Fri, 7 Mar 2025 11:45:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(fixednav):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BE=BD=E6=A0=87=E7=9A=84=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F,=E8=A7=A3=E5=86=B3=E5=8E=9F=E6=9C=89?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=A7=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/fixednav/fixednav.scss     | 15 ----------
 src/packages/fixednav/fixednav.taro.tsx | 38 ++++++++++++++++---------
 src/packages/fixednav/fixednav.tsx      | 36 ++++++++++++++++-------
 3 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/src/packages/fixednav/fixednav.scss b/src/packages/fixednav/fixednav.scss
index 9d76d46957..d5a04627fe 100644
--- a/src/packages/fixednav/fixednav.scss
+++ b/src/packages/fixednav/fixednav.scss
@@ -97,21 +97,6 @@
       .nut-fixednav-list-text {
         font-size: 10px;
       }
-
-      .b {
-        position: absolute;
-        right: 0;
-        top: 1px;
-        height: 14px;
-        line-height: 14px;
-        font-size: 10px;
-        padding: 0 3px;
-        color: white;
-        background: $color-primary;
-        border-radius: 7px;
-        text-align: center;
-        min-width: 12px;
-      }
     }
   }
 
diff --git a/src/packages/fixednav/fixednav.taro.tsx b/src/packages/fixednav/fixednav.taro.tsx
index 14a71ad3d5..2a746821c7 100644
--- a/src/packages/fixednav/fixednav.taro.tsx
+++ b/src/packages/fixednav/fixednav.taro.tsx
@@ -6,6 +6,7 @@ import Overlay from '@/packages/overlay/index.taro'
 import { useConfig } from '@/packages/configprovider/index.taro'
 import { FixedNavProps } from './types.taro'
 import { defaultOverlayProps } from '@/packages/overlay/overlay.taro'
+import Badge from '@/packages/badge/index.taro'
 
 const defaultProps: FixedNavProps = {
   ...defaultOverlayProps,
@@ -58,6 +59,23 @@ export const FixedNav: FunctionComponent<
     className
   )
 
+  const renderListItem = (item: any, index: number) => {
+    return (
+      <div
+        className={`${classPrefix}-list-item`}
+        onClick={(event) => onSelect(item, event)}
+        key={item.id || index}
+      >
+        {React.isValidElement(item.icon) ? (
+          item.icon
+        ) : (
+          <img src={item.icon} alt="" />
+        )}
+        <div className={`${classPrefix}-list-text`}>{item.text}</div>
+      </div>
+    )
+  }
+
   return (
     <View
       className={classes}
@@ -78,21 +96,15 @@ export const FixedNav: FunctionComponent<
           <View className={`${classPrefix}-list`}>
             {list.map((item: any, index) => {
               return (
-                <View
-                  className={`${classPrefix}-list-item`}
-                  onClick={(event) => onSelect(item, event as any)}
-                  key={item.id || index}
-                >
-                  {React.isValidElement(item.icon) ? (
-                    item.icon
+                <>
+                  {item.num ? (
+                    <Badge value={item.num} top={8} right={6}>
+                      {renderListItem(item, index)}
+                    </Badge>
                   ) : (
-                    <img src={item.icon} alt="" />
+                    <>{renderListItem(item, index)}</>
                   )}
-                  <View className={`${classPrefix}-list-text`}>
-                    {item.text}
-                  </View>
-                  {item.num && <View className="b">{item.num}</View>}
-                </View>
+                </>
               )
             })}
           </View>
diff --git a/src/packages/fixednav/fixednav.tsx b/src/packages/fixednav/fixednav.tsx
index 92b61f4ec4..28bc96b8ab 100644
--- a/src/packages/fixednav/fixednav.tsx
+++ b/src/packages/fixednav/fixednav.tsx
@@ -5,6 +5,7 @@ import Overlay from '@/packages/overlay/index'
 import { useConfig } from '@/packages/configprovider'
 import { FixedNavProps } from './types'
 import { defaultOverlayProps } from '@/packages/overlay/overlay'
+import Badge from '@/packages/badge/index'
 
 const defaultProps: FixedNavProps = {
   ...defaultOverlayProps,
@@ -58,6 +59,23 @@ export const FixedNav: FunctionComponent<
     className
   )
 
+  const renderListItem = (item: any, index: number) => {
+    return (
+      <div
+        className={`${classPrefix}-list-item`}
+        onClick={(event) => onSelect(item, event)}
+        key={item.id || index}
+      >
+        {React.isValidElement(item.icon) ? (
+          item.icon
+        ) : (
+          <img src={item.icon} alt="" />
+        )}
+        <div className={`${classPrefix}-list-text`}>{item.text}</div>
+      </div>
+    )
+  }
+
   return (
     <div
       className={classes}
@@ -79,19 +97,15 @@ export const FixedNav: FunctionComponent<
           <div className={`${classPrefix}-list`}>
             {list.map((item: any, index) => {
               return (
-                <div
-                  className={`${classPrefix}-list-item`}
-                  onClick={(event) => onSelect(item, event)}
-                  key={item.id || index}
-                >
-                  {React.isValidElement(item.icon) ? (
-                    item.icon
+                <>
+                  {item.num ? (
+                    <Badge value={item.num} top={8} right={6}>
+                      {renderListItem(item, index)}
+                    </Badge>
                   ) : (
-                    <img src={item.icon} alt="" />
+                    <>{renderListItem(item, index)}</>
                   )}
-                  <div className={`${classPrefix}-list-text`}>{item.text}</div>
-                  {item.num && <div className="b">{item.num}</div>}
-                </div>
+                </>
               )
             })}
           </div>

From 5c284ce53321d099e3c3b9cc16af099ab16dcefb Mon Sep 17 00:00:00 2001
From: songchenglin3 <353833373@qq.com>
Date: Fri, 7 Mar 2025 11:48:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(fixednav):=20=20taro=20=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/fixednav/fixednav.taro.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/packages/fixednav/fixednav.taro.tsx b/src/packages/fixednav/fixednav.taro.tsx
index 2a746821c7..1267a0660a 100644
--- a/src/packages/fixednav/fixednav.taro.tsx
+++ b/src/packages/fixednav/fixednav.taro.tsx
@@ -61,9 +61,9 @@ export const FixedNav: FunctionComponent<
 
   const renderListItem = (item: any, index: number) => {
     return (
-      <div
+      <View
         className={`${classPrefix}-list-item`}
-        onClick={(event) => onSelect(item, event)}
+        onClick={(event) => onSelect(item, event as any)}
         key={item.id || index}
       >
         {React.isValidElement(item.icon) ? (
@@ -71,8 +71,8 @@ export const FixedNav: FunctionComponent<
         ) : (
           <img src={item.icon} alt="" />
         )}
-        <div className={`${classPrefix}-list-text`}>{item.text}</div>
-      </div>
+        <View className={`${classPrefix}-list-text`}>{item.text}</View>
+      </View>
     )
   }