Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder
This commit is contained in:
commit
0b94c43fab
13 files changed
+600
-573
No files matched your search
@@ -106,10 +106,10 @@ namespace _29WxOrderWpf
|
||||
pddBuyerOrderReadCtrl.Visibility = Visibility.Visible;
|
||||
tbBuyerOrderReadCtrl.Visibility = Visibility.Visible;
|
||||
pddBuyerSelectCtrl.Visibility = Visibility.Visible;
|
||||
Task.Run(() =>
|
||||
Task.Run(async () =>
|
||||
{
|
||||
GetServerShop();
|
||||
StartTicketRealtimeMonitor();//启动工单监控
|
||||
GetServerShop();
|
||||
await StartTicketRealtimeMonitor();//启动工单监控
|
||||
GetShopSupplier(GlobalConfig.ShopLoginList.ToList());
|
||||
});
|
||||
Task.Run(() =>
|
||||
@@ -609,12 +609,12 @@ namespace _29WxOrderWpf
|
||||
_ticketMonitor.MarkAllRead();
|
||||
}
|
||||
|
||||
private void StartTicketRealtimeMonitor()
|
||||
private async Task StartTicketRealtimeMonitor()
|
||||
{
|
||||
try
|
||||
{
|
||||
var options = GetTicketOptions().Clone();
|
||||
_ticketMonitor.Start(options);
|
||||
await _ticketMonitor.Start(options);
|
||||
UpdateOrderSupportBadge();
|
||||
_ = LoadHistoricalTicketUnreadAsync(options);
|
||||
}
|
||||
@@ -637,7 +637,7 @@ namespace _29WxOrderWpf
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogSave.Add("TicketUnreadLoadError:" + ex);
|
||||
NLogger.Instance.Error("TicketUnreadLoadError:" + ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -652,9 +652,6 @@ namespace _29WxOrderWpf
|
||||
AppIds = GlobalConfig.ShopLoginList.Select(a => a.ShopId).ToList(),
|
||||
Orders = []
|
||||
};
|
||||
|
||||
|
||||
|
||||
//OrderSupportTicketView
|
||||
// .CreateDefaultOptions(BaseClass.UserName)
|
||||
// .Clone();
|
||||
|
||||
Reference in new issue
Block a user