From 55d1702f1207e32be196ecc94e702bdd9890a0d2 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 24 九月 2024 16:44:27 +0800
Subject: [PATCH] #

---
 pages/home/home.vue |   79 ++++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 2ad9a04..10c62f0 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -4,7 +4,7 @@
 			<view class="nav-list">
 				<navigator hover-class='none' :url="'/pages' + item.url" class="nav-li" navigateTo
 					:class="'bg-'+item.color" :style="[{animation: 'show ' + ((index+1)*0.2+1) + 's 1'}]"
-					v-for="(item,index) in elements" :key="index">
+					v-for="(item,index) in elements2" :key="index">
 					<view class="nav-title">{{item.title}}</view>
 					<view class="nav-name">{{item.name}}</view>
 					<text :class="'cuIcon-' + item.cuIcon"></text>
@@ -39,39 +39,25 @@
 						url: '/pakin/pickAgain'
 					},
 					{
-						title: 'AGV缁勬墭',
-						name: 'AGVPakin',
-						color: 'blue',
-						cuIcon: 'pullup',
-						url: '/AGV/AGVPakin'
-					},
-					{
-						title: 'AGV涓婃灦缁戝畾',
-						name: 'AGVPakinBing',
-						color: 'mauve',
-						// cuIcon: 'pullup',
-						url: '/AGV/AGVPakinBing'
-					},
-					{
-						title: 'AGV鍚姩鍏ュ簱',
-						name: 'AGVStart',
-						color: 'pink',
-						// cuIcon: 'pullup',
-						url: '/AGV/AGVStart'
-					},
-					{
-						title: 'AGV涓婃灦缁勬墭',
-						name: 'AGVPakinOn',
-						color: 'brown',
-						// cuIcon: 'pullup',
-						url: '/AGV/AGVPakinOn'
-					},
-					{
-						title: '璁㈠崟缁勬墭',
+						title: '璁㈠崟鍏ュ簱',
 						name: 'orderPakin',
 						color: 'red',
 						cuIcon: 'pullup',
 						url: '/order/orderPakin'
+					},
+					{
+						title: '閿�鍞崟鍏ュ簱',
+						name: 'orderIn',
+						color: 'blue',
+						cuIcon: 'pullup',
+						url: '/order/orderIn'
+					},
+					{
+						title: 'Bom鍏ュ簱鍗�',
+						name: 'orderBomPakin',
+						color: 'red',
+						cuIcon: 'pullup',
+						url: '/order/orderBomPakin'
 					},
 					{
 						title: '缁勬墭涓婃灦',
@@ -80,13 +66,13 @@
 						cuIcon: 'pullup',
 						url: '/pakin/putOn'
 					},
-					// {
-					// 	title: '鎵撳嵃',
-					// 	name: 'print',
-					// 	color: 'purple',
-					// 	cuIcon: 'text',
-					// 	url: '/print/print'
-					// },
+					{
+						title: '鎵撳嵃',
+						name: 'print',
+						color: 'purple',
+						cuIcon: 'text',
+						url: '/print/print'
+					},
 					{
 						title: '璁㈠崟涓婃灦',
 						name: 'orderPutOn',
@@ -137,6 +123,13 @@
 						url: '/pakin/piking'
 					},
 					{
+						title: '骞舵澘缁勬墭',
+						name: 'mergeStore',
+						color: 'olive',
+						cuIcon: 'order',
+						url: '/pakin/mergeStore'
+					},
+					{
 						title: '鎹㈡澘缁戝畾',
 						name: 'changePallet',
 						color: 'green',
@@ -170,7 +163,15 @@
 					method: 'POST',
 					success(res) {
 						res = res.data
-						that.elements = []
+						that.elements = [
+							// {
+							// 	title: '缁勪欢鍏ュ簱',
+							// 	name: 'modulePakin',
+							// 	color: 'green',
+							// 	cuIcon: 'order',
+							// 	url: '/pakin/modulePakin'
+							// },
+						]
 						if (res.code === 200) {
 							if (res.data == undefined || res.data == null || res.data == "") {
 								that.elements = that.elements2
@@ -181,7 +182,7 @@
 									break;
 								}
 								that.getIcon(res.data[i].title)
-								that.elements.unshift({
+								that.elements.push({
 									title: res.data[i].name,
 									name: res.data[i].title,
 									color: that.colorList[i],

--
Gitblit v1.9.1