feat: 更新应用版本至1.3.21并扩展钢卷发货品质限制
- 将应用版本从1.3.20升级至1.3.21,更新了相关配置文件 - 修改发货逻辑,允许B和B-品质的钢卷发货 - 调整撤回成功提示的图标显示为'none'
This commit is contained in:
@@ -8,7 +8,7 @@ module.exports = {
|
|||||||
// 应用名称
|
// 应用名称
|
||||||
name: "ruoyi-app",
|
name: "ruoyi-app",
|
||||||
// 应用版本
|
// 应用版本
|
||||||
version: "1.3.20",
|
version: "1.3.21",
|
||||||
// 应用logo
|
// 应用logo
|
||||||
logo: "/static/logo.jpg",
|
logo: "/static/logo.jpg",
|
||||||
// 官方网站
|
// 官方网站
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name" : "科伦普",
|
"name" : "科伦普",
|
||||||
"appid" : "__UNI__E781B49",
|
"appid" : "__UNI__E781B49",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.3.20",
|
"versionName" : "1.3.21",
|
||||||
"versionCode" : 1,
|
"versionCode" : 1,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
|
|||||||
@@ -267,8 +267,8 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
icon: 'success',
|
title: this.coilDetail.currentCoilNo + '发货已撤回',
|
||||||
title: this.coilDetail.currentCoilNo + '发货已撤回'
|
icon: 'none'
|
||||||
})
|
})
|
||||||
this.$refs.shipPopup.close()
|
this.$refs.shipPopup.close()
|
||||||
},
|
},
|
||||||
@@ -567,9 +567,13 @@
|
|||||||
async handleShipSubmit() {
|
async handleShipSubmit() {
|
||||||
try {
|
try {
|
||||||
// 判断钢卷的质量状态,必须是A+, A,A-, B+其中之一
|
// 判断钢卷的质量状态,必须是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({
|
uni.showToast({
|
||||||
title: '只能发货B+以上品质的钢卷',
|
title: '只能发货B-以上品质的钢卷',
|
||||||
icon: 'none'
|
icon: 'none'
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ function checkStorageSpace() {
|
|||||||
function checkUpdate(forceCheck = false) {
|
function checkUpdate(forceCheck = false) {
|
||||||
// 1. 准备本地版本信息
|
// 1. 准备本地版本信息
|
||||||
const localVersion = plus.runtime.version; // 基座版本
|
const localVersion = plus.runtime.version; // 基座版本
|
||||||
const staticVersion = '1.3.20'; // 静态默认版本
|
const staticVersion = '1.3.21'; // 静态默认版本
|
||||||
const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本(从存储获取或用默认)
|
const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本(从存储获取或用默认)
|
||||||
const currentVersion = compareVersion(localWgtVersion, localVersion) > 0
|
const currentVersion = compareVersion(localWgtVersion, localVersion) > 0
|
||||||
? localWgtVersion
|
? localWgtVersion
|
||||||
|
|||||||
@@ -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",
|
"wgtUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.wgt",
|
||||||
"apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk"
|
"apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user