修改

app/admin/controller/auction/Auction.php

@@ -73,8 +73,8 @@ class Auction extends AuthController
         })->filterable(1)->col(12);
         $f[] = Form::dateTimes('add_time', '预约开始时间');
         $f[] = Form::dateTimes('end_time', '预约结束时间');
-        $f[] = Form::dateTimes('radd_time', '预约结束时间');
+        $f[] = Form::dateTimes('radd_time', '入场时间');
-        $f[] = Form::dateTimes('rend_time', '预约结束时间');
+        $f[] = Form::dateTimes('rend_time', '结束时间');
         $f[] = Form::input('sort', '排序', '0');
         $f[] = Form::textarea('info', '介绍')->col(12);
 
@@ -196,8 +196,8 @@ class Auction extends AuthController
         })->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('radd_time', '入场时间', $data->getData('radd_time'));
-        $f[] = Form::dateTimes('rend_time', '预约结束时间', $data->getData('rend_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);
 

app/admin/view/auction/auction_gu/index.php

@@ -151,13 +151,13 @@
     //改状态
     layList.switch('status',function (odj,value) {
         if(odj.elem.checked==true){
-            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:1,id:value}}),function (res) {
+            layList.baseGet(layList.Url({c:'auction.auction_gu',a:'set_status',p:{status:1,id:value}}),function (res) {
                 layList.msg(res.msg, function () {
                     layList.reload();
                 });
             });
         }else{
-            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:0,id:value}}),function (res) {
+            layList.baseGet(layList.Url({c:'auction.auction_gu',a:'set_status',p:{status:0,id:value}}),function (res) {
                 layList.msg(res.msg, function () {
                     layList.reload();
                 });

app/admin/view/index/index.php

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
     <meta http-equiv="Cache-Control" content="no-siteapp" />
-    <title>CRMEB管理系统</title>
+    <title>易趣GO管理系统</title>
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html" />
     <![endif]-->

app/api/controller/auction/AuctionController.php

@@ -228,10 +228,11 @@ class AuctionController
             [['limit', 'd'], 0],
         ], $request);
         $uid = getParent($request->uid());
+        $uid[] = $request->uid();
         $list = [];
         if ($uid){
-            $uid[] = $request->uid();
             $list = AuctionGu::where('a.uid', 'in', $uid)
+                ->where('a.status', 1)
                 ->alias('a')
                 ->field('a.*,u.nickname,u.avatar')
                 ->leftJoin('user u', 'a.uid = u.uid')

app/api/controller/auction/AuctionProductController.php

@@ -82,11 +82,11 @@ class AuctionProductController
 
         $product = AuctionProduct::where('id', $data['product_id'])->find();
         $product_ids = AuctionProduct::where('auction_id', $product['auction_id'])->column('id');
-
+        $auction  = Auction::where('id', $product['auction_id'])->find();
-        $count = AuctionOrder::whereBetweenTime('create_time', day(),today())->where('product_id', 'in', $product_ids)->count();
+        $count = AuctionOrder::where('frequency',$auction['frequency'])->where('product_id', 'in', $product_ids)->count();
 
 //        $config = SystemConfig::where('menu_name', 'auction_number')->find();
-//        if ($count >= $config['value']) return app('json')->fail('单场购买数量已到达最大');
+//        if ($count >=  (int)$config['value']) return app('json')->fail('单场购买数量已到达最大');
 
         if ($product['uid'] == $request->uid()) return app('json')->fail('无法购买自己商品');
         if ($product){
@@ -104,6 +104,7 @@ class AuctionProductController
                 'product_id' => $product['id'],
                 'image'=> $product['image'],
                 'price' => $product['hanging_price'],
+                'frequency' => $auction['frequency']
             ]);
             if ($res){
                 AuctionOrder::commitTrans();