From 53193d9a0f6eac11a98c6da032e8a97979f433cb Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 10 四月 2024 21:20:11 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs
---
pages/login/login.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 8c7adf8..588654c 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>
+ <image src="../../static/img/newLogo.png" mode="aspectFit"></image>
</view>
</view>
<view class="content">
@@ -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: {
@@ -175,6 +168,7 @@
this.baseUrl = "http://" + this.url.ip + ':' + this.url.port + '/' + this.url.project
uni.setStorageSync('baseUrl', this.baseUrl);
uni.setStorageSync('url', this.url);
+ uni.setStorageSync('project','tzsk')
this.$refs.inputDialog.close()
},
onLogin() {
@@ -195,6 +189,9 @@
"content-type": "application/json"
},
success(result) {
+ // uni.reLaunch({
+ // url: '../home/menuHome'
+ // });
if (result.statusCode === 404) {
uni.showToast({
title: '鐧诲綍澶辫触',
@@ -218,7 +215,7 @@
})
setTimeout(() => {
uni.reLaunch({
- url: '../home/home'
+ url: '../home/menuHome'
});
}, 300)
}, 700)
@@ -268,7 +265,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