'add'

nsis/test.nsi

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

package.json

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

src/renderer/components/home.vue

@@ -1550,6 +1550,17 @@
 							// 	userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							// });
 							let page = await tbBrowser.newPage();
+							
+							let responseVideo = [];
+							page.on('response', async(response) => {
+								// 检查响应的 MIME 类型是否以 'video/' 开头
+								if (response.headers()['content-type'] && response.headers()['content-type'].startsWith('video/')) {
+									if(responseVideo.indexOf(response.url()) < 0 && !response.url().startsWith('blob:https://')){
+										responseVideo.push(response.url());
+									}
+								}
+							});
+							
 							await page.goto(urlInfo.url, {waitUntil : 'networkidle0'});
 							
 							if(urlInfo.title){
@@ -1563,14 +1574,6 @@
 								await this.getTitle(page, urlInfo); // 生成页面标题对应的文件夹
 							}
 							
-							let responseVideo = [];
-							page.on('response', async(response) => {
-								// 检查响应的 MIME 类型是否以 'video/' 开头
-								if (response.headers()['content-type'] && response.headers()['content-type'].startsWith('video/')) {
-									responseVideo.push(response.url());
-								}
-							});
-							
 							if(this.settingArr.indexOf('video') > -1){ // 用户选择下载视频的时候才会触发
 								//鼠标放在主图第一张，生成视频
 								const elementHandle = await page.$('li[class*=thumbnail--]');
@@ -1766,7 +1769,7 @@
 											}
 										}
 										// 视频
-										let arr5 = document.querySelectorAll('video.lib-video');
+										let arr5 = document.querySelectorAll('video');
 										for(let i=0; i< arr5.length; i++){
 											if(outObj.video.indexOf(arr5[i].src) == -1){
 												if(!authority && i < execNum){
@@ -2360,7 +2363,7 @@
 						}
 					}
 					// 视频
-					let arr5 = document.querySelectorAll('#description-layout video');
+					let arr5 = document.querySelectorAll('video');
 					for(let i=0; i< arr5.length; i++){
 						if(arr5[i].src && outObj.video.indexOf(arr5[i].src) == -1){
 							if(!authority && i < execNum){