From e5e6b4c8a63c486a4c37c218072c313ff755ed47 Mon Sep 17 00:00:00 2001 From: sanji Date: Mon, 16 Oct 2023 14:00:32 +0800 Subject: [PATCH] 10190 --- BBWY.Client/GlobalContext.cs | 2 +- .../Views/Order/OrderCouponDetailWindow.xaml | 409 ++++++++++++------ 2 files changed, 274 insertions(+), 137 deletions(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index f20b18e8..9f2db2d1 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10189"; + ClientVersion = "10190"; } private User user; diff --git a/BBWY.Client/Views/Order/OrderCouponDetailWindow.xaml b/BBWY.Client/Views/Order/OrderCouponDetailWindow.xaml index 6d77a775..3085a42e 100644 --- a/BBWY.Client/Views/Order/OrderCouponDetailWindow.xaml +++ b/BBWY.Client/Views/Order/OrderCouponDetailWindow.xaml @@ -146,38 +146,38 @@ + BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -190,117 +190,254 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +