From 9cc631da82223d2965771b7c939082f73e12d3bb Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 24 九月 2025 10:59:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-tlf-pda' into jx-tlf-pda
---
pages/login/login.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f552833..d4db49c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,7 +9,7 @@
<!-- logo -->
<view class="logo">
<view class="logo-box">
- <image src="../../static/img/logo.png" mode="aspectFit"></image>
+
</view>
</view>
<view class="content">
@@ -113,7 +113,7 @@
url: {
ip: '',
port: '',
- project: ''
+ project: 'wms'
},
baseUrl: '',
user: {
@@ -139,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: {
@@ -265,11 +257,18 @@
url: url,
method: 'GET',
success(res) {
+ console.log(res);
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'
+ })
}
}
@@ -355,7 +354,7 @@
float: right;
margin-right: 10rpx;
}
- .logo {
+ .logo {
height: 25%;
width: 100%;
display: flex;
@@ -363,6 +362,7 @@
}
.logo-box {
margin: auto 0;
+ min-height: 300rpx;
}
image {
height: 300rpx;
--
Gitblit v1.9.1