add

nsis/test.nsi

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

package.json

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

src/renderer/components/home.vue

@@ -78,11 +78,11 @@
 										@click="clearList()">清空链接</el-button>
 									<el-button type="danger" size="mini" icon="el-icon-video-pause" :disabled="pauseFlag"
 										@click="pause()">任务中止</el-button>
-									<el-button type="danger" size="mini" icon="el-icon-video-pause"
-										@click="del()">批量删除</el-button>
+									<!-- <el-button type="danger" size="mini" icon="el-icon-video-pause"
+										@click="del()">批量删除</el-button> -->
 								</el-button-group>
 								
-								<el-link type="info" style="margin-left: 20px; vertical-align:baseline; font-size: 12px;" @click="downloadExample()">导入模板下载<i class="el-icon-download"></i></el-link>
+								<el-link type="info" style="margin-left: 10px; vertical-align:baseline; font-size: 12px;" @click="downloadExample()">导入模板<i class="el-icon-download"></i></el-link>
 							</div>
 							
 							<el-row type="flex" style="align-items: center;">
@@ -119,16 +119,6 @@
 									<el-link v-if="menuIndex == '10'" :underline="false" type="danger" style="text-align: center; font-size: 12px;">
 										非会员功能，仅提供测试试用
 									</el-link>
-									
-									<!-- <el-link v-if="menuIndex == '3' || menuIndex == '4'" :underline="false" type="danger" style="text-align: center; font-size: 12px;">
-										(需登录{{menuIndex == '3' ? '天猫' : '淘宝'}}账号后才能下载)
-									</el-link>
-									<el-link v-if="menuIndex == '2'" :underline="false" type="danger" style="text-align: center; font-size: 12px;">
-										(需登录京东账号后才能下载)
-									</el-link>
-									<el-link v-if="menuIndex == '10'" :underline="false" type="info" style="text-align: center; font-size: 12px;">
-										 (非会员功能，仅提供试用)
-									</el-link> -->
 								</div>
 							</el-row>
 							
@@ -207,9 +197,9 @@
 								<!-- 1、 -->
 								<vxe-table ref="xTable" show-overflow class="img-table" max-height="100%" empty-text="没有更多数据了！" :loading="tabLoading" :row-config="{isHover: true}" 
 									:loading-config="{icon: 'vxe-icon-indicator roll', text: '列表加载中...'}" :data="this[listStr+'List']" :scroll-y="{enabled: true}">
-									<vxe-column type="checkbox" width="40"></vxe-column>
+									<!-- <vxe-column type="checkbox" width="40"></vxe-column> -->
 									<vxe-column type="seq" width="60"></vxe-column>
-									<vxe-column field="title" title="目录名称" width="200">
+									<vxe-column field="title" title="目录名称" width="180">
 										<template #default="{ row, rowIndex }">
 											<span v-if="row.title">{{row.title}}</span>
 											<el-tag size="mini" v-else>默认使用网页标题</el-tag>
@@ -764,31 +754,39 @@
 			},
 			
 			del(){
-				let info = this.$refs.xTable.getCheckboxRecords(true);
+				let info = this.$refs.xTable.getCheckboxRecords();
 				console.log(info);
 			},
 			
 			//任务暂停
 			async pause(){
-				if(this.loginBrowser){
-					await this.loginBrowser.close();
-					this.loginBrowser = null;
-				}
-				this.pauseFlag = true;
-				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.$confirm('是否中止下载任务?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(async() => {
+					if(this.loginBrowser){
+						await this.loginBrowser.close();
+						this.loginBrowser = null;
 					}
-				}
-				
-				let index = Number(this.menuIndex) - 1;
-				this[listNameArr[index]+'List'].map(item => {
-					if(item.status != '4'){
-						item.status = '1';
+					this.pauseFlag = true;
+					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;
+							}
+						}
 					}
+					
+					let index = Number(this.menuIndex) - 1;
+					this[listNameArr[index]+'List'].map(item => {
+						if(item.status != '4'){
+							item.status = '1';
+						}
+					});
+				}).catch(() => {
+						  
 				});
 				
 			},