'add'

nsis/test.nsi

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

package.json

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

src/renderer/components/home.vue

@@ -1067,18 +1067,23 @@
 					if(['3','4','5'].indexOf(this.menuIndex) > -1){
 						redSize = '--window-size=1920,800'; //给浏览器一个初始大小，在无头模式下，页面会自适用缩放
 					}
-					this[browserName] = await puppeteer.launch({
-						headless: headless,
-						executablePath: this.initPath(),
-						userDataDir: userDataDir, 
-						args: [
-							'--start-maximized',
-							'--no-sandbox',
-							'--disable-setuid-sandbox',
-							'--disable-blink-features=AutomationControlled',
-							redSize
-						]
-					});
+					
+					if(this[browserName] && this[browserName].isConnected()){
+						
+					}else{
+						this[browserName] = await puppeteer.launch({
+							headless: headless,
+							executablePath: this.initPath(),
+							userDataDir: userDataDir, 
+							args: [
+								'--start-maximized',
+								'--no-sandbox',
+								'--disable-setuid-sandbox',
+								'--disable-blink-features=AutomationControlled',
+								redSize
+							]
+						});
+					}
 					
 					for(let i = 0; i < fileList.length; i++){
 						let item = fileList[i];
@@ -1147,8 +1152,14 @@
 					}
 					
 					if(this[browserName]){
-						this[browserName].close();
-						this[browserName] = null;
+						//如果是前台显示模式就不关闭浏览器
+						let n1 = this.$utils.getStorage('exeType');
+						if(n1 && n1 == 2){
+							
+						}else{
+							this[browserName].close();
+							this[browserName] = null;
+						}
 					}
 					
 					this.loading = false;