|
@@ -1859,11 +1859,30 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- let iframeElementHandle = await page.$('iframe');
|
|
|
|
- if(iframeElementHandle){
|
|
|
|
- let m1 = await page.$('img[class^=PicGallery--thumbnailPic--]');
|
|
|
|
|
|
+
|
|
|
|
+ let frames = await page.$$('iframe');
|
|
|
|
+ if(frames.length == 1){ // 就一个
|
|
|
|
+ let isAdVisible = false;
|
|
|
|
+ try{ //判断是否是隐藏弹窗iframe
|
|
|
|
+ isAdVisible = await page.$eval('iframe', ad => {
|
|
|
|
+ return getComputedStyle(ad).display !== 'none';
|
|
|
|
+ });
|
|
|
|
+ }catch(e){
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ if(isAdVisible){
|
|
|
|
+ let m2 = await page.$('img[class*=thumbnailPic--]');
|
|
|
|
+ if(!m2){ // 出现弹窗而且没有主图,判断为拦截模式
|
|
|
|
+ await page.close();
|
|
|
|
+ urlInfo.status = '6';
|
|
|
|
+ resolve(true);
|
|
|
|
+ this.loading = false;
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }else if(frames.length > 1){ //多个弹窗就判断是否有图片显示
|
|
let m2 = await page.$('img[class*=thumbnailPic--]');
|
|
let m2 = await page.$('img[class*=thumbnailPic--]');
|
|
- if(!m1 && !m2){ // 出现弹窗而且没有主图,判断为拦截模式
|
|
|
|
|
|
+ if(!m2){ // 出现弹窗而且没有主图,判断为拦截模式
|
|
await page.close();
|
|
await page.close();
|
|
urlInfo.status = '6';
|
|
urlInfo.status = '6';
|
|
resolve(true);
|
|
resolve(true);
|
|
@@ -1872,6 +1891,7 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
let pageInfo = await page.evaluate(() => {
|
|
let pageInfo = await page.evaluate(() => {
|
|
let cHeight = document.documentElement.clientHeight;
|
|
let cHeight = document.documentElement.clientHeight;
|
|
let scrollHeight = document.body.scrollHeight;
|
|
let scrollHeight = document.body.scrollHeight;
|