Merge branch 'main' of github.com:jtt-fan/29WxOrder

This commit is contained in:
wule committed 2026-08-20 21:10:36 +08:00
commit fbe1b36062
7 files changed
+37 -18

No files matched your search

@@ -23,6 +23,8 @@ namespace _29WxOrderWpf.Converters
return "已完成";
case TaskStatus.ManuallyInterrupted:
return "已中断";
case TaskStatus.Fail:
return "执行失败";
}
}
return value?.ToString() ?? string.Empty;
@@ -187,6 +187,9 @@
<DataTrigger Binding="{Binding Status}" Value="3">
<Setter Property="Foreground" Value="#F56C6C" />
</DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="4">
<Setter Property="Foreground" Value="#F56C6C" />
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
@@ -109,7 +109,7 @@ public class OrderTaskDialogViewModel : BindableBaseEx, IDisposable
if (IsShowAll == true)
return true;
return task.Status == 1 || task.Status == 3;
return task.Status !=2;
}
/// <summary>任务列表</summary>
+12 -1
View File
@@ -91,10 +91,21 @@ namespace _29WxOrderWpf.Services
public async Task GetTaskStatus()
{
var tasks = await _kjdApi.GetWxTaskStatus();
if (tasks != null)
{
Tasks.Clear();
tasks.ForEach(a => Tasks.Add(a));
tasks.ForEach(a =>
{
if (!string.IsNullOrEmpty(a.TaskFailReason))
{
if (a.TaskFailReason.Contains("任务执行异常"))
{
a.Status = 4;
}
}
Tasks.Add(a);
});
}
}