1修复sku有特殊字符被截断的bug 2优化店铺进店/登录逻辑
This commit is contained in:
1 parent
91b1ea7dbc
commit
358bb5490e
21 files changed
+304
-171
No files matched your search
@@ -168,7 +168,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
Task.Run(() =>
|
||||
{
|
||||
int pageCount;
|
||||
var list = GetSelectProductList(out pageCount, page, ucSplitPage1.PageSize);
|
||||
decimal seconds;
|
||||
var list = GetSelectProductList(out pageCount, out seconds, page, ucSplitPage1.PageSize);
|
||||
lstAdminTemuDBProductSelect.AddRange(list);
|
||||
this.ucSplitPage1.TotalPage = pageCount;
|
||||
|
||||
@@ -225,6 +226,10 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
{
|
||||
ShowDgvImg();
|
||||
this.pbLoading.Visible = false;
|
||||
this.statusBar.lblTaskStatus.Text = "库存上传查询完毕";
|
||||
#if DEBUG
|
||||
this.statusBar.lblTaskStatus.Text += ",耗时:" + seconds;
|
||||
#endif
|
||||
}));
|
||||
});
|
||||
}
|
||||
@@ -283,10 +288,11 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
}
|
||||
|
||||
|
||||
public List<TemuDBProductSelect> GetSelectProductList(out int pageCount, int page = 1, int pageSize = 50)
|
||||
public List<TemuDBProductSelect> GetSelectProductList(out int pageCount, out decimal seconds, int page = 1, int pageSize = 50)
|
||||
{
|
||||
List<TemuDBProductSelect> list = new List<TemuDBProductSelect>();
|
||||
pageCount = 1;
|
||||
seconds = 0;
|
||||
|
||||
var url = BaseClass.BuildObjString("product_third/admin_get_user_select_product_list");
|
||||
if (ClientMode != EnumClientMode.Admin)
|
||||
@@ -332,6 +338,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
return new List<TemuDBProductSelect>();
|
||||
}
|
||||
|
||||
seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
|
||||
int count = BaseRegex.GetIntJson(ref html, "count");
|
||||
pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
|
||||
pageCount = Math.Max(pageCount, 1);
|
||||
|
||||
Reference in new issue
Block a user