xieruidong il y a 2 ans
Parent
commit
11abbfc865
2 fichiers modifiés avec 9 ajouts et 12 suppressions
  1. 2 2
      application/admin/controller/Orders.php
  2. 7 10
      public/assets/js/backend/orders.js

+ 2 - 2
application/admin/controller/Orders.php

@@ -108,9 +108,9 @@ class Orders extends Backend
 
             $list = OrderInfo::where($where)
                 ->where('order_info.order_id',$ids)
-                ->paginate($limit);
+                ->select();
 
-            $result = array("total" => $list->total(), "rows" => $list->items());
+            $result = array("total" => $list->count(), "rows" => $list->all());
 
             return json($result);
         }

+ 7 - 10
public/assets/js/backend/orders.js

@@ -110,22 +110,19 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 commonSearch:false,
                 search:false,
+                pagination:false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'status', title: __('Status'),formatter: Table.api.formatter.label,searchList:status},
-                        {field: 'user.nickname', title: __('下单用户')},
-                        {field: 'order_no', title: __('Order_no')},
+                        {field: 'logo', title: __('商品图片'),formatter: Table.api.formatter.image,events:Table.api.events.image,operate: false},
+                        {field: 'goods_name', title: __('商品名称'),operate: false},
+                        {field: 'sku_name', title: __('商品规格'),operate: false},
                         {field: 'amount_total', title: __('Amount_total'), operate:'BETWEEN'},
                         {field: 'amount_pay', title: __('Amount_pay'), operate:'BETWEEN'},
-                        /*  {field: 'amount_install', title: __('Amount_install'), operate:'BETWEEN'},
-                          {field: 'num', title: __('Num'),operate: 'between'},
-                          {field: 'num_install', title: __('Num_install'),operate: 'between'},*/
-                        {field: 'create_time', title: __('Create_time'),addClass:'datetimerange',formatter: Table.api.formatter.datetime,operate: 'range'},
-                        //{field: 'update_time', title: __('Update_time'),addClass:'datetimerange',formatter: Table.api.formatter.datetime,operate: 'range'},
-                        {field: 'pay_type', title: __('Pay_type'),formatter: Table.api.formatter.label,searchList:payTypes},
-                        {field: 'pay_time', title: __('支付时间'),addClass:'datetimerange',formatter: Table.api.formatter.datetime,operate: 'range'}
+                          {field: 'amount_install', title: __('Amount_install'), operate:'BETWEEN'},
+                          {field: 'num', title: __('购买数量'),operate: 'between'},
+                          {field: 'num_install', title: __('Num_install'),operate: 'between'},
                     ]
                 ],
                 onLoadSuccess(){