diff --git a/src/App.vue b/src/App.vue index 9128a34d..2305bec2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -18,10 +18,16 @@ // plus.screen.lockOrientation('landscape-primary'); // // app 强制竖屏 // plus.screen.lockOrientation('portrait-primary'); - appUpdate(); + appUpdate(false); // #endif }, + data() { + return { + // 假设有一个模态框显示的标志 + modalShowing: true + }; + }, onShow: function() { console.log('App Show') }, diff --git a/src/api/request2.js b/src/api/request2.js index 3ca3e1e6..274a1e26 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -419,9 +419,6 @@ export function getMesPackInfo(code) { - - - /** * 查询库位信息接口 * @param {*} code 库位代码 @@ -3852,9 +3849,9 @@ export function getMainMessage() { * */ export function appCheckUpdate() { - return uni.request({ - url: "http://192.168.0.119:9527/appUpdate.json", - method: "GET", + return request({ + url: baseApi+"/wms/system-install-package/returnNewFile", + method: "get", data: {} }) } diff --git a/src/common/appUpdate.js b/src/common/appUpdate.js index 03af4c39..1febe1ed 100644 --- a/src/common/appUpdate.js +++ b/src/common/appUpdate.js @@ -1,7 +1,7 @@ import { appCheckUpdate } from '../api/request2.js'; -export function appUpdate() { +export function appUpdate(isShowHint) { let curversion = 0; plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) { const data = { @@ -11,44 +11,77 @@ export function appUpdate() { wgtVersion: widgetInfo.version, versionCode: widgetInfo.versionCode } - curversion=data.versionCode - appCheckUpdate().then(res => { - console.log("当前版本提示",curversion) - if (res.data) { - if (res.data.versionCode > Number(curversion)) { - var downUrl = res.data.downUrl; - var content = res.data.content; - var version =res.data.version - console.log("新版本提示") - uni.showModal({ - title: "发现新版本:("+version+")", - content: content, - confirmText: "更新", - cancelText: "取消", - success: (res) => { - if (res.confirm) { - confirm(downUrl); - console.log('comfirm') //点击确定之后执行的代码 - } else { - console.log('cancel') //点击取消之后执行的代码 - } + curversion = data.versionCode + appCheckUpdate().then(res => { + console.log("当前版本提示", curversion) + var json = JSON.stringify(res) + console.log("获取更新数据", json) + if (res.data) { + if (res.data.installPackageVersion > Number(curversion)) { + var downUrl = res.data.downUrl; + var content = res.data.updateContent; + var version = res.data.installPackageVersion; + var isForcedUpdate = res.data.isForcedUpdate + var versionName =res.data.installPackageName + console.log("新版本提示") + showDialog(versionName, content, isForcedUpdate, downUrl) + + // uni.showModal({ + // title: "发现新版本:(" + version + ")", + // content: content, + // confirmText: "更新", + // showCancel: isForcedUpdate == "TRUE" ? false : true, + // cancelText: "取消", + // success: (res) => { + // if (res.confirm) { + // confirm(downUrl); + // console.log('comfirm') //点击确定之后执行的代码 + // } else { + // console.log('cancel') //点击取消之后执行的代码 + // if (isForcedUpdate == "TRUE") { + + // } + // } + // } + // }) + } else { + if(isShowHint){ + uni.showToast({ + title: "当前是最新版本" + }) } - }) + + console.log("没有新版本") + } + } + }).catch(error => { + console.log("版本错误", error) + }) + }) + +} + +export function showDialog(versionName, content, isForcedUpdate, downUrl) { + uni.showModal({ + title: "发现新版本:(" + versionName + ")", + content: content, + confirmText: "更新", + showCancel: isForcedUpdate == "TRUE" ? false : true, + cancelText: "取消", + success: (res) => { + if (res.confirm) { + confirm(downUrl); + console.log( + 'comfirm') //点击确定之后执行的代码 } else { - uni.showToast({ - title:"当前是最新版本" - }) - console.log("没有新版本") + console.log( + 'cancel') //点击取消之后执行的代码 + if (isForcedUpdate == "TRUE") { + showDialog(version, content, isForcedUpdate, downUrl) + } } } - }).catch(error => { - console.log("版本错误", error) - }) - }) - - - } export function confirm(downUrl) { diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css index adf36fbc..6dec3563 100644 --- a/src/common/style/new_style.css +++ b/src/common/style/new_style.css @@ -2031,7 +2031,8 @@ button::after { } .card_itemCode { - font-size: 36rpx; + font-size: 38rpx; + font-weight: bold; /* font-weight: 500; */ padding: 5rpx 10rpx; } diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue index f174b405..7906aa22 100644 --- a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue +++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue @@ -1,6 +1,6 @@