feat(dealer): 更新订单展示字段并调整页面文案- 在订单模型中新增 degreePrice 和 price 字段- 调整订单详情页展示字段顺序及文案描述
- 将“分销订单”入口改为“收益明细”- 修改页面标题“分销工具”为“我的工具”- 注释掉原结算时间展示逻辑
This commit is contained in:
@@ -34,6 +34,10 @@ export interface ShopDealerOrder {
|
||||
thirdNickname: undefined,
|
||||
// 订单结算金额
|
||||
settledPrice?: string;
|
||||
// 换算成度
|
||||
degreePrice?: string;
|
||||
// 单价
|
||||
price?: string;
|
||||
// 订单支付金额
|
||||
payPrice?: string;
|
||||
// 订单是否失效(0未失效 1已失效)
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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>
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user