diff --git a/TEMUKJD/WXForms/ProductForms/CloudGoodsFavoriteForm.cs b/TEMUKJD/WXForms/ProductForms/CloudGoodsFavoriteForm.cs index ca56b4a..0667c54 100644 --- a/TEMUKJD/WXForms/ProductForms/CloudGoodsFavoriteForm.cs +++ b/TEMUKJD/WXForms/ProductForms/CloudGoodsFavoriteForm.cs @@ -48,7 +48,7 @@ namespace TemuKJD.WXForms.ProductForms Disposed += (sender, e) => detection?.Cancel(); } - private void AdminCardCodeForm_Load(object sender, EventArgs e) + private async void AdminCardCodeForm_Load(object sender, EventArgs e) { pbLoading.Visible = false; ucSplitPage1.PageChange += UcSplitPage1_PageChange; @@ -70,12 +70,13 @@ namespace TemuKJD.WXForms.ProductForms { txt_title.Text = "连衣裙"; } - InitGroup(); + await InitGroup(); } - private void InitGroup() + private async Task InitGroup() { + await CloudGoodsService.GetGroups(); cm_group.DataSource = new List() { new UserFavoriteGroup { Id = 0, GroupName = "全部" } }.Concat(CloudGoodsService.UserGroups).ToList(); cm_group.ValueMember = "Id"; cm_group.DisplayMember = "GroupName"; diff --git a/TEMUKJD/WXForms/ProductForms/CloudGoodsForm.cs b/TEMUKJD/WXForms/ProductForms/CloudGoodsForm.cs index 6c7e724..97e1c87 100644 --- a/TEMUKJD/WXForms/ProductForms/CloudGoodsForm.cs +++ b/TEMUKJD/WXForms/ProductForms/CloudGoodsForm.cs @@ -43,9 +43,10 @@ namespace TemuKJD.WXForms.ProductForms this.VisibleChanged += CloudGoodsForm_VisibleChanged; } - private void CloudGoodsForm_VisibleChanged(object sender, EventArgs e) + private async void CloudGoodsForm_VisibleChanged(object sender, EventArgs e) { if (this.Visible == false) return; + await CloudGoodsService.GetGroups(BaseClass.UserName); cm_group.DataSource = new List() { new UserFavoriteGroup { Id = 0, GroupName = "全部" } }.Concat(CloudGoodsService.UserGroups).ToList(); cm_group.ValueMember = "Id"; cm_group.DisplayMember = "GroupName"; diff --git a/Work/Services/CloudGoodsService.cs b/Work/Services/CloudGoodsService.cs index 41152cb..6311e82 100644 --- a/Work/Services/CloudGoodsService.cs +++ b/Work/Services/CloudGoodsService.cs @@ -21,19 +21,15 @@ namespace Work.Services public static List UserGroups { get; private set; } static CloudGoodsService() { - GetGroups(BaseClass.UserName).ContinueWith(t => + _ = GetGroups(); + } + public static async Task> GetGroups() + { + if (UserGroups == null) { - if (t.IsFaulted) - { - return; - } - if (t.IsCanceled) - { - return; - } - - UserGroups = t.Result; - }); + UserGroups = await GetGroups(BaseClass.UserName); + } + return UserGroups; } public static async Task> GetGoods(GoodsSearchRequest request) {