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 |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0e9a529..78e9ddc 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/LkyLogo.jpg" mode="aspectFit"></image>
+				<image src="../../static/img/logo.png" mode="aspectFit"></image>
 			</view>
 		</view>
 		<view class="content">
@@ -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'
+							})
 						}
 						
 					}

--
Gitblit v1.9.1