xieruidong 2 年之前
父节点
当前提交
13b436ff74

+ 2 - 2
addons/aliyunsms/config.php

@@ -6,7 +6,7 @@ return [
         'title' => 'accessKeyId',
         'type' => 'string',
         'content' => [],
-        'value' => 'LTAI5tDhsptUTLeWfh4XBHd8',
+        'value' => 'LTAI5t6JbKFcNDp38HkTSfD2',
         'rule' => 'required',
         'msg' => '',
         'tip' => '',
@@ -18,7 +18,7 @@ return [
         'title' => 'accessSecret',
         'type' => 'string',
         'content' => [],
-        'value' => 'u9rTyaYq3KEqqKWzQgRAVSuy0FbMa9',
+        'value' => 'LtQz6iH7SMOMImXzN9LXRaViIHu3XQ',
         'rule' => 'required',
         'msg' => '',
         'tip' => '',

+ 9 - 2
application/admin/controller/Goods.php

@@ -247,15 +247,22 @@ class Goods extends Backend
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
+            $filter=json_decode(input('filter'),true);
+            $map=[];
+            if(!empty($filter['date'])){
+                $map['create_time']=['between',explode(' - ',$filter['date'])];
+            }
             $list=OrderInfo::payed()
                 ->where('goods_id',$row['id'])
+                ->where($map)
                 ->group('user_id')
                 ->field('user_id,SUM(amount_pay) as amount')
                 ->order('amount','desc')
                 ->paginate($limit);
 
-            $userNames=User::whereIn('id',array_column($list->items(),'user_id'))->column('nickname','id');
+            if(!$list->items()) {
+                $userNames = User::whereIn('id', array_column($list->items(), 'user_id'))->column('nickname', 'id');
+            }
             $index=$list->listRows()*$list->currentPage()-$list->listRows();
             foreach ($list as $idx=>$item){
                 $item['nickname']=$userNames[$item['user_id']]??'-';

+ 2 - 2
extend/aklsjfdnasjk/asdkjbaskjdb.log

@@ -13,6 +13,6 @@ fVczXhfg8960
 
 sms:
 用户登录名称 pingku@1414153901507201.onaliyun.com
-AccessKey ID LTAI5tDhsptUTLeWfh4XBHd8
-AccessKey Secret u9rTyaYq3KEqqKWzQgRAVSuy0FbMa9
+AccessKey ID LTAI5t6JbKFcNDp38HkTSfD2
+AccessKey Secret LtQz6iH7SMOMImXzN9LXRaViIHu3XQ
 regionId:

+ 6 - 5
public/assets/js/backend/goods.js

@@ -154,15 +154,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: location.href,
                 pk: 'id',
                 sortName: 'id',
-                searchFormVisible:false,
+                searchFormVisible:true,
                 showExport:false,
-                commonSearch:false,
+                commonSearch:true,
                 search:false,
                 columns: [
                     [
-                        {field: 'rank', title: __('排名')},
-                        {field: 'nickname', title: __('用户名')},
-                        {field: 'amount', title: __('金额')},
+                        {field: 'rank', title: __('排名'),operate:false,},
+                        {field: 'nickname', title: __('用户名'),operate:false,},
+                        {field: 'amount', title: __('金额'),operate:false,},
+                        {field: 'date', title: __('时间'),operate:'range',addClass:'datetimerange',visible:false},
                     ]
                 ]
             });