feat(dealer): 更新订单展示字段并调整页面文案- 在订单模型中新增 degreePrice 和 price 字段- 调整订单详情页展示字段顺序及文案描述
- 将“分销订单”入口改为“收益明细”- 修改页面标题“分销工具”为“我的工具”- 注释掉原结算时间展示逻辑
This commit is contained in:
@@ -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