From 3f1032713ed4b03527e22def8ebb3c03742eddb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Fri, 24 Apr 2026 13:23:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=87=B31.3.31=E5=B9=B6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将config.js和version.json中的版本号更新为1.3.31 - 移除easycode.vue中钢卷质量状态的发货限制 - 修改update.js的更新提示,取消更新时直接退出应用 --- apps/hand-factory/config.js | 2 +- apps/hand-factory/pages/easycode/easycode.vue | 22 +++++++++---------- apps/hand-factory/utils/update.js | 8 ++++--- apps/hand-factory/version.json | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js index 1dc5e8c..dbb8369 100644 --- a/apps/hand-factory/config.js +++ b/apps/hand-factory/config.js @@ -9,7 +9,7 @@ module.exports = { // 应用名称 name: "ruoyi-app", // 应用版本 - version: "1.3.30", + version: "1.3.31", // 应用logo logo: "/static/logo.jpg", // 官方网站 diff --git a/apps/hand-factory/pages/easycode/easycode.vue b/apps/hand-factory/pages/easycode/easycode.vue index 612da33..46cee9f 100644 --- a/apps/hand-factory/pages/easycode/easycode.vue +++ b/apps/hand-factory/pages/easycode/easycode.vue @@ -571,17 +571,17 @@ async handleShipSubmit() { try { // 判断钢卷的质量状态,必须是A+, A,A-, B+,B,B-其中之一 - if (!['A+', 'A', 'A-', 'B+', 'B', 'B-'].includes(this.coilDetail.qualityStatus) - && !(this.coilDetail.qualityStatus == null - || this.coilDetail.qualityStatus == undefined - || this.coilDetail.qualityStatus == '') - ) { - uni.showToast({ - title: '只能发货B-以上品质的钢卷', - icon: 'none' - }); - return; - } + // if (!['A+', 'A', 'A-', 'B+', 'B', 'B-'].includes(this.coilDetail.qualityStatus) + // && !(this.coilDetail.qualityStatus == null + // || this.coilDetail.qualityStatus == undefined + // || this.coilDetail.qualityStatus == '') + // ) { + // uni.showToast({ + // title: '只能发货B-以上品质的钢卷', + // icon: 'none' + // }); + // return; + // } // 1. 更新钢卷状态为已发货 const res = await exportCoil(this.coilDetail.coilId); diff --git a/apps/hand-factory/utils/update.js b/apps/hand-factory/utils/update.js index febeae5..e0f3d6c 100644 --- a/apps/hand-factory/utils/update.js +++ b/apps/hand-factory/utils/update.js @@ -73,7 +73,7 @@ function checkStorageSpace() { function checkUpdate(forceCheck = false) { // 1. 准备本地版本信息 const localVersion = plus.runtime.version; // 基座版本 - const staticVersion = '1.3.30'; // 静态默认版本 + const staticVersion = '1.3.31'; // 静态默认版本 // const localWgtVersion = staticVersion; const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本(从存储获取或用默认) const currentVersion = compareVersion(localWgtVersion, localVersion) > 0 @@ -155,14 +155,16 @@ function checkUpdate(forceCheck = false) { title: '发现新版本', content: `检测到新版本(${remoteVersion}),是否立即下载并更新?`, confirmText: '立即更新', - cancelText: '暂不更新', + cancelText: '推出应用', showCancel: true, success: (modalRes) => { if (modalRes.confirm) { // 用户确认更新:检查存储空间 -> 下载 -> 安装 handleConfirmUpdate(wgtUrl, remoteVersion); } else { - // 直接退出 + // 直接退出 + plus.runtime.quit() + // 用户取消更新:询问是否忽略该版本 // handleCancelUpdate(remoteVersion); diff --git a/apps/hand-factory/version.json b/apps/hand-factory/version.json index a7bbde5..e0e9ec9 100644 --- a/apps/hand-factory/version.json +++ b/apps/hand-factory/version.json @@ -1,5 +1,5 @@ { - "version": "klp 1.3.30", + "version": "klp 1.3.31", "wgtUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.wgt", "apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk" } \ No newline at end of file