From 321a8a61f3cbc8c0c507d7339e1d46f59ec535c2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 九月 2024 15:21:24 +0800
Subject: [PATCH] #

---
 pages/login/login.vue |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0e9a529..bfa5bf0 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/zy_logo.png" mode="aspectFit"></image>
 			</view>
 		</view>
 		<view class="content">
@@ -76,6 +76,18 @@
 						<view class="popup-item-left">椤圭洰:</view>
 						<view class="popup-item-right"><input type="text" v-model="url.project"></view>
 					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">WCSIP:</view>
+						<view class="popup-item-right"><input type="text" v-model="url.wcsIp"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">WCS绔彛:</view>
+						<view class="popup-item-right"><input type="text" v-model="url.wcsPort"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">WCS椤圭洰:</view>
+						<view class="popup-item-right"><input type="text" v-model="url.wcsProject"></view>
+					</view>
 					<view class="btn">
 						<view class="btn-left" @click="close">鍙栨秷</view>
 						<view class="btn-right" @click="settingConfirm">纭</view>
@@ -116,6 +128,7 @@
 					project: ''
 				},
 				baseUrl: '',
+				wcsBaseUrl: '',
 				user: {
 					userName: '',
 					password: '',
@@ -139,16 +152,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: {
@@ -174,7 +179,9 @@
 			// 淇濆瓨ip
 			settingConfirm() {
 				this.baseUrl = "http://" + this.url.ip + ':' + this.url.port + '/' + this.url.project
+				this.wcsBaseUrl = "http://" + this.url.wcsIp + ':' + this.url.wcsPort + '/' + this.url.wcsProject
 				uni.setStorageSync('baseUrl', this.baseUrl);
+				uni.setStorageSync('wcsBaseUrl',this.wcsBaseUrl)
 				uni.setStorageSync('url', this.url);
 				this.$refs.inputDialog.close()
 			},
@@ -265,11 +272,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'
+							})
 						}
 						
 					}
@@ -361,7 +375,7 @@
 		display: flex;
 		justify-content: center;
 	}
-	.logo-box {
+	.logo-box {		
 		margin: auto 0;
 	}
 	image {

--
Gitblit v1.9.1