'add'

nsis/test.nsi

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

package.json

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

src/renderer/components/home.vue

@@ -482,6 +482,11 @@
 				this.downloadDir = homedir + separator + "Downloads"
 			}
 			
+			let dir = this.$utils.getStorage('downloadDir');
+			if(dir){
+				this.downloadDir = dir;
+			}
+			
 			if (!fs.existsSync(os.tmpdir() + separator + 'chrome-data-capture')) {
 				fs.mkdirSync(os.tmpdir() + separator + 'chrome-data-capture');
 			}
@@ -645,6 +650,7 @@
 				electronApi.call('pickDir', []).then((path) => {
 					if (path) {
 						this.downloadDir = path;
+						this.$utils.setStorage('downloadDir', path);
 					}
 				});
 			},
@@ -1919,10 +1925,16 @@
 							let scrollTime = this.initMs();
 							let scrollInt = setInterval(async() => {
 								start ++;
-								if(this.settingArr.indexOf('commentImg') > -1 && this.settingArr.indexOf('detailImg') < 0){ // 选择了评论图没选择详情图
+								if((this.settingArr.indexOf('skuImg') > -1 || this.settingArr.indexOf('commentImg') > -1) && this.settingArr.indexOf('detailImg') < 0){ // 选择了评论图没选择详情图
 									let scrollHeight2 = await page.evaluate((start) => {
 										let scrollHeight = document.body.scrollHeight;
 										let cHeight = document.documentElement.clientHeight;
+										let skuObj = document.querySelector('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" })
+										}
 										let obj = document.getElementById('container') || document.getElementById('content');
 										if(obj && obj.getBoundingClientRect().top < -500){
 											return -1;
@@ -1961,28 +1973,31 @@
 										num = 0;
 									}
 								}
-								if(this.settingArr.indexOf('skuImg') > -1 && this.settingArr.indexOf('commentImg') < 0 && this.settingArr.indexOf('detailImg') < 0){ // 选择了sku图片没选择评论和详情
-									let scrollHeight2 = await page.evaluate((start) => {
-										let scrollHeight = document.body.scrollHeight;
-										let cHeight = document.documentElement.clientHeight;
-										let obj = document.querySelector('div[class^=SkuContent--]');
-										if(obj && obj.getBoundingClientRect().bottom < 500){
-											return -1;
-										}
-										window.scrollTo({
-											top: cHeight * start, 
-											behavior: "smooth" 
-										});
-										return scrollHeight;
-									}, start);
-									
-									if(scrollHeight2 > 0){
-										num = Math.ceil(scrollHeight2 / cHeight);
-									}else{
-										num = 0;
-									}
-								}
-								if(this.settingArr.indexOf('skuImg') < 0 && this.settingArr.indexOf('detailImg') < 0 && this.settingArr.indexOf('commentImg') < 0){ // 没有选择评论图和详情图
+								// if(this.settingArr.indexOf('skuImg') > -1 && this.settingArr.indexOf('commentImg') < 0 && this.settingArr.indexOf('detailImg') < 0){ // 选择了sku图片没选择评论和详情
+								// 	let scrollHeight2 = await page.evaluate((start) => {
+								// 		let scrollHeight = document.body.scrollHeight;
+								// 		let cHeight = document.documentElement.clientHeight;
+								// 		let obj = document.querySelector('div[class*=SkuContent--]');
+								// 		if(!obj){
+								// 			obj = document.querySelector('div[class*=skuValueWrap--]');
+								// 		}
+								// 		if(obj && obj.getBoundingClientRect().bottom < 500){
+								// 			return -1;
+								// 		}
+								// 		window.scrollTo({
+								// 			top: cHeight * start, 
+								// 			behavior: "smooth" 
+								// 		});
+								// 		document.getElementById('tbpcDetail_SkuPanelBody').scrollTo({top:1000,behavior: "smooth" })
+								// 		return scrollHeight;
+								// 	}, start);
+								// 	if(scrollHeight2 > 0){
+								// 		num = Math.ceil(scrollHeight2 / cHeight);
+								// 	}else{
+								// 		num = 0;
+								// 	}
+								// }
+								if(this.settingArr.indexOf('skuImg') < 0 && this.settingArr.indexOf('detailImg') < 0 && this.settingArr.indexOf('commentImg') < 0){ // 只有主图没有选择评论图和详情图
 									num = 0;
 								}
 								if(start > num || start > 200){ // 防止页面过长，滚动200次自动停止
@@ -2007,7 +2022,8 @@
 											detailImg: [],
 											skuImg: [],
 											commentImg: [],
-											video: []
+											video: [],
+											test: []
 										};
 										
 										// 正则表达式匹配字符 重写图片路径
@@ -2038,6 +2054,7 @@
 										}
 										for(let i=0; i< arr2.length; i++){
 											let skuImgUrl = arr2[i].src;
+											outObj.test.push(arr2[i].src);
 											let result = regex.exec(skuImgUrl);
 											if(result){
 												skuImgUrl = skuImgUrl.replace(result[0], '.'+result[1]); 
@@ -2109,6 +2126,8 @@
 										}
 									}
 									
+									//console.log(imgInfo.test)
+									
 									if(this.settingArr.indexOf('mainImg') > -1){
 										// 主图下载
 										for(let j = 0; j < imgInfo.mainImg.length; j++){