diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index adf69d0cb2c047a371867d513f81a9946bb44e4e..2aa1309decf72471f48adbcc2698092d292c63c3 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -68,6 +68,7 @@ class Admin extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], ]; $ret = AdminService::AdminList($data_params); diff --git a/application/admin/controller/Brand.php b/application/admin/controller/Brand.php index 1364aa2f42af6a594614547280032f6fd943461e..8eece4fde34007aef73920ab6137f3d34b4469a7 100755 --- a/application/admin/controller/Brand.php +++ b/application/admin/controller/Brand.php @@ -69,6 +69,7 @@ class Brand extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], ]; $ret = BrandService::BrandList($data_params); diff --git a/application/admin/controller/Customview.php b/application/admin/controller/Customview.php index 9ec480955c294332a2f7e3774cdc98ee46472475..b6f1ecdc57a97f460dc314dd95719d674881eaa6 100755 --- a/application/admin/controller/Customview.php +++ b/application/admin/controller/Customview.php @@ -67,6 +67,7 @@ class CustomView extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], ]; $ret = CustomViewService::CustomViewList($data_params); diff --git a/application/admin/controller/Goodsbrowse.php b/application/admin/controller/Goodsbrowse.php index 5bf90c08a62e0aefed9e37027b72b185bd4394fa..5cfc9d7c97e141a9e238478dfb3f5e79b3ffedae 100644 --- a/application/admin/controller/Goodsbrowse.php +++ b/application/admin/controller/Goodsbrowse.php @@ -69,6 +69,7 @@ class GoodsBrowse extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], 'is_public' => 0, 'user_type' => 'admin', ]; diff --git a/application/admin/controller/Goodscomments.php b/application/admin/controller/Goodscomments.php index 673c67878c0890e05f243afaf61bd7bb574058bb..2b60cc9dabde5b85a6b090f73007245016a98b15 100644 --- a/application/admin/controller/Goodscomments.php +++ b/application/admin/controller/Goodscomments.php @@ -67,6 +67,7 @@ class Goodscomments extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], 'is_public' => 0, ]; $ret = GoodsCommentsService::GoodsCommentsList($data_params); diff --git a/application/admin/controller/Goodsfavor.php b/application/admin/controller/Goodsfavor.php index 583bee4a0496638b9fc429dd0533b561cc796ffb..f726658b34d83ee60f5f60e8acbf720af8d75978 100644 --- a/application/admin/controller/Goodsfavor.php +++ b/application/admin/controller/Goodsfavor.php @@ -69,6 +69,7 @@ class Goodsfavor extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], 'is_public' => 0, 'user_type' => 'admin', ]; diff --git a/application/admin/controller/Link.php b/application/admin/controller/Link.php index 1cc2321e2202bf8b9e01a809caada4992d8aa1d6..306406de2d9e8817d306acddbab7e6e40f138c78 100755 --- a/application/admin/controller/Link.php +++ b/application/admin/controller/Link.php @@ -49,8 +49,12 @@ class Link extends Common */ public function Index() { - // 获取导航列表 - $ret = LinkService::LinkList(['where'=>$this->form_where]); + // 获取列表 + $data_params = [ + 'where' => $this->form_where, + 'order_by' => $this->form_order_by['data'], + ]; + $ret = LinkService::LinkList($data_params); $this->assign('data_list', $ret['data']); return $this->fetch(); } diff --git a/application/admin/controller/Navigation.php b/application/admin/controller/Navigation.php index b1e81a45c766ff46c3f6368a0b1ae1c82d9442ee..621f2536f90abd34b851cbb62c2a0283baa8a453 100755 --- a/application/admin/controller/Navigation.php +++ b/application/admin/controller/Navigation.php @@ -56,10 +56,13 @@ class Navigation extends Common */ public function Index() { - // 获取导航列表 - $where = $this->form_where; - $where[] = ['nav_type', '=', $this->nav_type]; - $ret = NavigationService::NavList(['where'=>$where]); + // 获取列表 + $data_params = [ + 'where' => $this->form_where, + 'order_by' => $this->form_order_by['data'], + ]; + $data_params['where'][] = ['nav_type', '=', $this->nav_type]; + $ret = NavigationService::NavList($data_params); $this->assign('data_list', $ret['data']); // 一级分类 diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 64cea2e0596ac96a1be06623c24062ba2b425a59..db97ea45590dcaa37735d4c61f3b8aa1bb634635 100755 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -69,6 +69,7 @@ class Order extends Common 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, 'where' => $this->form_where, + 'order_by' => $this->form_order_by['data'], 'is_public' => 0, 'user_type' => 'admin', ]; diff --git a/application/admin/controller/Orderaftersale.php b/application/admin/controller/Orderaftersale.php index a0804ffcbe9a0e4aabb9f6b9223938a4ead14b6c..f7871f0c50ce493738b987185f9162616cc4cd7e 100644 --- a/application/admin/controller/Orderaftersale.php +++ b/application/admin/controller/Orderaftersale.php @@ -70,6 +70,7 @@ class Orderaftersale extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], 'is_public' => 0, ]; $ret = OrderAftersaleService::OrderAftersaleList($data_params); diff --git a/application/admin/controller/Quicknav.php b/application/admin/controller/Quicknav.php index cf610a7071ece34647548f539d5f3f3e85d6c291..edf3503b6f8e47805b2447819f24a73585589b9f 100755 --- a/application/admin/controller/Quicknav.php +++ b/application/admin/controller/Quicknav.php @@ -67,6 +67,7 @@ class QuickNav extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], ]; $ret = QuickNavService::QuickNavList($data_params); diff --git a/application/admin/controller/Role.php b/application/admin/controller/Role.php index 126d26f086e52949d624c223e04865d6d8a207fb..bd6d7305ff3b18a1186b2d018bfd399839d49671 100644 --- a/application/admin/controller/Role.php +++ b/application/admin/controller/Role.php @@ -68,6 +68,7 @@ class Role extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], ]; $ret = AdminRoleService::RoleList($data_params); diff --git a/application/admin/controller/Slide.php b/application/admin/controller/Slide.php index bae1a80ca3bfe12f9c4d16954741fa72760ed195..f50538332412f481185042438a5fe72be4feb834 100755 --- a/application/admin/controller/Slide.php +++ b/application/admin/controller/Slide.php @@ -67,6 +67,7 @@ class Slide extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], ]; $ret = SlideService::SlideList($data_params); diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 17e8907da78e054d0923441d6e60bb9c8a815b44..a496324cc447ebcc4241413f9befc4af88d91cca 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -69,6 +69,7 @@ class User extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], ]; $ret = UserService::UserList($data_params); diff --git a/application/admin/controller/Useraddress.php b/application/admin/controller/Useraddress.php index 7be734c4d1f238166d2d5cf15df9117acd35da57..c20972f0e5f096a42546f2fa30d37ba839594d4d 100644 --- a/application/admin/controller/Useraddress.php +++ b/application/admin/controller/Useraddress.php @@ -67,6 +67,7 @@ class UserAddress extends Common 'where' => $this->form_where, 'm' => $page->GetPageStarNumber(), 'n' => $this->page_size, + 'order_by' => $this->form_order_by['data'], ]; $ret = UserAddressService::UserAddressAdminList($data_params); diff --git a/application/admin/form/Admin.php b/application/admin/form/Admin.php index 4184da6012c1c8a6ceaee2b68f3d963bbd234fe3..716acaa5883b0d701ac74b64ff563fdd05d90ad1 100644 --- a/application/admin/form/Admin.php +++ b/application/admin/form/Admin.php @@ -62,6 +62,7 @@ class Admin 'label' => '管理员', 'view_type' => 'field', 'view_key' => 'username', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -73,6 +74,7 @@ class Admin 'view_key' => 'status', 'view_data_key' => 'name', 'view_data' => lang('common_admin_status_list'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -88,6 +90,7 @@ class Admin 'view_key' => 'gender', 'view_data_key' => 'name', 'view_data' => lang('common_gender_list'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -101,6 +104,7 @@ class Admin 'label' => '手机', 'view_type' => 'field', 'view_key' => 'mobile', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -110,6 +114,7 @@ class Admin 'label' => '角色组', 'view_type' => 'field', 'view_key' => 'role_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'role_id', @@ -124,6 +129,7 @@ class Admin 'label' => '登录次数', 'view_type' => 'field', 'view_key' => 'login_total', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -132,6 +138,7 @@ class Admin 'label' => '最后登录时间', 'view_type' => 'field', 'view_key' => 'login_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -140,6 +147,7 @@ class Admin 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -148,6 +156,7 @@ class Admin 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Answer.php b/application/admin/form/Answer.php index bfe1aa846c457254df2091f4c72464731cdb1d29..1a126fd9b0170acab41047459e45b70949a602da 100644 --- a/application/admin/form/Answer.php +++ b/application/admin/form/Answer.php @@ -62,6 +62,7 @@ class Answer 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'user_id', @@ -75,6 +76,7 @@ class Answer 'label' => '联系人', 'view_type' => 'field', 'view_key' => 'name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -84,6 +86,7 @@ class Answer 'label' => '联系电话', 'view_type' => 'field', 'view_key' => 'tel', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -118,6 +121,7 @@ class Answer 'post_url' => MyUrl('admin/answer/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -133,6 +137,7 @@ class Answer 'view_key' => 'is_reply', 'post_url' => MyUrl('admin/answer/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -146,6 +151,7 @@ class Answer 'label' => '回复时间', 'view_type' => 'field', 'view_key' => 'reply_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'reply_time', @@ -155,6 +161,7 @@ class Answer 'label' => '访问次数', 'view_type' => 'field', 'view_key' => 'access_count', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -163,6 +170,7 @@ class Answer 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'add_time', @@ -172,6 +180,7 @@ class Answer 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'upd_time', diff --git a/application/admin/form/Appcenternav.php b/application/admin/form/Appcenternav.php index 6df1542273c0af3a2c3706ababa0936b77ba20b8..56e65a9ff32a4d23337d8b1f3da31886786a7626 100644 --- a/application/admin/form/Appcenternav.php +++ b/application/admin/form/Appcenternav.php @@ -59,6 +59,7 @@ class Appcenternav 'label' => '名称', 'view_type' => 'field', 'view_key' => 'name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -70,6 +71,7 @@ class Appcenternav 'view_key' => 'platform', 'view_data_key' => 'name', 'view_data' => lang('common_platform_type'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -92,6 +94,7 @@ class Appcenternav 'view_data_key' => 'name', 'view_data' => lang('common_app_event_type'), 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -106,6 +109,7 @@ class Appcenternav 'view_type' => 'field', 'view_key' => 'event_value', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -118,6 +122,7 @@ class Appcenternav 'post_url' => MyUrl('admin/appcenternav/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -133,6 +138,7 @@ class Appcenternav 'view_key' => 'is_need_login', 'post_url' => MyUrl('admin/appcenternav/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -146,11 +152,16 @@ class Appcenternav 'label' => '排序', 'view_type' => 'field', 'view_key' => 'sort', + 'is_sort' => 1, + 'search_config' => [ + 'form_type' => 'section', + ], ], [ 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -159,6 +170,7 @@ class Appcenternav 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Apphomenav.php b/application/admin/form/Apphomenav.php index b118ccd73042e034cac59c331d93f4bef0167383..c73f8473ff72580ce50ac7c3fc95250bc8f7602f 100644 --- a/application/admin/form/Apphomenav.php +++ b/application/admin/form/Apphomenav.php @@ -59,6 +59,7 @@ class Apphomenav 'label' => '名称', 'view_type' => 'field', 'view_key' => 'name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -70,6 +71,7 @@ class Apphomenav 'view_key' => 'platform', 'view_data_key' => 'name', 'view_data' => lang('common_platform_type'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -92,6 +94,7 @@ class Apphomenav 'view_data_key' => 'name', 'view_data' => lang('common_app_event_type'), 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -106,6 +109,7 @@ class Apphomenav 'view_type' => 'field', 'view_key' => 'event_value', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -118,6 +122,7 @@ class Apphomenav 'post_url' => MyUrl('admin/apphomenav/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -133,6 +138,7 @@ class Apphomenav 'view_key' => 'is_need_login', 'post_url' => MyUrl('admin/apphomenav/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -146,11 +152,16 @@ class Apphomenav 'label' => '排序', 'view_type' => 'field', 'view_key' => 'sort', + 'is_sort' => 1, + 'search_config' => [ + 'form_type' => 'section', + ], ], [ 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -159,6 +170,7 @@ class Apphomenav 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Article.php b/application/admin/form/Article.php index 5ce833bd3e71c870d9b16e12e3807461c379e590..d9e69ce1cb9c811ff2c6cea40dc9840d3709edff 100644 --- a/application/admin/form/Article.php +++ b/application/admin/form/Article.php @@ -63,6 +63,7 @@ class Article 'view_type' => 'module', 'view_key' => 'article/module/info', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'title', @@ -74,6 +75,7 @@ class Article 'view_type' => 'field', 'view_key' => 'jump_url', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -83,6 +85,7 @@ class Article 'label' => '分类', 'view_type' => 'field', 'view_key' => 'article_category_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'article_category_id', @@ -100,6 +103,7 @@ class Article 'post_url' => MyUrl('admin/article/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -115,6 +119,7 @@ class Article 'view_key' => 'is_home_recommended', 'post_url' => MyUrl('admin/article/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -128,6 +133,7 @@ class Article 'label' => '图片数量', 'view_type' => 'field', 'view_key' => 'images_count', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -136,6 +142,7 @@ class Article 'label' => '访问次数', 'view_type' => 'field', 'view_key' => 'access_count', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -144,6 +151,7 @@ class Article 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -152,6 +160,7 @@ class Article 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Brand.php b/application/admin/form/Brand.php index 739989713cd586be4c6fcd520ea05d1ccb16c842..19399ea18515e48a5962d348ecbabd4a547b66d2 100644 --- a/application/admin/form/Brand.php +++ b/application/admin/form/Brand.php @@ -64,6 +64,7 @@ class Brand 'label' => '名称', 'view_type' => 'field', 'view_key' => 'name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -107,6 +108,7 @@ class Brand 'post_url' => MyUrl('admin/brand/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -120,11 +122,16 @@ class Brand 'label' => '排序', 'view_type' => 'field', 'view_key' => 'sort', + 'is_sort' => 1, + 'search_config' => [ + 'form_type' => 'section', + ], ], [ 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -133,6 +140,7 @@ class Brand 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Customview.php b/application/admin/form/Customview.php index deac7e87bf9b4260a421ae61c086d8e072c027ba..95a9b4a0f3a440386336b0f85ec6fa8bbf1feea0 100644 --- a/application/admin/form/Customview.php +++ b/application/admin/form/Customview.php @@ -61,6 +61,7 @@ class Customview 'view_type' => 'module', 'view_key' => 'customview/module/info', 'grid_size' => 'lg', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'title', @@ -74,6 +75,7 @@ class Customview 'post_url' => MyUrl('admin/customview/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -89,6 +91,7 @@ class Customview 'view_key' => 'is_header', 'post_url' => MyUrl('admin/customview/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -104,6 +107,7 @@ class Customview 'view_key' => 'is_footer', 'post_url' => MyUrl('admin/customview/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -119,6 +123,7 @@ class Customview 'view_key' => 'is_full_screen', 'post_url' => MyUrl('admin/customview/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -132,6 +137,7 @@ class Customview 'label' => '图片数量', 'view_type' => 'field', 'view_key' => 'images_count', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -140,6 +146,7 @@ class Customview 'label' => '访问次数', 'view_type' => 'field', 'view_key' => 'access_count', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -148,6 +155,7 @@ class Customview 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -156,6 +164,7 @@ class Customview 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Goodsbrowse.php b/application/admin/form/Goodsbrowse.php index af60526df8a6c097edb95220d7d815b6cd18a854..8a6a7a11683480c3615d0617fff93a048d799811 100644 --- a/application/admin/form/Goodsbrowse.php +++ b/application/admin/form/Goodsbrowse.php @@ -61,6 +61,7 @@ class Goodsbrowse 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'b.user_id', @@ -75,6 +76,8 @@ class Goodsbrowse 'view_type' => 'module', 'view_key' => 'goodsbrowse/module/goods', 'grid_size' => 'lg', + 'is_sort' => 1, + 'sort_field' => 'g.title', 'search_config' => [ 'form_type' => 'input', 'form_name' => 'g.title|g.model|g.simple_desc|g.seo_title|g.seo_keywords|g.seo_keywords', @@ -86,6 +89,7 @@ class Goodsbrowse 'label' => '销售价格(元)', 'view_type' => 'field', 'view_key' => 'price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'form_name' => 'g.min_price', @@ -96,6 +100,7 @@ class Goodsbrowse 'label' => '原价(元)', 'view_type' => 'field', 'view_key' => 'original_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'form_name' => 'g.min_original_price', @@ -106,6 +111,7 @@ class Goodsbrowse 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'b.add_time', diff --git a/application/admin/form/Goodscomments.php b/application/admin/form/Goodscomments.php index 06f9948a82f9f536ccc166562481e83914218376..76194e1b374db2d1e9b978d418ce7817f4c9bbee 100644 --- a/application/admin/form/Goodscomments.php +++ b/application/admin/form/Goodscomments.php @@ -62,6 +62,8 @@ class Goodscomments 'view_type' => 'module', 'view_key' => 'goodscomments/module/goods', 'grid_size' => 'lg', + 'is_sort' => 1, + 'sort_field' => 'goods_id', 'search_config' => [ 'form_type' => 'input', 'form_name' => 'id', @@ -76,6 +78,7 @@ class Goodscomments 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'user_id', @@ -92,6 +95,7 @@ class Goodscomments 'view_data_key' => 'name', 'view_data' => lang('common_goods_comments_business_type_list'), 'width' => 120, + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -123,6 +127,7 @@ class Goodscomments 'view_type' => 'module', 'view_key' => 'goodscomments/module/rating', 'width' => 100, + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'rating', @@ -151,6 +156,7 @@ class Goodscomments 'post_url' => MyUrl('admin/goodscomments/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -166,6 +172,7 @@ class Goodscomments 'view_key' => 'is_anonymous', 'post_url' => MyUrl('admin/goodscomments/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -181,6 +188,7 @@ class Goodscomments 'view_key' => 'is_reply', 'post_url' => MyUrl('admin/goodscomments/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -194,6 +202,7 @@ class Goodscomments 'label' => '回复时间', 'view_type' => 'field', 'view_key' => 'reply_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'reply_time', @@ -203,6 +212,7 @@ class Goodscomments 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'add_time', @@ -212,6 +222,7 @@ class Goodscomments 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'upd_time', diff --git a/application/admin/form/Goodsfavor.php b/application/admin/form/Goodsfavor.php index d95b6dd9b26d4a55b448571a88657cbaee33b2bf..49f77afc582d98c7f10c2a8fdd3cab36ffcf3cdc 100644 --- a/application/admin/form/Goodsfavor.php +++ b/application/admin/form/Goodsfavor.php @@ -61,6 +61,7 @@ class Goodsfavor 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'f.user_id', @@ -75,6 +76,8 @@ class Goodsfavor 'view_type' => 'module', 'view_key' => 'goodsfavor/module/goods', 'grid_size' => 'lg', + 'is_sort' => 1, + 'sort_field' => 'g.title', 'search_config' => [ 'form_type' => 'input', 'form_name' => 'g.title|g.model|g.simple_desc|g.seo_title|g.seo_keywords|g.seo_keywords', @@ -86,6 +89,7 @@ class Goodsfavor 'label' => '销售价格(元)', 'view_type' => 'field', 'view_key' => 'price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'form_name' => 'g.min_price', @@ -96,6 +100,7 @@ class Goodsfavor 'label' => '原价(元)', 'view_type' => 'field', 'view_key' => 'original_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'form_name' => 'g.min_original_price', @@ -106,6 +111,7 @@ class Goodsfavor 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'f.add_time', diff --git a/application/admin/form/Integrallog.php b/application/admin/form/Integrallog.php index 610c47d612e8429ac35cb06bf5375100d17b559a..cd0b2f5e528a052baed65f02f8058a3dd25cb6be 100644 --- a/application/admin/form/Integrallog.php +++ b/application/admin/form/Integrallog.php @@ -50,6 +50,7 @@ class Integrallog 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'user_id', @@ -65,6 +66,7 @@ class Integrallog 'view_key' => 'type', 'view_data_key' => 'name', 'view_data' => lang('common_integral_log_type_list'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -78,6 +80,7 @@ class Integrallog 'label' => '操作积分', 'view_type' => 'field', 'view_key' => 'operation_integral', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -86,6 +89,7 @@ class Integrallog 'label' => '原始积分', 'view_type' => 'field', 'view_key' => 'original_integral', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -94,6 +98,7 @@ class Integrallog 'label' => '最新积分', 'view_type' => 'field', 'view_key' => 'new_integral', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -103,6 +108,7 @@ class Integrallog 'view_type' => 'field', 'view_key' => 'msg', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -112,6 +118,7 @@ class Integrallog 'label' => '操作人员id', 'view_type' => 'field', 'view_key' => 'operation_id', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => '=', @@ -121,6 +128,7 @@ class Integrallog 'label' => '操作时间', 'view_type' => 'field', 'view_key' => 'add_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'add_time', diff --git a/application/admin/form/Link.php b/application/admin/form/Link.php index 948d9ddb42234fa1e49afc1e9bb17bbc4ab92613..1cc85d1a978e415568fc141630089f2d660e5412 100644 --- a/application/admin/form/Link.php +++ b/application/admin/form/Link.php @@ -62,6 +62,7 @@ class Link 'view_type' => 'module', 'view_key' => 'link/module/info', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'name', @@ -83,6 +84,7 @@ class Link 'label' => '描述', 'view_type' => 'field', 'view_key' => 'describe', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -95,6 +97,7 @@ class Link 'post_url' => MyUrl('admin/link/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -110,6 +113,7 @@ class Link 'view_key' => 'is_new_window_open', 'post_url' => MyUrl('admin/link/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -123,11 +127,16 @@ class Link 'label' => '排序', 'view_type' => 'field', 'view_key' => 'sort', + 'is_sort' => 1, + 'search_config' => [ + 'form_type' => 'section', + ], ], [ 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Message.php b/application/admin/form/Message.php index fc4e9e8714b2acaff8dc98c61364c294a37e389e..099f4fac29b73e58aad4d3247db071a45e5fb451 100644 --- a/application/admin/form/Message.php +++ b/application/admin/form/Message.php @@ -63,6 +63,7 @@ class Message 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'user_id', @@ -78,6 +79,7 @@ class Message 'view_key' => 'type', 'view_data_key' => 'name', 'view_data' => lang('common_message_type_list'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -91,6 +93,7 @@ class Message 'label' => '业务类型', 'view_type' => 'field', 'view_key' => 'business_type', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -104,6 +107,7 @@ class Message 'label' => '标题', 'view_type' => 'field', 'view_key' => 'title', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -113,6 +117,7 @@ class Message 'label' => '详情', 'view_type' => 'field', 'view_key' => 'detail', + 'is_sort' => 1, 'grid_size' => 'lg', 'search_config' => [ 'form_type' => 'input', @@ -125,6 +130,7 @@ class Message 'view_key' => 'is_read', 'view_data_key' => 'name', 'view_data' => lang('common_is_read_list'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -138,11 +144,13 @@ class Message 'label' => '用户是否删除', 'view_type' => 'field', 'view_key' => 'user_is_delete_time_text', + 'is_sort' => 1, ], [ 'label' => '发送时间', 'view_type' => 'field', 'view_key' => 'add_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'add_time', diff --git a/application/admin/form/Navigation.php b/application/admin/form/Navigation.php index 815aa16a1043f39a03abe00e6f4aec324b074464..5d744c4102df30f3e3653f9cc6beb98e72cdad49 100644 --- a/application/admin/form/Navigation.php +++ b/application/admin/form/Navigation.php @@ -64,6 +64,7 @@ class Navigation 'view_type' => 'module', 'view_key' => 'navigation/module/info', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'name', @@ -76,6 +77,7 @@ class Navigation 'view_key' => 'data_type', 'view_data_key' => 'name', 'view_data' => lang('common_nav_type_list'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -92,6 +94,7 @@ class Navigation 'post_url' => MyUrl('admin/navigation/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -107,6 +110,7 @@ class Navigation 'view_key' => 'is_new_window_open', 'post_url' => MyUrl('admin/navigation/statusupdate'), 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -120,11 +124,16 @@ class Navigation 'label' => '排序', 'view_type' => 'field', 'view_key' => 'sort', + 'is_sort' => 1, + 'search_config' => [ + 'form_type' => 'section', + ], ], [ 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -133,6 +142,7 @@ class Navigation 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Order.php b/application/admin/form/Order.php index a9b63296fe078c4bd0dc4350f3118f41d984df93..612cbf548a4bda6474e3f9249148456583f24bad 100644 --- a/application/admin/form/Order.php +++ b/application/admin/form/Order.php @@ -71,6 +71,7 @@ class Order 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'user_id', @@ -84,6 +85,7 @@ class Order 'label' => '订单状态', 'view_type' => 'module', 'view_key' => 'order/module/status', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'status', @@ -98,6 +100,7 @@ class Order 'label' => '支付状态', 'view_type' => 'module', 'view_key' => 'order/module/pay_status', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'pay_status', @@ -112,6 +115,7 @@ class Order 'label' => '总价(元)', 'view_type' => 'field', 'view_key' => 'total_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -121,6 +125,7 @@ class Order 'label' => '支付金额(元)', 'view_type' => 'field', 'view_key' => 'pay_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -130,6 +135,7 @@ class Order 'label' => '单价(元)', 'view_type' => 'field', 'view_key' => 'price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -139,6 +145,7 @@ class Order 'label' => '出货仓库', 'view_type' => 'field', 'view_key' => 'warehouse_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'warehouse_id', @@ -155,6 +162,7 @@ class Order 'view_key' => 'order_model', 'view_data_key' => 'name', 'view_data' => lang('common_site_type_list'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -170,6 +178,7 @@ class Order 'view_key' => 'client_type', 'view_data_key' => 'name', 'view_data' => lang('common_platform_type'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -211,6 +220,7 @@ class Order 'label' => '退款金额(元)', 'view_type' => 'field', 'view_key' => 'refund_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -220,6 +230,7 @@ class Order 'label' => '退货数量', 'view_type' => 'field', 'view_key' => 'returned_quantity', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -228,6 +239,7 @@ class Order 'label' => '购买总数', 'view_type' => 'field', 'view_key' => 'buy_number_count', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -236,6 +248,7 @@ class Order 'label' => '增加金额(元)', 'view_type' => 'field', 'view_key' => 'increase_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -245,6 +258,7 @@ class Order 'label' => '优惠金额(元)', 'view_type' => 'field', 'view_key' => 'preferential_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -254,6 +268,7 @@ class Order 'label' => '支付方式', 'view_type' => 'field', 'view_key' => 'payment_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'payment_id', @@ -268,6 +283,7 @@ class Order 'label' => '用户备注', 'view_type' => 'field', 'view_key' => 'user_note', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'like', @@ -288,6 +304,7 @@ class Order 'label' => '快递公司', 'view_type' => 'field', 'view_key' => 'express_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'express_id', @@ -302,6 +319,7 @@ class Order 'label' => '快递单号', 'view_type' => 'field', 'view_key' => 'express_number', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -317,6 +335,7 @@ class Order 'label' => '用户是否评论', 'view_type' => 'module', 'view_key' => 'order/module/is_comments', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -333,6 +352,7 @@ class Order 'label' => '确认时间', 'view_type' => 'field', 'view_key' => 'confirm_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -341,6 +361,7 @@ class Order 'label' => '支付时间', 'view_type' => 'field', 'view_key' => 'pay_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -349,6 +370,7 @@ class Order 'label' => '发货时间', 'view_type' => 'field', 'view_key' => 'delivery_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -357,6 +379,7 @@ class Order 'label' => '完成时间', 'view_type' => 'field', 'view_key' => 'collect_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -365,6 +388,7 @@ class Order 'label' => '取消时间', 'view_type' => 'field', 'view_key' => 'cancel_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -373,6 +397,7 @@ class Order 'label' => '关闭时间', 'view_type' => 'field', 'view_key' => 'close_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -381,6 +406,7 @@ class Order 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -389,6 +415,7 @@ class Order 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Orderaftersale.php b/application/admin/form/Orderaftersale.php index c966feab55b4bde5f04e2eed7a1a59a727d5f686..9899a7185fb61839ee93f0c5a742c1a656fddf28 100644 --- a/application/admin/form/Orderaftersale.php +++ b/application/admin/form/Orderaftersale.php @@ -51,6 +51,8 @@ class Orderaftersale 'view_type' => 'module', 'view_key' => 'orderaftersale/module/goods', 'grid_size' => 'lg', + 'is_sort' => 1, + 'sort_field' => 'goods_id', 'search_config' => [ 'form_type' => 'input', 'form_name' => 'id', @@ -65,6 +67,7 @@ class Orderaftersale 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'user_id', @@ -81,6 +84,7 @@ class Orderaftersale 'view_data_key' => 'name', 'view_data' => lang('common_order_aftersale_status_list'), 'width' => 120, + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -97,6 +101,7 @@ class Orderaftersale 'view_data_key' => 'name', 'view_data' => lang('common_order_aftersale_type_list'), 'width' => 120, + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -110,6 +115,7 @@ class Orderaftersale 'label' => '原因', 'view_type' => 'field', 'view_key' => 'reason', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -119,6 +125,7 @@ class Orderaftersale 'label' => '退款金额(元)', 'view_type' => 'field', 'view_key' => 'price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -128,6 +135,7 @@ class Orderaftersale 'label' => '退货数量', 'view_type' => 'field', 'view_key' => 'number', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -137,6 +145,7 @@ class Orderaftersale 'view_type' => 'field', 'view_key' => 'msg', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -149,6 +158,7 @@ class Orderaftersale 'view_data_key' => 'name', 'view_data' => lang('common_order_aftersale_refundment_list'), 'width' => 120, + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -168,6 +178,7 @@ class Orderaftersale 'label' => '快递公司', 'view_type' => 'field', 'view_key' => 'express_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -177,6 +188,7 @@ class Orderaftersale 'label' => '快递单号', 'view_type' => 'field', 'view_key' => 'express_number', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -187,6 +199,7 @@ class Orderaftersale 'view_type' => 'field', 'view_key' => 'refuse_reason', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -196,6 +209,7 @@ class Orderaftersale 'label' => '申请时间', 'view_type' => 'field', 'view_key' => 'apply_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'apply_time', @@ -205,6 +219,7 @@ class Orderaftersale 'label' => '确认时间', 'view_type' => 'field', 'view_key' => 'confirm_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'confirm_time', @@ -214,6 +229,7 @@ class Orderaftersale 'label' => '退货时间', 'view_type' => 'field', 'view_key' => 'delivery_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'delivery_time', @@ -223,6 +239,7 @@ class Orderaftersale 'label' => '审核时间', 'view_type' => 'field', 'view_key' => 'audit_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'audit_time', @@ -232,6 +249,7 @@ class Orderaftersale 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'add_time', @@ -241,6 +259,7 @@ class Orderaftersale 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'upd_time', diff --git a/application/admin/form/Paylog.php b/application/admin/form/Paylog.php index 3502f1b3dad4bc123a07c1a3d53f87d3008631da..b2ce6775f84517f44fe7582ec4fdf82521ea71b9 100644 --- a/application/admin/form/Paylog.php +++ b/application/admin/form/Paylog.php @@ -52,6 +52,7 @@ class Paylog 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'user_id', @@ -66,6 +67,7 @@ class Paylog 'view_type' => 'field', 'view_key' => 'log_no', 'width' => 165, + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => '=', @@ -76,6 +78,7 @@ class Paylog 'view_type' => 'module', 'view_key' => 'paylog/module/payment', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'payment', @@ -92,6 +95,7 @@ class Paylog 'view_key' => 'status', 'view_data_key' => 'name', 'view_data' => lang('common_pay_log_status_list'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -105,6 +109,7 @@ class Paylog 'label' => '业务订单金额(元)', 'view_type' => 'field', 'view_key' => 'total_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -114,6 +119,7 @@ class Paylog 'label' => '支付金额(元)', 'view_type' => 'field', 'view_key' => 'pay_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -123,6 +129,7 @@ class Paylog 'label' => '业务类型', 'view_type' => 'field', 'view_key' => 'business_type', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -150,6 +157,7 @@ class Paylog 'view_type' => 'field', 'view_key' => 'trade_no', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => '=', @@ -160,6 +168,7 @@ class Paylog 'view_type' => 'field', 'view_key' => 'buyer_user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -169,6 +178,7 @@ class Paylog 'label' => '订单名称', 'view_type' => 'field', 'view_key' => 'subject', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -178,6 +188,7 @@ class Paylog 'label' => '支付时间', 'view_type' => 'field', 'view_key' => 'pay_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -186,6 +197,7 @@ class Paylog 'label' => '关闭时间', 'view_type' => 'field', 'view_key' => 'close_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -194,6 +206,7 @@ class Paylog 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Payrequestlog.php b/application/admin/form/Payrequestlog.php index 6fd496d4a72869604028ebccc64abaead9581094..95dd85a960dad94288a9c24c845b655a70fce3a7 100644 --- a/application/admin/form/Payrequestlog.php +++ b/application/admin/form/Payrequestlog.php @@ -50,6 +50,7 @@ class PayRequestLog 'label' => '业务类型', 'view_type' => 'field', 'view_key' => 'business_type', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -92,6 +93,7 @@ class PayRequestLog 'view_key' => 'payrequestlog/module/business_handle', 'align' => 'left', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -112,6 +114,7 @@ class PayRequestLog 'label' => '端口号', 'view_type' => 'field', 'view_key' => 'server_port', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -125,6 +128,7 @@ class PayRequestLog 'label' => '服务器ip', 'view_type' => 'field', 'view_key' => 'server_ip', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -143,6 +147,7 @@ class PayRequestLog 'label' => '操作系统', 'view_type' => 'field', 'view_key' => 'os', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -156,6 +161,7 @@ class PayRequestLog 'label' => '浏览器', 'view_type' => 'field', 'view_key' => 'browser', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -169,6 +175,7 @@ class PayRequestLog 'label' => '请求类型', 'view_type' => 'field', 'view_key' => 'method', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -182,6 +189,7 @@ class PayRequestLog 'label' => 'http类型', 'view_type' => 'field', 'view_key' => 'scheme', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -195,6 +203,7 @@ class PayRequestLog 'label' => 'http版本', 'view_type' => 'field', 'view_key' => 'version', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -208,6 +217,7 @@ class PayRequestLog 'label' => '客户端详情', 'view_type' => 'field', 'view_key' => 'client', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -217,6 +227,7 @@ class PayRequestLog 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -225,6 +236,7 @@ class PayRequestLog 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Quicknav.php b/application/admin/form/Quicknav.php index 0d5d59310757cd50eaf7336d13f8c60b7aaebda1..eb24d0b39ade7c781ca3476bcd6605d25ec06e03 100644 --- a/application/admin/form/Quicknav.php +++ b/application/admin/form/Quicknav.php @@ -59,6 +59,7 @@ class Quicknav 'label' => '名称', 'view_type' => 'field', 'view_key' => 'name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -70,6 +71,7 @@ class Quicknav 'view_key' => 'platform', 'view_data_key' => 'name', 'view_data' => lang('common_platform_type'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -92,6 +94,7 @@ class Quicknav 'view_data_key' => 'name', 'view_data' => lang('common_app_event_type'), 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -106,6 +109,7 @@ class Quicknav 'view_type' => 'field', 'view_key' => 'event_value', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -118,6 +122,7 @@ class Quicknav 'post_url' => MyUrl('admin/quicknav/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -131,11 +136,16 @@ class Quicknav 'label' => '排序', 'view_type' => 'field', 'view_key' => 'sort', + 'is_sort' => 1, + 'search_config' => [ + 'form_type' => 'section', + ], ], [ 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -144,6 +154,7 @@ class Quicknav 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Refundlog.php b/application/admin/form/Refundlog.php index a82315aa429fd7b22fc63d6df663738686a00d4a..308b44ed2832ef4d7d0ffbd92d9d741a399ee039 100644 --- a/application/admin/form/Refundlog.php +++ b/application/admin/form/Refundlog.php @@ -51,6 +51,7 @@ class Refundlog 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'user_id', @@ -65,6 +66,7 @@ class Refundlog 'view_type' => 'module', 'view_key' => 'refundlog/module/payment', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'payment', @@ -79,6 +81,7 @@ class Refundlog 'label' => '业务类型', 'view_type' => 'field', 'view_key' => 'business_type', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -92,6 +95,7 @@ class Refundlog 'label' => '业务订单id', 'view_type' => 'field', 'view_key' => 'business_id', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => '=', @@ -102,6 +106,7 @@ class Refundlog 'view_type' => 'field', 'view_key' => 'trade_no', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -112,6 +117,7 @@ class Refundlog 'view_type' => 'field', 'view_key' => 'buyer_user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -121,6 +127,7 @@ class Refundlog 'label' => '退款方式', 'view_type' => 'field', 'view_key' => 'refundment_text', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'refundment', @@ -135,6 +142,7 @@ class Refundlog 'label' => '退款金额', 'view_type' => 'field', 'view_key' => 'refund_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -144,6 +152,7 @@ class Refundlog 'label' => '订单支付金额', 'view_type' => 'field', 'view_key' => 'pay_price', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', 'is_point' => 1, @@ -154,6 +163,7 @@ class Refundlog 'view_type' => 'field', 'view_key' => 'msg', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -163,6 +173,7 @@ class Refundlog 'label' => '退款时间', 'view_type' => 'field', 'view_key' => 'add_time_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'add_time', diff --git a/application/admin/form/Role.php b/application/admin/form/Role.php index 6d4ca69e35b6386dec81d3c755a9662a301b1f0a..7ab8c1b6dfa0c9eaebc933bf26c983d39b7c89c0 100644 --- a/application/admin/form/Role.php +++ b/application/admin/form/Role.php @@ -62,6 +62,7 @@ class Role 'label' => '角色名称', 'view_type' => 'field', 'view_key' => 'name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -74,6 +75,7 @@ class Role 'post_url' => MyUrl('admin/role/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -87,6 +89,7 @@ class Role 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -95,6 +98,7 @@ class Role 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Slide.php b/application/admin/form/Slide.php index c785a6ef9fb07925e75d085403cb2710bdd54430..6f2e417618e4a4e156a4e98dbec2c6e2c9475e00 100644 --- a/application/admin/form/Slide.php +++ b/application/admin/form/Slide.php @@ -59,6 +59,7 @@ class Slide 'label' => '名称', 'view_type' => 'field', 'view_key' => 'name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -70,6 +71,7 @@ class Slide 'view_key' => 'platform', 'view_data_key' => 'name', 'view_data' => lang('common_platform_type'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -91,6 +93,7 @@ class Slide 'view_key' => 'event_type', 'view_data_key' => 'name', 'view_data' => lang('common_app_event_type'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -105,6 +108,7 @@ class Slide 'view_type' => 'field', 'view_key' => 'event_value', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -117,6 +121,7 @@ class Slide 'post_url' => MyUrl('admin/slide/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -130,11 +135,16 @@ class Slide 'label' => '排序', 'view_type' => 'field', 'view_key' => 'sort', + 'is_sort' => 1, + 'search_config' => [ + 'form_type' => 'section', + ], ], [ 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -143,6 +153,7 @@ class Slide 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/User.php b/application/admin/form/User.php index eec0ce41100e79ed2c4f4d6fa161191cdb99f12a..b8a67a6b85a542349f0102b103f67f7e64e4096f 100644 --- a/application/admin/form/User.php +++ b/application/admin/form/User.php @@ -59,6 +59,7 @@ class User 'view_type' => 'field', 'view_key' => 'id', 'width' => 105, + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'id', @@ -74,6 +75,7 @@ class User 'label' => '用户名', 'view_type' => 'field', 'view_key' => 'username', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -83,6 +85,7 @@ class User 'label' => '昵称', 'view_type' => 'field', 'view_key' => 'nickname', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -92,6 +95,7 @@ class User 'label' => '手机', 'view_type' => 'field', 'view_key' => 'mobile', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -101,6 +105,7 @@ class User 'label' => '邮箱', 'view_type' => 'field', 'view_key' => 'email', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -112,6 +117,7 @@ class User 'view_key' => 'gender', 'view_data_key' => 'name', 'view_data' => lang('common_gender_list'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -127,6 +133,7 @@ class User 'view_key' => 'status', 'view_data_key' => 'name', 'view_data' => lang('common_user_status_list'), + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -140,6 +147,7 @@ class User 'label' => '所在省', 'view_type' => 'field', 'view_key' => 'province', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -149,6 +157,7 @@ class User 'label' => '所在市', 'view_type' => 'field', 'view_key' => 'city', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -158,6 +167,7 @@ class User 'label' => '详细地址', 'view_type' => 'field', 'view_key' => 'address', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -167,6 +177,7 @@ class User 'label' => '生日', 'view_type' => 'field', 'view_key' => 'birthday_text', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'date', 'form_name' => 'birthday', @@ -177,6 +188,7 @@ class User 'label' => '可用积分', 'view_type' => 'field', 'view_key' => 'integral', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -185,6 +197,7 @@ class User 'label' => '锁定积分', 'view_type' => 'field', 'view_key' => 'locking_integral', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -193,6 +206,7 @@ class User 'label' => '注册时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -201,6 +215,7 @@ class User 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Useraddress.php b/application/admin/form/Useraddress.php index 25a15a90a980bb6d4bc28712cc60af9fc32bd8d0..26a898e36a53368c399a825578a64cc488991fb3 100644 --- a/application/admin/form/Useraddress.php +++ b/application/admin/form/Useraddress.php @@ -62,6 +62,7 @@ class UserAddress 'view_type' => 'module', 'view_key' => 'lib/module/user', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'form_name' => 'user_id', @@ -72,12 +73,22 @@ class UserAddress ], ], [ - 'label' => '别名/联系人', - 'view_type' => 'module', - 'view_key' => 'useraddress/module/info', + 'label' => '别名', + 'view_type' => 'field', + 'view_key' => 'alias', + 'is_sort' => 1, + 'search_config' => [ + 'form_type' => 'input', + 'where_type' => 'like', + ], + ], + [ + 'label' => '联系人', + 'view_type' => 'field', + 'view_key' => 'name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', - 'form_name' => 'alias|name', 'where_type' => 'like', ], ], @@ -85,6 +96,7 @@ class UserAddress 'label' => '联系电话', 'view_type' => 'field', 'view_key' => 'tel', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -94,6 +106,7 @@ class UserAddress 'label' => '所属省', 'view_type' => 'field', 'view_key' => 'province_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'province', @@ -108,17 +121,20 @@ class UserAddress 'label' => '所属市', 'view_type' => 'field', 'view_key' => 'city_name', + 'is_sort' => 1, ], [ 'label' => '所属区/县', 'view_type' => 'field', 'view_key' => 'county_name', + 'is_sort' => 1, ], [ 'label' => '详细地址', 'view_type' => 'field', 'view_key' => 'address', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -135,6 +151,8 @@ class UserAddress 'view_type' => 'module', 'view_key' => 'useraddress/module/idcard_info', 'grid_size' => 'sm', + 'is_sort' => 1, + 'sort_field' => 'idcard_number', 'search_config' => [ 'form_type' => 'input', 'form_name' => 'idcard_name|idcard_number', @@ -145,6 +163,7 @@ class UserAddress 'label' => '是否默认', 'view_type' => 'module', 'view_key' => 'useraddress/module/is_default', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'is_default', @@ -159,6 +178,7 @@ class UserAddress 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -167,6 +187,7 @@ class UserAddress 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Warehouse.php b/application/admin/form/Warehouse.php index a25419ea32996e091cdce13e792c35910a23bde2..6646c6e45a5d848eb9769cec8362db1798f77873 100644 --- a/application/admin/form/Warehouse.php +++ b/application/admin/form/Warehouse.php @@ -66,6 +66,8 @@ class Warehouse 'view_type' => 'module', 'view_key' => 'warehouse/module/info', 'grid_size' => 'sm', + 'is_sort' => 1, + 'sort_field' => 'name', 'search_config' => [ 'form_type' => 'input', 'form_name' => 'name|alias', @@ -76,6 +78,7 @@ class Warehouse 'label' => '权重', 'view_type' => 'field', 'view_key' => 'level', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -87,6 +90,7 @@ class Warehouse 'post_url' => MyUrl('admin/warehouse/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -100,6 +104,7 @@ class Warehouse 'label' => '联系人', 'view_type' => 'field', 'view_key' => 'contacts_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -109,6 +114,7 @@ class Warehouse 'label' => '联系电话', 'view_type' => 'field', 'view_key' => 'contacts_tel', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -118,6 +124,7 @@ class Warehouse 'label' => '所在省', 'view_type' => 'field', 'view_key' => 'province_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'province', @@ -132,6 +139,7 @@ class Warehouse 'label' => '所在市', 'view_type' => 'field', 'view_key' => 'city_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'city', @@ -146,6 +154,7 @@ class Warehouse 'label' => '所在区/县', 'view_type' => 'field', 'view_key' => 'county_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'county', @@ -161,6 +170,7 @@ class Warehouse 'view_type' => 'field', 'view_key' => 'address', 'grid_size' => 'sm', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'input', 'where_type' => 'like', @@ -176,6 +186,7 @@ class Warehouse 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -184,6 +195,7 @@ class Warehouse 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/form/Warehousegoods.php b/application/admin/form/Warehousegoods.php index 0903d9069e83851aa13001478499baf817db17ae..3018e090a67f380545217526efbd1d9afb896ddc 100644 --- a/application/admin/form/Warehousegoods.php +++ b/application/admin/form/Warehousegoods.php @@ -65,6 +65,8 @@ class Warehousegoods 'view_type' => 'module', 'view_key' => 'warehousegoods/module/goods', 'grid_size' => 'lg', + 'is_sort' => 1, + 'sort_field' => 'goods_id', 'search_config' => [ 'form_type' => 'input', 'form_name' => 'id', @@ -78,6 +80,7 @@ class Warehousegoods 'label' => '仓库', 'view_type' => 'field', 'view_key' => 'warehouse_name', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'form_name' => 'warehouse_id', @@ -95,6 +98,7 @@ class Warehousegoods 'post_url' => MyUrl('admin/warehousegoods/statusupdate'), 'is_form_su' => 1, 'align' => 'center', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', @@ -108,6 +112,7 @@ class Warehousegoods 'label' => '总库存', 'view_type' => 'field', 'view_key' => 'inventory', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'section', ], @@ -116,6 +121,7 @@ class Warehousegoods 'label' => '创建时间', 'view_type' => 'field', 'view_key' => 'add_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], @@ -124,6 +130,7 @@ class Warehousegoods 'label' => '更新时间', 'view_type' => 'field', 'view_key' => 'upd_time', + 'is_sort' => 1, 'search_config' => [ 'form_type' => 'datetime', ], diff --git a/application/admin/view/default/public/module/form.html b/application/admin/view/default/public/module/form.html index ca0d456e451513389e9c9eec1d8cec0804131d47..b85515fdb3bc695ef072a61ca092f8d733d041a0 100644 --- a/application/admin/view/default/public/module/form.html +++ b/application/admin/view/default/public/module/form.html @@ -72,6 +72,10 @@ + + + {{include file="public/module/form_fields_select" /}} + {{else /}}
{{if empty($form_error)}}动态表格配置有误{{else /}}{{$form_error}}{{/if}}
{{/if}} diff --git a/application/admin/view/default/public/module/form_fields_select.html b/application/admin/view/default/public/module/form_fields_select.html new file mode 100644 index 0000000000000000000000000000000000000000..270a2e2c6a5a2701da698306d20dfd35055a93c8 --- /dev/null +++ b/application/admin/view/default/public/module/form_fields_select.html @@ -0,0 +1,35 @@ +{{if !isset($form_table['base']['is_fields_sel']) or $form_table['base']['is_fields_sel'] eq 1}} + +{{/if}} \ No newline at end of file diff --git a/application/admin/view/default/public/module/form_operate_top.html b/application/admin/view/default/public/module/form_operate_top.html index bb267e744273f9f7107792149f97a4283623607c..8ddb2cd9b6bd839a3f6ace1b0c7e2389a1bdc24d 100644 --- a/application/admin/view/default/public/module/form_operate_top.html +++ b/application/admin/view/default/public/module/form_operate_top.html @@ -39,46 +39,13 @@ - - + + {{/if}} {{if !isset($form_table['base']['is_fields_sel']) or $form_table['base']['is_fields_sel'] eq 1}}
-
{{/if}} \ No newline at end of file diff --git a/application/admin/view/default/useraddress/module/info.html b/application/admin/view/default/useraddress/module/info.html deleted file mode 100644 index 98fce5109772d0cdb22e7117413cf47e03f728b0..0000000000000000000000000000000000000000 --- a/application/admin/view/default/useraddress/module/info.html +++ /dev/null @@ -1,9 +0,0 @@ - -{{if !empty($module_data)}} - {{if !empty($module_data['name'])}} -

{{$module_data.name}}

- {{/if}} - {{if !empty($module_data['alias'])}} -

{{$module_data.alias}}

- {{/if}} -{{/if}} \ No newline at end of file diff --git a/application/admin/view/default/useraddress/save_info.html b/application/admin/view/default/useraddress/save_info.html index f274dd5ba777c122f5ee00f3b445ce510b6360ef..aeaef0dc74b66f1a901004e2704c4bf8c3cc747f 100644 --- a/application/admin/view/default/useraddress/save_info.html +++ b/application/admin/view/default/useraddress/save_info.html @@ -19,6 +19,10 @@ +
+ + +
@@ -42,10 +46,6 @@
-
- - -
diff --git a/application/index/view/default/public/module/bare_form.html b/application/index/view/default/public/module/bare_form.html index 0ebe2c9d53072b18b3f5236f886de3b4512fcd08..3121615143ef7a0e80c6790cbb0013bc44a0afbb 100644 --- a/application/index/view/default/public/module/bare_form.html +++ b/application/index/view/default/public/module/bare_form.html @@ -28,6 +28,9 @@
+ + + {{include file="public/module/form_fields_select" /}} {{else /}}
{{if empty($form_error)}}动态表格配置有误{{else /}}{{$form_error}}{{/if}}
{{/if}} diff --git a/application/index/view/default/public/module/form.html b/application/index/view/default/public/module/form.html index 5f30ff26a639e1fc16fdaf9af6662c238e48f8d6..1251d2266694403eaaeb23b61919d88fe7425e1e 100644 --- a/application/index/view/default/public/module/form.html +++ b/application/index/view/default/public/module/form.html @@ -85,6 +85,9 @@ + + + {{include file="public/module/form_fields_select" /}} {{else /}}
{{if empty($form_error)}}动态表格配置有误{{else /}}{{$form_error}}{{/if}}
{{/if}} diff --git a/application/index/view/default/public/module/form_fields_select.html b/application/index/view/default/public/module/form_fields_select.html new file mode 100644 index 0000000000000000000000000000000000000000..4f3223736fb9c8b065186079c6bd70b759c6f4de --- /dev/null +++ b/application/index/view/default/public/module/form_fields_select.html @@ -0,0 +1,35 @@ +{{if !isset($form_table['base']['is_fields_sel']) or $form_table['base']['is_fields_sel'] eq 1}} + +{{/if}} \ No newline at end of file diff --git a/application/index/view/default/public/module/form_operate_top.html b/application/index/view/default/public/module/form_operate_top.html index 2a8fb00231877cbc85564355f394c343311cb61b..98522950939d819c40f3c517a8d32d2f8b42b449 100644 --- a/application/index/view/default/public/module/form_operate_top.html +++ b/application/index/view/default/public/module/form_operate_top.html @@ -39,46 +39,13 @@ - - + + {{/if}} {{if !empty($user) and (!isset($form_table['base']['is_fields_sel']) or $form_table['base']['is_fields_sel'] eq 1)}}
-
{{/if}} \ No newline at end of file diff --git a/application/index/view/default/public/module/user_form.html b/application/index/view/default/public/module/user_form.html index 920e3972edecc4899341c6316e65f300a98af8e5..dfc7d2b2d81246cc3f86918c5ace3a9882c9b27b 100644 --- a/application/index/view/default/public/module/user_form.html +++ b/application/index/view/default/public/module/user_form.html @@ -93,6 +93,9 @@ + + + {{include file="public/module/form_fields_select" /}} {{else /}}
{{if empty($form_error)}}动态表格配置有误{{else /}}{{$form_error}}{{/if}}
{{/if}} diff --git a/application/service/BrandService.php b/application/service/BrandService.php index ba06f26c2e64f2060bc788badae0f77fd98454a0..98a8a44d2d3b7a3f0d24a314c8f159a7dd999ffa 100755 --- a/application/service/BrandService.php +++ b/application/service/BrandService.php @@ -34,10 +34,9 @@ class BrandService */ public static function BrandList($params = []) { - $where = empty($params['where']) ? [] : $params['where']; $field = empty($params['field']) ? '*' : $params['field']; - $order_by = empty($params['order_by']) ? 'sort asc' : trim($params['order_by']); - + $where = empty($params['where']) ? [] : $params['where']; + $order_by = empty($params['order_by']) ? 'sort asc,id asc' : trim($params['order_by']); $m = isset($params['m']) ? intval($params['m']) : 0; $n = isset($params['n']) ? intval($params['n']) : 10; diff --git a/application/service/CustomViewService.php b/application/service/CustomViewService.php index b229e48cf6affffebcfa3b92f598e91550180e13..3085be795b3e463061d275d6f305f80a89541b5a 100755 --- a/application/service/CustomViewService.php +++ b/application/service/CustomViewService.php @@ -35,10 +35,11 @@ class CustomViewService { $where = empty($params['where']) ? [] : $params['where']; $field = empty($params['field']) ? '*' : $params['field']; + $order_by = empty($params['order_by']) ? 'id desc' : trim($params['order_by']); $m = isset($params['m']) ? intval($params['m']) : 0; $n = isset($params['n']) ? intval($params['n']) : 10; - $data = Db::name('CustomView')->field($field)->where($where)->order('id desc')->limit($m, $n)->select(); + $data = Db::name('CustomView')->field($field)->where($where)->order($order_by)->limit($m, $n)->select(); if(!empty($data)) { $common_is_enable_list = lang('common_is_enable_list'); diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index 2c41d45461ee6f965bec4bd54ae28871725366fd..079e08b456942aa394434f138606c36226381533 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -332,9 +332,22 @@ class GoodsService $where = empty($params['where']) ? [] : $params['where']; $field = empty($params['field']) ? 'g.*' : $params['field']; $order_by = empty($params['order_by']) ? 'g.id desc' : trim($params['order_by']); - $m = isset($params['m']) ? intval($params['m']) : 0; $n = isset($params['n']) ? intval($params['n']) : 10; + + // 商品列表读取前钩子 + $hook_name = 'plugins_service_category_goods_list_begin'; + Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'where' => &$where, + 'field' => &$field, + 'order_by' => &$order_by, + 'm' => &$m, + 'n' => &$n, + ]); + $data = Db::name('Goods')->alias('g')->join(['__GOODS_CATEGORY_JOIN__'=>'gci'], 'g.id=gci.goods_id')->field($field)->where($where)->group('g.id')->order($order_by)->limit($m, $n)->select(); // 数据处理 @@ -812,9 +825,22 @@ class GoodsService $where = empty($params['where']) ? [] : $params['where']; $field = empty($params['field']) ? '*' : $params['field']; $order_by = empty($params['order_by']) ? 'id desc' : trim($params['order_by']); - $m = isset($params['m']) ? intval($params['m']) : 0; $n = isset($params['n']) ? intval($params['n']) : 10; + + // 商品列表读取前钩子 + $hook_name = 'plugins_service_goods_list_begin'; + Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'where' => &$where, + 'field' => &$field, + 'order_by' => &$order_by, + 'm' => &$m, + 'n' => &$n, + ]); + $data = Db::name('Goods')->field($field)->where($where)->order($order_by)->limit($m, $n)->select(); return self::GoodsDataHandle($data, $params); diff --git a/application/service/LinkService.php b/application/service/LinkService.php index fc20f60441e4825264fc1bbcdabc2cf7a1e38f80..8e28b47c28c0fa0eb210ffed2ed2807817d61bf5 100755 --- a/application/service/LinkService.php +++ b/application/service/LinkService.php @@ -33,9 +33,10 @@ class LinkService */ public static function LinkList($params = []) { + $field = empty($params['field']) ? '*' : $params['field']; $where = empty($params['where']) ? [] : $params['where']; - $order_by = 'sort asc,id desc'; - $data = Db::name('Link')->where($where)->order($order_by)->select(); + $order_by = empty($params['order_by']) ? 'sort asc,id desc' : trim($params['order_by']); + $data = Db::name('Link')->field($field)->where($where)->order($order_by)->select(); if(!empty($data)) { foreach($data as &$v) diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php index 7674021b800210c851a348039d0bb1c8fbb25fd5..fa43a8c6eee38cc31cad1c99fdd7d06eda4a4df4 100755 --- a/application/service/NavigationService.php +++ b/application/service/NavigationService.php @@ -206,13 +206,14 @@ class NavigationService */ public static function NavList($params = []) { - // 导航条件 + // 基础参数 + $field = '*'; $where = empty($params['where']) ? [] : $params['where']; + $order_by = empty($params['order_by']) ? 'sort asc,id asc' : $params['order_by']; + + // 获取数据 $where1 = $where; $where1[] = ['pid', '=', 0]; - - $field = '*'; - $order_by = 'sort asc,id asc'; $data = self::NavigationHandle(self::NavDataDealWith(Db::name('Navigation')->field($field)->where($where1)->order($order_by)->select())); $result = []; if(!empty($data)) diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php index 3b64f27ac96316a84a29e8723b9e028318e4ddbd..62aecd0051ece21095d7d731482871768255e6ad 100755 --- a/application/service/PluginsAdminService.php +++ b/application/service/PluginsAdminService.php @@ -27,7 +27,7 @@ class PluginsAdminService public static $plugins_exclude_verification = ['view', 'shopxo', 'www']; // 排除的文件后缀 - private static $exclude_ext = ['.php']; + private static $exclude_ext = ['php']; /** * 列表 @@ -1069,7 +1069,8 @@ php; $pos = strripos($file, '.'); if($pos !== false) { - if(in_array(substr($file, $pos), self::$exclude_ext)) + $info = pathinfo($file); + if(isset($info['extension']) && in_array($info['extension'], self::$exclude_ext)) { continue; } diff --git a/application/service/QuickNavService.php b/application/service/QuickNavService.php index 53377109806812a9e471f5fe42efc1a325f97466..e075bbbaef71426b0cc2ef551c026cd9b65f8497 100755 --- a/application/service/QuickNavService.php +++ b/application/service/QuickNavService.php @@ -33,10 +33,9 @@ class QuickNavService */ public static function QuickNavList($params = []) { - $where = empty($params['where']) ? [] : $params['where']; $field = empty($params['field']) ? '*' : $params['field']; + $where = empty($params['where']) ? [] : $params['where']; $order_by = empty($params['order_by']) ? 'sort asc,id asc' : trim($params['order_by']); - $m = isset($params['m']) ? intval($params['m']) : 0; $n = isset($params['n']) ? intval($params['n']) : 10; diff --git a/application/service/SlideService.php b/application/service/SlideService.php index ece875685b4dc67cf2314db1db04d33afc4689a8..d8410c205272ee3f37b63630a0686bce8118fa11 100755 --- a/application/service/SlideService.php +++ b/application/service/SlideService.php @@ -33,11 +33,11 @@ class SlideService */ public static function SlideList($params = []) { - $where = empty($params['where']) ? [] : $params['where']; $field = empty($params['field']) ? '*' : $params['field']; + $where = empty($params['where']) ? [] : $params['where']; + $order_by = empty($params['order_by']) ? 'sort asc,id asc' : trim($params['order_by']); $m = isset($params['m']) ? intval($params['m']) : 0; $n = isset($params['n']) ? intval($params['n']) : 10; - $order_by = 'sort asc,id asc'; $data = Db::name('Slide')->field($field)->where($where)->order($order_by)->limit($m, $n)->select(); if(!empty($data)) { diff --git a/application/service/ThemeService.php b/application/service/ThemeService.php index 048dab1becf142fe316f30a349bd6ed7ff2a0bdc..a5982d0e3fc14ca671213a4d9b5b41b3c6ca3315 100755 --- a/application/service/ThemeService.php +++ b/application/service/ThemeService.php @@ -26,7 +26,7 @@ class ThemeService private static $static_path = 'public'.DS.'static'.DS.'index'.DS; // 排除的文件后缀 - private static $exclude_ext = ['.php']; + private static $exclude_ext = ['php']; /** * 获取模板列表 @@ -160,7 +160,8 @@ class ThemeService $pos = strripos($file, '.'); if($pos !== false) { - if(in_array(substr($file, $pos), self::$exclude_ext)) + $info = pathinfo($file); + if(isset($info['extension']) && in_array($info['extension'], self::$exclude_ext)) { continue; }