加入加载界面

客户端/齐越慧眼/齐越慧眼/Models/SearchItemModel.cs

@@ -18,7 +18,6 @@ namespace 齐越慧眼.Models
 
         public string ItemId { get; set; }
 
-        public string Html { get; set; }
 
     }
 

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

@@ -6,12 +6,7 @@
              xmlns:local="clr-namespace:齐越慧眼.UserControls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <Border x:Name="searchLoding" Visibility="Collapsed">
-            <Border.Background>
-                <SolidColorBrush Color="White" Opacity="0.1"></SolidColorBrush>
-            </Border.Background>
-            <TextBlock Text="分析中" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20"></TextBlock></Border>
+  
     <DockPanel>
         <DockPanel  DockPanel.Dock="Top" >
             <Button Content="返回" Margin="0 0 10 0" Name="back" Click="back_Click"></Button>
@@ -19,9 +14,16 @@
             <TextBox x:Name="txtUrl" Keyboard.KeyUp="txtUrl_KeyUp"></TextBox>
             
         </DockPanel>
-        <Grid  x:Name="grid" DockPanel.Dock="Bottom" Margin="0 10 0 0">
-            
+        <Grid DockPanel.Dock="Bottom"  Margin="0 10 0 0">
+            <Border x:Name="searchLoding" Visibility="Collapsed" Panel.ZIndex="100">
+                <Border.Background>
+                    <SolidColorBrush Color="White" Opacity="0.55"></SolidColorBrush>
+                </Border.Background>
+                <TextBlock Text="分析中" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20"></TextBlock>
+            </Border>
+            <Grid  x:Name="grid" >
+
+            </Grid>
         </Grid>
         </DockPanel>
-    </Grid>
 </UserControl>

客户端/齐越慧眼/齐越慧眼/UserControls/TaoBaoBrowerControl.cs

@@ -42,9 +42,13 @@ namespace 齐越慧眼.UserControls
                             Thread.Sleep(100);
                         }
 
-
                         //切换到当前页
-                        int totalPage = (int)DoJavaScript("return $(\"#mainsrp-pager li[class*=item]\").length").result;
+                        string pageText = (string)DoJavaScript("return $(\"#mainsrp-pager div[class=total]\").text()").result;
+
+                        pageText = Regex.Match(pageText, @"([1-9]\d*\.?\d*)|(0\.\d*[1-9])").Groups[0].Value.Trim();
+
+                        int.TryParse(pageText, out int totalPage);
+
                         if (totalPage > i)
                         {
                             DoJavaScript($"$($(\"#mainsrp-pager li[class*=item]\")[{i}]).find(\"a\")[0].click()");
@@ -57,31 +61,32 @@ namespace 齐越慧眼.UserControls
                         {
                             Thread.Sleep(100);
                         }
-
-                        while (DoJavaScript(@"return $(""#mainsrp-pager li[class='item active']"")[0].innerText").result?.ToString() != i.ToString())
+                        if (totalPage != 0)
                         {
-                            Thread.Sleep(100);
+                            while (DoJavaScript(@"return $(""#mainsrp-pager li[class='item active']"")[0].innerText").result?.ToString() != i.ToString())
+                            {
+                                Thread.Sleep(100);
+                            }
                         }
-
                         //获取当前页面的所有商品信息
 
                         var res = DoJavaScript(@"var ids=[]; 
-                    $('div#mainsrp-itemlist .items .item').each(function(){
-
-                    var ele=this;
-                    var itemid= $(ele).find(""a"").attr(""data-nid"");
-                    var infoDiv=$($(ele).find("".J_IconMoreNew""));
-                    var price=infoDiv.find("".g_price"").text();
-                    var sales=infoDiv.find("".deal-cnt"").text();
-                    var title=infoDiv.find("".title"").text();
-                    var img=$(ele).find(""img"").attr(""src"");
-                    if(img==""//g.alicdn.com/s.gif""||img==null||img==undefined)
-                    {
-                        img=$(ele).find(""img"").attr(""data-src"");
-                    }
-                    ids.push({itemid:itemid,price:price,sales:sales,title:title,img:img,html:$(this).html()});
+                        $('div#mainsrp-itemlist .items .item').each(function(){
+
+                        var ele=this;
+                        var itemid= $(ele).find(""a"").attr(""data-nid"");
+                        var infoDiv=$($(ele).find("".J_IconMoreNew""));
+                        var price=infoDiv.find("".g_price"").text();
+                        var sales=infoDiv.find("".deal-cnt"").text();
+                        var title=infoDiv.find("".title"").text();
+                        var img=$(ele).find(""img"").attr(""src"");
+                        if(img==""//g.alicdn.com/s.gif""||img==null||img==undefined)
+                        {
+                            img=$(ele).find(""img"").attr(""data-src"");
+                        }
+                        ids.push({itemid:itemid,price:price,sales:sales,title:title,img:img});
 
-                    });
+                        });
                     return ids;");
 
                         List<SearchItemModelExt> itemHtmls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SearchItemModelExt>>(Newtonsoft.Json.JsonConvert.SerializeObject(res.result));
@@ -97,7 +102,11 @@ namespace 齐越慧眼.UserControls
                         //将当前页面的商品加入
                         totalItems.AddRange(itemHtmls);
 
-                        Thread.Sleep(2000);
+                        if (i>=totalPage)
+                        {
+                            break;
+                        }
+                        Thread.Sleep(10);
                     }
                 }
                 catch (Exception ex)