From b50c8c6b10371bc16565a7ab5ef3d262bd62e334 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sat, 27 Apr 2024 10:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                    | 30 ++++++++++++------------
 pages/nongKe/gather/select_warehouse.vue | 17 ++++++++++++--
 pages/product/list/index.vue             | 20 +++++++++++++++-
 3 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 55e105c..529674b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -518,11 +518,11 @@
 						type: 1,
 						image: require('@/static/images/index7.png')
 					},
-					{
-						name: '入库管理',
-						type: 13,
-						image: require('@/static/images/index9.png')
-					},
+					// {
+					// 	name: '入库管理',
+					// 	type: 13,
+					// 	image: require('@/static/images/index9.png')
+					// },
 					// {
 					// 	name: '供货采购',
 					// 	type: 3,
@@ -619,11 +619,11 @@
 						type: 1,
 						image: require('@/static/images/index7.png')
 					},
-					{
-						name: '入库管理',
-						type: 13,
-						image: require('@/static/images/index9.png')
-					},
+					// {
+					// 	name: '入库管理',
+					// 	type: 13,
+					// 	image: require('@/static/images/index9.png')
+					// },
 					{
 						name: '订单管理',
 						type: 2,
@@ -699,11 +699,11 @@
 						type: 1,
 						image: require('@/static/images/index7.png')
 					},
-					{
-						name: '入库管理',
-						type: 13,
-						image: require('@/static/images/index9.png')
-					},
+					// {
+					// 	name: '入库管理',
+					// 	type: 13,
+					// 	image: require('@/static/images/index9.png')
+					// },
 					{
 						name: '订单管理',
 						type: 2,
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 8218b7d..c4b9e34 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -312,7 +312,7 @@
 			// }
 		},
 		onShow() {
-
+			console.log('show')
 		},
 		methods: {
 			handCancel() {
@@ -663,8 +663,21 @@
 						self.seachBarCode(res.result)
 					},
 					fail(res) {
-						// console.log(res);
+						uni.redirectTo({
+							url: '/pages/product/list/index'
+						})
+						// uni.showLoading({
+						// 	title: '加载中',
+						// 	mask: true
+						// })
+						// uni.navigateBack()
 					},
+					// complete() {
+					// 	uni.showLoading({
+					// 		title: '加载中',
+					// 		mask: true
+					// 	})
+					// }
 				})
 			},
 			isStartsWith6Or06(str) {
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index f7243bf..05db55b 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -447,6 +447,14 @@
 
 		methods: {
 			handClick(type) {
+				if (type == 2) {
+					// #ifndef APP-PLUS
+					this.$util.Tips({
+						title: '当前环境不支持扫码'
+					});
+					return
+					// #endif
+				}
 				// console.log(type)
 				if (type == 3) {
 					uni.navigateTo({
@@ -506,8 +514,10 @@
 			getProductTitle() {
 				productTitle(this.mer_id).then(res => {
 					this.tabList = res.data;
+					console.log(this.tabList)
 					let clickIndex = 0;
 					this.tabList.forEach((item, index) => {
+						item.name = item.name + `(${item.count})`
 						if (item.type == this.where.type) {
 							this.current = index;
 						}
@@ -849,6 +859,7 @@
 					that.where.cate_id = this.cate_id.store_category_id;
 					// mer_cate_id 为商户自己的分类参数
 				}
+				that.where.order = 'check'
 				productLstApi(mer_id, that.where).then(
 					res => {
 						that.loading = false;
@@ -1684,7 +1695,7 @@
 
 	.footer {
 		width: 750rpx;
-		height: 132rpx;
+		height: 150rpx;
 		background-color: white;
 		position: fixed;
 		bottom: 0;
@@ -1692,12 +1703,17 @@
 		display: flex;
 		justify-content: space-around;
 		align-items: center;
+		box-sizing: border-box;
 
 		.footer-li {
 			border: 1px solid #989898;
 			font-size: 32rpx;
 			padding: 14rpx 27rpx;
 			border-radius: 40rpx;
+			overflow: hidden;
+			width: 184rpx;
+			height: 72rpx;
+
 
 		}
 
@@ -1705,6 +1721,8 @@
 			border: none;
 			background-color: #32BB3B;
 			color: white;
+			width: 302rpx;
+			text-align: center;
 		}
 	}
 </style>
\ No newline at end of file