挂售

app/admin/controller/auction/Auction.php

@@ -146,16 +146,21 @@ class Auction extends AuthController
             'site.require' => '请选择开场日期',
         ]);
         $data['site'] = implode($data['site'], ',');
-        if (!$validate->check($data)) {
-            return Json::fail($validate->getError());
-        }
-        $res = $mode->save($data);
-        if ($res){
-            return Json::success('添加成功!');
+        if ($data['site'] == '1,3,5'  or  $data['site'] == '2,4,6') {
+            if (!$validate->check($data)) {
+                return Json::fail($validate->getError());
+            }
+            $res = $mode->save($data);
+            if ($res){
+                return Json::success('添加成功!');
+            }else{
+                return Json::fail('添加失败');
+            }
         }else{
-            return Json::fail('添加失败');
+            return Json::fail('请选择正确的日期,1,3,5 或者 2,4,6');
         }
 
+
     }
 
     /**
@@ -283,18 +288,23 @@ class Auction extends AuthController
             'site.require' => '请选择开场日期',
         ]);
         $data['site'] = implode($data['site'], ',');
-        if (!$validate->check($data)) {
-            return Json::fail($validate->getError());
-        }
+        if ($data['site'] == '1,3,5'  or  $data['site'] == '2,4,6') {
+            if (!$validate->check($data)) {
+                return Json::fail($validate->getError());
+            }
 
-        $res = \app\admin\model\auction\Auction::update($data);
-        if ($res){
-            return Json::success('修改成功!');
+            $res = \app\admin\model\auction\Auction::update($data);
+            if ($res){
+                return Json::success('修改成功!');
+            }else{
+                return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
+            }
         }else{
-            return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
+            return Json::fail('请选择正确的日期,1,3,5 或者 2,4,6');
         }
 
 
+
     }
     /**
      * 商品列表

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

@@ -48,19 +48,19 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label" style="top: -4.5px">搜索</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="store_name" class="layui-input" placeholder="订单号,账号,昵称,编号">
+                                    <input id="store_name" type="text" name="store_name" class="layui-input" placeholder="订单号,账号,昵称,编号">
                                 </div>
                             </div>
                             <div class="layui-inline">
                                 <label class="layui-form-label" style="top: -4.5px">商品名称</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="product_name" class="layui-input" placeholder="商品名称">
+                                    <input type="text"  id="product_name" name="product_name" class="layui-input" placeholder="商品名称">
                                 </div>
                             </div>
                             <div class="layui-inline">
                                 <label class="layui-form-label" style="top: -4.5px">所有场次</label>
                                 <div class="layui-input-block">
-                                    <select name="auction_id">
+                                    <select  id="auction_id" name="auction_id">
                                         <option value=" ">全部</option>
                                         {volist name='auction' id='vo'}
                                         <option value="{$vo.id}">{$vo.nickname}</option>
@@ -71,7 +71,7 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label" style="top: -4.5px">所有场馆</label>
                                 <div class="layui-input-block">
-                                    <select name="gu_id">
+                                    <select  id="gu_id" name="gu_id">
                                         <option value=" ">全部</option>
                                         {volist name='gu' id='vo'}
                                         <option value="{$vo.id}">{$vo.name}</option>
@@ -90,19 +90,21 @@
                                         </button>
                                     </div>
                                 </div>
-                                <label class="layui-form-label">创建时间:</label>
-                                <div class="layui-input-block" data-type="data" v-cloak="">
-                                    <button class="layui-btn layui-btn-sm" type="button" v-for="item in dataList"
-                                            @click="setData(item)"
-                                            :class="{'layui-btn-primary':where.data!=item.value}">{{item.name}}
-                                    </button>
-                                    <button class="layui-btn layui-btn-sm" type="button" ref="time"
-                                            @click="setData({value:'zd',is_zd:true})"
-                                            :class="{'layui-btn-primary':where.data!='zd'}">自定义
-                                    </button>
-                                    <button type="button" class="layui-btn layui-btn-sm layui-btn-primary"
-                                            v-show="showtime==true" ref="date_time">{$year.0} - {$year.1}
-                                    </button>
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">创建时间:</label>
+                                    <div class="layui-input-block" data-type="data" v-cloak="">
+                                        <button class="layui-btn layui-btn-sm" type="button" v-for="item in dataList"
+                                                @click="setData(item)"
+                                                :class="{'layui-btn-primary':where.data!=item.value}">{{item.name}}
+                                        </button>
+                                        <button class="layui-btn layui-btn-sm" type="button" ref="time"
+                                                @click="setData({value:'zd',is_zd:true})"
+                                                :class="{'layui-btn-primary':where.data!='zd'}">自定义
+                                        </button>
+                                        <button type="button" class="layui-btn layui-btn-sm layui-btn-primary"
+                                                v-show="showtime==true" ref="date_time">{$year.0} - {$year.1}
+                                        </button>
+                                    </div>
                                 </div>
                                 <button @click="excel" type="button"
                                         class="layui-btn layui-btn-warm layui-btn-sm export" type="button">
@@ -316,12 +318,22 @@
                 showtime: false,
             },
             watch: {
-                'where.store_name': function () {
+                'where.status': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.data': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.type': function () {
                     this.where.excel = 0;
                     this.getBadge();
                     layList.reload(this.where, true);
                 },
-                'where.product_name': function () {
+                'where.pay_type': function () {
                     this.where.excel = 0;
                     this.getBadge();
                     layList.reload(this.where, true);
@@ -354,7 +366,14 @@
                     this.getBadge();
                 },
                 excel: function () {
-                    console.log(11111);
+                    var store_name = $('#store_name').val();
+                    var product_name = $('#product_name').val();
+                    var auction_id = $('#auction_id').val();
+                    var gu_id = $('#gu_id').val();
+                    this.where['store_name'] = store_name;
+                    this.where['product_name'] = product_name;
+                    this.where['auction_id'] = auction_id;
+                    this.where['gu_id'] = gu_id;
                     this.where.excel = 1;
                     location.href = layList.U({c: 'Auction.auction_order', a: 'list', q: this.where});
                     this.where.excel = 0;

app/api/controller/auction/AuctionProductController.php

@@ -404,6 +404,27 @@ class AuctionProductController
 
     }
 
+    /**
+     * 订单数量
+     * @param Request $request
+     * @return mixed
+     */
+    public function untreated(Request $request){
+        $data = [
+            'user' => [
+                'paid' => AuctionOrder::where([['uid', '=', $request->uid()], ['status', '=', 1]])->count(), //待支付
+                'reviewed' => AuctionOrder::where([['uid', '=', $request->uid()], ['status', '=', 2]])->count(), // 待审核
+                'hanging' => AuctionOrder::where([['uid', '=', $request->uid()], ['status', '=', 3], ['is_gs', '=', 0]])->count(), // 待挂售
+            ],
+            'seller' => [
+                'paid' => AuctionOrder::where([['collection_id', '=', $request->uid()], ['status', '=', 1]])->count(), //待支付
+                'reviewed' => AuctionOrder::where([['collection_id', '=', $request->uid()], ['status', '=', 2]])->count(),  // 待审核
+                'hanging' => AuctionOrder::where([['uid', '=', $request->uid()], ['status', '=', 3], ['is_gs', '=', 1]])->count(), //挂售中
+            ]
+        ];
+        return app('json')->successful($data);
+    }
+
 
 
 

app/models/auction/AuctionProduct.php

@@ -56,7 +56,7 @@ class AuctionProduct extends BaseModel
                 if ($v['is_admin'] == 2){
                     $time = AuctionTime::where([['auction_id', '=', $auction['id']], ['product_id', '=', $v['id']], ['add_time', '=', strtotime(date('Y-m-d', time()))]])->find();
                     if (!$time){
-                        unset($list);
+                        unset($list[$k]);
                     } else{
                         $lists[] = $list[$k];
                     }
@@ -65,7 +65,16 @@ class AuctionProduct extends BaseModel
                 }
             }
         };
-        return $lists;
+        $a = [];
+        $b = [];
+        foreach ($lists as $k => $v){
+            if ($v['status']  == 1) $a[] = $v; // 未卖出的商品
+            if ($v['status']  == 2) $b[] = $v; // 卖出的商品
+        }
+        foreach ($b as $k => $v){
+            array_push($a, $v); // 卖出商品到最后
+        }
+        return $a;
     }
 
     /**

public/index/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d618d095.js></script><script src=/index/static/js/index.8672ff17.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d618d095.js></script><script src=/index/static/js/index.bdef51cf.js></script></body></html>

route/api/route.php

@@ -191,6 +191,7 @@ Route::group(function () {
     Route::get('auction/gsxq', 'auction.auctionProductController/gsxq')->name('gsxq');// 挂售详情
     Route::post('auction/hanging_sale', 'auction.auctionProductController/hanging_sale')->name('hanging_sale');// 挂售
     Route::post('auction/cancel', 'auction.auctionProductController/cancel')->name('cancel');// 取消挂售
+    Route::get('auction/untreated', 'auction.auctionProductController/untreated')->name('untreated');// 订单数量
 
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);
 //未授权接口