10204

BBWY.Client/Models/Order/Order.cs

@@ -95,7 +95,7 @@ namespace BBWY.Client.Models
         }
 
         /// <summary>
-        /// 商家优惠金额
+        /// 平台优惠金额
         /// </summary>
         public decimal PreferentialAmount { get; set; }
 

BBWY.Client/Views/Order/OrderListControl.xaml

@@ -330,12 +330,14 @@
                                             <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
                                                 <StackPanel>
                                                     <TextBlock>
-                                                            <Run Text="货款金额"/>
+                                                            <Run Text="用户应付"/>
-                                                            <Run Text="{Binding OrderSellerPrice}"/>
+                                                            <!--<Run Text="{Binding OrderSellerPrice}"/>-->
+                                                        <Run Text="{Binding OrderPayment}"/>
                                                     </TextBlock>
                                                     <TextBlock>
-                                                            <Run Text="用户支付运费"/>
+                                                            <Run Text="平台补贴"/>
-                                                            <Run Text="{Binding FreightPrice}"/>
+                                                            <Run Text="{Binding PreferentialAmount}"/>
+                                                         <!--<Run Text="{Binding FreightPrice}"/>-->
                                                     </TextBlock>
                                                 </StackPanel>
                                             </ToolTip>