订单后台修改

application/admin/controller/Order.php

@@ -53,7 +53,7 @@ class Order extends Backend
             $list = $this->model
                     ->with(['active','user','student','school','grade','classes'])
                     ->where($where)
-                    ->where('order.status',1)
+                    ->where('(order.pay_type = 1 and order.status = 1) or (order.pay_type = 2)')
                     ->order($sort, $order)
                     ->paginate($limit);
 

public/assets/js/backend/order.js

@@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-//                        {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
+                        {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
 //                        {field: 'active_id', title: __('Active_id')},
                         {field: 'active.name', title: __('Active.name'), operate: 'LIKE'},
 //                        {field: 'user_id', title: __('User_id')},