From 11a4e8a38ae2b949d5727f146554f08521c28b9c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 06 十月 2023 16:53:20 +0800
Subject: [PATCH] #

---
 pages/home/home.vue |  129 +++++++++++++++++++++++++++++-------------
 1 files changed, 88 insertions(+), 41 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8640219..adf7b0c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -21,21 +21,45 @@
 			return {
 				baseUrl: '',
 				token: '',
+				icon: '',
 				elements: [],
-				elements2: [{
-						title: '缁勬墭鍏ュ簱',
-						name: 'pakin',
+				elements2: [
+					// {
+					// 	title: '缁勬墭鍏ュ簱',
+					// 	name: 'pakin',
+					// 	color: 'orange',
+					// 	cuIcon: 'pullup',
+					// 	url: '/pakin/pakin'
+					// },
+					// {
+					// 	title: '璁㈠崟缁勬墭',
+					// 	name: 'orderPakin',
+					// 	color: 'blue',
+					// 	cuIcon: 'pullup',
+					// 	url: '/order/orderPakin'
+					// },
+					{
+						title: '璁㈠崟缁勬墭',
+						name: 'putOn',
 						color: 'cyan',
 						cuIcon: 'pullup',
-						url: '/pakin/pakin'
+						url: '/order/orderPutOn2'
 					},
 					{
-						title: '璁㈠崟鍏ュ簱',
-						name: 'orderPakin',
-						color: 'blue',
+						title: '缁勬墭涓婃灦',
+						name: 'putOn',
+						color: 'cyan',
 						cuIcon: 'pullup',
-						url: '/order/orderPakin'
+						url: '/pakin/putOn'
 					},
+					
+					// {
+					// 	title: '璁㈠崟缁勬墭3',
+					// 	name: 'putOn',
+					// 	color: 'cyan',
+					// 	cuIcon: 'pullup',
+					// 	url: '/order/orderPutOn3'
+					// },
 					// {
 					// 	title: '鎵撳嵃',
 					// 	name: 'print',
@@ -44,12 +68,19 @@
 					// 	url: '/print/print'
 					// },
 					{
-						title: '璁㈠崟涓婃灦',
+						title: '鐢熸垚璁㈠崟',
 						name: 'orderPutOn',
 						color: 'mauve',
 						cuIcon: 'pullup',
-						url: '/order/orderPutOn'
+						url: '/order/createOrder'
 					},
+					// {
+					// 	title: '璁㈠崟涓婃灦',
+					// 	name: 'orderPutOn',
+					// 	color: 'mauve',
+					// 	cuIcon: 'pullup',
+					// 	url: '/order/orderPutOn'
+					// },
 					{
 						title: '璁㈠崟涓嬫灦',
 						name: 'orderPutDown',
@@ -72,33 +103,40 @@
 						url: '/stock/stockCheck'
 					},
 					{
-						title: '鍟嗗搧鎵撳嵃',
-						name: 'matList',
-						color: 'orange',
-						cuIcon: 'post',
-						url: '/mat/matList'
-					},
-					{
-						title: '琛ヨ揣',
-						name: 'restock',
-						color: 'yellow',
-						cuIcon: 'punch',
-						url: '/stock/restock'
-					},
-					{
-						title: '杞叏鏉�',
-						name: 'piking',
+						title: '搴撲綅杞Щ',
+						name: 'locMove',
 						color: 'olive',
 						cuIcon: 'order',
-						url: '/pakin/piking'
+						url: '/loc/locMove'
 					},
-					{
-						title: '鎹㈡澘缁戝畾',
-						name: 'changePallet',
-						color: 'green',
-						cuIcon: 'order',
-						url: '/stock/changePallet'
-					},
+					// {
+					// 	title: '鍟嗗搧鎵撳嵃',
+					// 	name: 'matList',
+					// 	color: 'orange',
+					// 	cuIcon: 'post',
+					// 	url: '/mat/matList'
+					// },
+					// {
+					// 	title: '琛ヨ揣',
+					// 	name: 'restock',
+					// 	color: 'yellow',
+					// 	cuIcon: 'punch',
+					// 	url: '/stock/restock'
+					// },
+					// {
+					// 	title: '杞叏鏉�',
+					// 	name: 'piking',
+					// 	color: 'olive',
+					// 	cuIcon: 'order',
+					// 	url: '/pakin/piking'
+					// },
+					// {
+					// 	title: '鎹㈡澘缁戝畾',
+					// 	name: 'changePallet',
+					// 	color: 'green',
+					// 	cuIcon: 'order',
+					// 	url: '/stock/changePallet'
+					// },
 					{
 						title: '閫�鍑虹櫥褰�',
 						name: 'logOut',
@@ -136,11 +174,12 @@
 								if (res.data.length < 0) {
 									break;
 								}
+								that.getIcon(res.data[i].title)
 								that.elements.unshift({
 									title: res.data[i].name,
 									name: res.data[i].title,
 									color: that.colorList[i],
-									cuIcon: 'safe',
+									cuIcon: that.icon,
 									url: res.data[i].action
 								})
 							}
@@ -148,7 +187,8 @@
 								title: '閫�鍑虹櫥褰�',
 								name: 'logOut',
 								color: 'grey',
-								cuIcon: 'exit'
+								cuIcon: 'exit',
+								url: '/login/logOut'
 							})
 						} else if (res.code === 403) {
 							uni.showToast({
@@ -162,11 +202,12 @@
 								});
 							}, 1000);
 						} else if(res.status === 404) {
-							uni.showToast({
-								title: '404',
-								icon: "none",
-								position: 'top'
-							})
+							that.elements = that.elements2
+							// uni.showToast({
+							// 	title: '榛樿涓婚〉',
+							// 	icon: "none",
+							// 	position: 'top'
+							// })
 						} else {
 							uni.showToast({
 								title: res.msg,
@@ -180,6 +221,12 @@
 					}
 				})
 			},
+			getIcon(e) {
+				const ways = ['pakin','orderPakin','orderPutOn']
+				if (ways.includes(e)) {
+					this.icon = 'pullup'
+				}
+			}
 		}
 	}
 </script>

--
Gitblit v1.9.1