From bef2348cb832ebabb87561e5b4fb84b8757b0bbc Mon Sep 17 00:00:00 2001
From: feng <279202647@qq.com>
Date: Wed, 29 Jun 2022 18:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=AB=9E=E5=93=81SKU?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Coldairarrow.Entity/DTO/ItemLabelDto.cs   |  5 ++++
 .../齐越慧眼/MainWindow.xaml.cs           |  3 +++
 .../齐越慧眼/Models/ItemLabelDto.cs       |  5 ++++
 .../齐越慧眼/齐越慧眼/SkuWindow.xaml  | 22 ++++++++++++++++
 .../齐越慧眼/SkuWindow.xaml.cs            | 26 +++++++++++++++++++
 .../UserControls/BrowerControl.xaml.cs        |  8 ++++++
 6 files changed, 69 insertions(+)
 create mode 100644 客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml
 create mode 100644 客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml.cs

diff --git a/src/Coldairarrow.Entity/DTO/ItemLabelDto.cs b/src/Coldairarrow.Entity/DTO/ItemLabelDto.cs
index 55b42a1..bb92de5 100644
--- a/src/Coldairarrow.Entity/DTO/ItemLabelDto.cs
+++ b/src/Coldairarrow.Entity/DTO/ItemLabelDto.cs
@@ -27,6 +27,11 @@ namespace Coldairarrow.Entity.DTO
         /// 平台
         /// </summary>
         public ItemPlatform Platform { get; set; }
+
+        /// <summary>
+        /// 自己的SKU
+        /// </summary>
+        public string Sku { get; set; }
     }
 
     /// <summary>
diff --git a/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs b/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs
index 96a605d..22c9f89 100644
--- a/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs
+++ b/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs
@@ -52,6 +52,9 @@ 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/客户端/齐越慧眼/齐越慧眼/Models/ItemLabelDto.cs b/客户端/齐越慧眼/齐越慧眼/Models/ItemLabelDto.cs
index 21adec5..eaf620e 100644
--- a/客户端/齐越慧眼/齐越慧眼/Models/ItemLabelDto.cs
+++ b/客户端/齐越慧眼/齐越慧眼/Models/ItemLabelDto.cs
@@ -27,6 +27,11 @@ namespace 齐越慧眼.Models
         /// 平台
         /// </summary>
         public ItemPlatform Platform { get; set; }
+
+        /// <summary>
+        /// 自己的SKU
+        /// </summary>
+        public string Sku { get; set; }
     }
 
     /// <summary>
diff --git a/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml b/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml
new file mode 100644
index 0000000..2dc5602
--- /dev/null
+++ b/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml
@@ -0,0 +1,22 @@
+<hc:GlowWindow x:Class="齐越慧眼.SkuWindow"
+        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:齐越慧眼"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
+        mc:Ignorable="d" Background="White"
+        WindowStartupLocation="CenterScreen"
+        ActiveGlowColor="Transparent"
+        Title="竞品确认" Height="180" Width="350">
+    <Border Padding="20">
+        <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>
+            </DockPanel>
+
+            <Button Command="{Binding _Btn_OkClick}" 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
new file mode 100644
index 0000000..71baf7b
--- /dev/null
+++ b/客户端/齐越慧眼/齐越慧眼/SkuWindow.xaml.cs
@@ -0,0 +1,26 @@
+using HandyControl.Controls;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace 齐越慧眼
+{
+    /// <summary>
+    /// SkuWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class SkuWindow : GlowWindow
+    {
+        public SkuWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
index c2aeaf4..e0e564a 100644
--- a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
+++ b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
@@ -1020,6 +1020,14 @@ namespace 齐越慧眼.UserControls
             string img = data.img;
             string itemId = data.itemid;
 
+
+            //如果是竞品，则需要输入自己的SKU
+            if (type == 3)
+            { 
+                
+            }
+
+
             var result = ApiHelper.SetItemLabel(new Models.ItemLabelDto()
             {
                 Img = img,