修改关于页面

This commit is contained in:
zm2000 2026-08-12 14:55:47 +08:00
parent 45694c1942
commit edd932fa49
2 changed files with 593 additions and 29 deletions

View File

@ -66,6 +66,9 @@ export default {
data() {
return {
updateLogSeq: 0,
// 远端更新配置地址。注意:当前为 http 明文,Android 9+ 默认禁止明文流量,
// 若真机请求 latest.json 失败,建议与主接口(https://api.youzixy.com)保持一致改用 https。
updateConfigUrl: 'http://dl.wms.gztbyc.com/pda/latest.json',
currentAppVersion: '',
showUpdateDialog: false,
isCheckingUpdate: false,
@ -96,7 +99,7 @@ export default {
/**
* 检查更新并弹窗
* @param {Boolean} force 为 true 时忽略 hasCheckedUpdate,强制重新检查远端配置
* @returns {Promise<void>}
* @returns {Promise<Boolean>} 是否发现新版本并弹窗;检查失败时返回 false 且 updateErrorMessage 有值
*/
async checkForAppUpdate(force = false) {
this.logUpdateStep('checkForAppUpdate -> 开始执行', { force });
@ -108,12 +111,12 @@ export default {
hasCheckedUpdate: this.hasCheckedUpdate,
isCheckingUpdate: this.isCheckingUpdate
});
return;
return false;
}
if (typeof plus === 'undefined' || !plus.runtime) {
this.logUpdateStep('checkForAppUpdate -> 非 APP-PLUS 环境,跳过更新检查');
return;
return false;
}
this.hasCheckedUpdate = true;
@ -136,9 +139,15 @@ export default {
});
this.logUpdateStep('checkForAppUpdate -> 标准化后的远端配置', latestInfo || {});
if (!currentVersion) {
this.logUpdateStep('checkForAppUpdate -> 未获取到当前应用版本,无法比较', { currentVersion });
this.updateErrorMessage = '获取当前应用版本失败';
return false;
}
if (!latestInfo || !latestInfo.version || !latestInfo.url) {
this.logUpdateStep('checkForAppUpdate -> 远端配置缺少必要字段,结束', latestInfo || {});
return;
return false;
}
const isNewer = this.isVersionNewer(latestInfo.version, currentVersion);
@ -150,7 +159,7 @@ export default {
if (!isNewer) {
this.logUpdateStep('checkForAppUpdate -> 远端版本不高于当前版本,不弹窗');
return;
return false;
}
this.updateInfo = {
@ -162,9 +171,12 @@ export default {
};
this.showUpdateDialog = true;
this.logUpdateStep('checkForAppUpdate -> 发现新版本,显示更新弹窗', this.updateInfo);
return true;
} catch (error) {
this.logUpdateStep('checkForAppUpdate -> 检查异常', error);
console.warn('[update] check failed:', error);
this.updateErrorMessage = error?.message || '更新检查失败';
return false;
} finally {
this.isCheckingUpdate = false;
this.logUpdateStep('checkForAppUpdate -> 结束,isCheckingUpdate=false');
@ -172,11 +184,11 @@ export default {
},
fetchLatestVersionInfo() {
this.logUpdateStep('fetchLatestVersionInfo -> 发起请求', {
url: 'http://dl.wms.gztbyc.com/pda/latest.json'
url: this.updateConfigUrl
});
return new Promise((resolve, reject) => {
uni.request({
url: 'http://dl.wms.gztbyc.com/pda/latest.json',
url: this.updateConfigUrl,
method: 'GET',
timeout: 10000,
success: (res) => {
@ -202,7 +214,8 @@ export default {
},
fail: (error) => {
this.logUpdateStep('fetchLatestVersionInfo -> 请求失败', error);
reject(error || new Error('更新配置获取失败'));
const message = error?.errMsg || error?.message || '更新配置获取失败';
reject(new Error(message));
}
});
});
@ -237,22 +250,35 @@ export default {
return;
}
let settled = false;
const timer = setTimeout(() => {
if (settled) return;
settled = true;
this.logUpdateStep('getCurrentAppVersion -> getProperty 回调超时,返回空版本');
resolve('');
}, 3000);
const done = (version) => {
if (settled) return;
settled = true;
clearTimeout(timer);
resolve(version);
};
try {
// 注意:plus.runtime.version 是 HTML5+ 运行时版本(如 3.x),不是应用版本,
// 数值可能比应用版本大,若用作比较会导致「永远认为已是最新、不弹窗」。
// 因此这里只取 info.version(manifest 的 versionName),读不到就返回空。
plus.runtime.getProperty(plus.runtime.appid, (info) => {
const version = String(info?.version || plus.runtime.version || '').trim();
const version = String(info?.version || '').trim();
this.logUpdateStep('getCurrentAppVersion -> 读取成功', {
version,
appid: plus.runtime.appid
});
resolve(version);
done(version);
});
} catch (error) {
const fallbackVersion = String((typeof plus !== 'undefined' && plus.runtime && plus.runtime.version) || '').trim();
this.logUpdateStep('getCurrentAppVersion -> 读取异常,走兜底版本', {
fallbackVersion,
error
});
resolve(fallbackVersion);
this.logUpdateStep('getCurrentAppVersion -> 读取异常,返回空版本', { error });
done('');
}
});
},

View File

@ -27,22 +27,87 @@
</view>
</view>
<!-- 版本更新弹窗(复用登录页更新流程) -->
<app-update-dialog ref="appUpdateDialog"></app-update-dialog>
<!-- 版本更新弹窗(与登录页同一套内联逻辑,真机验证可弹窗) -->
<view v-if="showUpdateDialog" class="update-mask">
<view class="update-dialog">
<view class="update-header">
<text class="update-title">发现新版本</text>
<text class="update-version">当前 {{ currentAppVersion || '--' }} → 最新 {{ updateInfo.version || '--' }}</text>
</view>
<view class="update-body">
<view class="update-row">
<text class="update-label">安装包</text>
<text class="update-value">{{ updateInfo.file || '未提供文件名' }}</text>
</view>
<view v-if="updateInfo.publishedAtUtc" class="update-row">
<text class="update-label">发布时间</text>
<text class="update-value">{{ formatUpdateTime(updateInfo.publishedAtUtc) }}</text>
</view>
<view class="update-tip-box">
<text class="update-tip">检测到新版本,确认后将开始下载安装包。</text>
<text class="update-tip">下载完成后会自动打开文件。</text>
</view>
<view v-if="isDownloadingUpdate" class="update-progress-section">
<view class="update-progress-head">
<text class="update-progress-text">正在下载更新</text>
<text class="update-progress-text">{{ updateDownloadProgress }}%</text>
</view>
<view class="update-progress-bar">
<view class="update-progress-inner" :style="{ width: updateDownloadProgress + '%' }"></view>
</view>
</view>
<text v-if="updateErrorMessage" class="update-error">{{ updateErrorMessage }}</text>
</view>
<view class="update-actions">
<u-button
v-if="!isDownloadingUpdate"
plain
text="暂不更新"
@click="closeUpdateDialog"
></u-button>
<u-button
type="primary"
:loading="isDownloadingUpdate"
:disabled="isDownloadingUpdate"
:text="isDownloadingUpdate ? '下载中...' : '立即更新'"
@click="confirmUpdateDownload"
></u-button>
</view>
</view>
</view>
</view>
</template>
<script>
import AppUpdateDialog from '@/components/AppUpdateDialog/AppUpdateDialog.vue'
export default {
components: {
AppUpdateDialog
},
data() {
return {
appVersion: '',
updateChecking: false
updateChecking: false,
// ===== 版本更新(与登录页同一套内联逻辑,真机验证可弹窗) =====
updateLogSeq: 0,
// 远端更新配置地址。注意:当前为 http 明文,Android 9+ 默认禁止明文流量,
// 若真机请求 latest.json 失败,建议与主接口(https://api.youzixy.com)保持一致改用 https。
updateConfigUrl: 'http://dl.wms.gztbyc.com/pda/latest.json',
currentAppVersion: '',
showUpdateDialog: false,
isCheckingUpdate: false,
isDownloadingUpdate: false,
updateDownloadProgress: 0,
updateErrorMessage: '',
hasCheckedUpdate: false,
updateTask: null,
updateInfo: {
version: '',
file: '',
url: '',
sha256: '',
publishedAtUtc: ''
}
};
},
onLoad() {
@ -65,17 +130,363 @@ export default {
},
handleCheckUpdate() {
// #ifdef APP-PLUS
const dialog = this.$refs.appUpdateDialog;
if (!dialog) return;
this.updateChecking = true;
// force=true:每次点击都强制重新检查远端配置
dialog.checkForAppUpdate(true).finally(() => {
this.updateChecking = dialog.isCheckingUpdate;
});
this.checkForAppUpdate(true)
.then((hasNewVersion) => {
if (hasNewVersion) {
return;
}
// 没有新版本:区分「检查失败」与「已是最新」
if (this.updateErrorMessage) {
uni.showToast({ title: '更新检查失败', icon: 'none' });
} else {
uni.showToast({ title: '当前已是最新版本', icon: 'none' });
}
})
.finally(() => {
this.updateChecking = false;
});
// #endif
// #ifndef APP-PLUS
uni.showToast({ title: '当前环境不支持更新检查', icon: 'none' });
// #endif
},
// ===== 以下为版本更新流程(与登录页保持一致) =====
logUpdateStep(step, payload) {
this.updateLogSeq += 1;
const seq = String(this.updateLogSeq).padStart(2, '0');
if (typeof payload === 'undefined') {
console.log(`[update][${seq}] ${step}`);
return;
}
console.log(`[update][${seq}] ${step}`, payload);
},
async checkForAppUpdate(force = false) {
this.logUpdateStep('checkForAppUpdate -> 开始执行', { force });
if (force) {
this.hasCheckedUpdate = false;
}
if (this.hasCheckedUpdate || this.isCheckingUpdate) {
this.logUpdateStep('checkForAppUpdate -> 已检查过或正在检查,直接返回', {
hasCheckedUpdate: this.hasCheckedUpdate,
isCheckingUpdate: this.isCheckingUpdate
});
return false;
}
if (typeof plus === 'undefined' || !plus.runtime) {
this.logUpdateStep('checkForAppUpdate -> 非 APP-PLUS 环境,跳过更新检查');
return false;
}
this.hasCheckedUpdate = true;
this.isCheckingUpdate = true;
this.updateErrorMessage = '';
this.logUpdateStep('checkForAppUpdate -> 状态已置为检查中');
try {
this.logUpdateStep('checkForAppUpdate -> 并行获取当前版本和远端配置');
const [currentVersion, latestInfoRaw] = await Promise.all([
this.getCurrentAppVersion(),
this.fetchLatestVersionInfo()
]);
const latestInfo = this.normalizeLatestInfo(latestInfoRaw);
this.currentAppVersion = currentVersion;
this.logUpdateStep('checkForAppUpdate -> 已拿到版本信息', {
currentVersion,
latestVersion: latestInfo && latestInfo.version ? latestInfo.version : ''
});
this.logUpdateStep('checkForAppUpdate -> 标准化后的远端配置', latestInfo || {});
if (!currentVersion) {
this.logUpdateStep('checkForAppUpdate -> 未获取到当前应用版本,无法比较', { currentVersion });
this.updateErrorMessage = '获取当前应用版本失败';
return false;
}
if (!latestInfo || !latestInfo.version || !latestInfo.url) {
this.logUpdateStep('checkForAppUpdate -> 远端配置缺少必要字段,结束', latestInfo || {});
return false;
}
const isNewer = this.isVersionNewer(latestInfo.version, currentVersion);
this.logUpdateStep('checkForAppUpdate -> 版本比较完成', {
latestVersion: latestInfo.version,
currentVersion,
isNewer
});
if (!isNewer) {
this.logUpdateStep('checkForAppUpdate -> 远端版本不高于当前版本,不弹窗');
return false;
}
this.updateInfo = {
version: String(latestInfo.version || '').trim(),
file: String(latestInfo.file || '').trim(),
url: String(latestInfo.url || '').trim(),
sha256: String(latestInfo.sha256 || '').trim(),
publishedAtUtc: String(latestInfo.publishedAtUtc || '').trim()
};
this.showUpdateDialog = true;
this.logUpdateStep('checkForAppUpdate -> 发现新版本,显示更新弹窗', this.updateInfo);
return true;
} catch (error) {
this.logUpdateStep('checkForAppUpdate -> 检查异常', error);
console.warn('[update] check failed:', error);
this.updateErrorMessage = error?.message || '更新检查失败';
return false;
} finally {
this.isCheckingUpdate = false;
this.logUpdateStep('checkForAppUpdate -> 结束,isCheckingUpdate=false');
}
},
fetchLatestVersionInfo() {
this.logUpdateStep('fetchLatestVersionInfo -> 发起请求', {
url: this.updateConfigUrl
});
return new Promise((resolve, reject) => {
uni.request({
url: this.updateConfigUrl,
method: 'GET',
timeout: 10000,
success: (res) => {
this.logUpdateStep('fetchLatestVersionInfo -> 请求成功', {
statusCode: res.statusCode
});
if (res.statusCode !== 200) {
this.logUpdateStep('fetchLatestVersionInfo -> 状态码异常,reject', {
statusCode: res.statusCode
});
reject(new Error(`更新配置获取失败: ${res.statusCode}`));
return;
}
try {
const data = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
this.logUpdateStep('fetchLatestVersionInfo -> 配置解析成功', data || {});
resolve(data || {});
} catch (parseError) {
this.logUpdateStep('fetchLatestVersionInfo -> 配置解析失败', parseError);
reject(parseError);
}
},
fail: (error) => {
this.logUpdateStep('fetchLatestVersionInfo -> 请求失败', error);
const message = error?.errMsg || error?.message || '更新配置获取失败';
reject(new Error(message));
}
});
});
},
normalizeLatestInfo(raw) {
const source = raw && typeof raw === 'object' ? raw : {};
const version = String(source.version || source.versionName || source.appVersion || '').trim();
const url = String(
source.url ||
source.downloadUrl ||
source.apkUrl ||
source.download_url ||
''
).trim();
const file = String(source.file || source.fileName || source.apkName || source.name || '').trim();
return {
...source,
version,
url,
file,
sha256: String(source.sha256 || source.md5 || '').trim(),
publishedAtUtc: String(source.publishedAtUtc || source.publishedAt || source.releaseTime || '').trim()
};
},
getCurrentAppVersion() {
this.logUpdateStep('getCurrentAppVersion -> 开始读取当前版本');
return new Promise((resolve) => {
if (typeof plus === 'undefined' || !plus.runtime) {
this.logUpdateStep('getCurrentAppVersion -> 非 APP-PLUS,返回空版本');
resolve('');
return;
}
let settled = false;
const timer = setTimeout(() => {
if (settled) return;
settled = true;
this.logUpdateStep('getCurrentAppVersion -> getProperty 回调超时,返回空版本');
resolve('');
}, 3000);
const done = (version) => {
if (settled) return;
settled = true;
clearTimeout(timer);
resolve(version);
};
try {
// 注意:plus.runtime.version 是 HTML5+ 运行时版本(如 3.x),不是应用版本,
// 数值可能比应用版本大,若用作比较会导致「永远认为已是最新、不弹窗」。
// 因此这里只取 info.version(manifest 的 versionName),读不到就返回空。
plus.runtime.getProperty(plus.runtime.appid, (info) => {
const version = String(info?.version || '').trim();
this.logUpdateStep('getCurrentAppVersion -> 读取成功', {
version,
appid: plus.runtime.appid
});
done(version);
});
} catch (error) {
this.logUpdateStep('getCurrentAppVersion -> 读取异常,返回空版本', { error });
done('');
}
});
},
isVersionNewer(latestVersion, currentVersion) {
const normalize = (version) => String(version || '')
.split('.')
.map(item => parseInt(item, 10) || 0);
const latest = normalize(latestVersion);
const current = normalize(currentVersion);
const maxLength = Math.max(latest.length, current.length);
for (let i = 0; i < maxLength; i++) {
const latestPart = latest[i] || 0;
const currentPart = current[i] || 0;
if (latestPart > currentPart) {
return true;
}
if (latestPart < currentPart) {
return false;
}
}
return false;
},
formatUpdateTime(value) {
if (!value) {
return '';
}
const date = new Date(value);
if (Number.isNaN(date.getTime())) {
return value;
}
const pad = (num) => String(num).padStart(2, '0');
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
},
closeUpdateDialog() {
if (this.isDownloadingUpdate) {
this.logUpdateStep('closeUpdateDialog -> 下载中,禁止关闭弹窗');
return;
}
this.showUpdateDialog = false;
this.updateErrorMessage = '';
this.logUpdateStep('closeUpdateDialog -> 用户取消更新,弹窗关闭');
},
confirmUpdateDownload() {
if (this.isDownloadingUpdate) {
this.logUpdateStep('confirmUpdateDownload -> 已在下载中,忽略重复点击');
return;
}
this.logUpdateStep('confirmUpdateDownload -> 用户确认更新,准备下载');
this.startUpdateDownload();
},
startUpdateDownload() {
this.logUpdateStep('startUpdateDownload -> 开始下载流程', {
url: this.updateInfo.url,
file: this.updateInfo.file
});
if (!this.updateInfo.url) {
this.updateErrorMessage = '未获取到下载地址';
this.logUpdateStep('startUpdateDownload -> 缺少下载地址,终止');
return;
}
this.isDownloadingUpdate = true;
this.updateDownloadProgress = 0;
this.updateErrorMessage = '';
const downloadTask = uni.downloadFile({
url: this.updateInfo.url,
success: (res) => {
this.updateTask = null;
this.logUpdateStep('startUpdateDownload -> 下载完成回调', {
statusCode: res.statusCode,
tempFilePath: res.tempFilePath
});
if (res.statusCode !== 200 || !res.tempFilePath) {
this.isDownloadingUpdate = false;
this.updateErrorMessage = '安装包下载失败';
this.logUpdateStep('startUpdateDownload -> 下载结果无效,终止');
return;
}
this.updateDownloadProgress = 100;
this.logUpdateStep('startUpdateDownload -> 下载成功,准备打开文件');
this.openDownloadedFile(res.tempFilePath);
},
fail: (error) => {
this.updateTask = null;
this.isDownloadingUpdate = false;
this.updateErrorMessage = error?.errMsg || '安装包下载失败';
this.logUpdateStep('startUpdateDownload -> 下载失败', error);
}
});
this.updateTask = downloadTask;
this.logUpdateStep('startUpdateDownload -> downloadTask 已创建');
if (downloadTask && typeof downloadTask.onProgressUpdate === 'function') {
downloadTask.onProgressUpdate((progressEvent) => {
this.updateDownloadProgress = Number(progressEvent.progress || 0);
this.logUpdateStep('startUpdateDownload -> 下载进度', {
progress: this.updateDownloadProgress,
totalBytesWritten: progressEvent.totalBytesWritten,
totalBytesExpectedToWrite: progressEvent.totalBytesExpectedToWrite
});
});
} else {
this.logUpdateStep('startUpdateDownload -> 当前环境不支持进度回调');
}
},
openDownloadedFile(filePath) {
this.logUpdateStep('openDownloadedFile -> 尝试打开下载文件', {
filePath
});
if (typeof plus === 'undefined' || !plus.runtime || typeof plus.runtime.openFile !== 'function') {
this.updateTask = null;
this.isDownloadingUpdate = false;
this.updateErrorMessage = '当前环境不支持打开安装包';
this.logUpdateStep('openDownloadedFile -> 环境不支持 plus.runtime.openFile');
return;
}
try {
plus.runtime.openFile(filePath, {}, () => {
this.updateTask = null;
this.isDownloadingUpdate = false;
this.updateErrorMessage = '';
this.showUpdateDialog = false;
this.logUpdateStep('openDownloadedFile -> 文件打开成功,更新流程完成');
}, (error) => {
this.updateTask = null;
this.isDownloadingUpdate = false;
this.updateErrorMessage = error?.message || '文件已下载,但打开失败';
this.logUpdateStep('openDownloadedFile -> 文件打开失败', error);
});
} catch (error) {
this.updateTask = null;
this.isDownloadingUpdate = false;
this.updateErrorMessage = error?.message || '文件已下载,但打开失败';
this.logUpdateStep('openDownloadedFile -> 调用异常', error);
}
}
}
};
@ -131,4 +542,131 @@ export default {
font-size: 24rpx;
color: #c0c4cc;
}
/* ===== 版本更新弹窗(与登录页一致) ===== */
.update-mask {
position: fixed;
left: 0;
top: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.48);
display: flex;
align-items: center;
justify-content: center;
z-index: 9999;
padding: 32rpx;
box-sizing: border-box;
}
.update-dialog {
width: 100%;
max-width: 680rpx;
background: #fff;
border-radius: 24rpx;
padding: 36rpx;
box-sizing: border-box;
box-shadow: 0 24rpx 80rpx rgba(0, 0, 0, 0.18);
}
.update-header {
display: flex;
flex-direction: column;
gap: 10rpx;
margin-bottom: 28rpx;
}
.update-title {
font-size: 36rpx;
font-weight: 600;
color: #222;
}
.update-version {
font-size: 24rpx;
color: #5c6b77;
}
.update-body {
display: flex;
flex-direction: column;
gap: 20rpx;
}
.update-row {
display: flex;
justify-content: space-between;
align-items: flex-start;
gap: 20rpx;
}
.update-label {
font-size: 26rpx;
color: #86909c;
flex-shrink: 0;
}
.update-value {
font-size: 26rpx;
color: #333;
text-align: right;
word-break: break-all;
}
.update-tip-box {
background: #f6f9ff;
border-radius: 16rpx;
padding: 24rpx;
display: flex;
flex-direction: column;
gap: 12rpx;
}
.update-tip {
font-size: 26rpx;
line-height: 1.6;
color: #4e5969;
}
.update-progress-section {
margin-top: 8rpx;
}
.update-progress-head {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 14rpx;
}
.update-progress-text {
font-size: 26rpx;
color: #333;
}
.update-progress-bar {
height: 18rpx;
background: #eef1f5;
border-radius: 999rpx;
overflow: hidden;
}
.update-progress-inner {
height: 100%;
background: linear-gradient(90deg, #2979ff, #19be6b);
border-radius: 999rpx;
transition: width 0.2s ease;
}
.update-error {
font-size: 24rpx;
color: #fa3534;
line-height: 1.6;
}
.update-actions {
display: flex;
gap: 20rpx;
margin-top: 32rpx;
}
</style>