'add'

nsis/test.nsi

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

package.json

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

src/renderer/components/header.vue

@@ -372,6 +372,7 @@
 				isRead: false,
 				noticeValue: {},
 				noticeModel: false,
+				settingValue: {}
 			}
 		},
         props: {
@@ -692,7 +693,6 @@
 					this.memberUrl = "https://www.xingyousoft.com/soft/reminder2/"+pjson.softInfo.softMid+"?p_mid="+pjson.softInfo.softMid+"&agent_mid="+this.sysInfo.agentMid+"&uuid="+windows_uuid+"&soft_type="+this.sysInfo.softType;
 				});
 				
-				
 				this.$http.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8';
 				this.$http.get(pjson.softInfo.downloadPrefix + '/' + pjson.name + "/notice.json?"+Math.random()).then((response) => {
 					this.noticeValue = response.data || {};
@@ -704,6 +704,23 @@
 				}).catch(function(error){
 					console.log(error);
 				});
+				//网络连接设置
+				this.$http.get(pjson.softInfo.downloadPrefix + '/' + pjson.name + "/setting.json?"+Math.random()).then((response) => {
+					this.settingValue = response.data || {};
+					let isForce = this.settingValue.isForce;
+					if(isForce){
+						if(this.settingValue.waitUntil){
+							this.waitUntil = this.settingValue.waitUntil;
+							this.$utils.setStorage('waitUntil', this.waitUntil);
+						}
+						if(this.settingValue.waitUntil2){
+							this.waitUntil = this.settingValue.waitUntil2;
+							this.$utils.setStorage('waitUntil2', this.waitUntil2);
+						}
+					}
+				}).catch(function(error){
+					console.log(error);
+				});
 				
 			},
 			// 刷新登录二维码

src/renderer/components/home.vue

@@ -644,7 +644,7 @@
 					}
 				}
 				
-				if(this.menuIndex == '3' || this.menuIndex == '4'){ // 非淘宝网络连接设置
+				if(this.menuIndex == '3' || this.menuIndex == '4'){ // 淘宝网络连接设置
 					if(n2){
 						develop.waitUntil = n2;
 					}else{