Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/admin/view/order/store_order/exchange_order.php

@@ -80,10 +80,6 @@
                                                 class="layui-btn layui-btn-sm layui-btn-normal">
                                             <i class="layui-icon layui-icon-search"></i>搜索
                                         </button>
-                                        <button @click="excel" type="button"
-                                                class="layui-btn layui-btn-warm layui-btn-sm export" type="button">
-                                            <i class="fa fa-floppy-o" style="margin-right: 3px;"></i>导出
-                                        </button>
                                         <button @click="refresh" type="reset"
                                                 class="layui-btn layui-btn-primary layui-btn-sm">
                                             <i class="layui-icon layui-icon-refresh"></i>刷新

app/models/store/StoreExchangeOrder.php

@@ -42,6 +42,19 @@ class StoreExchangeOrder extends BaseModel
         return ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()) && count($data) ? $data->toArray() : [];
     }
 
+    public static function getList($where)
+    {
+        $model = self::getOrderWhere($where, self::alias('a')->join('user r', 'r.uid=a.uid', 'LEFT'), 'a.', 'r')->field('a.*');
+        if ($where['order'] != '') {
+            $model = $model->order(self::setOrder($where['order']));
+        } else {
+            $model = $model->order('a.id desc');
+        }
+        $data = ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()) && count($data) ? $data->toArray() : [];
+        $count = $model->count();
+        return compact('data', 'count');
+    }
+
     public static function getOrderWhere($where, $model, $aler = '', $join = '')
     {
         if (isset($where['status']) && $where['status'] != '') $model = self::statusWhere($where['status'], $model, $aler);