diff --git a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs index 2ac4182..df6cf27 100644 --- a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs @@ -102,6 +102,7 @@ namespace Coldairarrow.Business.HuiYan public AjaxResult SetItemLabel(ItemLabelDto model) { + bool isAddItem = false; var item= Db.GetIQueryable().FirstOrDefault(c => c.GoodsId == model.ItemId); if (item == null) @@ -121,6 +122,8 @@ namespace Coldairarrow.Business.HuiYan if (row <= 0) return Error("添加失败！"); + + isAddItem = true; } var where = LinqHelper.True().And(c => c.ItemsId == item.Id); @@ -128,13 +131,13 @@ namespace Coldairarrow.Business.HuiYan //团队筛选 //where = where.And(c=>c.TeamId==""); + var label = GetIQueryable().FirstOrDefault(where); var result = Db.RunTransaction(() => { int row = 0; bool hasAdded = false; - var label = GetIQueryable().FirstOrDefault(where); //新增 if (label == null) { @@ -159,7 +162,6 @@ namespace Coldairarrow.Business.HuiYan break; case 2: label.IsAdded = true; - label.IsScreening = true; break; case 3: label.IsCompeting = true; @@ -174,7 +176,6 @@ namespace Coldairarrow.Business.HuiYan { hasAdded = label.IsAdded; - //更新状态 row = Db.Update(c => c.Id == label.Id, (data) => { @@ -193,7 +194,6 @@ namespace Coldairarrow.Business.HuiYan case 2: //加入产品库同时也勾选筛选 data.IsAdded = true; - data.IsScreening = true; break; case 3: data.IsCompeting = true; @@ -204,9 +204,8 @@ namespace Coldairarrow.Business.HuiYan throw new Exception("标签设置失败！"); } - //设置集团过滤 - if (model.Status == 1) + if (model.Status == 1&& !isAddItem) { Db.Update(c => c.Id == item.Id, (i) => { i.HasFilter = true; }); } @@ -228,11 +227,11 @@ namespace Coldairarrow.Business.HuiYan throw new Exception("添加产品库失败！"); } } - }); if (result.Success) return Success("操作成功！"); + return Error(result.ex.Message); } } diff --git a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs index 7a4f99d..7145746 100644 --- a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs @@ -90,9 +90,10 @@ namespace Coldairarrow.Business.HuiYan //查询对应状态 var where = LinqHelper.True().And(c => c.State == int.Parse(search.Keyword)); + where = where.And(c => c.TeamId == _operator.TeamId); - var list = q.Where(where).GetPageResultAsync(input).Result; + var list = q.Where(where).GetPageResultAsync(input).Result; return list; @@ -116,7 +117,7 @@ namespace Coldairarrow.Business.HuiYan GoodsId = model.GoodsId, CreateTime = DateTime.Now, - CreatorId =_operator.UserId, + CreatorId = _operator.UserId, Deleted = false, HasFilter = false, Id = IdHelper.GetId(), @@ -143,7 +144,7 @@ namespace Coldairarrow.Business.HuiYan Id = IdHelper.GetId(), TeamId = _operator.TeamId, - UserId =_operator.UserId, + UserId = _operator.UserId, Price = model.Price, ItemImg = model.ItemImg, @@ -168,12 +169,13 @@ namespace Coldairarrow.Business.HuiYan model.RivalGoodsId = Regex.Match(model.RivalGoodsId + "&", "id=(.*?)&").Groups[1].Value; } } - int row= Db.Update(c=>c.Id==model.Id,(item)=> { + int row = Db.Update(c => c.Id == model.Id, (item) => + { item.ExtensionJson = Newtonsoft.Json.JsonConvert.SerializeObject(model.Extensions); item.RivalGoodsId = model.RivalGoodsId; item.RivalPLCount = model.RivalPLCount; item.RivalPrice = model.RivalPrice; - item.RivalTitle = model.RivalTitle; + item.RivalTitle = model.RivalTitle; }); if (row > 0) @@ -182,7 +184,7 @@ namespace Coldairarrow.Business.HuiYan } - public AjaxResult SetState(string id,int state) + public AjaxResult SetState(string id, int state) { //删除 if (state == 4) @@ -190,7 +192,8 @@ namespace Coldairarrow.Business.HuiYan return DeleteItem(id); } - int row = Db.Update(c => c.Id == id, (item) => { + int row = Db.Update(c => c.Id == id, (item) => + { item.State = state; }); @@ -202,9 +205,10 @@ namespace Coldairarrow.Business.HuiYan public AjaxResult DeleteItem(string id) { - var titem = Db.GetIQueryable().FirstOrDefault(c => c.Id == id); + + string itemId = Db.GetIQueryable().FirstOrDefault(c => c.Id == id)?.ItemId; - var result= Db.RunTransaction(() => + var result = Db.RunTransaction(() => { var row = Db.Delete(c => c.Id == id); @@ -212,7 +216,8 @@ namespace Coldairarrow.Business.HuiYan { throw new Exception("操作失败！"); } - row = Db.Update(c => c.ItemsId == titem.ItemId && c.TeamId == _operator.TeamId, (item) => + + row = Db.Update(c => c.ItemsId == itemId && c.TeamId == _operator.TeamId, (item) => { //item.IsScreening = false; item.IsAdded = false; @@ -220,7 +225,7 @@ namespace Coldairarrow.Business.HuiYan if (row <= 0) { - throw new Exception("删除失败！"); + throw new Exception($"删除失败！"); } }); @@ -230,7 +235,7 @@ namespace Coldairarrow.Business.HuiYan return Success(); } - return Error(); + return Error(result.ex.Message); } } } \ No newline at end of file diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs index 0d64a99..5fcf2d2 100644 --- a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs @@ -172,6 +172,12 @@ namespace 齐越慧眼.UserControls DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.myitemState').addClass(""trueBg"")"); 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').addClass(""popBg"")"); + DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{item.GoodsId}""]').parent().parent()).find('.stateGraydiv').addClass(""divshow"")"); + } } } } @@ -234,6 +240,11 @@ namespace 齐越慧眼.UserControls background-size: 100% 100%; } + .popBg + { + background: url(""nacollector://home/img/pop.png"") no-repeat; + background-size: 100% 100%; + } .falseBg { background: url(""nacollector://home/img/close.png"") no-repeat; @@ -398,14 +409,18 @@ namespace 齐越慧眼.UserControls { BrowerControl.Main.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').prepend('
竞
')"); } - } - if (type == 0||type==2) + if (type == 0) { BrowerControl.Main.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""trueBg"")"); } + if (type == 2) + { + BrowerControl.Main.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""popBg"")"); + } + BrowerControl.Main.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.stateGraydiv').addClass(""divshow"")"); } diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/img/pop.png b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/img/pop.png new file mode 100644 index 0000000..66103d4 Binary files /dev/null and b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/img/pop.png differ