qiushang 2 days ago
parent
commit
58ed60b1cf
3 changed files with 13 additions and 4 deletions
  1. 3 3
      nsis/test.nsi
  2. 1 1
      package.json
  3. 9 0
      src/renderer/components/home.vue

+ 3 - 3
nsis/test.nsi

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

+ 1 - 1
package.json

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

+ 9 - 0
src/renderer/components/home.vue

@@ -1071,6 +1071,15 @@
 					if(this[browserName] && this[browserName].isConnected()){
 						
 					}else{
+						for(let i = 0; i < listNameArr.length; i++){
+							if(listNameArr[i]){
+								if(this[listNameArr[i]+'Browser']){
+									await this[listNameArr[i]+'Browser'].close();
+									this[listNameArr[i]+'Browser'] = null;
+								}
+							}
+						}
+						
 						this[browserName] = await puppeteer.launch({
 							headless: headless,
 							executablePath: this.initPath(),