diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj index 21014f94..57758a1a 100644 --- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj +++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj @@ -21,6 +21,8 @@ + + @@ -225,6 +227,8 @@ + + diff --git a/BPASmartClient.CustomResource/Fonts/MT/iconfont.ttf b/BPASmartClient.CustomResource/Fonts/MT/iconfont.ttf new file mode 100644 index 00000000..a790bcd4 Binary files /dev/null and b/BPASmartClient.CustomResource/Fonts/MT/iconfont.ttf differ diff --git a/BPASmartClient.CustomResource/Fonts/naicha.ttf b/BPASmartClient.CustomResource/Fonts/naicha.ttf new file mode 100644 index 00000000..a790bcd4 Binary files /dev/null and b/BPASmartClient.CustomResource/Fonts/naicha.ttf differ diff --git a/BPASmartClient.CustomResource/Image/背景矢量/beijing.png b/BPASmartClient.CustomResource/Image/背景矢量/beijing.png new file mode 100644 index 00000000..15d57a81 Binary files /dev/null and b/BPASmartClient.CustomResource/Image/背景矢量/beijing.png differ diff --git a/BPASmartClient.CustomResource/Themes/MyStyle.xaml b/BPASmartClient.CustomResource/Themes/MyStyle.xaml index acdc7f56..d18e74e3 100644 --- a/BPASmartClient.CustomResource/Themes/MyStyle.xaml +++ b/BPASmartClient.CustomResource/Themes/MyStyle.xaml @@ -797,6 +797,16 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BPASmartClient.MilkWithTea/MainWindow.xaml.cs b/BPASmartClient.MilkWithTea/MainWindow.xaml.cs new file mode 100644 index 00000000..bb1932c3 --- /dev/null +++ b/BPASmartClient.MilkWithTea/MainWindow.xaml.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +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 BPASmartClient.MilkWithTea +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + + + + + + private void Grid_MouseDown(object sender, MouseButtonEventArgs e) + { + this.DragMove(); + } + } +} diff --git a/BPASmartClient.MilkWithTea/View/MainControlView.xaml b/BPASmartClient.MilkWithTea/View/MainControlView.xaml new file mode 100644 index 00000000..8fc6f50c --- /dev/null +++ b/BPASmartClient.MilkWithTea/View/MainControlView.xaml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BPASmartClient.MilkWithTea/View/MainControlView.xaml.cs b/BPASmartClient.MilkWithTea/View/MainControlView.xaml.cs new file mode 100644 index 00000000..54f586d6 --- /dev/null +++ b/BPASmartClient.MilkWithTea/View/MainControlView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +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 BPASmartClient.MilkWithTea.View +{ + /// + /// MainControlView.xaml 的交互逻辑 + /// + public partial class MainControlView : UserControl + { + public MainControlView() + { + InitializeComponent(); + } + } +} diff --git a/BPASmartClient.MorkT/View/DebugView.xaml b/BPASmartClient.MorkT/View/DebugView.xaml index 6fa9be9b..2dbc12ff 100644 --- a/BPASmartClient.MorkT/View/DebugView.xaml +++ b/BPASmartClient.MorkT/View/DebugView.xaml @@ -24,12 +24,12 @@ - - - + + + - @@ -91,15 +91,15 @@ - - - + + 冰淇淋