hrjy 2 anos atrás
pai
commit
590d54be4f

+ 121 - 42
app/admin/controller/auction/Auction.php

@@ -18,6 +18,7 @@ use app\admin\model\system\{
     SystemAttachment as SystemAttachmentModel, SystemAttachmentCategory as Category
 };
 use think\facade\Route as Url;
+use think\facade\Validate;
 
 /**
  * 竞拍管理
@@ -56,17 +57,42 @@ class Auction extends AuthController
      */
     public function create($id = 0)
     {
-        $data = [];
-        $model = new AuctionGu();
-        $auction = $model->select();
-        if ($id > 0) $data = \app\admin\model\auction\Auction::find($id)->toArray();
-
-        $this->assign(['id' => $id, 'dataList' => $data, 'auction' => $auction]);
-        return $this->fetch();
+        $f = [];
+        $f[] = Form::input('nickname', '场次名称')->col(12);
+        $f[] = Form::input('anticipate', '预约价格')->col(12);
+        $f[] = Form::frameImageOne('image', '场次主图片(305*305px)', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')))->icon('image')->width('100%')->height('500px');
+        $f[] = Form::radio('status', '状态', 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]])->col(12);
+        $f[] = Form::select('auction_gu_id', '绑定场馆')->setOptions(function () {
+            $model = new AuctionGu();
+            $list = $model->select();
+            $menus = [];
+            foreach ($list as $menu) {
+                $menus[] = ['value' => $menu['id'], 'label' => $menu['name']];
+            }
+            return $menus;
+        })->filterable(1)->col(12);
+        $f[] = Form::dateTimes('add_time', '预约开始时间');
+        $f[] = Form::dateTimes('end_time', '预约结束时间');
+        $f[] = Form::dateTimes('radd_time', '预约结束时间');
+        $f[] = Form::dateTimes('rend_time', '预约结束时间');
+        $f[] = Form::input('sort', '排序', '0');
+        $f[] = Form::textarea('info', '介绍')->col(12);
+
+        $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
+        $this->assign(compact('form'));
+        return $this->fetch('public/form-builder');
+
+//        $data = [];
+//        $model = new AuctionGu();
+//        $auction = $model->select();
+//        if ($id > 0) $data = \app\admin\model\auction\Auction::find($id)->toArray();
+//
+//        $this->assign(['id' => $id, 'dataList' => $data, 'auction' => $auction]);
+//        return $this->fetch();
     }
 
 
-    public function save($id)
+    public function save()
     {
         $mode  = new \app\admin\model\auction\Auction();
         $data = Util::postMore([
@@ -74,30 +100,45 @@ class Auction extends AuthController
             'image',
             'status',
             'sort',
-            'time',
-            'rtime',
+            'add_time',
+            'end_time',
+            'radd_time',
+            'rend_time',
             'info',
             'anticipate',
             'auction_gu_id'
         ]);
-
-
-        $time = explode('-', $data['time']);
-
-        $data['add_time'] = trim($time[0]);
-        $data['end_time'] = trim($time[1]);
-        $rtime = explode('-', $data['rtime']);
-        $data['radd_time'] = trim($rtime[0]);
-        $data['rend_time'] = trim($rtime[1]);
-
-        if (strtotime($time[0]) > strtotime( $time[1])) Json::fail('预约时间选择错误');
-        if (strtotime($time[0]) > strtotime( $time[1])) Json::fail('进场时间选择错误');
-
+        $validate = Validate::rule('nickname', 'require')->rule([
+            'nickname' => 'require',
+            'image' => 'require',
+            'status' => 'require',
+            'anticipate' => 'require',
+            'add_time' => 'require',
+            'end_time' => 'require',
+            'radd_time' => 'require',
+            'rend_time' => 'require',
+            'auction_gu_id' => 'require',
+        ]);
+        $validate->message([
+            'nickname.require' => '名称不能为空',
+            'image.require' => '图片不能为空',
+            'status.require' => '状态不能为空',
+            'anticipate.require' => '请填写预约价格',
+            'add_time.require' => '请选择预约开始时间价格',
+            'end_time.require' => '请选择预约结束时间价格',
+            'radd_time.require' => '请选择进场时间',
+            'rend_time.require' => '请选择结束时间',
+            'auction_gu_id.require' => '请选择绑定场馆',
+        ]);
+        if (!$validate->check($data)) {
+            return Json::fail($validate->getError());
+            dump($validate->getError());
+        }
         $res = $mode->save($data);
         if ($res){
             return Json::success('添加成功!');
         }else{
-            return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
+            return Json::fail('添加失败');
         }
 
     }
@@ -139,13 +180,31 @@ class Auction extends AuthController
     public function edit($id)
     {
         if (!$id) Json::fail('数据不存在');
-        $data = [];
-        $model = new AuctionGu();
-        $auction = $model->select();
-        if ($id > 0) $data = \app\admin\model\auction\Auction::find($id)->toArray();
-
-        $this->assign(['id' => $id, 'dataList' => $data, 'auction' => $auction]);
-        return $this->fetch();
+        $data = \app\admin\model\auction\Auction::find($id);
+        $f = [];
+        $f[] = Form::input('nickname', '场次名称', $data->getData('nickname'))->col(12);
+        $f[] = Form::input('anticipate', '预约价格', $data->getData('anticipate'))->col(12);
+        $f[] = Form::frameImageOne('image', '场次主图片(305*305px)',Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), $data->getData('image'))->icon('image')->width('100%')->height('500px');
+        $f[] = Form::radio('status', '状态',  $data->getData('status'))->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]])->col(12);
+        $f[] = Form::select('auction_gu_id', '绑定场馆', (string)$data->getData('auction_gu_id'))->setOptions(function () {
+            $model = new AuctionGu();
+            $list = $model->select();
+            $menus = [];
+            foreach ($list as $menu) {
+                $menus[] = ['value' => $menu['id'], 'label' => $menu['name']];
+            }
+            return $menus;
+        })->filterable(1)->col(12);
+        $f[] = Form::dateTimes('add_time', '预约开始时间', $data->getData('add_time'));
+        $f[] = Form::dateTimes('end_time', '预约结束时间', $data->getData('end_time'));
+        $f[] = Form::dateTimes('radd_time', '预约结束时间', $data->getData('radd_time'));
+        $f[] = Form::dateTimes('rend_time', '预约结束时间', $data->getData('rend_time'));
+        $f[] = Form::input('sort', '排序', '0', $data->getData('sort'));
+        $f[] = Form::textarea('info', '介绍', $data->getData('info'))->col(12);
+
+        $form = Form::make_post_form('修改', $f, Url::buildUrl('update', compact('id')));
+        $this->assign(compact('form'));
+        return $this->fetch('public/form-builder');
     }
 
 
@@ -165,22 +224,42 @@ class Auction extends AuthController
             'id',
             'nickname',
             'image',
-            'time',
-            'rtime',
+            'status',
             'sort',
+            'add_time',
+            'end_time',
+            'radd_time',
+            'rend_time',
             'info',
             'anticipate',
             'auction_gu_id'
         ]);
-        $time = explode('-', $data['time']);
-        $data['add_time'] = trim($time[0]);
-        $data['end_time'] = trim($time[1]);
-        $rtime = explode('-', $data['rtime']);
-        $data['radd_time'] = trim($rtime[0]);
-        $data['rend_time'] = trim($rtime[1]);
-
-        if (strtotime($time[0]) > strtotime( $time[1])) Json::fail('预约时间选择错误');
-        if (strtotime($time[0]) > strtotime( $time[1])) Json::fail('进场时间选择错误');
+        $validate = Validate::rule('nickname', 'require')->rule([
+            'nickname' => 'require',
+            'image' => 'require',
+            'status' => 'require',
+            'anticipate' => 'require',
+            'add_time' => 'require',
+            'end_time' => 'require',
+            'radd_time' => 'require',
+            'rend_time' => 'require',
+            'auction_gu_id' => 'require',
+        ]);
+        $validate->message([
+            'nickname.require' => '名称不能为空',
+            'image.require' => '图片不能为空',
+            'status.require' => '状态不能为空',
+            'anticipate.require' => '请填写预约价格',
+            'add_time.require' => '请选择预约开始时间价格',
+            'end_time.require' => '请选择预约结束时间价格',
+            'radd_time.require' => '请选择进场时间',
+            'rend_time.require' => '请选择结束时间',
+            'auction_gu_id.require' => '请选择绑定场馆',
+        ]);
+        if (!$validate->check($data)) {
+            return Json::fail($validate->getError());
+            dump($validate->getError());
+        }
 
         $res = \app\admin\model\auction\Auction::update($data);
         if ($res){

+ 71 - 18
app/admin/controller/auction/AuctionGu.php

@@ -18,6 +18,7 @@ use app\admin\model\system\{
 };
 use think\Db;
 use think\facade\Route as Url;
+use think\facade\Validate;
 
 /**
  * 竞拍管理
@@ -67,17 +68,29 @@ class AuctionGu extends AuthController
      */
     public function create($id = 0)
     {
-        $data = [];
-        $userModel = new \app\models\user\User();
-        $user = $userModel->select();
-        if ($id > 0) $data = \app\admin\model\auction\Auction::find($id)->toArray();
-
-        $this->assign(['id' => $id, 'dataList' => $data, 'user' => $user]);
-        return $this->fetch();
+        $f = [];
+        $f[] = Form::input('name', '场馆名称')->col(12);
+        $f[] = Form::frameImageOne('image', '场次主图片(305*305px)', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')))->icon('image')->width('100%')->height('500px');
+        $f[] = Form::radio('status', '状态', 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
+        $f[] = Form::select('uid', '绑定用户')->setOptions(function () {
+            $model = new \app\models\user\User();
+            $list = $model->select();
+            $menus = [];
+            foreach ($list as $menu) {
+                $menus[] = ['value' => $menu['uid'], 'label' => $menu['nickname']];
+            }
+            return $menus;
+        })->filterable(1)->col(12);
+        $f[] = Form::input('sort', '排序', '0')->col(12);
+        $f[] = Form::textarea('info', '介绍');
+
+        $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
+        $this->assign(compact('form'));
+        return $this->fetch('public/form-builder');
     }
 
 
-    public function save($id)
+    public function save()
     {
         $mode  = new \app\admin\model\auction\AuctionGu();
         $data = Util::postMore([
@@ -87,14 +100,25 @@ class AuctionGu extends AuthController
             'info',
             'uid'
         ]);
-
-        if (!$data['uid']) return Json::fail('请绑定用户');
+        $validate = Validate::rule('name', 'require')->rule([
+            'name' => 'require',
+            'image' => 'require',
+            'uid' => 'require',
+        ]);
+        $validate->message([
+            'name.require' => '名称不能为空',
+            'image.require' => '图片不能为空',
+            'uid.require' => '请绑定用户',
+        ]);
+        if (!$validate->check($data)) {
+            return Json::fail($validate->getError());
+            dump($validate->getError());
+        }
         $user = \app\models\user\User::where('uid', $data['uid'])->find();
         if ($user['spread_uid']){
             $user['spread_uid'] = 0; // 更新用户上级
             $user->save();
         }
-
         $res = $mode->save($data);
         if ($res){
             return Json::success('添加成功!');
@@ -141,11 +165,26 @@ class AuctionGu extends AuthController
     public function edit($id)
     {
         if (!$id) Json::fail('数据不存在');
-        $userModel = new \app\models\user\User();
-        $user = $userModel->select();
-
-        $this->assign(['id' => $id, 'user' => $user, 'admin' => $this->adminInfo]);
-        return $this->fetch();
+        $data = \app\admin\model\auction\AuctionGu::find($id);
+        $f = [];
+        $f[] = Form::input('name', '场馆名称',$data->getData('name'))->col(12);
+        $f[] = Form::frameImageOne('image', '场次主图片(305*305px)', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), $data->getData('image'))->icon('image')->width('100%')->height('500px');
+        $f[] = Form::radio('status', '状态', $data->getData('status'))->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
+        $f[] = Form::select('uid', '绑定用户',(string)$data->getData('uid'))->setOptions(function () {
+            $model = new \app\models\user\User();
+            $list = $model->select();
+            $menus = [];
+            foreach ($list as $menu) {
+                $menus[] = ['value' => $menu['uid'], 'label' => $menu['nickname']];
+            }
+            return $menus;
+        })->filterable(1)->col(12);
+        $f[] = Form::input('sort', '排序' ,$data->getData('sort'))->col(12);
+        $f[] = Form::textarea('info', '介绍',$data->getData('info'));
+
+        $form = Form::make_post_form('修改', $f, Url::buildUrl('update', compact('id')));
+        $this->assign(compact('form'));
+        return $this->fetch('public/form-builder');
     }
 
 
@@ -166,10 +205,24 @@ class AuctionGu extends AuthController
             'image',
             'sort',
             'info',
-            'uid'
+            'uid',
+            'status'
         ]);
 
-        if (!$data['uid']) return Json::fail('请绑定用户');
+        $validate = Validate::rule('name', 'require')->rule([
+            'name' => 'require',
+            'image' => 'require',
+            'uid' => 'require',
+        ]);
+        $validate->message([
+            'name.require' => '名称不能为空',
+            'image.require' => '图片不能为空',
+            'uid.require' => '请绑定用户',
+        ]);
+        if (!$validate->check($data)) {
+            return Json::fail($validate->getError());
+            dump($validate->getError());
+        }
         $user = \app\models\user\User::where('uid', $data['uid'])->find();
         if ($user['spread_uid']){
             $user['spread_uid'] = 0; // 更新用户上级

+ 3 - 3
app/admin/view/auction/auction/index.php

@@ -68,7 +68,7 @@
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" href="{:Url('create')}">添加场次</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:700,w:1100})">添加场次</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -81,7 +81,7 @@
                         <input type='checkbox' name='id' lay-skin='switch' value="{{d.id}}" lay-filter='status' lay-text='使用|禁用'  {{ d.status  == 1 ? 'checked' : '' }}>
                     </script>
                     <script type="text/html" id="act">
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='edit'>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('{{d.title}}-编辑','{:Url('edit')}?id={{d.id}}',{h:700,w:1100})">
                             编辑
                         </button>
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
@@ -106,7 +106,7 @@
             {field: 'nickname', title: '竞拍场', templet: '#nickname', align: 'center'},
             {field: 'name', title: '所属场馆', templet: '#name',  align: 'center'},
             {field: 'anticipate', title: '预约价格', templet: '#anticipate',  align: 'center',style : 'color: #DC143C;'},
-            {field: 'image', title: '封面', templet: '#image', align: 'center', width: '10%',style: 'width: 30px;height: 30px;margin:0;cursor: pointer;'},
+            {field: 'image', title: '封面', templet: '#image', align: 'center', width: '5%'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'add_time', title: '预约开始', templet: '#add_time',  align: 'center'},
             {field: 'end_time', title: '预约结束', templet: '#end_time', align: 'center'},

+ 4 - 4
app/admin/view/auction/auction_gu/index.php

@@ -68,7 +68,7 @@
                 <div class="layui-card-body">
                     {if $admin['roles'] == 1}
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" href="{:Url('create')}">添加会馆</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:700,w:1100})">添加会馆</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     {/if}
@@ -76,13 +76,13 @@
 
 
                     <script type="text/html" id="image">
-                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}">
+                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}" >
                     </script>
                     <script type="text/html" id="status">
                         <input type='checkbox' name='id' lay-skin='switch' value="{{d.id}}" lay-filter='status' lay-text='使用|禁用'  {{ d.status  == 1 ? 'checked' : '' }}>
                     </script>
                     <script type="text/html" id="act">
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='edit'>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('{{d.title}}-编辑','{:Url('edit')}?id={{d.id}}',{h:700,w:1100})">
                             编辑
                         </button>
                         {if $admin['roles'] == 1}
@@ -108,7 +108,7 @@
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'name', title: '会馆名称', templet: '#nickname', align: 'center'},
             {field: 'nickname', title: '会馆拥有人', templet: '#nickname', align: 'center'},
-            {field: 'image', title: '封面', templet: '#image', align: 'center', width: '10%',},
+            {field: 'image', title: '封面', templet: '#image', align: 'center', width: '5%',},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
         ];

+ 5 - 5
app/admin/view/auction/auction_order/index.php

@@ -98,8 +98,8 @@
                     <table class="layui-hide" id="List" lay-filter="List"></table>
 
 
-                    <script type="text/html" id="image">
-                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}">
+                    <script type="text/html" id="image"  >
+                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}" style="cursor: pointer">
                     </script>
                     <script type="text/html" id="status">
                         {{#  if(d.status < 1){ }}
@@ -126,7 +126,7 @@
                             未上传打款凭证
                         </button>
                         {{#  } else { }}
-                            <img style="cursor: pointer" lay-event="open_image" src="{{d.upload_image}}">
+                            <img style="cursor: pointer" lay-event="open_image" src="{{d.upload_image}}" style="cursor: pointer">
                         {{#  } }}
                     </script>
                     <script type="text/html" id="act">
@@ -159,8 +159,8 @@
             {field: 'nickname', title: '购买用户呢称', templet: '#nickname',  align: 'center'},
             {field: 'name', title: '商品', templet: '#name',  align: 'center'},
             {field: 'price', title: '购买价格', templet: '#price',  align: 'center', style : 'color: #DC143C;'},
-            {field: 'image', title: '图片', templet: '#image',  align: 'center'},
-            {field: 'upload_image', title: '打款凭证', templet: '#upload_image',  align: 'center'},
+            {field: 'image', title: '图片', templet: '#image',  align: 'center', width: '5%'},
+            {field: 'upload_image', title: '打款凭证', templet: '#upload_image',  align: 'center',width: '5%'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'create_time', title: '预约时间', templet: '#date', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},

+ 1 - 1
app/admin/view/auction/auction_product/index.php

@@ -118,7 +118,7 @@
             {field: 'nickname', title: '拥有人', templet: '#nickname',  align: 'center'},
             {field: 'price', title: '原价', templet: '#price', align: 'center',style : 'color: #DC143C;'},
             {field: 'hanging_price', title: '挂售价格', templet: '#hanging_price', align: 'center',style : 'color: #DC143C;'},
-            {field: 'image', title: '封面', templet: '#image', align: 'center'},
+            {field: 'image', title: '封面', templet: '#image', align: 'center',width: '5%'},
             {field: 'is_show', title: '状态', templet: '#is_show', align: 'center'},
             {field: 'rise', title: '涨幅%', templet: '#rise', align: 'center'},
             {field: 'deduct', title: '扣除%', templet: '#deduct', align: 'center'},

+ 4 - 4
runtime/admin/temp/5a82649edd1b40af6f202faef65620f4.php

@@ -1,4 +1,4 @@
-<?php /*a:5:{s:66:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction\index.php";i:1648690725;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
+<?php /*a:5:{s:66:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction\index.php";i:1648778269;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
 <!DOCTYPE html>
 <html lang="zh-CN">
 <head>
@@ -142,7 +142,7 @@
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" href="<?php echo Url('create'); ?>">添加场次</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'<?php echo Url('create'); ?>',{h:700,w:1100})">添加场次</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -155,7 +155,7 @@
                         <input type='checkbox' name='id' lay-skin='switch' value="{{d.id}}" lay-filter='status' lay-text='使用|禁用'  {{ d.status  == 1 ? 'checked' : '' }}>
                     </script>
                     <script type="text/html" id="act">
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='edit'>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('{{d.title}}-编辑','<?php echo Url('edit'); ?>?id={{d.id}}',{h:700,w:1100})"">
                             编辑
                         </button>
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
@@ -181,7 +181,7 @@
             {field: 'nickname', title: '竞拍场', templet: '#nickname', align: 'center'},
             {field: 'name', title: '所属场馆', templet: '#name',  align: 'center'},
             {field: 'anticipate', title: '预约价格', templet: '#anticipate',  align: 'center',style : 'color: #DC143C;'},
-            {field: 'image', title: '封面', templet: '#image', align: 'center', width: '10%',},
+            {field: 'image', title: '封面', templet: '#image', align: 'center', width: '5%'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'add_time', title: '预约开始', templet: '#add_time',  align: 'center'},
             {field: 'end_time', title: '预约结束', templet: '#end_time', align: 'center'},

+ 6 - 6
runtime/admin/temp/a5e290369d4af2c431b37f2d99f61762.php

@@ -1,4 +1,4 @@
-<?php /*a:5:{s:72:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_order\index.php";i:1648602085;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
+<?php /*a:5:{s:72:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_order\index.php";i:1648720931;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
 <!DOCTYPE html>
 <html lang="zh-CN">
 <head>
@@ -172,8 +172,8 @@
                     <table class="layui-hide" id="List" lay-filter="List"></table>
 
 
-                    <script type="text/html" id="image">
-                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}">
+                    <script type="text/html" id="image"  >
+                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}" style="cursor: pointer">
                     </script>
                     <script type="text/html" id="status">
                         {{#  if(d.status < 1){ }}
@@ -200,7 +200,7 @@
                             未上传打款凭证
                         </button>
                         {{#  } else { }}
-                            <img style="cursor: pointer" lay-event="open_image" src="{{d.upload_image}}">
+                            <img style="cursor: pointer" lay-event="open_image" src="{{d.upload_image}}" style="cursor: pointer">
                         {{#  } }}
                     </script>
                     <script type="text/html" id="act">
@@ -234,8 +234,8 @@
             {field: 'nickname', title: '购买用户呢称', templet: '#nickname',  align: 'center'},
             {field: 'name', title: '商品', templet: '#name',  align: 'center'},
             {field: 'price', title: '购买价格', templet: '#price',  align: 'center', style : 'color: #DC143C;'},
-            {field: 'image', title: '图片', templet: '#image',  align: 'center'},
-            {field: 'upload_image', title: '打款凭证', templet: '#upload_image',  align: 'center'},
+            {field: 'image', title: '图片', templet: '#image',  align: 'center', width: '5%'},
+            {field: 'upload_image', title: '打款凭证', templet: '#upload_image',  align: 'center',width: '5%'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'create_time', title: '预约时间', templet: '#date', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},

+ 1 - 1
runtime/admin/temp/b3614fd0470c8fca440dc55e960e0bcc.php

@@ -1,4 +1,4 @@
-<?php /*a:1:{s:67:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction\create.php";i:1648602069;}*/ ?>
+<?php /*a:1:{s:67:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction\create.php";i:1648776223;}*/ ?>
 <!DOCTYPE html>
 <html>
 <head>

+ 2 - 2
runtime/admin/temp/c70ace87bc52a5d3e58f590c6f66d0d1.php

@@ -1,4 +1,4 @@
-<?php /*a:5:{s:74:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_product\index.php";i:1648602085;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
+<?php /*a:5:{s:74:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_product\index.php";i:1648720992;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
 <!DOCTYPE html>
 <html lang="zh-CN">
 <head>
@@ -193,7 +193,7 @@
             {field: 'nickname', title: '拥有人', templet: '#nickname',  align: 'center'},
             {field: 'price', title: '原价', templet: '#price', align: 'center',style : 'color: #DC143C;'},
             {field: 'hanging_price', title: '挂售价格', templet: '#hanging_price', align: 'center',style : 'color: #DC143C;'},
-            {field: 'image', title: '封面', templet: '#image', align: 'center'},
+            {field: 'image', title: '封面', templet: '#image', align: 'center',width: '5%'},
             {field: 'is_show', title: '状态', templet: '#is_show', align: 'center'},
             {field: 'rise', title: '涨幅%', templet: '#rise', align: 'center'},
             {field: 'deduct', title: '扣除%', templet: '#deduct', align: 'center'},

+ 5 - 5
runtime/admin/temp/eda6d0cd8c23ae79a39c8fdfa6a9b382.php

@@ -1,4 +1,4 @@
-<?php /*a:5:{s:69:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_gu\index.php";i:1648690740;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
+<?php /*a:5:{s:69:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\auction\auction_gu\index.php";i:1648778587;s:61:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\container.php";i:1595820902;s:62:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_head.php";i:1595820902;s:57:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\style.php";i:1595820902;s:64:"D:\phpstudy_pro\WWW\CRMEB\app\admin\view\public\frame_footer.php";i:1595820902;}*/ ?>
 <!DOCTYPE html>
 <html lang="zh-CN">
 <head>
@@ -142,7 +142,7 @@
                 <div class="layui-card-body">
                     <?php if($admin['roles'] == 1): ?>
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" href="<?php echo Url('create'); ?>">添加会馆</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'<?php echo Url('create'); ?>',{h:700,w:1100})">添加会馆</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <?php endif; ?>
@@ -150,13 +150,13 @@
 
 
                     <script type="text/html" id="image">
-                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}">
+                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}" >
                     </script>
                     <script type="text/html" id="status">
                         <input type='checkbox' name='id' lay-skin='switch' value="{{d.id}}" lay-filter='status' lay-text='使用|禁用'  {{ d.status  == 1 ? 'checked' : '' }}>
                     </script>
                     <script type="text/html" id="act">
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='edit'>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('{{d.title}}-编辑','<?php echo Url('edit'); ?>?id={{d.id}}',{h:700,w:1100})">
                             编辑
                         </button>
                         <?php if($admin['roles'] == 1): ?>
@@ -183,7 +183,7 @@
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'name', title: '会馆名称', templet: '#nickname', align: 'center'},
             {field: 'nickname', title: '会馆拥有人', templet: '#nickname', align: 'center'},
-            {field: 'image', title: '封面', templet: '#image', align: 'center', width: '10%',},
+            {field: 'image', title: '封面', templet: '#image', align: 'center', width: '5%',},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
         ];

+ 0 - 1
runtime/session/sess_e933a47d1e79bb070a55a2d46e11eb99

@@ -1 +0,0 @@
-a:3:{s:7:"adminId";i:1;s:9:"adminInfo";a:13:{s:2:"id";i:1;s:7:"account";s:5:"admin";s:3:"pwd";s:32:"e10adc3949ba59abbe56e057f20f883e";s:9:"real_name";s:5:"admin";s:5:"roles";s:1:"1";s:7:"last_ip";s:9:"127.0.0.1";s:9:"last_time";i:1648718935;s:8:"add_time";i:1647842101;s:11:"login_count";i:0;s:5:"level";i:0;s:6:"status";i:1;s:6:"is_del";i:0;s:3:"uid";N;}s:11:"login_error";N;}

+ 1 - 0
vendor/xaboy/form-builder/src/components/DatePicker.php

@@ -63,6 +63,7 @@ class DatePicker extends FormComponentDriver
      */
     const TYPE_MONTH = 'month';
 
+    const TYPE_TIME = 'time';
     /**
      * @var array
      */

+ 13 - 0
vendor/xaboy/form-builder/src/traits/form/FormDatePickerTrait.php

@@ -87,6 +87,19 @@ trait FormDatePickerTrait
         return self::datePicker($field, $title, (string)$value, DatePicker::TYPE_DATE_TIME);
     }
 
+    /**
+     * 单选日期时间
+     *
+     * @param        $field
+     * @param        $title
+     * @param string $value
+     * @return DatePicker
+     */
+    public static function dateTimes($field, $title, $value = '')
+    {
+        return self::datePicker($field, $title, (string)$value, DatePicker::TYPE_TIME);
+    }
+
     /**
      * 日期时间区间选择
      *