From e7585650bb50577c309c1dbc05e8dc42c574be84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 16 Oct 2025 00:04:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(dealer):=20=E6=9B=B4=E6=96=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E5=B9=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=A1=B5=E9=9D=A2=E6=96=87=E6=A1=88-=20=E5=9C=A8?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9E=8B=E4=B8=AD=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=20`degreePrice`=20=E5=92=8C=20`price`=20=E5=AD=97=E6=AE=B5-=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E5=8F=8A?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E6=8F=8F=E8=BF=B0=20-=20=E5=B0=86=E2=80=9C?=
 =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95=E2=80=9D=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E6=94=B6=E7=9B=8A=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E2=80=9D-=20=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E2=80=9C=E5=88=86=E9=94=80=E5=B7=A5=E5=85=B7=E2=80=9D?=
 =?UTF-8?q?=E4=B8=BA=E2=80=9C=E6=88=91=E7=9A=84=E5=B7=A5=E5=85=B7=E2=80=9D?=
 =?UTF-8?q?-=20=E6=B3=A8=E9=87=8A=E6=8E=89=E5=8E=9F=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shop/shopDealerOrder/model/index.ts |  4 +++
 src/dealer/index.tsx                        |  4 +--
 src/dealer/orders/index.tsx                 | 39 +++++++++++++--------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/api/shop/shopDealerOrder/model/index.ts b/src/api/shop/shopDealerOrder/model/index.ts
index 03916cd..b60994e 100644
--- a/src/api/shop/shopDealerOrder/model/index.ts
+++ b/src/api/shop/shopDealerOrder/model/index.ts
@@ -34,6 +34,10 @@ export interface ShopDealerOrder {
   thirdNickname: undefined,
   // 订单结算金额
   settledPrice?: string;
+  // 换算成度
+  degreePrice?: string;
+  // 单价
+  price?: string;
   // 订单支付金额
   payPrice?: string;
   // 订单是否失效(0未失效 1已失效)
diff --git a/src/dealer/index.tsx b/src/dealer/index.tsx
index 498c7ce..2eaabbd 100644
--- a/src/dealer/index.tsx
+++ b/src/dealer/index.tsx
@@ -198,7 +198,7 @@ const DealerIndex: React.FC = () => {
 
         {/* 功能导航 */}
         <View className="bg-white mx-4 mt-4 rounded-xl p-4">
-          <View className="font-semibold mb-4 text-gray-800">分销工具</View>
+          <View className="font-semibold mb-4 text-gray-800">我的工具</View>
           <ConfigProvider>
             <Grid
               columns={4}
@@ -209,7 +209,7 @@ const DealerIndex: React.FC = () => {
                 border: 'none'
               } as React.CSSProperties}
             >
-              <Grid.Item text="分销订单" onClick={() => navigateToPage('/dealer/orders/index')}>
+              <Grid.Item text="收益明细" onClick={() => navigateToPage('/dealer/capital/index')}>
                 <View className="text-center">
                   <View className="w-12 h-12 bg-blue-50 rounded-xl flex items-center justify-center mx-auto mb-2">
                     <Shopping color="#3b82f6" size="20"/>
diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx
index f2bba32..1352e22 100644
--- a/src/dealer/orders/index.tsx
+++ b/src/dealer/orders/index.tsx
@@ -164,28 +164,37 @@ const DealerOrder: React.FC = () => {
 
       <View className="flex justify-between items-center mt-2">
         <Text className="text-sm text-gray-400">
-          结算月份：{order.month}
+          结算电量：{order.degreePrice}
         </Text>
-        <Text className="text-sm text-gray-400">
-          结算电量：{order.orderPrice || '0.00'}
-        </Text>
-      </View>
-
-      <View className="flex justify-between items-center mb-1">
         <Text className="text-sm text-gray-400">
           结算金额：{order.settledPrice}
         </Text>
+      </View>
+
+      <View className="flex justify-between items-center mb-1">
         <Text className="text-sm text-gray-400">
-          实发金额：{order.payPrice}
+          单价：{order.price}
+        </Text>
+        <Text className="text-sm text-gray-400">
+          税费：{order.rate}
         </Text>
       </View>
 
       <View className="flex justify-between items-center mb-1">
         <Text className="text-sm text-gray-400">
-          税费：{order.rate}
+          实发金额：{order.payPrice}
         </Text>
         <Text className="text-sm text-gray-400">
-          状态：{getStatusText(order.isSettled, order.isInvalid)}
+          结算月份：{order.month}
+        </Text>
+      </View>
+
+      <View className="flex justify-between items-center mb-1">
+        <Text className="text-sm text-gray-400">
+          结算状态：{getStatusText(order.isSettled, order.isInvalid)}
+        </Text>
+        <Text className="text-sm text-gray-400">
+          {order.settleTime}
         </Text>
       </View>
 
@@ -198,11 +207,11 @@ const DealerOrder: React.FC = () => {
       {/*  </Text>*/}
       {/*</View>*/}
 
-      <View className="flex justify-between items-center mb-1">
-        <Text className="text-sm text-gray-400">
-          {order.settleTime}
-        </Text>
-      </View>
+      {/*<View className="flex justify-between items-center mb-1">*/}
+      {/*  <Text className="text-sm text-gray-400">*/}
+      {/*    {order.settleTime}*/}
+      {/*  </Text>*/}
+      {/*</View>*/}
 
     </View>
   )