From 87a39931ca9bd6119ce1bee325d303f808059767 Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Tue, 3 Jun 2025 14:53:20 +0800
Subject: [PATCH] =?UTF-8?q?YT-2667PDA=E6=9B=B4=E6=96=B0=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/appUpdate.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/common/appUpdate.js b/src/common/appUpdate.js
index cb5502bd..be8aad1f 100644
--- a/src/common/appUpdate.js
+++ b/src/common/appUpdate.js
@@ -23,8 +23,9 @@ export function appUpdate(isShowHint) {
 					var version = res.data.installPackageVersion;
 					var isForcedUpdate = res.data.isForcedUpdate
 					var versionName = res.data.installPackageName
+					var size = res.data.size
 					console.log("新版本提示")
-					showDialog(versionName, content, isForcedUpdate, downUrl)
+					showDialog(versionName, content, isForcedUpdate, downUrl,size)
 
 					// uni.showModal({
 					// 	title: "发现新版本:(" + version + ")",
@@ -61,7 +62,7 @@ export function appUpdate(isShowHint) {
 
 }
 
-export function showDialog(versionName, content, isForcedUpdate, downUrl) {
+export function showDialog(versionName, content, isForcedUpdate, downUrl,size) {
 	uni.showModal({
 		title: "发现新版本:(" + versionName + ")",
 		content: content,
@@ -70,21 +71,21 @@ export function showDialog(versionName, content, isForcedUpdate, downUrl) {
 		cancelText: "取消",
 		success: (res) => {
 			if (res.confirm) {
-				confirm(downUrl);
+				confirm(downUrl,size);
 				console.log(
 					'comfirm') //点击确定之后执行的代码
 			} else {
 				console.log(
 					'cancel') //点击取消之后执行的代码
 				if (isForcedUpdate == "TRUE") {
-					showDialog(versionName, content, isForcedUpdate, downUrl)
+					showDialog(versionName, content, isForcedUpdate, downUrl,size)
 				}
 			}
 		}
 	})
 }
 
-export function confirm(downUrl) {
+export function confirm(downUrl,size) {
 	var downloadApkUrl = downUrl
 	var dtask = plus.downloader.createDownload(downloadApkUrl, {},
 		function(d, status) {
@@ -124,10 +125,10 @@ export function confirm(downUrl) {
 					showLoading.setTitle("已连接到服务器");
 					break;
 				case 3:
-					if (task.totalSize && task.totalSize > 0) {
+					if (size && size > 0) {
 						prg = parseInt(
 							(parseFloat(task.downloadedSize) /
-								parseFloat(task.totalSize)) *
+								parseFloat(size)) *
 							100
 						);
 						showLoading.setTitle("正在下载" + prg + "%  ");