From 233fdc1cc07df94e54036fa421addf1e17cdff83 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 28 二月 2024 10:58:12 +0800
Subject: [PATCH] #

---
 pages/LoginDemo/LoginDemo.vue |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pages/LoginDemo/LoginDemo.vue b/pages/LoginDemo/LoginDemo.vue
index e4b6fbc..09d9eef 100644
--- a/pages/LoginDemo/LoginDemo.vue
+++ b/pages/LoginDemo/LoginDemo.vue
@@ -74,17 +74,12 @@
 					username: '',
 					password: ''
 				},
-				network: [{
-						name: 'wms',
-						ip: '192.168.1.1',
-						port: '8080',
-						address: 'pswms'
-					},
+				network: [
 					{
 						name: 'wcs',
-						ip: '192.168.1.1',
+						ip: '10.10.10.200',
 						port: '9090',
-						address: 'pswcs'
+						address: 'jmwcs'
 					}
 				],
 				load: {
@@ -135,10 +130,10 @@
 				this.$refs.settings.close()
 			},
 			async login() {
-				uni.reLaunch({
-					url: `/pages/project/jmAGV/home`,
-				});
-				return
+				// uni.reLaunch({
+				// 	url: `/pages/project/jmAGV/home`,
+				// });
+				// return
 				if (!uni.getStorageSync('Network')) {
 					uni.showToast({ icon: 'error', title: '璇烽厤缃綉缁滀俊鎭�' }) 
 					return
@@ -153,7 +148,9 @@
 				}
 				this.load.loading = true;
 				this.load.btnText = '鐧诲綍涓�';
+				uni.setStorageSync('user', this.user);
 				let res = await common.onLogin(this.user)
+				console.log(res);
 				if (res.code === 200) {
 					setTimeout(() => {
 						uni.showToast({
@@ -161,13 +158,13 @@
 						})
 						setTimeout(() => {
 							uni.reLaunch({
-								url: `/pages/home/home`,
+								url: `/pages/project/jmAGV/home`,
 							});
 						}, 300)
 						if (!this.remberPassword) {
 							this.user.password = ''
 						}
-						uni.setStorageSync('user', this.user);
+						// uni.setStorageSync('user', this.user);
 					}, 700)
 				} else if (res.code === 0) {
 					this.load.loading = false;

--
Gitblit v1.9.1