From 5ae8ab602a08cc924b6891f0d0cc67526cc09ea2 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Tue, 12 Jul 2022 19:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Views/Order/OrderList.xaml | 22 ++++++++++++++++------
 BBWY.Server.API/appsettings.json       | 12 ++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 27cc13ef..20033f03 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -375,18 +375,24 @@
                                                             <Run Text="{Binding ItemTotal}"/>
                                                     </TextBlock>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <TextBlock Text="SPU:"/>
-                                                        <c:BButton Content="{Binding ProductId}" Style="{StaticResource LinkButton}"
+                                                        <StackPanel Orientation="Vertical">
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <TextBlock Text="SPU:"/>
+                                                                <c:BButton Content="{Binding ProductId}" Style="{StaticResource LinkButton}"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
                                                                    CommandParameter="{Binding ProductId}"
                                                                    Margin=" 5,0,0,0"/>
-                                                    </StackPanel>
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <TextBlock Text="SKU:"/>
-                                                        <c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}"
+                                                            </StackPanel>
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <TextBlock Text="SKU:"/>
+                                                                <c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
                                                                    CommandParameter="{Binding Id}"
                                                                    Margin=" 5,0,0,0"/>
+                                                            </StackPanel>
+                                                        </StackPanel>
+                                                        <c:BButton Content="修改售后" Padding="5,0" Margin="5,0,0,0" Background="#EC808D"
+                                                                   Visibility="{Binding DataContext.OrderState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}},Converter={StaticResource objConverter},ConverterParameter=已完成:Visible:Collapsed}"/>
                                                     </StackPanel>
                                                     <TextBlock>
                                                             <Run Text="货号:" />
@@ -397,6 +403,10 @@
                                                            <Run Text="买家备注:" />
                                                            <Run Text="{Binding BuyerRemark}"/>
                                                     </TextBlock>
+                                                    <Border BorderBrush="#EC808D" BorderThickness="1" HorizontalAlignment="Left" Padding="5,2"
+                                                            Visibility="{Binding IsRefund,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}">
+                                                        <TextBlock Text="退货" Foreground="#EC808D"/>
+                                                    </Border>
                                                 </StackPanel>
 
                                                 <Border Grid.ColumnSpan="2" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"
diff --git a/BBWY.Server.API/appsettings.json b/BBWY.Server.API/appsettings.json
index e21adaf7..5eb9f7a7 100644
--- a/BBWY.Server.API/appsettings.json
+++ b/BBWY.Server.API/appsettings.json
@@ -33,6 +33,18 @@
       {
         "StoreId": "110023168",
         "StoreName": "广州亚一综合B仓6号库"
+      },
+      {
+        "StoreId": "110008191",
+        "StoreName": "广州公共平台仓4号库"
+      },
+      {
+        "StoreId": "110017918",
+        "StoreName": "北京公共平台仓26号库"
+      },
+      {
+        "StoreId": "110013947",
+        "StoreName": "西安亚一3CA仓2号库"
       }
     ]
   }