diff --git a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs index 7445937..155a314 100644 --- a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs @@ -99,8 +99,18 @@ namespace Coldairarrow.Business.HuiYan //查询这边还需要添加 (Teamid筛选,或者HasFilter=True) 的二选一查询 var where = LinqHelper.True().And(c => c.Platform == (int)platform ); where = where.And(c => ids.Contains(c.GoodsId)); + + _operator.SonTeamList.Add(_operator.TeamId); + where = where.And(c => _operator.SonTeamList.Contains(c.TeamId)); + //选品部 + if (_operator.SonTeamList.Contains("1620343827472584704")) + { + where = where.Or(c => ids.Contains(c.GoodsId) && c.IsAdded == true); + } + + where = where.Or(c => ids.Contains(c.GoodsId)&&c.HasFilter ==true); var list = q.Where(where).ToListAsync().Result; diff --git a/src/Coldairarrow.Entity/HuiYan/itemlabels.cs b/src/Coldairarrow.Entity/HuiYan/itemlabels.cs index 6abd317..ededf77 100644 --- a/src/Coldairarrow.Entity/HuiYan/itemlabels.cs +++ b/src/Coldairarrow.Entity/HuiYan/itemlabels.cs @@ -53,7 +53,7 @@ namespace Coldairarrow.Entity.HuiYan public Boolean IsCompeting { get; set; } /// - /// 是否加入产品库 + /// 是否加入产品库(海选) /// public Boolean IsAdded { get; set; } diff --git a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs index 767e77e..e3d7b29 100644 --- a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs +++ b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs @@ -31,9 +31,15 @@ namespace 齐越慧眼 { #if LOCATION - //return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTE5NTA3MzgwMTkzMjAyMTc2IiwidGVhbUlkIjoiMTQzOTg5ODUxNDIyMDkxMjY0MCIsImV4cCI6MTY4ODExNzc4Nn0.xnkLLkvmMtNwS1u4SAEj-i6rwNZ1_prx_LmkGQEP47o"; + //测试001 + return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzAwMDEzMTg2NjgyODgwIiwidGVhbUlkIjoiMTU0NzM5OTExMTU1NTE1ODAxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQzODI3NDcyNTg0NzA0IiwiZXhwIjoxNzA3ODExMjQxfQ.Vw_BhiUJnT_Sxm7QzbD2-lSguQI_pA9BDbTcQQ-sfQo"; - return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjAxODUxNDAyMDAxMzIxOTg0IiwidGVhbUlkIjoiMTU2NzA0ODk5MjgwODc2NzQ4OCIsInNvblRlYW1JZHMiOiIxNTY3MDQ4OTkyODA4NzY3NDg4IiwiZXhwIjoxNzAyMjgyMjUwfQ.nd11fJb99Ous6YuS10oodyFwVOVstEJ87JE6z-NGswU"; + //叶秋 + //return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTgyMjA1NjAwOTk2MDAzODQwIiwidGVhbUlkIjoiMTUxNzczNzYwNDQyNDkyOTI4MCIsInNvblRlYW1JZHMiOiIxNTE3NzM3NjA0NDI0OTI5MjgwIiwiZXhwIjoxNzA3Mjg0MDQxfQ.gXfsdhGTUg1ZPhSGi5j9xG8UwAk6IS4D0oIUeRgLgas"; + + //芒格 + //return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTgwNzM5MTY4NTg0MDc3MzEyIiwidGVhbUlkIjoiMTYyMDM0MzgyNzQ3MjU4NDcwNCIsInNvblRlYW1JZHMiOiIxNjIwMzQzODI3NDcyNTg0NzA0IiwiZXhwIjoxNzA3Mjg0MDc1fQ.ERRSAbj9t1cvRPTbbqTsNoHd2ErclxK8tU_4w3gb_JI"; + // return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM5OTA0MDUwNzc3NjkwMTEyIiwiZXhwIjoxNzA3ODEwNTUxfQ.wzpfkvDy_GTrbBW4urJJ3mqJHbsdWlwL8eWMhXc-3zg"; #endif return jwtToken; } diff --git a/客户端/齐越慧眼/齐越慧眼/Models/ItemLabelDto.cs b/客户端/齐越慧眼/齐越慧眼/Models/ItemLabelDto.cs index 9bd5f98..809cddd 100644 --- a/客户端/齐越慧眼/齐越慧眼/Models/ItemLabelDto.cs +++ b/客户端/齐越慧眼/齐越慧眼/Models/ItemLabelDto.cs @@ -71,7 +71,7 @@ namespace 齐越慧眼.Models /// Filter = 1, /// - /// 添加产品库 + /// 添加产品库(海选) /// Added = 2, /// diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs index d81d430..d9b587f 100644 --- a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs @@ -391,6 +391,14 @@ namespace 齐越慧眼.UserControls DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.stateGraydiv').addClass(""divshow"")"); } + + //选品团海选 + if (item.IsAdded) + { + DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.myitemState').prepend(""smallpopBg"")"); + DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.stateGraydiv').addClass(""divshow"")"); + } + continue; } @@ -422,6 +430,8 @@ namespace 齐越慧眼.UserControls DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.myitemState').addClass(""popBg"")"); DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.stateGraydiv').addClass(""divshow"")"); } + + //smallpopBg } } } @@ -496,11 +506,20 @@ namespace 齐越慧眼.UserControls DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.myitemState').prepend('
')"); DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")"); } + + + + //选品团海选 + if (item.IsAdded) + { + DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.myitemState').prepend('
')"); + DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")"); + } continue; } - //判断是否团队过滤 - if (item.IsFilter) + //判断是否团队过滤 + if (item.IsFilter) { DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.myitemState').addClass(""falseBg"")"); DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")"); @@ -628,6 +647,12 @@ namespace 齐越慧眼.UserControls DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")"); } + //选品团海选 + if (item.IsAdded) + { + DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.myitemState').prepend('
')"); + DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")"); + } continue; } //判断是否团队过滤 @@ -1052,6 +1077,17 @@ for(var i=0;i