1.随机地址功能优化
2.商品随机主图遍框实现裂变
This commit is contained in:
1 parent
898a739b65
commit
3f6a91c164
10 files changed
+3523
-214
No files matched your search
@@ -37,7 +37,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
CheckBox chkSelectAll;
|
||||
ChanceProductConfig chanceProductConfig;
|
||||
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
|
||||
public ConcurrentList<ShopLoginInfo> lstAdminShopInfo { get; set; } = new ConcurrentList<ShopLoginInfo>();
|
||||
public ConcurrentList<ShopLoginInfo> lstAdminPddShopInfo { get; set; } = new ConcurrentList<ShopLoginInfo>();
|
||||
public ConcurrentList<ChanceProductResult> lstChanceProductResult { get; set; } = new ConcurrentList<ChanceProductResult>();
|
||||
public List<ChanceCateInfo> lstChanceCateInfo { get; set; } = new List<ChanceCateInfo>();
|
||||
/// <summary>
|
||||
@@ -50,8 +50,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
|
||||
private void PDDGetChanceProd_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (IsAuthorityUser)
|
||||
btnShowMyCollect.Visible = true;
|
||||
//if (IsAuthorityUser)
|
||||
// btnShowMyCollect.Visible = true;
|
||||
|
||||
this.panel2.Location = new Point(45, 55);
|
||||
this.panel2.Width = Math.Max(10, this.panel2.Parent.Width - 90);
|
||||
@@ -188,7 +188,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
}
|
||||
else
|
||||
{
|
||||
var list = lstAdminShopInfo.Where(s => s.LoginStatus == "登录成功").ToList();
|
||||
var list = lstAdminPddShopInfo.Where(s => s.LoginStatus == "登录成功").ToList();
|
||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||
{
|
||||
if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString()))
|
||||
@@ -223,14 +223,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
{
|
||||
this.pbShopLoading.Visible = true;
|
||||
this.dgvShop.Rows.Clear();
|
||||
lstAdminShopInfo.Clear();
|
||||
lstAdminPddShopInfo.Clear();
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pbShopLoading.Visible = true;
|
||||
this.dgvShop.Rows.Clear();
|
||||
lstAdminShopInfo.Clear();
|
||||
lstAdminPddShopInfo.Clear();
|
||||
}
|
||||
if (cancellationTokenSource == null || cancellationTokenSource.IsCancellationRequested)
|
||||
cancellationTokenSource = new CancellationTokenSource();
|
||||
@@ -238,10 +238,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
{
|
||||
int pageCount;
|
||||
var list = AdminGetServerShopLst(out pageCount, page);
|
||||
lstAdminShopInfo.AddRange(list);
|
||||
lstAdminPddShopInfo.AddRange(list);
|
||||
this.ucSplitPage1.TotalPage = pageCount;
|
||||
|
||||
foreach (var shop in lstAdminShopInfo)
|
||||
foreach (var shop in lstAdminPddShopInfo)
|
||||
{
|
||||
bool canUse = shop.LoginStatus2 == "国际版在线";
|
||||
Invoke(new Action(() =>
|
||||
@@ -332,7 +332,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
string loginName = dgvShop.Rows[e.RowIndex].Cells["colShopLoginName"].Value.ParseToString();
|
||||
string accountId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString();
|
||||
ShopLoginInfo shop = null;
|
||||
shop = lstAdminShopInfo.FirstOrDefault(s => s.LoginName == loginName && s.ShopId == accountId);
|
||||
shop = lstAdminPddShopInfo.FirstOrDefault(s => s.LoginName == loginName && s.ShopId == accountId);
|
||||
|
||||
switch (headerText)
|
||||
{
|
||||
@@ -784,7 +784,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
{
|
||||
try
|
||||
{
|
||||
var shopList = lstAdminShopInfo.Where(s => shopIds.Contains(s.ShopId) && s.LoginStatus == "登录成功").ToList();
|
||||
var shopList = lstAdminPddShopInfo.Where(s => shopIds.Contains(s.ShopId) && s.LoginStatus == "登录成功").ToList();
|
||||
if (shopList.Count == 0)
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
@@ -1143,8 +1143,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
|
||||
private void btnGetMyCollect_Click(object sender, EventArgs e)
|
||||
{
|
||||
WXUserCollectAuthProdListForm userCollectAuthProdListForm = new WXUserCollectAuthProdListForm();
|
||||
userCollectAuthProdListForm.ShowDialog();
|
||||
//WXUserCollectAuthProdListForm userCollectAuthProdListForm = new WXUserCollectAuthProdListForm();
|
||||
//userCollectAuthProdListForm.ShowDialog();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user