diff --git a/application/common/model/BaseModel.php b/application/common/model/BaseModel.php index 93c5f84..38c8a98 100644 --- a/application/common/model/BaseModel.php +++ b/application/common/model/BaseModel.php @@ -230,11 +230,11 @@ class BaseModel extends Model if(!$this->withTable)$alisa = ''; $alisa_name = ''; if($alisa)$alisa_name = "{$alisa}."; - if(!$sort)$sort = "{$alisa_name}id asc"; + if(!$sort)$sort = "{$alisa_name}id desc"; $self = static::getBaseWhere($whereData, null, $alisa,$this->withTable); if($this->withTable)$self = $self->with($this->withTable); - if($page&&$limit)$self = $self->orderRaw($sort)->where($where)->page($page, $limit); - $list = $self->select(); + if($page&&$limit)$self = $self->where($where)->page($page, $limit); + $list = $self->orderRaw($sort)->select(); foreach ($list as $row) { if(isset($field['base'])&&$field['base']!=['*']){ diff --git a/public/assets/js/backend/school/activity/order/order_code.js b/public/assets/js/backend/school/activity/order/order_code.js index 1c91d5b..1342b1a 100644 --- a/public/assets/js/backend/school/activity/order/order_code.js +++ b/public/assets/js/backend/school/activity/order/order_code.js @@ -34,9 +34,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'miniurl', title: __('核销码内容'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'codeimage',visible:false, title: __('Codeimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, + {field: 'codeimage', title: __('Codeimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, - {field: 'codeoneimage',visible:false, title: __('Codeoneimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, + {field: 'codeoneimage', title: __('Codeoneimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, {field: 'status', title: __('Status'), searchList: {"3":__('Status 3'),"6":__('Status 6')}, formatter: Table.api.formatter.status}, {field: 'verificationtime', title: __('Verificationtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'verification_user_id', title: __('Verification_user_id')},