From 817f410089cd27cd37d7913c4d6d74b5fccd735b Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 13 Sep 2023 10:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plantGrass/plant_release/index.vue |  2 +-
 pages/product/list/index.vue             | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/pages/plantGrass/plant_release/index.vue b/pages/plantGrass/plant_release/index.vue
index 8c96326..13b26b8 100644
--- a/pages/plantGrass/plant_release/index.vue
+++ b/pages/plantGrass/plant_release/index.vue
@@ -187,7 +187,7 @@
 			// #endif
 		},
 		onLoad(options) {
-			console.log(options.type);
+			
 			this.id = options.id;
 			this.order_id = options.order_id;
 			this.tabActive = options.type || 1;
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 766a9e0..6dcb676 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -249,14 +249,14 @@
 		},
 		onLoad(options) {
 			this.mer_id = options.mer_id;
-			this.getList(this.mer_id,true);
+			this.getList(this.mer_id, true);
 		},
 		onPullDownRefresh() {
 			this.where.page = 1
 			this.productList = []
 			this.loading = false
 			this.loaded = false
-			this.getList(this.mer_id,false);
+			this.getList(this.mer_id, false);
 			uni.stopPullDownRefresh()
 		},
 		onReachBottom() {
@@ -264,7 +264,7 @@
 			if (this.status == 'nomore') return;
 			this.status = 'loading';
 			this.where.page = ++this.where.page;
-			this.getList(this.mer_id,true);
+			this.getList(this.mer_id, true);
 		},
 
 		methods: {
@@ -351,6 +351,7 @@
 				this.checkboxList1 = item.attrValue
 				// console.log(this.checkboxList1.length)
 				if (this.checkboxList1.length > 0) {
+
 					this.show = true
 					this.data.product_id = this.checkboxList1[0].product_id
 					this.data.unique = this.checkboxList1[0].unique
@@ -378,7 +379,9 @@
 						})
 					} else {
 						postImport(this.mer_id, this.data).then(res => {
-							// console.log(res);
+							this.data.unique = ''
+							this.data.product_id=''
+							this.data.number=1
 							this.loading = false
 							this.loaded = false
 							this.getList(this.mer_id, true);
@@ -386,10 +389,16 @@
 							this.$util.Tips({
 								title: res.message
 							})
-
+							this.data.unique = ''
+							this.data.product_id=''
+							this.data.number=1
+								
 
 						}).catch(err => {
 							this.show = false
+							this.data.unique = ''
+							this.data.product_id=''
+							this.data.number=1
 							this.$util.Tips({
 								title: '请选择规格后再次进行入库'
 							})
@@ -457,7 +466,7 @@
 				if (that.loading || that.loaded) return;
 				that.loading = true;
 				if (ispage) {
-					this.where.page=1
+					this.where.page = 1
 					that.productList = []
 				}
 				productLstApi(mer_id, that.where).then(