From e179bf0117d25f49bd0252da89f10cd8b4349c20 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 20 三月 2024 09:40:53 +0800
Subject: [PATCH] Merge branch 'hzdzwms' of http://47.97.1.152:5880/r/wms_app into hzdzwms
---
pages/login/login.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 8c7adf8..78e9ddc 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -87,7 +87,7 @@
<view>
<!-- 鎻愮ず绐楃ず渚� -->
<uni-popup ref="upVersion" type="dialog">
- <uni-popup-dialog :type="msgType" title="閫氱煡" content="鍙戠幇鏂扮増鏈�,鏄惁闇�瑕佹洿鏂�" @confirm="dialogConfirm"
+ <uni-popup-dialog :type="msgType" title="閫氱煡" :content="dialogContent" @confirm="dialogConfirm"
@close="dialogClose"></uni-popup-dialog>
</uni-popup>
</view>
@@ -126,6 +126,7 @@
},
msgType: 'success',
filename: '',
+ dialogContent: ''
}
},
onLoad() {
@@ -138,16 +139,8 @@
if (!this.url) {
this.url = {ip: '',port: '',project: ''}
}
- // this.getVersion()
},
onShow () {
- // 鎵嬫満绔増鏈彿
- // // #ifdef APP-PLUS
- // var that = this
- // plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
- // that.version = wgtinfo.version
- // });
- // // #endif
this.getVersion()
},
methods: {
@@ -268,7 +261,14 @@
var res = res.data
if (res.data) {
that.filename = res.data.path
+ that.dialogContent = '鍙戠幇鏂扮増鏈�:' + res.data.version + ', 鏄惁绔嬪嵆鏇存柊'
that.$refs.upVersion.open()
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
}
}
--
Gitblit v1.9.1