From 47bad23d9543b60a655cd9a569f409a0c9c1d478 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 22 Apr 2022 18:19:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/ViewModels/MainViewModel.cs       |  8 +++
 BBWY.Client/Views/Setting/ShopSetting.xaml    | 53 +++++++++++++++++++
 BBWY.Client/Views/Setting/ShopSetting.xaml.cs | 26 +++++++++
 BBWY.Client/Views/Setting/TeamSetting.xaml    | 14 +++++
 BBWY.Client/Views/Setting/TeamSetting.xaml.cs | 26 +++++++++
 .../Statistics/StatisticsBusiness.cs          |  1 -
 6 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 BBWY.Client/Views/Setting/ShopSetting.xaml
 create mode 100644 BBWY.Client/Views/Setting/ShopSetting.xaml.cs
 create mode 100644 BBWY.Client/Views/Setting/TeamSetting.xaml
 create mode 100644 BBWY.Client/Views/Setting/TeamSetting.xaml.cs

diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs
index 1e3a2aec..3524bec2 100644
--- a/BBWY.Client/ViewModels/MainViewModel.cs
+++ b/BBWY.Client/ViewModels/MainViewModel.cs
@@ -102,6 +102,14 @@ namespace BBWY.Client.ViewModels
                         new MenuModel(){ Name="货源管理",Url="/Views/Ware/WareManager.xaml" },
                         new MenuModel(){ Name="产品库存",Url="/Views/Ware/WareStock.xaml" }
                     }
+                },
+                new MenuModel()
+                {
+                    Name="设置",ChildList=new List<MenuModel>()
+                    {
+                        new MenuModel(){ Name="店铺设置",Url="/Views/Setting/ShopSetting.xaml" },
+                        new MenuModel(){ Name="团队配置",Url="/Views/Setting/TeamSetting.xaml" }
+                    }
                 }
             };
             Task.Factory.StartNew(Login);
diff --git a/BBWY.Client/Views/Setting/ShopSetting.xaml b/BBWY.Client/Views/Setting/ShopSetting.xaml
new file mode 100644
index 00000000..ba7a72d5
--- /dev/null
+++ b/BBWY.Client/Views/Setting/ShopSetting.xaml
@@ -0,0 +1,53 @@
+<Page x:Class="BBWY.Client.Views.Setting.ShopSetting"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:BBWY.Client.Views.Setting"
+      xmlns:b="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="ShopSetting">
+    <Page.Resources>
+        <Style x:Key="textblockPropertyStyle" TargetType="TextBlock">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="0,0,5,0"/>
+        </Style>
+        <Style x:Key="textboxValueStyle" TargetType="{x:Type b:BTextBox}">
+            <Setter Property="Width" Value="150"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="Height" Value="30"/>
+            <Setter Property="Background" Value="White"/>
+            <Setter Property="BorderBrush" Value="{StaticResource TextBox.BorderBrush}"/>
+        </Style>
+    </Page.Resources>
+    <Grid>
+        <Grid Margin="5,0" ShowGridLines="True">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition/>
+                <RowDefinition Height="50"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Text="管理密码" Style="{StaticResource textblockPropertyStyle}"/>
+            <b:BTextBox Grid.Column="1" Style="{StaticResource textboxValueStyle}"/>
+
+            <TextBlock Text="平台扣点" Style="{StaticResource textblockPropertyStyle}" Grid.Row="1"/>
+            <b:BTextBox Grid.Column="1" Style="{StaticResource textboxValueStyle}" Grid.Row="1"/>
+
+            <TextBlock Text="采购平台" Style="{StaticResource textblockPropertyStyle}" Grid.Row="2"/>
+        </Grid>
+    </Grid>
+</Page>
diff --git a/BBWY.Client/Views/Setting/ShopSetting.xaml.cs b/BBWY.Client/Views/Setting/ShopSetting.xaml.cs
new file mode 100644
index 00000000..2d54f04f
--- /dev/null
+++ b/BBWY.Client/Views/Setting/ShopSetting.xaml.cs
@@ -0,0 +1,26 @@
+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.Navigation;
+using System.Windows.Shapes;
+
+namespace BBWY.Client.Views.Setting
+{
+    /// <summary>
+    /// ShopSetting.xaml 的交互逻辑
+    /// </summary>
+    public partial class ShopSetting : Page
+    {
+        public ShopSetting()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BBWY.Client/Views/Setting/TeamSetting.xaml b/BBWY.Client/Views/Setting/TeamSetting.xaml
new file mode 100644
index 00000000..46416b07
--- /dev/null
+++ b/BBWY.Client/Views/Setting/TeamSetting.xaml
@@ -0,0 +1,14 @@
+<Page x:Class="BBWY.Client.Views.Setting.TeamSetting"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:BBWY.Client.Views.Setting"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="TeamSetting">
+
+    <Grid>
+        
+    </Grid>
+</Page>
diff --git a/BBWY.Client/Views/Setting/TeamSetting.xaml.cs b/BBWY.Client/Views/Setting/TeamSetting.xaml.cs
new file mode 100644
index 00000000..aca044ae
--- /dev/null
+++ b/BBWY.Client/Views/Setting/TeamSetting.xaml.cs
@@ -0,0 +1,26 @@
+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.Navigation;
+using System.Windows.Shapes;
+
+namespace BBWY.Client.Views.Setting
+{
+    /// <summary>
+    /// TeamSetting.xaml 的交互逻辑
+    /// </summary>
+    public partial class TeamSetting : Page
+    {
+        public TeamSetting()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
index 72058a44..c5fdc42f 100644
--- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
+++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
@@ -39,7 +39,6 @@ namespace BBWY.Server.Business
             return response;
         }
 
-
         public XingXinagSearchResponse XingXiangStatistics(XingXiangSearchOrderRequest xingXiangSearchOrderRequest)
         {
             var beginTime = xingXiangSearchOrderRequest.SearchDate.Date;