'add'

nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "Ds8JqlRmiiGR"
-!define PRODUCT_VERSION        		"2.3.1.1"
+!define PRODUCT_VERSION        		"2.3.1.5"
 !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.3.1.1.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.3.1.5.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.3.1.1"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.3.1.5"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

package.json

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

src/renderer/components/header.vue

@@ -171,7 +171,7 @@
 				</el-row>
 				<el-divider content-position="left">
 					页面滚动速度
-					<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="默认500ms,本地网路访问速度快可选择短时间,时间越长处理任务的时间也越长">
+					<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="默认600ms,本地网路访问速度快可选择短时间,时间越长处理任务的时间也越长">
 						<i class="el-icon-info" slot="reference" style="margin-left: 10px; color: #F56C6C;"></i>
 					</el-popover>
 				</el-divider>
@@ -184,6 +184,7 @@
 						<el-option :value="800"></el-option>
 						<el-option :value="900"></el-option>
 						<el-option :value="1000"></el-option>
+						<el-option :value="1200"></el-option>
 					</el-select>ms
 				</el-row>
 				<el-divider content-position="left">清理缓存</el-divider>
@@ -272,7 +273,7 @@
 				versionType: 2,
 				chromeType: 2,
 				chromePath: '',
-				pageMs: 500,
+				pageMs: 600,
 				isRemember:true,
 				//
 				productName: pjson.softInfo.softName,

src/renderer/components/home.vue

@@ -593,7 +593,7 @@
 				if(pageMs){
 					return Number(pageMs);
 				}else{
-					return 500;
+					return 600;
 				}
 			},
 			// 实时获取淘宝的开发者设置
@@ -1022,8 +1022,8 @@
 					let headless = true;
 					headless = this.initDevelop().headless;
 					let redSize = '';
-					if(this.menuIndex == '5'){
-						redSize = '--window-size=1280,800'; //给浏览器一个初始大小，在无头模式下，页面会自适用缩放
+					if(['3','4','5'].indexOf(this.menuIndex) > -1){
+						redSize = '--window-size=1920,800'; //给浏览器一个初始大小，在无头模式下，页面会自适用缩放
 					}
 					this[browserName] = await puppeteer.launch({
 						headless: headless,
@@ -1929,14 +1929,13 @@
 									let scrollHeight2 = await page.evaluate((start) => {
 										let scrollHeight = document.body.scrollHeight;
 										let cHeight = document.documentElement.clientHeight;
-										let skuObj = document.querySelector('div[class*=skuValueWrap--]');
+										let skuObj = document.querySelectorAll('div[class*=skuValueWrap--]');
 										let scrollObj = document.getElementById('tbpcDetail_SkuPanelBody');
-										if(skuObj && scrollObj){
-											let scrollHeight = skuObj.getBoundingClientRect().height;
-											document.getElementById('tbpcDetail_SkuPanelBody').scrollTo({top: scrollHeight ,behavior: "smooth" })
+										if(skuObj.length > 0 && scrollObj){
+											document.getElementById('tbpcDetail_SkuPanelBody').scrollTo({top: 10000,behavior: "smooth" })
 										}
 										let obj = document.getElementById('container') || document.getElementById('content');
-										if(obj && obj.getBoundingClientRect().top < -500){
+										if(obj && obj.getBoundingClientRect().top < 0){
 											return -1;
 										}
 										window.scrollTo({
@@ -1953,9 +1952,21 @@
 									}
 								}
 								if(this.settingArr.indexOf('detailImg') > -1){ // 选择详情图
-									let scrollHeight2 = await page.evaluate((start) => {
+									let tag = false;
+									if(this.settingArr.indexOf('skuImg') > -1){ // 选择sku
+										tag = true;
+									}
+									let scrollHeight2 = await page.evaluate((start, tag) => {
 										let scrollHeight = document.body.scrollHeight;
 										let cHeight = document.documentElement.clientHeight;
+										if(tag){
+											let skuObj = document.querySelectorAll('div[class*=skuValueWrap--]');
+											let scrollObj = document.getElementById('tbpcDetail_SkuPanelBody');
+											if(skuObj.length > 0 && scrollObj){
+												document.getElementById('tbpcDetail_SkuPanelBody').scrollTo({top: 10000,behavior: "smooth" })
+											}
+										}
+										
 										let obj = document.getElementById('container') || document.getElementById('content');
 										if(obj && obj.getBoundingClientRect().bottom < 100){
 											return -1;
@@ -1965,7 +1976,7 @@
 											behavior: "smooth" 
 										});
 										return scrollHeight;
-									}, start);
+									}, start, tag);
 									
 									if(scrollHeight2 > 0){
 										num = Math.ceil(scrollHeight2 / cHeight);
@@ -3496,7 +3507,13 @@
 						
 						req.on('end', ()=> {
 							if(urlInfo != 'example'){
-								urlInfo.num += 1;
+								if(total_bytes < 1024 && outputPath.indexOf('评论图') > -1){
+									if (fs.existsSync(outputPath)) {
+										fs.unlinkSync(outputPath);
+									}
+								}else{
+									urlInfo.num += 1;
+								}
 							}else{
 								this.$msgbox({
 									title: '消息',