'add'

nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "zw6yxe4noPx3"
-!define PRODUCT_VERSION        		"1.3.0.0"
+!define PRODUCT_VERSION        		"1.4.0.0"
 !define PRODUCT_NAME           		"星优图片处理器"
 !define INSTALL_OUTPUT_NAME    		"XYImage_XY.exe" 
 !define EXE_NAME               		"XYImage.exe"
 !define PRODUCT_PATHNAME           	"XYImage"     #安装卸载项用到的KEY，注册表
 !define INSTALL_APPEND_PATH         "XYImage"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYImage/lastest1.3.0.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYImage/lastest1.4.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/XYImage/uninstallWeb/?v=1.3.0.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYImage/uninstallWeb/?v=1.4.0.0"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYImage",
-	"version": "1.3.0.0",
+	"version": "1.4.0.0",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "image",

src/renderer/components/header.vue

@@ -93,7 +93,7 @@
 						</el-col>
 						<el-col :span="6" class="micon-item">
 							<img src="../assets/image/member3.png" style="width: 60px;"/>
-							<p>免费升级</p>
+							<p>无官方水印</p>
 						</el-col>
 						<el-col :span="6" class="micon-item">
 							<img src="../assets/image/member4.png" style="width: 60px;"/>
@@ -127,8 +127,8 @@
 		<!-- 软件设置 -->
 		<el-dialog title="软件设置" :visible.sync="settingModal" width="400px">
 			<div>
-				<el-divider content-position="left">开机启动</el-divider>
-				<el-checkbox v-model="boot">开机时自动启动此软件</el-checkbox>
+				<!-- <el-divider content-position="left">开机启动</el-divider>
+				<el-checkbox v-model="boot">开机时自动启动此软件</el-checkbox> -->
 				<el-divider content-position="left">退出设置</el-divider>
 				<el-radio-group v-model="closeType">
 				    <el-radio :label="1">最小化到系统托盘</el-radio>

src/renderer/components/home.vue

@@ -69,7 +69,7 @@
 									<el-button type="primary" size="small" icon="el-icon-folder"
 										@click="pickDir()">添加文件夹</el-button>
 									<el-button type="info" size="small" icon="el-icon-delete"
-										@click="clearList()">清空列表</el-button>
+										@click="clearList()">清空图片</el-button>
 								</div>
 							</div>
 							
@@ -212,7 +212,7 @@
 														<div id="show-img" class="show-img" style="position:relative;overflow: hidden; width: 100%; height: 100%;">
 															<div style="position: absolute;top: 5px; left: 5px;padding: 0 10px 10px 10px; background: #00000060; color: #fff;font-size: 12px;z-index: 2;">
 																<label>放大：</label>
-																<el-slider v-model="viewScale" class="info-input" :min="1" :max="5" :step="0.1"></el-slider> 
+																<el-slider v-model="viewScale" class="info-input" :min="0.5" :max="5" :step="0.1"></el-slider> 
 																{{viewScale.toFixed(1)}}
 															</div>
 															<img draggable="false" class="result-img" :src="imgSrc"
@@ -435,6 +435,10 @@
 															<label class="handle-label">旋转角度：</label>
 															<el-input-number size="small" :max="360" :min="-360" v-model="handleData.rotateValue" ></el-input-number> °
 														</div>
+														
+														<div class="handle-item" style="text-align: center;">
+															<el-tag type="danger">正值向右旋转，负值向左旋转</el-tag>
+														</div>
 													</div>
 													
 													<!-- 10图片裁剪 -->
@@ -539,6 +543,10 @@
 															<el-button style="margin: 20px 0;" type="info" @click="setModal = true;">应用全部</el-button>
 															<el-button type="info" plain @click="resetModal = true;">重置设置</el-button>
 														</div>
+														
+														<div class="handle-item" style="text-align: center;">
+															<el-tag type="danger">批量裁剪请点击“应用全部”按钮</el-tag>
+														</div>
 													</template>
 												</div>
 											</div>
@@ -567,7 +575,7 @@
 													<div class="merge-top">
 														<div style="line-height: 34px;color: #333;">
 															{{mergeList.length}} / <span style="color: #999;">100</span>
-															<vxe-button type="text" status="info" icon="vxe-icon-info-circle-fill" @click="$message({message:'上下拖动左侧图片可调整前后顺序', type:'warning'})"></vxe-button>
+															<!-- <vxe-button type="text" status="info" icon="vxe-icon-info-circle-fill" @click="$message({message:'上下拖动左侧图片可调整前后顺序', type:'warning'})"></vxe-button> -->
 														</div>
 														<div class="action-right" v-if="mergeData.sortType == 3">
 															<div class="action-ritem" @click="zoom('reduce')">
@@ -717,7 +725,7 @@
 									<div class="footer-line-between">
 										<!-- 1格式转化 -->
 										<div class="handle-item" v-if="menuIndex == 1">
-											<label class="handle-label">格式转换：</label>
+											<label class="handle-label">输出转换：</label>
 											<el-select v-model="handleData.imgFormat" style="width:100px;" size="small">
 												<el-option v-for="(item, key) in imgFormat" :key="key" :value="item" :label="item"></el-option>
 											</el-select>
@@ -729,7 +737,7 @@
 										<div class="handle-item" v-if="menuIndex == 2">
 											<label class="handle-label">压缩质量：</label>
 											<el-input-number v-model="handleData.quality" :min="1" :max="100" size="small"></el-input-number>
-											<vxe-button type="text" status="info" icon="vxe-icon-info-circle-fill" @click="$message('质量越低压缩的越小')"></vxe-button>
+											<el-tag size="mini" type="danger" style="margin-left: 10px;">质量越低压缩的越小</el-tag>
 										</div>
 										<!-- 11修改dpi -->
 										<div class="handle-item" v-if="menuIndex == 11">
@@ -747,11 +755,16 @@
 											<vxe-button type="text" status="info" icon="vxe-icon-info-circle-fill" @click="$message({message:'提高分辨率(DPI)不能让模糊的图片变清晰,也不会改变照片的高宽像素等属性', type:'warning'})"></vxe-button>
 										</div>
 										
+										<!-- 8图片拼接 -->
+										<div v-if="menuIndex == 8">
+											<el-tag type="danger">拖动左侧列表中的图片可以调整拼接顺序</el-tag>
+										</div>
+										
 										<!-- 7重命名 -->
 										<div v-if="menuIndex == 7">
 											<div class="handle-item" >
-												<label class="handle-label" style="width: 80px;">新文件名：</label>
-												<el-input type="text" v-model="handleRename.fileName" size="small" placeholder="请输入新文件名" style="width:200px;" @change="setChange"></el-input>
+												<label class="handle-label" style="width: 80px;">新图片名：</label>
+												<el-input type="text" v-model="handleRename.fileName" size="small" placeholder="请输入新图片名" style="width:200px;" @change="setChange"></el-input>
 											</div>
 										</div>
 										<div v-else> </div>
@@ -1669,7 +1682,9 @@ export default {
 			
 			if([3,4,5,6,9].indexOf(this.menuIndex) > -1){ // 绑定滚动事件
 				setTimeout(() => {
-					this.initRoll();
+					if(!this.rollFlag){
+						this.initRoll();
+					}
 				}, 600);
 			}