xiaofeng
/
JDHY
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

加入判断是否自己团队标记

master
feng 3 years ago
parent
f95d0c41d2
commit
cda15751d8
8 changed files with 73 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs
  2. 5
      src/Coldairarrow.Entity/DTO/ItemlabelInfoDto.cs
  3. 1
      客户端/齐越慧眼/WpfNoticeMsg/WpfNoticeMsg.csproj
  4. 14
      客户端/齐越慧眼/齐越慧眼.sln
  5. 11
      客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
  6. 5
      客户端/齐越慧眼/齐越慧眼/Models/ItemlabelInfoDto.cs
  7. 56
      客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
  8. 1
      客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj

13
src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs
View File

@ -97,12 +97,21 @@ namespace Coldairarrow.Business.HuiYan
select @select.Invoke(a, b);
//查询这边还需要添加 （Teamid筛选，或者HasFilter=True） 的二选一查询
var where = LinqHelper.True<ItemlabelInfoDto>().And(c => c.Platform == (int)platform && ids.Contains(c.GoodsId));
var where = LinqHelper.True<ItemlabelInfoDto>().And(c => c.Platform == (int)platform );
where = where.And(c => ids.Contains(c.GoodsId));
where = where.And(c => _operator.SonTeamList.Contains(c.TeamId));
where = where.And(c =>_operator.SonTeamList.Contains(c.TeamId) || c.HasFilter ==true);
where = where.Or(c => ids.Contains(c.GoodsId)&&c.HasFilter ==true);
var list = q.Where(where).ToListAsync().Result;
list.ForEach(item => {
if (_operator.SonTeamList.Contains(item.TeamId))
{
item.IsMyTeam = true;
}
});
return Success(list);
}

5
src/Coldairarrow.Entity/DTO/ItemlabelInfoDto.cs
View File

@ -29,6 +29,11 @@ namespace Coldairarrow.Entity.DTO
/// </summary>
public string GoodsUrl { get; set; }
/// <summary>
/// 是否自己团队
/// </summary>
public bool IsMyTeam { get; set; }
}
public class AlbbItemlabelInfoDto : albbitemlabels

1
客户端/齐越慧眼/WpfNoticeMsg/WpfNoticeMsg.csproj
View File

@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF>
<Configurations>Debug;Release;Location</Configurations>
</PropertyGroup>
<ItemGroup>

14
客户端/齐越慧眼/齐越慧眼.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30804.86
# Visual Studio Version 17
VisualStudioVersion = 17.2.32314.265
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "齐越慧眼", "齐越慧眼\齐越慧眼.csproj", "{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}"
EndProject
@ -11,6 +11,8 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Location|Any CPU = Location|Any CPU
Location|x64 = Location|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
@ -19,6 +21,10 @@ Global
{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}.Debug|Any CPU.Build.0 = Debug|x64
{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}.Debug|x64.ActiveCfg = Debug|x64
{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}.Debug|x64.Build.0 = Debug|x64
{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}.Location|Any CPU.ActiveCfg = Location|Any CPU
{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}.Location|Any CPU.Build.0 = Location|Any CPU
{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}.Location|x64.ActiveCfg = Location|x64
{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}.Location|x64.Build.0 = Location|x64
{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}.Release|Any CPU.Build.0 = Release|Any CPU
{BAF5933E-1C5F-4316-ABFF-D02263E4AC5A}.Release|x64.ActiveCfg = Release|x64
@ -27,6 +33,10 @@ Global
{5206154B-5317-4473-B818-8164CFCED06D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5206154B-5317-4473-B818-8164CFCED06D}.Debug|x64.ActiveCfg = Debug|Any CPU
{5206154B-5317-4473-B818-8164CFCED06D}.Debug|x64.Build.0 = Debug|Any CPU
{5206154B-5317-4473-B818-8164CFCED06D}.Location|Any CPU.ActiveCfg = Location|Any CPU
{5206154B-5317-4473-B818-8164CFCED06D}.Location|Any CPU.Build.0 = Location|Any CPU
{5206154B-5317-4473-B818-8164CFCED06D}.Location|x64.ActiveCfg = Location|Any CPU
{5206154B-5317-4473-B818-8164CFCED06D}.Location|x64.Build.0 = Location|Any CPU
{5206154B-5317-4473-B818-8164CFCED06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5206154B-5317-4473-B818-8164CFCED06D}.Release|Any CPU.Build.0 = Release|Any CPU
{5206154B-5317-4473-B818-8164CFCED06D}.Release|x64.ActiveCfg = Release|Any CPU

11
客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
View File

@ -12,10 +12,11 @@ namespace 齐越慧眼
{
public class ApiHelper
{
#if DEBUG
//public static string ApiBase { get; set; } = "http://localhost:5000";
public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com";
#if LOCATION
public static string ApiBase { get; set; } = "http://localhost:5000";
//public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com";
#else
public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com";
#endif
public static UserInfo LoginSystemUser { get; set; }
@ -29,10 +30,10 @@ namespace 齐越慧眼
get
{
#if DEBUG
#if LOCATION
//return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTE5NTA3MzgwMTkzMjAyMTc2IiwidGVhbUlkIjoiMTQzOTg5ODUxNDIyMDkxMjY0MCIsImV4cCI6MTY4ODExNzc4Nn0.xnkLLkvmMtNwS1u4SAEj-i6rwNZ1_prx_LmkGQEP47o";
return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTIwOTc1OTY0NzczODE0MjcyIiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTU1NDAzMTN9.baOvngaBp67FXWlVVlMLbNXXA2KSHzA0gGZYWrZ59uk";
return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxMDUzOTEzMzUwNjA2ODQ4IiwidGVhbUlkIjoiMTU2NzA0ODk5MjgwODc2NzQ4OCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTU3OTU4MTV9.JvCOsec7mh94--zFtV9egqhVLGNsfSUv_LH5natQtWo";
#endif
if (string.IsNullOrEmpty(jwtToken))

5
客户端/齐越慧眼/齐越慧眼/Models/ItemlabelInfoDto.cs
View File

@ -52,6 +52,11 @@ namespace 齐越慧眼.Models
/// 宝贝ID
/// </summary>
public string GoodsId { get; set; }
/// <summary>
/// 是否自己团队
/// </summary>
public bool IsMyTeam { get; set; }
}
public class itemlabels

56
客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
View File

@ -346,23 +346,27 @@ namespace 齐越慧眼.UserControls
{
foreach (var item in result.datas)
{
//判断是否团队过滤
if (item.IsFilter)
{
DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.myitemState').addClass(""falseBg"")");
DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.stateGraydiv').addClass(""divshow"")");
}
else
//不是自己团队只判断是否过滤
if (!item.IsMyTeam)
{
//判断是否集团过滤
if (item.HasFilter)
{
DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.myitemState').prepend('<div class=""smallfalseBg""></div>')");
DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.stateGraydiv').addClass(""divshow"")");
}
continue;
}
//判断是否团队过滤
if (item.IsFilter)
{
DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.myitemState').addClass(""falseBg"")");
DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.stateGraydiv').addClass(""divshow"")");
}
if (item.IsCompeting)
{
if ((int)DoJavaScript(@$"return $($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.stateYellow').length").result <= 0)
@ -448,13 +452,8 @@ namespace 齐越慧眼.UserControls
{
foreach (var item in result.datas)
{
//判断是否团队过滤
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"")");
}
else
//不是自己团队只判断是否过滤
if (!item.IsMyTeam)
{
//判断是否集团过滤
if (item.HasFilter)
@ -462,6 +461,14 @@ namespace 齐越慧眼.UserControls
DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.myitemState').prepend('<div class=""smallfalseBg""></div>')");
DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
}
continue;
}
//判断是否团队过滤
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"")");
}
@ -575,24 +582,25 @@ namespace 齐越慧眼.UserControls
if (result.isOk)
{
foreach (var item in result.datas)
{
//判断是否团队过滤
if (item.IsFilter)
{
DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.myitemState').addClass(""falseBg"")");
DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
}
else
{ //不是自己团队只判断是否过滤
if (!item.IsMyTeam)
{
//判断是否集团过滤
if (item.HasFilter)
{
DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.myitemState').prepend('<div class=""smallfalseBg""></div>')");
DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
}
}
continue;
}
//判断是否团队过滤
if (item.IsFilter)
{
DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.myitemState').addClass(""falseBg"")");
DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
}
//if (item.IsCompeting)
//{
// if ((int)BrowerControl.Main.DoJavaScript(@$"return $($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateYellow').length").result <= 0)

1
客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj
View File

@ -7,6 +7,7 @@
<Platforms>AnyCPU;x64</Platforms>
<Version>1.0.0.2</Version>
<ApplicationIcon>icon.ico</ApplicationIcon>
<Configurations>Debug;Release;Location</Configurations>
</PropertyGroup>
<ItemGroup>

Write Preview
Loading…
Cancel
Save