From 04abb8b1b927f00155867bd5b13d5e63dfc0e9f9 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Mon, 20 May 2024 16:01:11 +0800
Subject: [PATCH] add

---
 pages/nongKe/gather/select_warehouse.vue      |  6 ++----
 pages/product/addGoodDetail/addGoodDetail.vue | 14 +++++++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index c401025..ae0c049 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -320,12 +320,10 @@
 					url: '/pages/product/list/index'
 				})
 			},
-			addGoods(item = {}) {
-				item = (JSON.stringify(item));
+			addGoods(item) {
 				uni.navigateTo({
-					url: `/pages/product/addGoodDetail/addGoodDetail?mer_id=${this.mer_id}&&goodsInfo=${item}`
+					url: `/pages/product/addGoodDetail/addGoodDetail?mer_id=${this.mer_id}&&goodsInfoId=${item.id}&&name=${this.searchGoodsName}`
 				})
-				return
 			},
 			initShop(item) {
 				if (item.spec == '' || item.spec == undefined || item.spec == null) {
diff --git a/pages/product/addGoodDetail/addGoodDetail.vue b/pages/product/addGoodDetail/addGoodDetail.vue
index ce30ca9..6222e70 100644
--- a/pages/product/addGoodDetail/addGoodDetail.vue
+++ b/pages/product/addGoodDetail/addGoodDetail.vue
@@ -271,6 +271,9 @@
 </template>
 
 <script>
+	import {
+		seachBarCodeAPI
+	} from '@/api/api.js'
 	import {
 		Toast,
 		Modal
@@ -732,14 +735,19 @@
 			},
 
 
-			initFormData(option) {
+			async initFormData(option) {
 				this.isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale == 2;
 				this.mer_id = option.mer_id
 				if (option.formData) {
 					this.formData = JSON.parse(option.formData)
 				}
-				if (option.goodsInfo) {
-					let goods = JSON.parse(option.goodsInfo)
+				if (option.goodsInfoId) {
+
+					let res = await await seachBarCodeAPI({
+						id: option.goodsInfoId,
+						name: option.name
+					})
+					let goods = res.data.list[0]
 					console.log(goods)
 					this.formData.store_name = goods.store_name
 					this.formData.imageList = [goods.image, ...goods.slider_image]