qiushang пре 2 недеља
родитељ
комит
3fbdcee296
4 измењених фајлова са 22 додато и 6 уклоњено
  1. 3 3
      nsis/test.nsi
  2. 1 1
      package.json
  3. 1 1
      src/renderer/components/header.vue
  4. 17 1
      src/renderer/components/home.vue

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "b4X0GBHb95VN"
-!define PRODUCT_VERSION        		"2.1.0.5"
+!define PRODUCT_VERSION        		"2.1.0.7"
 !define PRODUCT_NAME           		"星优链接复制器"
 !define INSTALL_OUTPUT_NAME    		"XYLinks_XY.exe" 
 !define EXE_NAME               		"XYLinks.exe"
 !define PRODUCT_PATHNAME           	"XYLinks"     #安装卸载项用到的KEY,注册表
 !define INSTALL_APPEND_PATH         "XYLinks"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYLinks/lastest2.1.0.5.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYLinks/lastest2.1.0.7.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/XYLinks/uninstallWeb/?v=2.1.0.5"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYLinks/uninstallWeb/?v=2.1.0.7"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYLinks",
-	"version": "2.1.0.5",
+	"version": "2.1.0.7",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "links",

+ 1 - 1
src/renderer/components/header.vue

@@ -80,7 +80,7 @@
 				</div>
 				<div class="font-12" style="padding: 20px; margin-bottom: 10px;">
 					<div style="text-align: center; margin-bottom: 10px;">
-						<p style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP平台链接仅下载前5条</p>
+						<p style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP平台链接仅导出前5条</p>
 						<p style="font-size: 14px; font-weight: 600; margin-top: 15px;">开通会员即享以下权益</p>
 					</div>
 					<el-row :gutter="20" class="micon-list">

+ 17 - 1
src/renderer/components/home.vue

@@ -611,6 +611,10 @@
 				}
 				
 				this.addLoading = true;
+				this.tabLoading = true;
+				setTimeout(() => {
+					this.tabLoading = false;
+				}, 10000)
 				if(this.loginBrowser){
 					await this.loginBrowser.close();
 					this.loginBrowser = null;
@@ -853,6 +857,13 @@
 						await page.goto(url, {waitUntil : waitUntil});
 						await page.waitForTimeout(3000);
 						
+						// 特殊处理
+						let nextBtn = await page.$x("//button[contains(text(), '快速进入')]");
+						if(nextBtn && nextBtn.length > 0){
+							nextBtn[0].click({force: true});
+							await page.waitForTimeout(3000);
+						}
+						
 						if(tbShopReg.test(url) || tmallShopReg.test(url)){ // 店铺主页
 							let searchTitle = await this.getTitle(page, '店铺主页');
 							let typeStr = 'tbShop';
@@ -2130,9 +2141,14 @@
 					str = e.toString();
 				}
 				this.loading = false;
+				let duration = 4500;
+				if(e.toString().indexOf('Failed to launch the browser') > -1){
+					duration = 0;
+				}
 				this.$notify.error({
 					title: '提示',
-					message: str
+					message: str,
+					duration: duration
 				});
 			},