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 = () => { {/* 功能导航 */} - 分销工具 + 我的工具 { border: 'none' } as React.CSSProperties} > - navigateToPage('/dealer/orders/index')}> + navigateToPage('/dealer/capital/index')}> 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 = () => { - 结算月份:{order.month} + 结算电量:{order.degreePrice} - - 结算电量:{order.orderPrice || '0.00'} - - - - 结算金额:{order.settledPrice} + + + - 实发金额:{order.payPrice} + 单价:{order.price} + + + 税费:{order.rate} - 税费:{order.rate} + 实发金额:{order.payPrice} - 状态:{getStatusText(order.isSettled, order.isInvalid)} + 结算月份:{order.month} + + + + + + 结算状态:{getStatusText(order.isSettled, order.isInvalid)} + + + {order.settleTime} @@ -198,11 +207,11 @@ const DealerOrder: React.FC = () => { {/* */} {/**/} - - - {order.settleTime} - - + {/**/} + {/* */} + {/* {order.settleTime}*/} + {/* */} + {/**/} )