From 580ea81154ee47267642cd7b1d7850d23895cc74 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 23 Nov 2023 18:44:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/nongKe/gather/select_warehouse.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 35d4780..8a22765 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -237,6 +237,7 @@
         editGoodsStore: '',
         editGoodsShow: false, // 扫码修改商品信息
         mer_id: 0,
+        userInfo: {},
         searchGoodsShow: false,
         searchGoodsName: '',
         showModel: false,
@@ -283,6 +284,8 @@
     },
     onLoad(e) {
       this.mer_id = e.mer_id
+      this.userInfo = this.$store.state.app.userInfo;
+      if(typeof this.userInfo == 'string') this.userInfo = JSON.parse(this.userInfo);
     },
     onShow() {
 
@@ -343,7 +346,7 @@
         delete item.stock;
         console.log({...item});
         uni.navigateTo({
-          url: '/pages/product/addGood/addGood?mer_id=42&import=1',
+          url: `/pages/product/addGood/addGood?mer_id=${this.userInfo.service.mer_id}&import=1`,
           success: (e) => {
             e.eventChannel.emit('importAttrValue', item);
             uni.$once('importAttrValueOK', (e)=>{