From fb8387d09ddf6d1ef325bd9e9c3291efdb904e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 19 Aug 2025 10:26:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=20=E7=94=A8=E6=88=B7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E5=BE=BD=E6=A0=87?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在用户订单组件中添加 Badge 徽标，用于提示未读消息或新订单数量
- 更新小程序分享功能，使用 showShareItems 替代 menus配置
- 修复团队和提现页面的下拉刷新组件，将 loading 属性改为 disabled
---
 src/dealer/qrcode/index.tsx             |  2 +-
 src/dealer/team/index.tsx               |  2 +-
 src/dealer/withdraw/index.tsx           |  2 +-
 src/pages/user/components/UserOrder.tsx | 52 +++++++++++++++----------
 4 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/dealer/qrcode/index.tsx b/src/dealer/qrcode/index.tsx
index cb952d7..ee9fd44 100644
--- a/src/dealer/qrcode/index.tsx
+++ b/src/dealer/qrcode/index.tsx
@@ -153,7 +153,7 @@ const DealerQrcode: React.FC = () => {
     // 小程序分享
     Taro.showShareMenu({
       withShareTicket: true,
-      menus: ['shareAppMessage', 'shareTimeline']
+      showShareItems: ['shareAppMessage', 'shareTimeline']
     })
   }
 
diff --git a/src/dealer/team/index.tsx b/src/dealer/team/index.tsx
index c305299..845516d 100644
--- a/src/dealer/team/index.tsx
+++ b/src/dealer/team/index.tsx
@@ -310,7 +310,7 @@ const DealerTeam: React.FC = () => {
 
   const renderMemberList = (level?: number) => (
     <PullToRefresh
-      loading={refreshing}
+      disabled={refreshing}
       onRefresh={handleRefresh}
     >
       <View className="p-4">
diff --git a/src/dealer/withdraw/index.tsx b/src/dealer/withdraw/index.tsx
index eb671bd..9ef56f5 100644
--- a/src/dealer/withdraw/index.tsx
+++ b/src/dealer/withdraw/index.tsx
@@ -349,7 +349,7 @@ const DealerWithdraw: React.FC = () => {
 
   const renderWithdrawRecords = () => (
     <PullToRefresh
-      loading={refreshing}
+      disabled={refreshing}
       onRefresh={handleRefresh}
     >
       <View className="p-4">
diff --git a/src/pages/user/components/UserOrder.tsx b/src/pages/user/components/UserOrder.tsx
index 92e94a4..c34fa78 100644
--- a/src/pages/user/components/UserOrder.tsx
+++ b/src/pages/user/components/UserOrder.tsx
@@ -1,6 +1,7 @@
 import {useEffect} from "react";
 import navTo from "@/utils/common";
 import {View, Text} from '@tarojs/components';
+import {Badge} from '@nutui/nutui-react-taro';
 import {ArrowRight, Wallet, Comment, Transit, Refund, Package} from '@nutui/icons-react-taro';
 
 function UserOrder() {
@@ -22,6 +23,7 @@ function UserOrder() {
             background: 'linear-gradient(to bottom, #ffffff, #ffffff)', // 这种情况建议使用类名来控制样式（引入外联样式）
             // margin: '10px auto 0px auto',
             height: '120px',
+            // paddingBottom: '3px'
             // borderRadius: '22px 22px 0 0',
           }}
         >
@@ -32,32 +34,40 @@ function UserOrder() {
               <ArrowRight color="#cccccc" size={12}/>
             </View>
           </View>
-          <View className={'flex justify-around pb-1'}>
-            <View className={'item flex justify-center flex-col items-center'}
-                  onClick={() => navTo('/user/order/order?statusFilter=0', true)}>
-              <Wallet size={26} className={'font-normal text-gray-500'}/>
-              <Text className={'text-sm text-gray-600 py-1'}>待付款</Text>
-            </View>
-            <View className={'item flex justify-center flex-col items-center'}
-                  onClick={() => navTo('/user/order/order?statusFilter=1', true)}>
-              <Package size={26} className={'text-gray-500 font-normal'}/>
-              <Text className={'text-sm text-gray-600 py-1'}>待发货</Text>
-            </View>
-            <View className={'item flex justify-center flex-col items-center'}
-                  onClick={() => navTo('/user/order/order?statusFilter=3', true)}>
-              <Transit size={24} className={'text-gray-500 font-normal'}/>
-              <Text className={'text-sm text-gray-600 py-1'}>待收货</Text>
-            </View>
+          <View className={'flex justify-around pb-1 mt-4'}>
+            <Badge value={8}>
+              <View className={'item flex justify-center flex-col items-center'}>
+                <Wallet size={26} className={'font-normal text-gray-500'}
+                        onClick={() => navTo('/user/order/order?statusFilter=0', true)}/>
+                <Text className={'text-sm text-gray-600 py-1'}>待付款</Text>
+              </View>
+            </Badge>
+            <Badge value={8}>
+              <View className={'item flex justify-center flex-col items-center'}
+                    onClick={() => navTo('/user/order/order?statusFilter=1', true)}>
+                <Package size={26} className={'text-gray-500 font-normal'}/>
+                <Text className={'text-sm text-gray-600 py-1'}>待发货</Text>
+              </View>
+            </Badge>
+            <Badge value={8}>
+              <View className={'item flex justify-center flex-col items-center'}
+                    onClick={() => navTo('/user/order/order?statusFilter=3', true)}>
+                <Transit size={24} className={'text-gray-500 font-normal'}/>
+                <Text className={'text-sm text-gray-600 py-1'}>待收货</Text>
+              </View>
+            </Badge>
             <View className={'item flex justify-center flex-col items-center'}
                   onClick={() => navTo('/user/order/order?statusFilter=5', true)}>
               <Comment size={24} className={'text-gray-500 font-normal'}/>
               <Text className={'text-sm text-gray-600 py-1'}>已完成</Text>
             </View>
-            <View className={'item flex justify-center flex-col items-center'}
-                  onClick={() => navTo('/user/order/order?statusFilter=6', true)}>
-              <Refund size={26} className={'font-normal text-gray-500'}/>
-              <Text className={'text-sm text-gray-600 py-1'}>退货/售后</Text>
-            </View>
+            <Badge value={8}>
+              <View className={'item flex justify-center flex-col items-center'}
+                    onClick={() => navTo('/user/order/order?statusFilter=6', true)}>
+                <Refund size={26} className={'font-normal text-gray-500'}/>
+                <Text className={'text-sm text-gray-600 py-1'}>退货/售后</Text>
+              </View>
+            </Badge>
           </View>
         </View>
       </View>