From 3d3b0dfcad73a87c06c8f8dddd01c841d05f5d74 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Wed, 16 Oct 2024 10:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=95=86=E5=AE=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=AE=B6=E5=90=8D=E7=A7=B0=E5=92=8C=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E8=81=94=E7=B3=BB=E4=BA=BA=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/shop/LocalStoreLogic.php   | 12 ++++++++++++
 app/admin/view/shop/local_store/lists.html |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/admin/logic/shop/LocalStoreLogic.php b/app/admin/logic/shop/LocalStoreLogic.php
index 60facc2a..c91221a2 100755
--- a/app/admin/logic/shop/LocalStoreLogic.php
+++ b/app/admin/logic/shop/LocalStoreLogic.php
@@ -29,7 +29,19 @@ class LocalStoreLogic extends Logic
 
     public static function lists($get)
     {
+        $where = [];
+        if (!empty($get['shop_name'])) {
+            // 商家名称
+            $where[] = ['shopName', 'like', '%' . $get['shop_name'] . '%'];
+        }
+
+        if (!empty($get['merconat'])) {
+            // 商户联系人
+            $where[] = ['name', 'like', '%' . $get['merconat'] . '%'];
+        }
+
         $lists = LocalStore::with('info')
+            ->where($where)
             ->where('is_delete', 0)
             ->order('lstore_id', 'desc')
             ->paginate([
diff --git a/app/admin/view/shop/local_store/lists.html b/app/admin/view/shop/local_store/lists.html
index 64771b5c..ccc65eb3 100755
--- a/app/admin/view/shop/local_store/lists.html
+++ b/app/admin/view/shop/local_store/lists.html
@@ -19,6 +19,13 @@
         <!-- 搜索区域 -->
         <div class="layui-card-body layui-form">
             <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label for="merconat" class="layui-form-label" style="width: 100px;">商家名称：</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="shop_name" name="shop_name" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+
                 <div class="layui-inline">
                     <label for="merconat" class="layui-form-label" style="width: 100px;">商户联系人：</label>
                     <div class="layui-input-inline">
@@ -220,7 +227,6 @@
 
 
         form.on("submit(search)", function (data) {
-            console.log(data.field);
             table.reload("like-table-lists", {
                 where: data.field,
                 page: {