add

nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "Ds8JqlRmiiGR"
-!define PRODUCT_VERSION        		"2.2.0.2"
+!define PRODUCT_VERSION        		"2.2.0.3"
 !define PRODUCT_NAME           		"星优图片下载助手"
 !define INSTALL_OUTPUT_NAME    		"XYCapture_XY.exe" 
 !define EXE_NAME               		"XYCapture.exe"
 !define PRODUCT_PATHNAME           	"XYCapture"     #安装卸载项用到的KEY，注册表
 !define INSTALL_APPEND_PATH         "XYCapture"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.2.0.2.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.2.0.3.7z"
 !define PRODUCT_PUBLISHER      	    "苏州星优办公软件有限公司"
 !define PRODUCT_LEGAL          	    "苏州星优办公软件有限公司"
 !define STATISTICS_url              "https://www.xingyousoft.com/api/index/user_log"   # 统计网址
-!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.2.0.2"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.2.0.3"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYCapture",
-	"version": "2.2.0.2",
+	"version": "2.2.0.3",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "capture",

src/renderer/components/home.vue

@@ -735,6 +735,7 @@
 							userDataDir = os.tmpdir() + separator + 'chrome-data-capture-jd';
 						}
 						
+						puppeteer.use(StealthPlugin());
 						this.loginBrowser = await puppeteer.launch({
 							headless: false,
 							executablePath: this.initPath(),
@@ -1144,7 +1145,16 @@
 							
 							let waitUntil = 'networkidle2';
 							waitUntil = this.initDevelop().waitUntil;
-							await page.goto(urlInfo.url, {waitUntil : waitUntil});
+							
+							let goUrl = urlInfo.url;
+							if(this.menuIndex == '1' && goUrl.indexOf('version=0') == -1){ // 阿里巴巴
+								if(goUrl.indexOf('?') > -1){
+									goUrl += "&version=0";
+								}else{
+									goUrl += "?verison=0";
+								}
+							}
+							await page.goto(goUrl, {waitUntil : waitUntil});
 							
 							if(urlInfo.title){
 								if (fs.existsSync(this.downloadDir + separator + pjson.softInfo.softName + separator + urlInfo.title)) {
@@ -1645,17 +1655,6 @@
 								return {'scrollHeight': scrollHeight, 'cHeight': cHeight}
 							});
 							
-							if(urlInfo.title){
-								if (fs.existsSync(this.downloadDir + separator + pjson.softInfo.softName + separator + urlInfo.title)) {
-									urlInfo.newPath = this.downloadDir + separator + pjson.softInfo.softName + separator + urlInfo.title;
-								} else {
-									fs.mkdirSync(this.downloadDir + separator + pjson.softInfo.softName + separator + urlInfo.title);
-									urlInfo.newPath = this.downloadDir + separator + pjson.softInfo.softName + separator + urlInfo.title;
-								}
-							}else{
-								await this.getTitle(page, urlInfo); // 生成页面标题对应的文件夹
-							}
-							
 							let scrollHeight = pageInfo.scrollHeight;
 							let cHeight = pageInfo.cHeight;
 							let num = Math.ceil(scrollHeight / cHeight);
@@ -1733,6 +1732,17 @@
 									urlInfo.status = '3';
 									clearInterval(scrollInt);
 									
+									if(urlInfo.title){
+										if (fs.existsSync(this.downloadDir + separator + pjson.softInfo.softName + separator + urlInfo.title)) {
+											urlInfo.newPath = this.downloadDir + separator + pjson.softInfo.softName + separator + urlInfo.title;
+										} else {
+											fs.mkdirSync(this.downloadDir + separator + pjson.softInfo.softName + separator + urlInfo.title);
+											urlInfo.newPath = this.downloadDir + separator + pjson.softInfo.softName + separator + urlInfo.title;
+										}
+									}else{
+										await this.getTitle(page, urlInfo); // 生成页面标题对应的文件夹
+									}
+									
 									//detailImg：详情图；skuImg：sku图片；commentImg: 评论图；video: 视频
 									const imgInfo = await page.evaluate((authority, execNum) => {
 										let outObj = {
@@ -1810,7 +1820,7 @@
 											arr4 = document.querySelectorAll('div[class^=comments--] img');
 										}
 										for(let i=0; i< arr4.length; i++){ 
-											if(arr4[i].src.indexOf('/avatar/sns/user/flag/sns_logo') == -1){ //过滤淘宝用户头像
+											if(arr4[i].src.indexOf('/avatar/sns/user/flag/sns_logo') == -1 && arr4[i].className.indexOf('creditImg') == -1){ //过滤淘宝用户头像
 												if(!authority && i < execNum){
 													outObj.commentImg.push(arr4[i].src);
 												}
@@ -1833,7 +1843,7 @@
 										}
 										return outObj;
 									}, authority, this.execNum);
-				
+									
 									if(responseVideo.length > 0){
 										for(let l=0; l<responseVideo.length; l++){
 											if(imgInfo.video.indexOf(responseVideo[l]) == -1){