From 72dfbb36a1ce0d847af10dba58073120b81c55b5 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 16 Feb 2022 18:00:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88=E8=AE=A2=E5=8D=95=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/ChoosePurchaseSchemeViewModel.cs    |  6 ++-
 .../ViewModels/Order/OrderListViewModel.cs    |  2 +-
 BBWY.Client/Views/Purchase/1688Purchase.xaml  | 50 +++++++++++++++++++
 .../Views/Purchase/1688Purchase.xaml.cs       | 15 ++++++
 4 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 BBWY.Client/Views/Purchase/1688Purchase.xaml
 create mode 100644 BBWY.Client/Views/Purchase/1688Purchase.xaml.cs

diff --git a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
index 834194d4..a417ea42 100644
--- a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
@@ -17,6 +17,7 @@ namespace BBWY.Client.ViewModels
         private BindingPurchaseProductViewModel bindingPurchaseProduct;
         public string SkuId { get; set; }
         public string SkuName { get; set; }
+        public string OrderId { get; set; }
         public IList<PurchaseScheme> PurchaseSchemeList { get; set; }
 
 
@@ -41,12 +42,13 @@ namespace BBWY.Client.ViewModels
 
         protected override void Unload()
         {
-            this.SkuId = this.SkuName = string.Empty;
+            this.OrderId = this.SkuId = this.SkuName = string.Empty;
             PurchaseSchemeList.Clear();
         }
 
-        public void SetData(string skuId, string skuName)
+        public void SetData(string orderId, string skuId, string skuName)
         {
+            this.OrderId = orderId;
             this.SkuId = skuId;
             this.SkuName = skuName;
         }
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 415b364e..82690aba 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -257,7 +257,7 @@ namespace BBWY.Client.ViewModels
                 }
                 else if (chooseDFType.DFType == DFType.在线采购)
                 {
-                    choosePurchaseSchemeViewModel.SetData(order.ItemList[0].Id, order.ItemList[0].Title);
+                    choosePurchaseSchemeViewModel.SetData(order.Id, order.ItemList[0].Id, order.ItemList[0].Title);
                     var choosePurchaseScheme = new ChoosePurchaseScheme();
                     choosePurchaseScheme.ShowDialog();
                 }
diff --git a/BBWY.Client/Views/Purchase/1688Purchase.xaml b/BBWY.Client/Views/Purchase/1688Purchase.xaml
new file mode 100644
index 00000000..6b02d674
--- /dev/null
+++ b/BBWY.Client/Views/Purchase/1688Purchase.xaml
@@ -0,0 +1,50 @@
+<c:BWindow x:Class="BBWY.Client.Views.Purchase._1688Purchase"
+           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+           xmlns:local="clr-namespace:BBWY.Client.Views.Purchase"
+           xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+           mc:Ignorable="d"
+           Title="提交订单" Height="450" Width="800"
+           Style="{StaticResource bwstyle}"
+           MinButtonVisibility="Collapsed"
+           MaxButtonVisibility="Collapsed">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="30"/>
+            <RowDefinition/>
+            <RowDefinition Height="60"/>
+            <RowDefinition Height="100"/>
+            <RowDefinition Height="40"/>
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
+                Background="{StaticResource Border.Background}">
+            <TextBlock Text="提交订单" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+
+        <Grid Grid.Row="2" Margin="5,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.8*"/>
+                <ColumnDefinition Width="0.2*"/>
+            </Grid.ColumnDefinitions>
+            <c:BTextBox Text="留言信息" 
+                        WaterRemark="留言信息"
+                        VerticalAlignment="Stretch" Height="Auto" VerticalContentAlignment="Top" Padding="3,5,0,0"
+                        TextWrapping="Wrap"/>
+        </Grid>
+
+        <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Row="3" Margin="5,0">
+            <c:BTextBox Text="收货人" WaterRemark="收货人"/>
+            <c:BTextBox Text="福建泉州鲤城区浮桥街龙景华庭B栋1008" Margin="0,2.5" Width="300" WaterRemark="地址"/>
+            <c:BTextBox Text="18996038927" WaterRemark="电话"/>
+        </StackPanel>
+
+        <TextBlock Grid.Row="4" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="16">
+            <Run Text="应付总额(含运费)"/>
+            <Run Text="163.3" Foreground="Pink"/>
+            <Run Text="元"/>
+        </TextBlock>
+        <c:BButton Content="提交订单" Grid.Row="4" Width="80" HorizontalAlignment="Right" Margin="0,0,8,0"/>
+    </Grid>
+</c:BWindow>
diff --git a/BBWY.Client/Views/Purchase/1688Purchase.xaml.cs b/BBWY.Client/Views/Purchase/1688Purchase.xaml.cs
new file mode 100644
index 00000000..17d1e80f
--- /dev/null
+++ b/BBWY.Client/Views/Purchase/1688Purchase.xaml.cs
@@ -0,0 +1,15 @@
+using BBWY.Controls;
+
+namespace BBWY.Client.Views.Purchase
+{
+    /// <summary>
+    /// _1688Purchase.xaml 的交互逻辑
+    /// </summary>
+    public partial class _1688Purchase : BWindow
+    {
+        public _1688Purchase()
+        {
+            InitializeComponent();
+        }
+    }
+}