From cf3446b3d292e5591e0214ff9ce19102dd50b789 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 19 九月 2025 16:59:06 +0800
Subject: [PATCH] 江苏小松初始化

---
 pages/home/home.vue    |  100 ++++++++++++++++++++++++++-----------------------
 pages/login/login.vue  |   17 ++++----
 pages/AGV/AGVPakin.vue |    2 
 3 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/pages/AGV/AGVPakin.vue b/pages/AGV/AGVPakin.vue
index 6f92ee6..16d99af 100644
--- a/pages/AGV/AGVPakin.vue
+++ b/pages/AGV/AGVPakin.vue
@@ -410,7 +410,7 @@
 					}
 				}
 				uni.request({
-					url: that.baseUrl + '/agvMobile/comb/auth',
+					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
 						orderNo: that.orderNo,
 						barcode: that.barcode,
diff --git a/pages/home/home.vue b/pages/home/home.vue
index f55cad5..ca83f2e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,27 +24,27 @@
 				icon: '',
 				elements: [],
 				elements2: [
-					// {
-					// 	title: '缁勬墭',
-					// 	name: 'pakin',
-					// 	color: 'cyan',
-					// 	cuIcon: 'pullup',
-					// 	url: '/pakin/pakin'
-					// },
 					{
-						title: '璁㈠崟鍏ュ簱',
-						name: 'orderPakin',
-						color: 'red',
+						title: '缁勬墭',
+						name: 'pakin',
+						color: 'cyan',
 						cuIcon: 'pullup',
-						url: '/order/orderList'
+						url: '/pakin/pakin'
 					},
-					{
-						title: '鎷f枡绔欏埌绔�',
-						name: 'leftover',
-						color: 'orange',
-						cuIcon: 'pullup',
-						url: '/pakin/leftovers'
-					},					
+					// {
+					// 	title: '璁㈠崟鍏ュ簱',
+					// 	name: 'orderPakin',
+					// 	color: 'red',
+					// 	cuIcon: 'pullup',
+					// 	url: '/order/orderList'
+					// },
+					// {
+					// 	title: '鎷f枡绔欏埌绔�',
+					// 	name: 'leftover',
+					// 	color: 'orange',
+					// 	cuIcon: 'pullup',
+					// 	url: '/pakin/leftovers'
+					// },					
 					
 					// {
 					// 	title: '骞冲簱鍏ュ簱',
@@ -60,7 +60,13 @@
 					// 	cuIcon: 'pullup',
 					// 	url: '/pingku/POrderListOut'
 					// },
-					
+					{
+						title: 'Agv缁勬墭',
+						name: 'AGVPakin',
+						color: 'cyan',
+						cuIcon: 'order',
+						url: '/AGV/AGVPakin'
+					},
 					{
 						title: '鍛煎彨Agv',
 						name: 'AGVStart',
@@ -68,34 +74,34 @@
 						cuIcon: 'order',
 						url: '/AGV/AGVStart'
 					},
-					{
-						title: 'Agv鍌ㄤ綅瑙g粦',
-						name: 'AGVUnbind',
-						color: 'orange',
-						cuIcon: 'order',
-						url: '/AGV/AGVUnbind'
-					},					
-					{
-						title: '绔欑粦瀹�',
-						name: 'AGVStaBind',
-						color: 'red',
-						cuIcon: 'post',
-						url: '/AGV/AGVStaBind'
-					},
-					{
-						title: '浜х嚎鍙枡',
-						name: 'AGVSiteList',
-						color: 'red',
-						cuIcon: 'post',
-						url: '/AGV/AGVSiteList'
-					},
-					{
-						title: '鎴愬搧鍛煎彨',
-						name: 'AGVFinishedCall',
-						color: 'orange',
-						cuIcon: 'pullup',
-						url: '/AGV/AGVFinishedCall'
-					},
+					// {
+					// 	title: 'Agv鍌ㄤ綅瑙g粦',
+					// 	name: 'AGVUnbind',
+					// 	color: 'orange',
+					// 	cuIcon: 'order',
+					// 	url: '/AGV/AGVUnbind'
+					// },					
+					// {
+					// 	title: '绔欑粦瀹�',
+					// 	name: 'AGVStaBind',
+					// 	color: 'red',
+					// 	cuIcon: 'post',
+					// 	url: '/AGV/AGVStaBind'
+					// },
+					// {
+					// 	title: '浜х嚎鍙枡',
+					// 	name: 'AGVSiteList',
+					// 	color: 'red',
+					// 	cuIcon: 'post',
+					// 	url: '/AGV/AGVSiteList'
+					// },
+					// {
+					// 	title: '鎴愬搧鍛煎彨',
+					// 	name: 'AGVFinishedCall',
+					// 	color: 'orange',
+					// 	cuIcon: 'pullup',
+					// 	url: '/AGV/AGVFinishedCall'
+					// },
 					// {
 					// 	title: '缁勬墭涓婃灦',
 					// 	name: 'putOn',
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a754947..1170f91 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -174,18 +174,11 @@
 				let that = this
 				uni.request({
 					url: that.baseUrl + '/login.action',
-					fail(result) {
-						uni.showToast({
-							icon: 'error',
-							title: '璇锋眰澶辫触'
-						})
-					},
+					method: 'POST',
+					header: {"content-type": "application/json"},
 					data: {
 						username: that.user.userName,
 						password: md5.hex_md5(that.user.password)
-					},
-					header: {
-						"content-type": "application/json"
 					},
 					success(result) {
 						if (result.statusCode === 404) {
@@ -221,6 +214,12 @@
 							})
 						}
 					},
+					fail(result) {
+						uni.showToast({
+							icon: 'error',
+							title: '璇锋眰澶辫触'
+						})
+					},
 				})
 			},
 			//妫�娴嬪綋鍓嶅钩鍙帮紝濡傛灉鏄畨鍗撳垯鍚姩瀹夊崜鏇存柊

--
Gitblit v1.9.1