1展示店铺运费收益及相关计算 2优化部分数据展示

This commit is contained in:
wule committed 2026-09-15 14:27:21 +08:00
1 parent 1b634434c2
commit 9ce8c6e6bc
5 files changed
+76 -51

No files matched your search

@@ -2202,7 +2202,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
int index = 0;
foreach (var tmpOrderItem in tmpOrderItems)
{
if (tmpOrderItem.order_id == "3738534855500515072")
if (tmpOrderItem.order_id == "3739068430223324416")
{
}
@@ -2237,7 +2237,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
continue;
}
MainWindow.Instance.orderListCtrl.GetOrder(tmpOrderItem.order_id);
await Task.Run(() => { MainWindow.Instance.orderListCtrl.GetOrder(tmpOrderItem.order_id); });
oms_wei_order_info order = null;
Dispatcher.Invoke(new Action(() => { order = GlobalConfig.lstOrder.FirstOrDefault(oi => oi.order_id == tmpOrderItem.order_id); }));
@@ -2353,7 +2354,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
BaseMsgWindow.ShowAnimateMessage("买手退款信息更新成功" + orderItem.order_id, "Msg", 3);
isSimPddAfterSaleSuccess = true;
Thread.Sleep(Randomx.GetId(10000, 12001));
await Task.Run(() => { Thread.Sleep(Randomx.GetId(10000, 12001)); });
}
else
{
@@ -2368,7 +2369,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
BaseMsgWindow.ShowAnimateMessage("买手退款信息更新成功", "Msg", 3);
isSimPddAfterSaleSuccess = true;
Thread.Sleep(Randomx.GetId(10000, 12001));
await Task.Run(() => { Thread.Sleep(Randomx.GetId(10000, 12001)); });
}
else
{
@@ -207,6 +207,7 @@
<wpf:TitleContent Title="发货时间:" Visibility="{Binding ItemOrder.ship_done_time_visibility}">
<uc:UcWaterMarkTextBox1
d:Text="00-01-01 01:01:01"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
@@ -217,6 +218,7 @@
<wpf:TitleContent Title="退款时间:" Visibility="{Binding RefundTimeVisibility}">
<uc:UcWaterMarkTextBox1
d:Text="00-01-01 01:01:01"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
@@ -245,6 +247,16 @@
WaterMark="售价" />
</wpf:TitleContent>
<wpf:TitleContent Title="店铺运费:">
<uc:UcWaterMarkTextBox1
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding PostagePriceStr}"
TextWrapping="Wrap"
WaterMark="店铺运费" />
</wpf:TitleContent>
<wpf:TitleContent Title="平台优惠:">
<uc:UcWaterMarkTextBox1
d:Text="¥100.00"
@@ -256,24 +268,25 @@
WaterMark="平台优惠" />
</wpf:TitleContent>
<wpf:TitleContent Title="进价:" Visibility="{Binding purchase_price_visibility}">
<wpf:TitleContent Title="进价:" Visibility="{Binding PurchasePriceVisibility}">
<uc:UcWaterMarkTextBox1
d:Text="¥100.00"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding purchase_price_str}"
Text="{Binding PurchasePriceStr}"
TextWrapping="Wrap"
Visibility="{Binding purchase_price_visibility}"
Visibility="{Binding PurchasePriceVisibility}"
WaterMark="进价" />
</wpf:TitleContent>
<wpf:TitleContent Title="运费:" Visibility="{Binding FreightVisibility}">
<uc:UcWaterMarkTextBox1
d:Text="¥100.00"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding freight_str}"
Text="{Binding FreightStr}"
TextWrapping="Wrap"
Visibility="{Binding FreightVisibility}"
WaterMark="运费" />
@@ -565,15 +578,10 @@
Orientation="Vertical"
VerticalSpacing="2">
<!-- 状态标签行(原 Row 1-2) -->
<WrapPanel
x:Name="wpTransitBuyerRefundStatus"
HorizontalAlignment="Center"
VerticalAlignment="Center" />
<!-- 状态标签行 -->
<WrapPanel
x:Name="wpTransitWaybillStatus"
Margin="0,0,0,4"
Margin="0,0,0,2"
HorizontalAlignment="Center">
<Border
x:Name="borderBuyStatas"
@@ -698,7 +706,7 @@
<WrapPanel Orientation="Horizontal">
<uc:UcWaterMarkTextBox1
x:Name="txtTransitOrderNumStr"
Margin="-2,2"
Margin="-2,0"
Padding="0"
VerticalAlignment="Top"
Background="Transparent"
@@ -736,7 +744,7 @@
Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
<uc:UcWaterMarkTextBox1
x:Name="txtOutOrderTimeQualifiedStr"
Margin="-2,2"
Margin="-2,0"
Padding="0"
VerticalAlignment="Top"
Background="Transparent"
@@ -754,7 +762,7 @@
Foreground="{StaticResource PageOkBrush}"
Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
<uc:UcWaterMarkTextBox1
Margin="-2,2"
Margin="-2,0"
Padding="0"
VerticalAlignment="Top"
Background="Transparent"
@@ -784,7 +792,7 @@
<!-- 仓库物流 -->
<wpf:TitleContent Title="仓库物流:" Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
<uc:UcWaterMarkTextBox1
Margin="-2,2"
Margin="-2,0"
Padding="0"
VerticalAlignment="Top"
Background="Transparent"
@@ -1170,7 +1178,7 @@
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}">
Visibility="{Binding ElementName=txtDirectBuyerRefundAddress, Path=Visibility}">
<Path
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}"
@@ -652,13 +652,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
//wpBuyOrderId.Visibility = Visibility.Collapsed;
//wpBuyTime.Visibility = Visibility.Collapsed;
//wpTransitWaybillStatus.Visibility = Visibility.Collapsed;
//wpTransitBuyerRefundStatus.Visibility = Visibility.Collapsed;
wpBuyAccount.Opacity = 0.5;
wpBuyOrderId.Opacity = 0.5;
wpBuyTime.Opacity = 0.5;
wpTransitWaybillStatus.Opacity = 0.5;
wpTransitBuyerRefundStatus.Opacity = 0.5;
}
}
}