diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index f42f220..7132770 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.81'; //正式版本号 + version = '0.0.82'; //正式版本号 //version = '0.0.4'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue index 7fa08e4..8a68348 100644 --- a/src/pages/quality/Materialinspection/index.vue +++ b/src/pages/quality/Materialinspection/index.vue @@ -82,7 +82,8 @@ - + +
检验项目 :
@@ -1499,6 +1500,42 @@ export default class PurchaseWHSRM extends BasePage { url: `/pages/quality/Materialinspection/web?listitem=` + encodeURIComponent(result), }); } + closepopup() { + //是否关闭弹窗 + this.$nextTick(() => { + uni.showModal({ + content: '是否退出?', + showCancel: true, + success: (res) => { + if (res.confirm) { + this.show = false; + } else if (res.cancel) { + console.log('不关闭'); + } + }, + }); + }); + } + onBackPress(e) { + if (e.from === 'backbutton') { + if (this.show === true) { + uni.showModal({ + content: '是否退出?', + showCancel: true, + success: (res) => { + if (res.confirm) { + this.show = false; + } else if (res.cancel) { + console.log('不关闭'); + } + }, + }); + return true; + } else { + /// + } + } + } }