From dcda96e04c6756a1da630158005e55722c5cb40c Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 16 Jun 2023 20:28:51 +0800
Subject: [PATCH] =?UTF-8?q?C=E7=AB=AF=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8(web)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs            |  2 +-
 BBWY.Client/ViewModels/MainViewModel.cs |  4 +-
 BBWY.Client/Views/Web/Web.xaml          | 13 ++++++
 BBWY.Client/Views/Web/Web.xaml.cs       | 54 +++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 BBWY.Client/Views/Web/Web.xaml
 create mode 100644 BBWY.Client/Views/Web/Web.xaml.cs

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 963bd169..b665bde4 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -9,7 +9,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10126";
+            ClientVersion = "10127";
         }
 
         private User user;
diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs
index c36d866a..3250a6c1 100644
--- a/BBWY.Client/ViewModels/MainViewModel.cs
+++ b/BBWY.Client/ViewModels/MainViewModel.cs
@@ -175,8 +175,8 @@ namespace BBWY.Client.ViewModels
                         Name = "采购管理",
                         ChildList = new List<MenuModel>()
                     {
-                        new MenuModel(){ Name="采购列表",Url="/Views/BatchPurchase/BatchPurchaseOrderList.xaml" }
-                        //new MenuModel(){ Name="采购账单",Url="/Views/ServiceOrder/ServiceOrderList.xaml" }
+                        new MenuModel(){ Name="采购列表",Url="/Views/BatchPurchase/BatchPurchaseOrderList.xaml" },
+                        new MenuModel(){ Name="采购列表(Web)",Url="/Views/Web/Web.xaml" }
                     }
                     });
 
diff --git a/BBWY.Client/Views/Web/Web.xaml b/BBWY.Client/Views/Web/Web.xaml
new file mode 100644
index 00000000..7830700d
--- /dev/null
+++ b/BBWY.Client/Views/Web/Web.xaml
@@ -0,0 +1,13 @@
+<Page x:Class="BBWY.Client.Views.Web.Web"
+      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.Web"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="Web">
+    <Grid x:Name="grid">
+        
+    </Grid>
+</Page>
diff --git a/BBWY.Client/Views/Web/Web.xaml.cs b/BBWY.Client/Views/Web/Web.xaml.cs
new file mode 100644
index 00000000..5c35e579
--- /dev/null
+++ b/BBWY.Client/Views/Web/Web.xaml.cs
@@ -0,0 +1,54 @@
+using Microsoft.Extensions.DependencyInjection;
+using System.Windows.Controls;
+
+namespace BBWY.Client.Views.Web
+{
+    /// <summary>
+    /// Web.xaml 的交互逻辑
+    /// </summary>
+    public partial class Web : Page
+    {
+        private WebView2Manager w2m;
+        private GlobalContext globalContext;
+        private bool isNavigated = false;
+
+#if DEBUG
+        private string url = "http://192.168.1.4:8881/";
+#else
+        private string url= "http://bbwyweb.qiyue666.com";
+#endif
+
+        public Web()
+        {
+            InitializeComponent();
+            this.Loaded += Web_Loaded;
+        }
+
+        private void Web_Loaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+            var sp = (App.Current as App).ServiceProvider;
+            using (var s = sp.CreateScope())
+            {
+                globalContext = s.ServiceProvider.GetRequiredService<GlobalContext>();
+            }
+            using (var s = sp.CreateScope())
+            {
+                w2m = s.ServiceProvider.GetRequiredService<WebView2Manager>();
+            }
+            w2m.Init(globalContext.User.Shop.ShopId.ToString());
+            grid.Children.Add(w2m.wb2);
+
+            w2m.CoreWebView2InitializationCompleted = (e) =>
+            {
+                isNavigated = true;
+                // w2m.wb2.CoreWebView2.Navigate($"https://neworder.shop.jd.com/order/orderDetail?orderId={orderId}");
+                w2m.wb2.CoreWebView2.Navigate(url);
+            };
+            if(w2m.IsInitializationCompleted && !isNavigated)
+            {
+                w2m.wb2.CoreWebView2.Navigate(url);
+                isNavigated = true;
+            }
+        }
+    }
+}