From 325041ada6c2227cdd597ba5b21119c46a618c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 12 Jan 2026 13:20:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=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.21=E5=B9=B6=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=8F=91=E8=B4=A7=E5=93=81=E8=B4=A8=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将应用版本从1.3.20升级至1.3.21，更新了相关配置文件 - 修改发货逻辑，允许B和B-品质的钢卷发货 - 调整撤回成功提示的图标显示为'none' --- apps/hand-factory/config.js | 2 +- apps/hand-factory/manifest.json | 2 +- apps/hand-factory/pages/easycode/easycode.vue | 16 ++++++++++------ apps/hand-factory/utils/update.js | 2 +- apps/hand-factory/version.json | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js index 71e24a5..8afa89a 100644 --- a/apps/hand-factory/config.js +++ b/apps/hand-factory/config.js @@ -8,7 +8,7 @@ module.exports = { // 应用名称 name: "ruoyi-app", // 应用版本 - version: "1.3.20", + version: "1.3.21", // 应用logo logo: "/static/logo.jpg", // 官方网站 diff --git a/apps/hand-factory/manifest.json b/apps/hand-factory/manifest.json index 73e7d2c..8c1637c 100644 --- a/apps/hand-factory/manifest.json +++ b/apps/hand-factory/manifest.json @@ -2,7 +2,7 @@ "name" : "科伦普", "appid" : "__UNI__E781B49", "description" : "", - "versionName" : "1.3.20", + "versionName" : "1.3.21", "versionCode" : 1, "transformPx" : false, "app-plus" : { diff --git a/apps/hand-factory/pages/easycode/easycode.vue b/apps/hand-factory/pages/easycode/easycode.vue index 9a0303c..a6714d2 100644 --- a/apps/hand-factory/pages/easycode/easycode.vue +++ b/apps/hand-factory/pages/easycode/easycode.vue @@ -264,11 +264,11 @@ icon: 'error', title: res.message || '撤回失败请重试' }) - return; + return; } uni.showToast({ - icon: 'success', - title: this.coilDetail.currentCoilNo + '发货已撤回' + title: this.coilDetail.currentCoilNo + '发货已撤回', + icon: 'none' }) this.$refs.shipPopup.close() }, @@ -484,7 +484,7 @@ if (coilRes.code !== 200) { throw new Error(coilRes.msg || '查询钢卷信息失败'); } - + if (!coilRes.data) { throw new Error('未找到钢卷信息'); } @@ -567,9 +567,13 @@ async handleShipSubmit() { try { // 判断钢卷的质量状态，必须是A+, A，A-, B+其中之一 - if (!['A+', 'A', 'A-', 'B+'].includes(this.coilDetail.qualityStatus)) { + 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+以上品质的钢卷', + title: '只能发货B-以上品质的钢卷', icon: 'none' }); return; diff --git a/apps/hand-factory/utils/update.js b/apps/hand-factory/utils/update.js index 47d6697..5307b91 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.20'; // 静态默认版本 + const staticVersion = '1.3.21'; // 静态默认版本 const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本（从存储获取或用默认） const currentVersion = compareVersion(localWgtVersion, localVersion) > 0 ? localWgtVersion diff --git a/apps/hand-factory/version.json b/apps/hand-factory/version.json index f827cb4..eeab412 100644 --- a/apps/hand-factory/version.json +++ b/apps/hand-factory/version.json @@ -1,5 +1,5 @@ { - "version": "klp 1.3.20", + "version": "klp 1.3.21", "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