xieruidong 2 vuotta sitten
vanhempi
commit
f8878b9125
2 muutettua tiedostoa jossa 4 lisäystä ja 6 poistoa
  1. 3 5
      application/admin/controller/Goods.php
  2. 1 1
      thinkphp/library/think/Model.php

+ 3 - 5
application/admin/controller/Goods.php

@@ -234,11 +234,9 @@ class Goods extends Backend
         $time=input('time')?:sprintf('%s - %s',date('Y-m-d 00:00:00'),date('Y-m-d 23:59:59'));
         $this->assign('time',$time);
         $timeArr=explode(' - ',$time);
-        $timeArr[0]=strtotime($timeArr[0]);
-        $timeArr[1]=strtotime($timeArr[1]);
-        $this->assign('viewCount',$row->viewFavCart()->typeView()->filterDate($timeArr,'date')->sum('num'));
-        $this->assign('favCount',$row->viewFavCart()->typeFav()->filterDate($timeArr,'date')->sum('num'));
-        $this->assign('cartCount',$row->viewFavCart()->typeCart()->filterDate($timeArr,'date')->sum('num'));
+        $this->assign('viewCount',$row->viewFavCart()->typeView()->filterDate($timeArr,'date','date')->sum('num'));
+        $this->assign('favCount',$row->viewFavCart()->typeFav()->filterDate($timeArr,'date','date')->sum('num'));
+        $this->assign('cartCount',$row->viewFavCart()->typeCart()->filterDate($timeArr,'date','date')->sum('num'));
         #单价
         $goodsAmount=OrderInfo::payed()
             ->whereBetween('create_time',$timeArr)

+ 1 - 1
thinkphp/library/think/Model.php

@@ -37,7 +37,7 @@ use think\model\relation\MorphTo;
  * @method static static|Query findOrFail($data = null)
  * @method static static|Query order($field, $order = null)
  * @method static static|Query whereBetween($field, $data)
- * @method Query|static filterDate($date,$dateType=0,$column='create_time')
+ * @method Query|static filterDate($date,$column='create_time',$dateType='timestamp')
  * @mixin Query
  */
 abstract class Model implements \JsonSerializable, \ArrayAccess