From b0785d6b9f6e68ae3954c4d7b4952d682625a366 Mon Sep 17 00:00:00 2001
From: cc_zbp <487602586@qq.com>
Date: Fri, 19 May 2023 10:19:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                               | 17 +++----
 pages/gather/gather.vue                  | 12 ++---
 pages/nongKe/gather/select_warehouse.vue | 64 ++++++++++++++++++++----
 3 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/api/api.js b/api/api.js
index d1e19e5..de5adeb 100644
--- a/api/api.js
+++ b/api/api.js
@@ -1,13 +1,12 @@
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
 import request from "@/utils/request.js";
+/**
+ * 商品扫码枪查询商品是否存在
+ * 
+ */
+export function seachBarCodeAPI(data) {
+  return request.get("micro/seach_bar_code", data);
+}
+
 /**
  * 获取里海云仓商品
  * 
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 066e5e6..b87f7f7 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -4,8 +4,8 @@
     <u-empty :show="jurisdiction" marginTop="260" mode="permission" :text="emptyText"
       icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
     <block v-if="isLogin">
-      <view class="special_work com" v-if="userInfoData.mer_info.type_id === 12">
-        <!-- <view class="special_work com" v-if="true"> -->
+      <!-- <view class="special_work com" v-if="userInfoData.mer_info.type_id === 12"> -->
+      <view class="special_work com" v-if="true">
         <view class="title">市级供应链</view>
         <view class="content">
           <view class="examine" @click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
@@ -38,8 +38,8 @@
         </view>
       </view>
 
-      <view class="business com" v-if="userInfoData.mer_info.type_id === 10">
-        <!-- <view class="business com" v-if="true"> -->
+      <!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 10"> -->
+      <view class="business com" v-if="true">
         <view class="special_work com">
           <view class="title">我的店铺</view>
           <view class="content ">
@@ -99,8 +99,8 @@
         <!-- <gatherBusiness :userInfoData="userInfoData" /> -->
       </view>
 
-      <view class="business com" v-if="userInfoData.mer_info.type_id === 11">
-        <!-- <view class="business com" v-if="true"> -->
+      <!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 11"> -->
+      <view class="business com" v-if="true">
         <view class="special_work com">
           <view class="title">里海云仓</view>
           <view class="content ">
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 9cf90e8..b0c3014 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -32,12 +32,25 @@
       </view>
     </u-popup>
 
+    <u-popup :show="searchGoodsShow" @close="searchGoodsClose" :round="18" mode="center">
+      <view class="search_goods_box">
+        <input type="text" v-model="searchGoodsName" class="searchGoods" placeholder="请输入商品名称">
+        <view class="edit_goods_btn">
+          <u-button type="error" text="取消" class="edit_btn" @click="searchGoodsShow=false">
+          </u-button>
+          <u-button type="primary" text="保存" class="edit_btn" @click="searchGoodsClose">
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+
   </view>
 </template>
 
 <script>
   import { microSeachBarCode, microEadtProduct } from '@/api/store.js'
-  import { Toast } from '../../../libs/uniApi'
+  import { seachBarCodeAPI } from '@/api/api.js'
+  import { Toast } from '@/libs/uniApi'
   export default {
     data() {
       return {
@@ -58,7 +71,9 @@
         editGoodsPrice: '',
         editGoodsStore: '',
         editGoodsShow: false, // 扫码修改商品信息
-        mer_id: ''
+        mer_id: '',
+        searchGoodsShow: true,
+        searchGoodsName: ''
       }
     },
     onLoad(e) {
@@ -66,6 +81,18 @@
     },
     onShow() {},
     methods: {
+      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.searchGoodsShow = false
+      },
       async editGoodsClose() {
         const data = {
           price: this.editGoodsPrice,
@@ -83,13 +110,9 @@
 
       },
       navigato(type) {
-        if (type === 1) {
-          uni.navigateTo({
-            url: `/pages/product/addGoods/index?mer_id=${this.mer_id}`
-          })
-        } else {
-          this.scanCode()
-        }
+        type === 1 ? uni.navigateTo({
+          url: `/pages/product/addGoods/index?mer_id=${this.mer_id}`
+        }) : this.scanCode();
       },
       scanCode() {
         const self = this
@@ -156,6 +179,29 @@
     }
   }
 
+  .search_goods_box {
+    width: 694.74rpx;
+    padding: 28.07rpx;
+    font-size: 31.58rpx;
+
+    .searchGoods {
+      height: 87.72rpx;
+      border: 1px solid #f5f5f5;
+      border-radius: 8px;
+      padding: 12px;
+      margin: 21.05rpx 0;
+    }
+
+    .edit_goods_btn {
+      margin-top: 28.07rpx;
+      display: flex;
+      justify-content: space-between;
+
+      .edit_btn {
+        width: 210.53rpx;
+      }
+    }
+  }
 
   // 扫码编辑商品
   .edit_goods_box {