From ef3e38d33b355eb5ab7d6b2f444270e234ad835b Mon Sep 17 00:00:00 2001
From: feng <279202647@qq.com>
Date: Wed, 29 Jun 2022 20:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=8F=90=E4=BA=A4=E7=AB=9E?=
 =?UTF-8?q?=E4=BB=B7=E5=90=8C=E6=97=B6=E5=8F=91=E5=B8=83=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../齐越慧眼/齐越慧眼/MainWindow.xaml.cs |  3 ---
 .../齐越慧眼/齐越慧眼/SkuWindow.xaml     |  4 ++--
 .../齐越慧眼/齐越慧眼/SkuWindow.xaml.cs  |  8 ++++++++
 .../UserControls/BrowerControl.xaml.cs           | 16 ++++++++++++----
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs b/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs
index 22c9f89..96a605d 100644
--- a/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs
+++ b/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs
@@ -52,9 +52,6 @@ namespace 齐越慧眼
         private void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
 
-            SkuWindow skuWindow = new SkuWindow();
-            skuWindow.Show();
-
             var u = ApiHelper.GetUserInfo();
 
             if (u.isOk)
diff --git a/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml b/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml
index 2dc5602..b330c13 100644
--- a/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml
+++ b/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml
@@ -13,10 +13,10 @@
         <StackPanel>
             <DockPanel Margin="0 20 0 0" VerticalAlignment="Center">
                 <TextBlock  VerticalAlignment="Center" Text="SKU："></TextBlock>
-                <hc:TextBox  VerticalAlignment="Center" hc:InfoElement.Placeholder="请输入我方需要对标的SKU"  Text="{Binding UserName}"></hc:TextBox>
+                <hc:TextBox  VerticalAlignment="Center" hc:InfoElement.Placeholder="请输入我方需要对标的SKU" Name="txtSku"></hc:TextBox>
             </DockPanel>
 
-            <Button Command="{Binding _Btn_OkClick}" Style="{StaticResource ButtonPrimary}" Margin="0 20 0 20" Content="确认" Width="200" Cursor="Hand"/>
+            <Button Click="Button_Click" Style="{StaticResource ButtonPrimary}" Margin="0 20 0 20" Content="确认" Width="200" Cursor="Hand"/>
         </StackPanel>
     </Border>
 </hc:GlowWindow>
diff --git a/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml.cs b/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml.cs
index 71baf7b..436d9e2 100644
--- a/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml.cs
+++ b/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml.cs
@@ -22,5 +22,13 @@ namespace 齐越慧眼
         {
             InitializeComponent();
         }
+
+        public string Sku;
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            Sku = txtSku.Text.Trim();
+            this.DialogResult = true;
+        }
     }
 }
diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
index e0e564a..266ec0b 100644
--- a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
+++ b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
@@ -1020,11 +1020,18 @@ namespace 齐越慧眼.UserControls
             string img = data.img;
             string itemId = data.itemid;
 
-
+            string sku = string.Empty;
             //如果是竞品，则需要输入自己的SKU
             if (type == 3)
-            { 
-                
+            {
+                SkuWindow skuWindow = new SkuWindow();
+                if (skuWindow.ShowDialog() != true)
+                {
+                    return false;
+                }
+
+                sku=skuWindow.Sku;
+
             }
 
 
@@ -1037,7 +1044,8 @@ namespace 齐越慧眼.UserControls
                 Sales = sales,
                 Status = (ItemLabelStatus)type,
                 Title = title,
-                CatId = MainWindow.Main.LastKeyWord
+                CatId = MainWindow.Main.LastKeyWord,
+                Sku = sku
             });
 
             if (result.isOk)