hrjy 3 سال پیش
والد
کامیت
813738b21f

+ 1 - 1
app/admin/model/auction/AuctionApply.php

@@ -35,13 +35,13 @@ class AuctionApply extends BaseModel
             ->leftJoin('user u', 'a.uid = u.uid');
 
         if ($where['auction']) $model->where('u.nickname', 'like', '%'.$where['auction'].'%');
+        $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
         }else{
             $model->page(20, 1);
         }
 
-        $data['count'] = $model->count();
         $list = $model->select();
         $data['data'] = empty($list) ? [] : $list->toArray();
         return $data;

+ 2 - 2
app/admin/model/auction/AuctionBooking.php

@@ -41,14 +41,14 @@ class AuctionBooking extends BaseModel
         if (trim($where['store_name']) != '') $model->where('a.id|u.account|u.nickname', 'like', '%'.$where['store_name'].'%');
         if (trim($where['auction_id']) != '') $model->where('a.auction_id', $where['auction_id']);
         if (trim($where['data']) != '') $model = self::getModelTime($where, $model,  'create_time');
-
+        $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
         }else{
             $model->page(20, 1);
         }
 
-        $data['count'] = $model->count();
+
         $list = $model->select();
 
         $data['data'] = $list;

+ 2 - 1
app/admin/model/auction/AuctionGu.php

@@ -41,13 +41,14 @@ class AuctionGu extends BaseModel
         if ($where['null']) $model->where('a.status', '>', 5);
 
         if ($where['auction'])$model->where('a.id|a.name|u.nickname' , 'like', '%'.$where['auction'],'%');
+        $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
         }else{
             $model->page(20, 1);
         }
 
-        $data['count'] = $model->count();
+
         $list = $model->select();
 
         $list = count($list) ? $list->toArray() : [];

+ 1 - 2
app/admin/model/auction/AuctionOrder.php

@@ -62,14 +62,13 @@ class AuctionOrder extends BaseModel
         if (isset($where['excel']) && $where['excel'] == 1) {
             self::SaveExcel($list);
         }
-
+        $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
         }else{
             $model->page(20, 1);
         }
 
-        $data['count'] = $model->count();
         $list = $model->select();
 
 

+ 2 - 1
app/admin/model/auction/AuctionProduct.php

@@ -52,13 +52,14 @@ class AuctionProduct extends BaseModel
             $where['is_show'] = $where['is_show'] == 2? 0: 1;
             $model->where('a.is_show', '=',$where['is_show']);
         }
+        $data['count'] = $model->count();
+
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
         }else{
             $model->page(20, 1);
         }
 
-        $data['count'] = $model->count();
         $data['data'] = $model->select()->toArray();
         foreach ($data['data'] as $k => $v)
         {

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

@@ -48,7 +48,7 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label" style="top: -4.5px">搜索</label>
                                 <div class="layui-input-block">
-                                    <input type="text" name="store_name" class="layui-input" placeholder="商品名称,编号">
+                                    <input type="text" name="store_name" class="layui-input" placeholder="商品名称,编号,拥有人">
                                 </div>
                             </div>
                             <div class="layui-inline">