'add'

nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "EB6PwuL4mFP1"
-!define PRODUCT_VERSION        		"2.1.0.0"
+!define PRODUCT_VERSION        		"2.1.1.0"
 !define PRODUCT_NAME           		"星优视频处理器"
-!define INSTALL_OUTPUT_NAME    		"XYVideoia32.exe" 
+!define INSTALL_OUTPUT_NAME    		"XYVideox64.exe" 
 !define EXE_NAME               		"XYVideo.exe"
 !define PRODUCT_PATHNAME           	"XYVideo"     #安装卸载项用到的KEY，注册表
 !define INSTALL_APPEND_PATH         "XYVideo"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYVideo/lastest_ia32_2.1.0.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYVideo/lastest_x64_2.1.1.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/XYVideo/uninstallWeb/?v=2.1.0.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYVideo/uninstallWeb/?v=2.1.1.0"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

package.json

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

src/renderer/components/home.vue

@@ -305,7 +305,7 @@
 									<el-input-number size="small" v-model="handleData.height" style="width: 100px;" controls-position="right" @change="changeHeight" :min="1"></el-input-number>
 								</template>
 								
-								<label class="handle-label">视频质量：</label>
+								<label class="handle-label">视频码率：</label>
 								<el-select v-model="handleData.videoQuality" style="width:100px;" size="small">
 									<el-option value="-1" label="同原视频"></el-option>
 									<el-option value="0.9" label="90%"></el-option>
@@ -354,13 +354,15 @@
 									<el-checkbox v-model="handleData.reverse"></el-checkbox>
 									<label class="handle-label">声音倒放：</label>
 									<el-checkbox v-model="handleData.areverse"></el-checkbox>
+									
+									<span style="margin-left: 20px;color: #F56C6C;font-size: 12px;">倒放视频会消耗大量的CPU资源和时间，请控制视频时长不超过5分钟</span>
 								</template>
 							</div>
 							
 							<!-- 8音量调整 -->
 							<div class="handle-item" v-if="menuIndex == '8'" style="margin-bottom: 5px;">
 								<label class="handle-label">音量调整：</label>
-								<el-slider class="info-input" v-model="handleData.volume" :min="0.5" :max="2.0" :step="0.05" style="margin-right: 10px;"></el-slider> {{handleData.volume}}
+								<el-slider class="info-input" v-model="handleData.volume" :min="0.5" :max="2.0" :step="0.05" style="margin-right: 10px;"></el-slider> {{handleData.volume}}倍
 							</div>
 						</div>
 						
@@ -378,6 +380,16 @@
 					</div>
 				</template>
 				
+				<!-- 合并进度 -->
+				<el-dialog title="视频合并进度" :visible.sync="isShow" width="400px" :close-on-click-modal="false">
+					<div style="text-align: center;">
+						<el-progress type="circle" :percentage="Number(hebingInfo_percent)"></el-progress>
+						<div>
+							<el-button type="primary" style="margin-top: 30px;" @click="isShow = false">打开文件夹</el-button>
+						</div>
+					</div>
+				</el-dialog>
+				
 			</el-main>
 			<el-footer height="48px">
 				<!-- 更新 -->