From 02af59850daff5605225c50632c4b86108241023 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Thu, 1 Jun 2023 14:50:56 +0800 Subject: [PATCH] 10022 --- BBWYB.Client/GlobalContext.cs | 6 ++- BBWYB.Client/ViewModels/MainViewModel.cs | 3 +- .../ViewModels/Order/OrderViewModel.cs | 46 ------------------- BBWYB.Client/Views/MainWindow.xaml.cs | 14 +----- BBWYB.Client/Views/WebB/WebB.xaml.cs | 41 +++++++++++++++-- 5 files changed, 46 insertions(+), 64 deletions(-) diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs index f249ce0..78984da 100644 --- a/BBWYB.Client/GlobalContext.cs +++ b/BBWYB.Client/GlobalContext.cs @@ -2,7 +2,9 @@ using BBWYB.Client.Models; using BBWYB.Client.ViewModels; using BBWYB.Client.Views.PackPurchaseTaska; +using BBWYB.Client.Views.WebB; using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Messaging; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using System.Collections.Generic; @@ -18,7 +20,7 @@ namespace BBWYB.Client { public GlobalContext() { - BBWYBApiVersion = "10021"; + BBWYBApiVersion = "10022"; } private User user; @@ -111,6 +113,8 @@ namespace BBWYB.Client packTask.ShowDialog(); + WeakReferenceMessenger.Default.Send(new Message_WebB_RefreshPack(null)); + // } #endregion } diff --git a/BBWYB.Client/ViewModels/MainViewModel.cs b/BBWYB.Client/ViewModels/MainViewModel.cs index 3bb51fe..0343adb 100644 --- a/BBWYB.Client/ViewModels/MainViewModel.cs +++ b/BBWYB.Client/ViewModels/MainViewModel.cs @@ -2,6 +2,7 @@ using BBWYB.Client.Models; using BBWYB.Client.Views; using BBWYB.Client.Views.SelectShop; +using BBWYB.Client.Views.WebB; using BBWYB.Common.Extensions; using BBWYB.Common.Models; using CommunityToolkit.Mvvm.Input; @@ -235,7 +236,7 @@ namespace BBWYB.Client.ViewModels vm.WareManager.Refresh(); if (SelectedMenuModel.Name == "订单列表Bata") { - WeakReferenceMessenger.Default.Send(new Message_Frame_Refresh(null)); + WeakReferenceMessenger.Default.Send(new Message_WebB_Refresh(null)); } } } diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs index 8bde918..14d9661 100644 --- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs +++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs @@ -151,52 +151,6 @@ namespace BBWYB.Client.ViewModels } - private void EditPackConfigForWeb(string belongSkuId, string orderId, string skuLogo, string skuTitle, string originShopName) - { - //var objList = (object[])obj; - //var OriginShopName = (string)objList[0]; - //OrderSku order = (OrderSku)objList[1]; - - var orderSku = new OrderSku() - { - OrderId = orderId, - BelongSkuId = belongSkuId, - Title = skuTitle, - Logo = skuLogo, - - }; - - var res = PackPurchaseTaskService.GetOrderTask(orderSku.BelongSkuId, orderSku.OrderId); - if (res == null || !res.Success) - { - MessageBox.Show("网络异常!查不到任务"); - return; - } - if (res.Data == null) - { - MessageBox.Show("打包任务,不存在或已被删除,请重新发起任务!"); - return; - } - UpdatePurchaseTaskWindow packTask = new(); - - ViewModelLocator view = new(); - var updatePackTask = view.UpdatePurchaseTask; - var show = updatePackTask.SearchSku(res.Data, originShopName, orderSku); - - - if (!show) return; - - //updatePackTask.ReflashWindow = () => - //{ - // Task.Factory.StartNew(() => LoadOrder(PageIndex)); - - //}; - - - packTask.ShowDialog(); - - } - /// /// /// diff --git a/BBWYB.Client/Views/MainWindow.xaml.cs b/BBWYB.Client/Views/MainWindow.xaml.cs index 9c28e5a..4522738 100644 --- a/BBWYB.Client/Views/MainWindow.xaml.cs +++ b/BBWYB.Client/Views/MainWindow.xaml.cs @@ -20,13 +20,7 @@ namespace BBWYB.Client.Views this.Height = SystemParameters.WorkArea.Size.Height * 0.7; this.Loaded += MainWindow_Loaded; - WeakReferenceMessenger.Default.Register(this, (o, x) => - { - this.Dispatcher.Invoke(() => - { - frame.Refresh(); - }); - }); + } private void MainWindow_Loaded(object sender, RoutedEventArgs e) @@ -76,10 +70,4 @@ namespace BBWYB.Client.Views } } - public class Message_Frame_Refresh : ValueChangedMessage - { - public Message_Frame_Refresh(object value) : base(value) - { - } - } } diff --git a/BBWYB.Client/Views/WebB/WebB.xaml.cs b/BBWYB.Client/Views/WebB/WebB.xaml.cs index fd34972..ad34426 100644 --- a/BBWYB.Client/Views/WebB/WebB.xaml.cs +++ b/BBWYB.Client/Views/WebB/WebB.xaml.cs @@ -1,4 +1,6 @@ using BBWYB.Client.APIServices; +using CommunityToolkit.Mvvm.Messaging; +using CommunityToolkit.Mvvm.Messaging.Messages; using Microsoft.Extensions.DependencyInjection; using System.Collections.Generic; using System.IO; @@ -26,6 +28,22 @@ namespace BBWYB.Client.Views.WebB InitializeComponent(); this.Loaded += WebB_Loaded; this.Unloaded += WebB_Unloaded; + + WeakReferenceMessenger.Default.Register(this, (o, x) => + { + this.Dispatcher.Invoke(() => + { + _ = w2m.wb2.ExecuteScriptAsync("window.location.reload();"); + }); + }); + + WeakReferenceMessenger.Default.Register(this, (o, x) => + { + this.Dispatcher.Invoke(() => + { + _ = w2m.wb2.ExecuteScriptAsync("window.BBWY_B_WebContex('PACK_CONFIG_SUCCESS');"); + }); + }); } private void WebB_Unloaded(object sender, RoutedEventArgs e) @@ -33,6 +51,8 @@ namespace BBWYB.Client.Views.WebB grid.Children.Remove(w2m.wb2); //w2m.wb2.Dispose(); w2m.Close(); + WeakReferenceMessenger.Default.UnregisterAll(this); + } private void WebB_Loaded(object sender, System.Windows.RoutedEventArgs e) @@ -47,12 +67,12 @@ namespace BBWYB.Client.Views.WebB } #if DEBUG - var url = "http://192.168.1.2:8080"; + var url = "http://192.168.1.2:8080"; //var url = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "s.html"); #else - var url = "http://qtbbwy.qiyue666.com"; + var url = "http://qtbbwy.qiyue666.com"; #endif - + //var url = "http://qtbbwy.qiyue666.com"; w2m.CoreWebView2InitializationCompleted = (e) => { w2m.wb2.CoreWebView2.AddHostObjectToScript("qtbbwybContext", this.globalContext); @@ -75,4 +95,19 @@ namespace BBWYB.Client.Views.WebB } } } + + + public class Message_WebB_Refresh : ValueChangedMessage + { + public Message_WebB_Refresh(object value) : base(value) + { + } + } + + public class Message_WebB_RefreshPack : ValueChangedMessage + { + public Message_WebB_RefreshPack(object value) : base(value) + { + } + } }