diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java index 6020759a..4894444d 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java @@ -42,7 +42,7 @@ public class AdminTopicController { public Object list(String title, String subtitle, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer limit, - @Sort @RequestParam(defaultValue = "add_time") String sort, + @Sort(accepts = {"id", "add_time", "price"}) @RequestParam(defaultValue = "add_time") String sort, @Order @RequestParam(defaultValue = "desc") String order) { List topicList = topicService.querySelective(title, subtitle, page, limit, sort, order); return ResponseUtil.okList(topicList); diff --git a/litemall-admin/src/views/promotion/topic.vue b/litemall-admin/src/views/promotion/topic.vue index 9ebcc646..f31555ad 100644 --- a/litemall-admin/src/views/promotion/topic.vue +++ b/litemall-admin/src/views/promotion/topic.vue @@ -5,13 +5,16 @@
+ + + 查找 - 添加 导出
- 批量删除 + 添加 + 批量删除
@@ -109,6 +112,16 @@ export default { sort: 'add_time', order: 'desc' }, + options: [{ + value: 'id', + label: '按序号排序' + }, { + value: 'add_time', + label: '按时间排序' + }, { + value: 'price', + label: '按价格排序' + }], multipleSelection: [], contentDetail: '', contentDialogVisible: false,