add

src/renderer/components/home.vue

@@ -14,13 +14,13 @@
 							<span slot="title">常用转换</span>
 						</el-menu-item>
 						<el-menu-item index="2" @click="setMenuIndex(2)">
-							<img src="../assets/image/file-pdf.png" class="menu-img"/>
-							<span slot="title">文件转PDF</span>
-						</el-menu-item>
-						<el-menu-item index="3" @click="setMenuIndex(3)">
 							<img src="../assets/image/pdf-file.png" class="menu-img"/>
 							<span slot="title">PDF转文件</span>
 						</el-menu-item>
+						<el-menu-item index="3" @click="setMenuIndex(3)">
+							<img src="../assets/image/file-pdf.png" class="menu-img"/>
+							<span slot="title">文件转PDF</span>
+						</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>
@@ -59,37 +59,7 @@
 							</div>
 							
 							<div class="cmenu-item">
-								<p class="cmenu-title" id="menuIndex2">文件转PDF</p>
-								<el-row :gutter="30">
-									<el-col :span="4">
-										<div class="citem-nav" @click="changeMenu('2-1')">
-											<img src="../assets/image/word-pdf.png" class="citem-img" />
-											<p>WORD转PDF</p>
-										</div>
-									</el-col>
-									<el-col :span="4">
-										<div class="citem-nav" @click="changeMenu('2-2')">
-											<img src="../assets/image/ppt-pdf.png" class="citem-img" />
-											<p>PPT转PDF</p>
-										</div>
-									</el-col>
-									<el-col :span="4">
-										<div class="citem-nav" @click="changeMenu('2-3')">
-											<img src="../assets/image/excel-pdf.png" class="citem-img" />
-											<p>EXCEL转PDF</p>
-										</div>
-									</el-col>
-									<el-col :span="4">
-										<div class="citem-nav" @click="changeMenu('2-4')">
-											<img src="../assets/image/img-pdf.png" class="citem-img" />
-											<p>图片转PDF</p>
-										</div>
-									</el-col>
-								</el-row>
-							</div>
-
-							<div class="cmenu-item">
-								<p class="cmenu-title" id="menuIndex3">PDF转文件</p>
+								<p class="cmenu-title" id="menuIndex2">PDF转文件</p>
 								<el-row :gutter="30">
 									<el-col :span="4">
 										<div class="citem-nav" @click="changeMenu('1-1')">
@@ -129,6 +99,36 @@
 									</el-col>
 								</el-row>
 							</div>
+							
+							<div class="cmenu-item">
+								<p class="cmenu-title" id="menuIndex3">文件转PDF</p>
+								<el-row :gutter="30">
+									<el-col :span="6">
+										<div class="citem-nav" @click="changeMenu('2-1')">
+											<img src="../assets/image/word-pdf.png" class="citem-img" />
+											<p>WORD转PDF</p>
+										</div>
+									</el-col>
+									<el-col :span="6">
+										<div class="citem-nav" @click="changeMenu('2-2')">
+											<img src="../assets/image/ppt-pdf.png" class="citem-img" />
+											<p>PPT转PDF</p>
+										</div>
+									</el-col>
+									<el-col :span="6">
+										<div class="citem-nav" @click="changeMenu('2-3')">
+											<img src="../assets/image/excel-pdf.png" class="citem-img" />
+											<p>EXCEL转PDF</p>
+										</div>
+									</el-col>
+									<el-col :span="6">
+										<div class="citem-nav" @click="changeMenu('2-4')">
+											<img src="../assets/image/img-pdf.png" class="citem-img" />
+											<p>图片转PDF</p>
+										</div>
+									</el-col>
+								</el-row>
+							</div>
 
 							<div class="cmenu-item">
 								<p class="cmenu-title" id="menuIndex4">PDF文件功能</p>
@@ -308,6 +308,56 @@
 								</div>
 							</div>
 						</template>
+						
+						<!-- 合并进度 -->
+						<el-dialog title="合并中" :visible.sync="isShow" width="400px">
+							<div style="text-align: center;">
+								<i-circle
+									:size="250"
+									:trail-width="4"
+									:stroke-width="5"
+									:percent="Number(hebingInfo_percent)"
+									stroke-linecap="square"
+									stroke-color="#43a3fb">
+									<div class="demo-Circle-custom">
+										<h1>{{hebingInfo_percent}}%</h1>
+										<p>合并生成进度</p>
+									</div>
+								</i-circle>
+							</div>
+						</el-dialog>
+						
+						<!-- 非会员转换提示框 -->
+						<el-dialog title="非会员提示" :visible.sync="tipsModal" width="400px">
+							<div class="member-model">
+								<div class="tips-flex">
+									<Icon class="md-bulb" type="md-bulb" size="60" color="#BD2C00"/>
+									<p class="m-title">{{tipsDesc}}</p>
+								</div>
+								<div class="member-btn">
+									<Button v-if="isPwd" style="margin:0 10px;" @click="exportFile(true)">继续转换</Button>
+									<Button type="error" @click="openVip()">开通会员</Button>
+								</div>
+							</div>
+						</el-dialog>
+						
+						<!-- 选择页面提示框 -->
+						<el-dialog title="选择页码" :visible.sync="pagesModal" width="400px">
+							<div class="member-model">
+								<div class="tips-flex">
+									<Select v-if="fileList.length > 0 && selectIndex >= 0" v-model="fileList[selectIndex].selectPages" multiple>
+										<Option v-for="(item, key) in fileList[selectIndex].totalPages" :value="item" :key="key">{{ item }}</Option>
+									</Select>
+								</div>
+								<div class="tips-flex" style="margin-top: 20px;">
+									<Checkbox v-model="selectAll">同步成所有PDF的页码选择</Checkbox>
+								</div>
+								<div class="member-btn">
+									<Button style="margin:0 10px;" @click="pagesModal = false; selectPages = -1;">取消</Button>
+									<Button type="primary" @click="pageSure()">确定</Button>
+								</div>
+							</div>
+						</el-dialog>
 
 					</el-main>
 					<el-footer height="48px">
@@ -357,6 +407,7 @@
 				xlsxList: [],
 				imgList: [],
 				pdfList: [], //pdf压缩列表
+				imgFormat: ['png','bmp','jpeg','jpg','svg'], // 图片格式
 
 				ebookInfo: '',
 
@@ -382,12 +433,21 @@
 				procMap: {},
 				execLimit: 3,
 
-				exportLoading: false,
+				pagesModal: false,
+				selectIndex: -1,
+				selectAll: false,
+				
+				isShow:false,
+				hebingInfo_percent:0,
+				hebingInt: false,
+				tipsModal: false,
+				tipsDesc: "非会员用户只能转换前2页，如需完整功能请开通会员。",
+				isPwd: true, // 非会员不能加密解密
 			};
 		},
 		computed: {
 			listStr: function(){
-				let str = 'pdf';
+				let str = 'file';
 				if(this.activeName && this.activeName.split('-')[0] == '2'){
 					switch(this.activeName.split('-')[1]){
 						case '1':
@@ -404,11 +464,13 @@
 							break;
 					}
 				}
+				if(this.activeName == '3-5'){
+					str = 'pdf';
+				}
 				return str;
 			}
 		},
 		async mounted() {
-			
 			this.tempPath = os.tmpdir();
 			this.$refs.updateRef.updateSoft(true);
 
@@ -776,11 +838,8 @@
 						fileList = this.pdfList;
 						break;
 				}
-				if(((this.menuIndex == '1' || (this.menuIndex == '3' && this.activeName != '3-5')) && this.fileList.length > 0) 
-					|| (this.activeName == '2-1' && this.wordList.length > 0) || (this.activeName == '2-2' && this.pptxList.length > 0) 
-					|| (this.activeName == '2-3' && this.xlsxList.length > 0) || (this.activeName == '2-4' && this.imgList.length > 0) 
-					|| (this.activeName == '3-5' && this.pdfList.length > 0) ){
-						
+				if(fileList.length > 0){
+					console.log(fileList, authority, flag)
 					if (!authority && !flag) { // 非会员点击转换弹出提示框
 						this.tipsModal = true;
 						this.isPwd = true;