From 86f776c4498ba755e85ce7f2d21e67b7d27e2f18 Mon Sep 17 00:00:00 2001
From: cc_zbp <487602586@qq.com>
Date: Fri, 19 May 2023 18:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/product.js                                |  5 ++++
 pages.json                                    |  7 ++++++
 pages/nongKe/gather/select_warehouse.vue      | 24 ++++++++++---------
 pages/product/addGoods/index.vue              |  5 ++--
 .../components/store_classification.vue       |  3 +--
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/api/product.js b/api/product.js
index 675d319..b820836 100644
--- a/api/product.js
+++ b/api/product.js
@@ -9,6 +9,11 @@
 // +----------------------------------------------------------------------
 import request from "@/utils/request.js";
 
+/**
+ * 获取商品详情
+ */
+export const getProductDetailsAPI = (data) => request.get('micro/product_details', data)
+
 /**
  * 获取商户基本信息 http://127.0.0.1:8324/api/store/merchant/info?id=4
  */
diff --git a/pages.json b/pages.json
index feea07f..658635b 100644
--- a/pages.json
+++ b/pages.json
@@ -905,6 +905,13 @@
             "navigationBarTitleText": "商户基本设置",
             "enablePullDownRefresh": false
           }
+        }, {
+          "path": "addGoods/addMyStore",
+          "style": {
+            "navigationBarTitleText": "",
+            "enablePullDownRefresh": false
+          }
+
         }
       ]
     },
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 356a402..65e822a 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -9,7 +9,7 @@
       </block>
     </view>
 
-    <view class="goods-wrapper wrapper">
+    <view class="goods-wrapper wrapper" v-if="goods.length">
       <block v-for="(item,index) in goods" :key="index">
         <view class="item">
           <view class="l_cont">
@@ -17,6 +17,7 @@
           </view>
           <view class="r_cont">
             <text>{{item.store_name}}</text>
+            <view class="addBtn" @click="addGoods(item)">加入仓库</view>
           </view>
         </view>
       </block>
@@ -61,6 +62,7 @@
 </template>
 
 <script>
+  import { productCreate } from '@/api/product.js'
   import { microSeachBarCode, microEadtProduct } from '@/api/store.js'
   import { seachBarCodeAPI } from '@/api/api.js'
   import { Toast } from '@/libs/uniApi'
@@ -84,27 +86,30 @@
         editGoodsPrice: '',
         editGoodsStore: '',
         editGoodsShow: false, // 扫码修改商品信息
-        mer_id: '',
-        searchGoodsShow: true,
-        searchGoodsName: '',
+        mer_id: 318,
+        searchGoodsShow: false,
+        searchGoodsName: '摩托',
         goods: []
       }
     },
     onLoad(e) {
       this.mer_id = e.mer_id
+      this.searchGoodsClose()
     },
     onShow() {},
     methods: {
-      openSearch() {
-
+      addGoods(item) {
+        uni.navigateTo({
+          url: `/pages/product/addGoods/addMyStore?mer_id=${this.mer_id}&product_id=${item.product_id}`
+        })
       },
+      openSearch() {},
       async searchGoodsClose() {
         const rq = {
           mer_id: this.mer_id,
           name: this.searchGoodsName
         }
         const { data } = await seachBarCodeAPI(rq).catch(err => Toast(err))
-        console.log('data', data);
         this.goods = data.list
         this.searchGoodsShow = false
       },
@@ -122,12 +127,9 @@
           Toast("更新失败")
           this.editGoodsShow = false
         }
-
       },
       navigato(type) {
-        type === 1 ? uni.navigateTo({
-          url: `/pages/product/addGoods/index?mer_id=${this.mer_id}`
-        }) : this.scanCode();
+        type === 1 ? this.searchGoodsShow = true : this.scanCode();
       },
       scanCode() {
         const self = this
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index c565b6a..361acc2 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -382,14 +382,14 @@
       };
     },
     onLoad(opt) {
-      this.merId = opt.mer_id;
+      this.merId = Number(opt.mer_id);
       this.product_id = opt.product_id;
       if (opt.code) {
         this.code = opt.code;
         this.bar_code_dis = true
       }
-      this.getDeliveryType();
       this.initData();
+      this.getDeliveryType();
       if (this.product_id) {
         this.initDataEditData();
       }
@@ -499,7 +499,6 @@
           temp_id: '', // 运费模板ID
           tempName: '' // 运费模板名称
         };
-
         if (getStorage('editGoodsDetils')) {
           removeStorage('editGoodsDetils');
         }
diff --git a/pages/product/components/store_classification.vue b/pages/product/components/store_classification.vue
index ec75559..e05e567 100644
--- a/pages/product/components/store_classification.vue
+++ b/pages/product/components/store_classification.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-  import { serialize, Toast } from '../../../libs/uniApi.js';
+  import { serialize, Toast } from '@/libs/uniApi.js';
   export default {
     props: {
       allReadySelect: {
@@ -77,7 +77,6 @@
     },
     created() {
       this.areaList = serialize(this.classifiedData);
-      console.log(this.areaList);
     },
     methods: {