add

nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "q2ab1F6Bo3w8"
-!define PRODUCT_VERSION        		"2.0.0.0"
+!define PRODUCT_VERSION        		"2.1.0.0"
 !define PRODUCT_NAME           		"星优PDF工具箱"
 !define INSTALL_OUTPUT_NAME    		"XYPdf_XY.exe" 
 !define EXE_NAME               		"XYPdf.exe"
 !define PRODUCT_PATHNAME           	"XYPdf"     #安装卸载项用到的KEY，注册表
 !define INSTALL_APPEND_PATH         "XYPdf"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYPdf/lastest2.0.0.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYPdf/lastest2.1.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/XYPdf/uninstallWeb/?v=2.0.0.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYPdf/uninstallWeb/?v=2.1.0.0"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYPdf",
-	"version": "2.0.0.0",
+	"version": "2.1.0.0",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "pdf",

src/renderer/components/home.vue

@@ -23,7 +23,7 @@
 						</el-menu-item>
 						<el-menu-item index="4" @click="setMenuIndex(4)">
 							<img src="../assets/image/pdf-fun.png" class="menu-img"/>
-							<span slot="title">PDF文件功能</span>
+							<span slot="title">PDF文件处理</span>
 						</el-menu-item>
 					</el-menu>
 				</el-aside>
@@ -299,6 +299,7 @@
 										:edit-config="{trigger: 'click', mode: 'cell'}" :data="this[listStr + 'List']" :scroll-y="{enabled: true}">
 											<vxe-column field="name" title="文件名"></vxe-column>
 											<vxe-column field="size" title="大小" width="120"></vxe-column>
+											<vxe-column field="totalPages" title="总页数" width="100" v-if="['2-1','2-2','2-3','2-4'].indexOf(activeName) == -1"></vxe-column>
 											<vxe-column field="progress" title="进度" width="180">
 												<template #default="{ row }">
 													<el-progress :text-inside="true" :stroke-width="20" :percentage="row.percent"></el-progress>
@@ -346,7 +347,7 @@
 									
 									<!-- 2-4 -->
 									<div class="handle-item" v-if="activeName == '2-4'">
-										<label style="font-weight: 600;">将所有图片合成一个PDF：</label>
+										<label style="font-weight: 600;">合成一个PDF：</label>
 										<el-radio-group v-model="handleData.imgContact">
 											<el-radio label="1">否</el-radio>
 											<el-radio label="2">是</el-radio>
@@ -354,7 +355,7 @@
 										
 										<template v-if="handleData.imgContact == '2'">
 											<label class="handle-label">合并名称：</label>
-											<el-input placeholder="合并名称" size="mini" v-model="handleData.contactImgname" style="width:150px;"></el-input> .pdf
+											<el-input placeholder="合并名称" size="mini" v-model="handleData.contactImgname" style="width:120px;"></el-input> .pdf
 										</template>
 									</div>
 									
@@ -379,7 +380,7 @@
 										<el-popover placement="bottom" popper-class="popper-open" trigger="hover" content="打开保存目录">
 										    <i class="el-icon-folder-opened" slot="reference" style="padding-left: 5px; cursor: pointer; font-size: 22px; vertical-align: middle;" @click="openFolder()"></i>
 										</el-popover>
-										<el-button type="danger" style="margin: 0 20px;" @click="exportFile()" :loading="loading">开始转换</el-button>
+										<el-button type="danger" style="margin-left: 20px;" @click="exportFile()" :loading="loading">开始转换</el-button>
 									</div>
 								</div>
 							</div>
@@ -871,7 +872,7 @@
 				if(!authority){
 					this.tipsModal = true;
 					this.isPwd = false;
-					this.tipsDesc = "非会员不能选择提取的页面，只能提取前两页，如需完整功能请开通会员。";
+					this.tipsDesc = "非VIP用户不能设置页码，只能处理前两页，如需完整功能请开通VIP会员。";
 				}else if(this.fileList[index].totalPages > 0){
 					this.selectIndex = index;
 					this.pagesModal = true;
@@ -1740,4 +1741,8 @@
 		font-size: 16px;
 		font-weight: 600;
 	}
+	
+	.el-radio{
+		margin-right: 20px !important;
+	}
 </style>