From 66a5bcf4171e36207d667c6949c2e9d429deeb26 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Mon, 16 Oct 2023 01:59:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E6=83=A0=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/GlobalContext.cs | 2 +- .../Views/Order/OrderCouponDetailWindow.xaml | 348 +++++++++++++----- 2 files changed, 259 insertions(+), 91 deletions(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 2f3b9059..f20b18e8 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 = "10188"; + ClientVersion = "10189"; } private User user; diff --git a/BBWY.Client/Views/Order/OrderCouponDetailWindow.xaml b/BBWY.Client/Views/Order/OrderCouponDetailWindow.xaml index f8beea34..6d77a775 100644 --- a/BBWY.Client/Views/Order/OrderCouponDetailWindow.xaml +++ b/BBWY.Client/Views/Order/OrderCouponDetailWindow.xaml @@ -11,6 +11,7 @@ DataContext="{Binding OrderCouponDetailVM,Source={StaticResource Locator}}" MinButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed"> + @@ -21,124 +22,291 @@ - - - - - - - - + + - - - + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + +