From ae8034646344ac12b84df2ac5cc5d1b10ecd8383 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Thu, 15 Aug 2024 09:33:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=AC=E5=9C=B0=E7=94=9F?=
 =?UTF-8?q?=E6=B4=BB=E5=95=86=E5=AE=B6=E4=BF=A1=E6=81=AF=E7=9A=84=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/shop/LocalStore.php       |  7 +++++--
 app/admin/logic/shop/LocalStoreLogic.php       |  2 +-
 app/admin/validate/shop/LocalStoreValidate.php |  2 ++
 app/admin/view/shop/local_store/add.html       |  9 +++++----
 app/admin/view/shop/local_store/user.html      | 11 ++++++-----
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/admin/controller/shop/LocalStore.php b/app/admin/controller/shop/LocalStore.php
index c2ee45d5..b5b7fa41 100755
--- a/app/admin/controller/shop/LocalStore.php
+++ b/app/admin/controller/shop/LocalStore.php
@@ -29,8 +29,11 @@ class LocalStore extends AdminBase
         if ($this->request->isAjax()) {
             $post = $this->request->post();
             (new LocalStoreValidate())->goCheck();
-            $lists = LocalStoreLogic::create($post);
-//            return JsonServer::success('获取成功', $lists);
+            $data = LocalStoreLogic::create($post);
+            if ($data) {
+                return JsonServer::success('添加成功', $data);
+            }
+            return JsonServer::success('添加失败', $data);
         }
 
         return view('', [
diff --git a/app/admin/logic/shop/LocalStoreLogic.php b/app/admin/logic/shop/LocalStoreLogic.php
index 38f29d77..2a52a479 100755
--- a/app/admin/logic/shop/LocalStoreLogic.php
+++ b/app/admin/logic/shop/LocalStoreLogic.php
@@ -38,7 +38,7 @@ class LocalStoreLogic extends Logic
         unset($form['file']);
         $form['create_time'] = date('Y-m-d H:i:s');
         $result = LocalStore::create($form);
-        dump($result);die;
+        return $result;
     }
 
     public static function get_data($id)
diff --git a/app/admin/validate/shop/LocalStoreValidate.php b/app/admin/validate/shop/LocalStoreValidate.php
index 87b0208b..2ddbb106 100755
--- a/app/admin/validate/shop/LocalStoreValidate.php
+++ b/app/admin/validate/shop/LocalStoreValidate.php
@@ -7,6 +7,7 @@ use app\common\basics\Validate;
 class LocalStoreValidate extends Validate
 {
     protected $rule = [
+        'user_id' => 'require',
         'shopName' => 'require',
         'shopLogo' => 'require',
         'bankType' => 'require|checkBankType',
@@ -23,6 +24,7 @@ class LocalStoreValidate extends Validate
     ];
 
     protected $message = [
+        'user_id.require' => '请绑定用户',
         'shopName.require' => '商家名称不能为空',
         'shopLogo.require' => '商家Logo不能为空',
         'bankName.require' => '银行名称不能为空',
diff --git a/app/admin/view/shop/local_store/add.html b/app/admin/view/shop/local_store/add.html
index c8ef9370..b41c15b9 100755
--- a/app/admin/view/shop/local_store/add.html
+++ b/app/admin/view/shop/local_store/add.html
@@ -4,12 +4,13 @@
     .layui-form-item .layui-form-label { width: 95px; }
     .layui-form-item .layui-input-inline { width: 240px; }
     .layui-form-item .map-container{ width: 600px; height: 400px; margin-left: 100px; margin-top: 20px; }
+    #sel_user_id {margin-right: 20px;line-height: 36px;}
 </style>
 
 <div class="layui-card layui-form">
     <div class="layui-tab-item layui-show">
         <div class="layui-form-item" id="one-shop">
-            <label class="layui-form-label">用户：</label>
+            <label class="layui-form-label"><span style="color:red;">*</span>用户：</label>
             <div class="layui-input-inline" style="display: flex">
                 <div id="sel_user_id"></div>
                 <input type="hidden" id="user_id" name="user_id">
@@ -295,14 +296,14 @@
         $(document).on('click','.select-goods',function () {
             layer.open({
                 type: 2
-                ,title: '选择商品'
+                ,title: '选择用户'
                 ,content: '{:url("shop.LocalStore/user")}'
                 ,area: ['90%', '90%']
                 ,btn: ['确认', '取消']
                 ,yes: function(index, layero){
                     var data = window["layui-layer-iframe" + index].callbackdata();
-                    $('#shop_name').html(data[0].name)
-                    $('#shop_id').val(data[0].id)
+                    $('#sel_user_id').html(data[0].nickname)
+                    $('#user_id').val(data[0].id)
                 }
             })
         })
diff --git a/app/admin/view/shop/local_store/user.html b/app/admin/view/shop/local_store/user.html
index 2ad18b8c..497d18cd 100755
--- a/app/admin/view/shop/local_store/user.html
+++ b/app/admin/view/shop/local_store/user.html
@@ -7,9 +7,10 @@
                     <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                         <div class="layui-form-item type">
                             <div class="layui-inline">
-                                <label class="layui-form-label">商品名称:</label>
+                                <label class="layui-form-label">用户名称:</label>
                                 <div class="layui-input-block">
-                                    <input type="text" name="goods_name" id="keyword" placeholder="请输入关键词" autocomplete="off" class="layui-input">
+                                    <input type="hidden" name="keyword_type" id="keyword_type" value="nickname">
+                                    <input type="text" name="keyword" id="keyword" placeholder="请输入关键词" autocomplete="off" class="layui-input">
                                 </div>
                             </div>
                             <div class="layui-inline">
@@ -19,8 +20,8 @@
                     </div>
                     <div class="layui-card-body">
                         <table id="goods-lists" lay-filter="goods-lists"></table>
-                        <script type="text/html" id="goods-info">
-                            <img src="{{d.image}}" style="height:60px;width: 60px" class="image-show"> {{d.name}}
+                        <script type="text/html" id="user-info">
+                            <img src="{{d.abs_avatar}}" style="height:60px;width: 60px" class="image-show">
                         </script>
                     </div>
                 </div>
@@ -79,7 +80,7 @@
             , cols: [[
                 {type: 'radio'}
                 , {field: 'nickname', title: '用户名称'}
-                , {field: 'abs_avatar', title: '头像'}
+                , {field: 'abs_avatar', title: '头像', templet: '#user-info'}
             ]]
             , page: true
             , text: {none: '暂无数据！'}