qiushang 1 gadu atpakaļ
vecāks
revīzija
89f8beac61
3 mainītis faili ar 25 papildinājumiem un 15 dzēšanām
  1. 1 1
      package.json
  2. 3 3
      src/renderer/components/header.vue
  3. 21 11
      src/renderer/components/home.vue

+ 1 - 1
package.json

@@ -9,7 +9,7 @@
 		"description": "这里是软件描述文档",
 		"downloadName": "XYCompress",
 		"softMid": "2NRKUn0jsI9J",
-		"softName": "压缩器",
+		"softName": "星优文件压缩器",
 		"copyright": "苏州星优办公软件有限公司",
 		"popupAdvId": "26",
 		"linkId": "25",

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

@@ -62,8 +62,7 @@
 		<el-dialog custom-class="member-dialog member-dialog1" :visible.sync="vipModel" width="700px" :close-on-click-modal="false">
 			<div slot="title">
 				<p class="soft-mtitle">
-					<img src="../assets/image/icon.png" class="soft-icon" />
-					{{productName}}
+					会员中心
 				</p>
 			</div>
 			<div style="height: 580px;">
@@ -79,7 +78,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限制文件大小为2MB</p>
+						<p style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP图片/音频限制大小为300KB,视频/文档限制大小为2MB</p>
 						<p style="font-size: 14px; font-weight: 600; margin-top: 15px;">开通会员即享以下权益</p>
 					</div>
 					<el-row :gutter="20" class="micon-list">
@@ -218,6 +217,7 @@
 			
 			window.addEventListener('message', e => {
 				if (e.origin === 'https://www.xingyousoft.com') {
+					console.log(e.data)
 					if(e.data.userInfo){ // 返回用户信息
 						this.userInfo = e.data.userInfo;
 						this.$utils.setStorage('userInfo', e.data.userInfo);

+ 21 - 11
src/renderer/components/home.vue

@@ -103,7 +103,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-left: 20px;" @click="exportFile()" :loading="exportLoading">开始处理</el-button>
+								<el-button type="danger" style="margin-left: 20px;" @click="exportFile()" :loading="exportLoading">开始压缩</el-button>
 							</div>
 						</div>
 						
@@ -336,7 +336,7 @@
 								<div class="handle-item" v-if="menuIndex == '4'">
 									<label class="handle-label">压缩质量:</label>
 									<el-input-number size="small" :min="1" :max="300" v-model="handleData.pdfQuality" style="width: 120px;" controls-position="right"></el-input-number>
-									<span class="tips">数值越低压缩的越小(1-300)</span>
+									<span class="tips">数值越低压缩的越小</span>
 								</div>
 								
 								<!-- 5 -->
@@ -464,7 +464,7 @@ export default {
 			wordList: [],
 			pptList: [],
 			imgInfo: '',
-			menuIndex: '1', // 选中菜单
+			menuIndex: '', // 选中菜单
 			
 			imgFormat: ['PNG','BMP','JPEG','JPG','ICO','WBMP','WEBP','GIF','JFIF','TTF','TIFF','SVG','3FR','3G2','AI','ART','ARW','BGR','BGRA','BGRO','BIE','BMP2','BMP3','BRF','CAL','CALS','CANVAS','CAPTION','CIN','CIP','CLIP','CMYK','CMYKA','CR2','CRW','CUR','CUT','DATA','DCM','DCR','DCX','DDS','DFONT','DJVU','DNG','DOT','DPX','DXT1','DXT5','EPDF','EPI','EPS','EPS2','EPS3','EPSF','EPSI','EPT','EPT2','EPT3','ERF','EXR','FAX','FILE','FITS','FRACTAL','FTP','FTS','G3','G4','GIF87','GRADIENT','GRAY','GRAYA','GROUP4','GV','H','HALD','HDR','HISTOGRAM','HRZ','ICB','ICON','IIQ','INFO','INLINE','IPL','ISOBRL','ISOBRL6','J2C','J2K','JBG','JBIG','JNG','JNX','JP2','JPC','JPE','JPM','JPS','JPT','K25','KDC','LABEL','M2V','M4V','MAC','MAGICK','MAP','MASK','MAT','MATTE','MEF','MIFF','MNG','MONO','MRW','MSL','MSVG','MVG','NEF','NRW','ORF','OTB','OTF','PAL','PALM','PAM','PANGO','PATTERN','PBM','PCD','PCDS','PCL','PCT','PEF','PES','PFA','PFB','PFM','PGM','PGX','PICON','PICT','PIX','PJPEG','PLASMA','PNG00','PNG24','PNG32','PNG48','PNG64','PNG8','PNM','PPM','PREVIEW','PS','PS2','PS3','PSB','PSD','PTIF','PWP','RADIAL-GRADIENT','RAF','RAS','RAW','RGB','RGBA','RGBO','RGF','RLA','RLE','RMF','RW2','SCR','SCT','SFW','SGI','SHTML','SIX','SIXEL','SPARSE-COLOR','SR2','SRF','STEGANO','SUN','SVGZ','TGA','THUMBNAIL','TIFF64','TILE','UBRL','UBRL6','UIL','UYVY','VDA','VICAR','VID','VIFF','VIPS','VST','WMF','WMV','WMZ','WPG','X','X3F','XBM','XC','XCF','XPM','XPS','XV','XWD','YCbCr','YCbCrA','YUV'],
 			inputAudio: ['mp3', 'wav', 'ogg', 'flac', 'mp2', 'm4a', 'm4r', 'ac3', 'amr', 'wma', 'aiff','aifc','caf','aac','ape','mmf','wv','au','voc','3gpp','mka','mp4'],
@@ -521,7 +521,7 @@ export default {
 			isUpdate: false, // 是否有更新
 
 			loadingTips: '',
-			execLimit: 5,
+			execLimit: 3,
 			showIndex: '',
 		};
 	},
@@ -604,7 +604,7 @@ export default {
 				case '5':
 					this.wordList = [];
 					break;
-				case '5':
+				case '6':
 					this.pptList = [];
 					break;
 			}
@@ -752,12 +752,22 @@ export default {
 				let size = fs.statSync(file).size;
 				
 				if(!this.$refs.headerRef.authority.isAuthority){
-					if(size > 1024*1024*2){
-						this.$notify.error({
-							title: '提示',
-							message: '免费版,文件最大不能超过2M!'
-						});
-						return false;
+					if(this.menuIndex == '1' || this.menuIndex == '2'){
+						if(size > 1024*300){
+							this.$notify.error({
+								title: '提示',
+								message: '免费版,文件最大不能超过300KB!'
+							});
+							return false;
+						}
+					}else{
+						if(size > 1024*1024*2){
+							this.$notify.error({
+								title: '提示',
+								message: '免费版,文件最大不能超过2M!'
+							});
+							return false;
+						}
 					}
 				}