diff --git a/BBWYB.Client/App.xaml.cs b/BBWYB.Client/App.xaml.cs index dcd5ecf..fed38fb 100644 --- a/BBWYB.Client/App.xaml.cs +++ b/BBWYB.Client/App.xaml.cs @@ -78,6 +78,7 @@ namespace BBWYB.Client serviceCollection.AddTransient(); serviceCollection.AddTransient(); serviceCollection.AddTransient(); + serviceCollection.AddTransient(); serviceCollection.AddMapper(new MappingProfile()); ServiceProvider = serviceCollection.BuildServiceProvider(); base.OnStartup(e); diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs index f249ce0..dbe2462 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 = "10023"; } private User user; @@ -94,23 +96,11 @@ namespace BBWYB.Client 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(); + UpdatePurchaseTaskWindow packTask = new(res.Data, originShopName, orderSku); + if (!packTask.IsClosed) + packTask.Show(); + 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..371957b 100644 --- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs +++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs @@ -130,70 +130,17 @@ namespace BBWYB.Client.ViewModels MessageBox.Show("打包任务,不存在或已被删除,请重新发起任务!"); return; } - UpdatePurchaseTaskWindow packTask = new(); - - ViewModelLocator view = new(); - var updatePackTask = view.UpdatePurchaseTask; - var show = updatePackTask.SearchSku(res.Data, OriginShopName, order); - - - if (!show) return; - - - updatePackTask.ReflashWindow = () => + UpdatePurchaseTaskWindow packTask = new(res.Data, OriginShopName, order, () => { Task.Factory.StartNew(() => LoadOrder(PageIndex)); - }; - - - packTask.ShowDialog(); - - } - - 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)); - - //}; - + }); + //var source = PresentationSource.FromVisual(packTask); + ////如 source 为空或 source.IsDisposed == true ，这表示您的 Window 已关闭。 + //if (source == null || source.IsDisposed) - packTask.ShowDialog(); + if (!packTask.IsClosed) + packTask.Show(); } diff --git a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs index 3dd47de..04763d1 100644 --- a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs +++ b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs @@ -15,10 +15,12 @@ using BBWYB.Client.Models.PackPurchaseTask; using BBWYB.Client.Views.PackPurchaseTask; using BBWYB.Client.Models.APIModel; using BBWYB.Client.Models.APIModel.Response.PackPurchaseTask; +using BBWYB.Client.Views.PackPurchaseTaska; +using CommunityToolkit.Mvvm.Messaging; namespace BBWYB.Client.ViewModels { - public class UpdatePurchaseTaskViewModel : BaseVM, IDenpendency + public class UpdatePurchaseTaskViewModel : BaseVM { #region 属性 @@ -425,7 +427,7 @@ namespace BBWYB.Client.ViewModels /// public bool SearchSku(PackTaskResponse obj, string shopname, OrderSku order) { - InitData(); + //InitData(); MarkMessage = obj.MarkMessage; //SkuPurchaseSchemeId = "416647656341573"; @@ -537,6 +539,8 @@ namespace BBWYB.Client.ViewModels string[] increateDatas = config.Increment1?.Split(','); bool isSelected = false; + + IncreateList = new ObservableCollection(); foreach (var item in increates) { isSelected = false; @@ -624,6 +628,22 @@ namespace BBWYB.Client.ViewModels IsNeedBarCode = Need.需要; IsNeedCertificateModel = Need.不需要; + + + bool isSelected; + IncreateList = new ObservableCollection(); + foreach (var item in increates) + { + isSelected = false; + App.Current.Dispatcher.Invoke(() => + { + IncreateList.Add(new IncreateModel + { + IncreateName = item, + IsSelected = isSelected + }); + }); + } } private void OpenSkuDetail(object param) { 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/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs index 0dbd6bd..715c23c 100644 --- a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs +++ b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs @@ -1,4 +1,11 @@ -using SJ.Controls; +using BBWYB.Client.Models; +using BBWYB.Client.Models.APIModel.Response.PackPurchaseTask; +using BBWYB.Client.ViewModels; +using BBWYB.Client.Views.Ware; +using BBWYB.Client.Views.WebB; +using CommunityToolkit.Mvvm.Messaging; +using CommunityToolkit.Mvvm.Messaging.Messages; +using SJ.Controls; using System; using System.Collections.Generic; using System.Linq; @@ -20,18 +27,53 @@ namespace BBWYB.Client.Views.PackPurchaseTaska /// public partial class UpdatePurchaseTaskWindow : BWindow { - public UpdatePurchaseTaskWindow() + public UpdatePurchaseTaskWindow(PackTaskResponse packTaskResponse, string shopname, OrderSku order, Action ReflashWindow = null) { InitializeComponent(); - this.Loaded += UpdatePurchaseTaskWindow_Loaded; + + var updatePackTask = (this.DataContext as UpdatePurchaseTaskViewModel); + var show = updatePackTask.SearchSku(packTaskResponse, shopname, order); + if (!show) { this.Close(); IsClosed = true; } + + if (ReflashWindow != null) + updatePackTask.ReflashWindow = ReflashWindow; + + + //this.Loaded += UpdatePurchaseTaskWindow_Loaded; + //this.Unloaded += UpdatePurchaseTaskWindow_Unloaded; + } + + + public bool IsClosed { get; set; }=false; + + + private void UpdatePurchaseTaskWindow_Unloaded(object sender, RoutedEventArgs e) + { + WeakReferenceMessenger.Default.Unregister(this); } private void UpdatePurchaseTaskWindow_Loaded(object sender, RoutedEventArgs e) { - - + WeakReferenceMessenger.Default.Register(this, (o, r) => + { + this.DialogResult = r.Value; + this.Close(); + }); + } + + + } + + + public class Message_BindingUpdatePurchaseTaskClose : ValueChangedMessage + { + public Message_BindingUpdatePurchaseTaskClose(bool 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) + { + } + } } diff --git a/BBWYB.Client/appsettings.json b/BBWYB.Client/appsettings.json index 61bc1a0..80bdfe4 100644 --- a/BBWYB.Client/appsettings.json +++ b/BBWYB.Client/appsettings.json @@ -1,5 +1,5 @@ { - //"BBWYApiHost": "http://localhost:5000", + // "BBWYApiHost": "http://localhost:5000", "BBWYApiHost": "http://bbwyb.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com", "BBWYCApiHost": "http://bbwytest.qiyue666.com",