去除jquery ajaxhook改为cefsharp httphook

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

@@ -67,10 +67,16 @@ namespace 齐越慧眼.UserControls
                 });
             }
 
-            if (url.Contains("s.1688.com/selloffer/offer_search.htm"))
+            if (url.Contains("/marketOfferResultViewService"))
             {
                 Task.Factory.StartNew(() =>
                 {
+                    var items= Get1688ShopIds();
+
+                    while (items == Get1688ShopIds())
+                    {
+                        Thread.Sleep(100);
+                    }
                     nowPatlom = 2;
                        lastUrl = "s.1688.com";
                     StartPage();
@@ -304,7 +310,7 @@ namespace 齐越慧眼.UserControls
                 };
             ");
 
-            return DoJavaScript(@"$('div#mainsrp-itemlist .items .item').find('.myitemState').remove();
+            return DoJavaScript(@"$('div#mainsrp-itemlist .items .item').find('.myitemState').remove();$('div#mainsrp-itemlist .items .item').find('.myopdiv').remove();
             $('div#mainsrp-itemlist .items .item .pic').before('
             <div class=""myitemState"">
                 <div class=""stateGraydiv""></div></div><div class=""myopdiv"">
@@ -406,7 +412,7 @@ namespace 齐越慧眼.UserControls
                 };
             ");
 
-            return DoJavaScript(@"$('div#J_goodsList .gl-item').find('.myitemState').remove();
+            return DoJavaScript(@"$('div#J_goodsList .gl-item').find('.myitemState').remove();$('div#J_goodsList .gl-item').find('.myopdiv').remove();
             $('div#J_goodsList .gl-item .p-img a').before('
             <div class=""myitemState"">
                 <div class=""stateGraydiv""></div></div><div class=""myopdiv"">
@@ -423,6 +429,25 @@ namespace 齐越慧眼.UserControls
 
         #region 阿里巴巴代码
 
+        private List<string> Get1688ShopIds()
+        {
+            var res = DoJavaScript(@"var ids=[];  $('ul#sm-offer-list div.normalcommon-offer-card').each(function(){ids.push($(this).attr(""data-aplus-report""))});return ids;");
+
+            List<string> reports = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(Newtonsoft.Json.JsonConvert.SerializeObject(res.result));
+
+            List<string> itemIds = new List<string>();
+            if (reports != null)
+            {
+                reports.ForEach(c =>
+                {
+                    string objid = Regex.Match(c, "object_id\\@(.*?)\\^").Groups[1].Value;
+                    itemIds.Add(objid);
+                });
+            }
+
+            return itemIds;
+        }
+
         /// <summary>
         /// 检测页面商品
         /// </summary>
@@ -431,8 +456,6 @@ namespace 齐越慧眼.UserControls
         {
             var res = DoJavaScript(@"var ids=[];  $('ul#sm-offer-list div.normalcommon-offer-card').each(function(){ids.push($(this).attr(""data-aplus-report""))});return ids;");
 
-
-
             List<string> reports = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(Newtonsoft.Json.JsonConvert.SerializeObject(res.result));
 
             List<string> itemIds = new List<string>();
@@ -455,16 +478,16 @@ namespace 齐越慧眼.UserControls
                     //判断是否团队过滤
                     if (item.IsFilter)
                     {
-                        DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.myitemState').addClass(""falseBg"")");
+                        DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.myitemState').addClass(""falseBg"")");
-                        DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
+                        DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
                     }
                     else
                     {
                         //判断是否集团过滤
                         if (item.HasFilter)
                         {
-                            DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.myitemState').prepend('<div class=""smallfalseBg""></div>')");
+                            DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.myitemState').prepend('<div class=""smallfalseBg""></div>')");
-                            DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
+                            DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
                         }
                     }
 
@@ -474,21 +497,21 @@ namespace 齐越慧眼.UserControls
                         //<div style=""width:20%;height:20%"" class=""bgYellow"">竞</div>
                         if ((int)BrowerControl.Main.DoJavaScript(@$"return $($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateYellow').length").result <= 0)
                         {
-                            DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.myitemState').prepend('<div style=""width:20%;height:20%"" class=""stateYellow"">竞</div>')");
+                            DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.myitemState').prepend('<div style=""width:20%;height:20%"" class=""stateYellow"">竞</div>')");
                         }
-                        DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
+                        DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
                     }
 
                     if (item.IsScreening)
                     {
-                        DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.myitemState').addClass(""trueBg"")");
+                        DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.myitemState').addClass(""trueBg"")");
-                        DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
+                        DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
                     }
 
                     if (item.IsAdded)
                     {
-                        DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.myitemState').addClass(""popBg"")");
+                        DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.myitemState').addClass(""popBg"")");
-                        DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
+                        DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{item.GoodsId}""]')).find('.stateGraydiv').addClass(""divshow"")");
                     }
                 }
             }
@@ -501,29 +524,34 @@ namespace 齐越慧眼.UserControls
         private bool Add1688OptionDiv()
         {
             ///添加js事件
+
             DoJavaScript(@"
                window.optClick= function (ele,type){
                     var e=window.event || arguments.callee.caller.arguments[0];
                     e.preventDefault();
                     e.stopPropagation();
-                   var itemid= $(ele).parent().parent().parent().parent().attr(""data-sku"");
+
-                   var price=$(ele).parent().parent().parent().parent().find("".p-price i"").text();
+                   var infoDiv=$($(ele).parent().parent().parent().parent().parent().parent());
-                   var sales=$(ele).parent().parent().parent().parent().find("".p-commit"").text();
+                   var itemid= infoDiv.attr(""data-sku"");
-                   var title=$(ele).parent().parent().parent().parent().find("".p-name a em"").text();
+
-                   var img=$(ele).parent().parent().parent().parent().find("".p-img img"").attr(""src"");
+                    debugger;
-                   hyCoreModel.setjdItemData({itemid:itemid,price:price,sales:sales,title:title,img:img,type:type});
+                   var price=infoDiv.find("".showPricec"").text();
+                   var sales=infoDiv.find("".sale"").text();
+                   var title=infoDiv.find("".mojar-element-title"").text();
+                   var img=$(ele).parent().parent().find(""div.img"").css(""background-image"");
+                   hyCoreModel.set1688ItemData({itemid:itemid,price:price,sales:sales,title:title,img:img,type:type});
                 };
             ");
 
-            return DoJavaScript(@"$('ul#sm-offer-list div.normalcommon-offer-card').find('.myitemState').remove();
+            return DoJavaScript(@"$('ul#sm-offer-list').find('.myitemState').remove();$('ul#sm-offer-list').find('.myopdiv').remove();
-            $('ul#sm-offer-list div.normalcommon-offer-card .img-container a').before('
+            $('ul#sm-offer-list div.normalcommon-offer-card .img-container div.img').append('
             <div class=""myitemState"">
                 <div class=""stateGraydiv""></div></div>
                 <div class=""myopdiv"">
-                    <div class=""bgYellow"" style=""display:flex;height:10%"" onclick=""optClick(this,3)"">竞品</div>
+                    <div class=""bgYellow"" style=""display:flex;"" onclick=""optClick(this,3)"">竞品</div>
-                    <div class=""bgZs"" style=""display:flex;height:10%"" onclick=""optClick(this,2)"" >海选</div>
+                    <div class=""bgZs"" style=""display:flex;"" onclick=""optClick(this,2)"" >海选</div>
-                    <div class=""bgPig"" style=""display:flex;height:10%"" onclick=""optClick(this,1)"">淘汰</div>
+                    <div class=""bgPig"" style=""display:flex;"" onclick=""optClick(this,1)"">淘汰</div>
-                    <div class=""bgGreen"" style=""display:flex;height:10%"" onclick=""optClick(this,0)"">同款</div>
+                    <div class=""bgGreen"" style=""display:flex;"" onclick=""optClick(this,0)"">同款</div>
                 </div>
             ')").isOk;
 
@@ -733,7 +761,7 @@ namespace 齐越慧眼.UserControls
 
         private void albbRb_Click(object sender, RoutedEventArgs e)
         {
-            web.Load("https://s.1688.com/");
+            web.Load("https://www.1688.com/?spm=a26352.13672862.searchbox.1.27bf6ae2slybzR");
         }
     }
 
@@ -875,6 +903,72 @@ namespace 齐越慧眼.UserControls
             }
 
 
+            WpfNoticeMsg.NoticeMessage.Show(result.msg, "提示");
+
+            return result.isOk;
+        }
+
+
+        public bool set1688ItemData(dynamic data)
+        {
+            if (!MainWindow.Main.IsUpdateKey)
+            {
+                MainWindow.Main.IsUpdateKey = true;
+                ApiHelper.SetKeyOpenTime(MainWindow.Main.LastKeyWord, Models.ItemPlatform.ALBB);
+            }
+
+            int type = data.type;
+            string price = data.price;
+            price = price.Replace("¥", "").Trim();
+            string sales = data.sales;
+            sales = sales.Trim();
+            string title = data.title;
+            title = title.Trim();
+            string img = data.img;
+            string itemId = data.itemid;
+
+            var result = ApiHelper.SetItemLabel(new Models.ItemLabelDto()
+            {
+                Img = img,
+                ItemId = itemId,
+                Platform = Models.ItemPlatform.ALBB,
+                Price = Convert.ToDecimal(price),
+                Sales = sales,
+                Status = type,
+                Title = title
+            });
+
+            if (result.isOk)
+            {
+                //判断是否团队过滤
+                if (type == 1)
+                {
+                    BrowerControl.Main.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').addClass(""falseBg"")");
+                }
+
+                if (type == 3)
+                {
+                    int row = (int)BrowerControl.Main.DoJavaScript(@$"return $($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').find('.stateYellow').length").result;
+                    if (row < 1)
+                    {
+                        BrowerControl.Main.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').prepend('<div style=""width:20%;height:20%"" class=""stateYellow"">竞</div>')");
+                    }
+                }
+
+                if (type == 0)
+                {
+                    BrowerControl.Main.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').addClass(""trueBg"")");
+                }
+
+                if (type == 2)
+                {
+                    BrowerControl.Main.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').addClass(""popBg"")");
+                }
+
+                BrowerControl.Main.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.stateGraydiv').addClass(""divshow"")");
+            }
+
+
             WpfNoticeMsg.NoticeMessage.Show(result.msg, "提示");
 
             return result.isOk;