add

nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "W0GN9r611Z7w"
-!define PRODUCT_VERSION        		"1.1.0.0"
+!define PRODUCT_VERSION        		"2.1.0.0"
 !define PRODUCT_NAME           		"星优音频助手"
 !define INSTALL_OUTPUT_NAME    		"XYAudio_XY.exe" 
 !define EXE_NAME               		"XYAudio.exe"
 !define PRODUCT_PATHNAME           	"XYAudio"     #安装卸载项用到的KEY，注册表
 !define INSTALL_APPEND_PATH         "XYAudio"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYAudio/lastest1.1.0.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYAudio/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/XYAudio/uninstallWeb/?v=1.1.0.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYAudio/uninstallWeb/?v=2.1.0.0"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

src/renderer/components/home.vue

@@ -349,6 +349,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-dialog title="文件详情" :visible.sync="fileDetailModel" width="500px">
 					<el-descriptions v-if="showIndex !== ''" class="margin-top"  :column="1" size="medium" border>