From 90b0f47be452354d3ae681bdddee9a4cbb1e8309 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Sat, 18 Jan 2020 22:45:05 +0800
Subject: [PATCH] =?UTF-8?q?feat[litemall-admin,=20litemall-admin-api]:=20?=
 =?UTF-8?q?=E4=B8=93=E9=A2=98=E6=94=AF=E6=8C=81=E6=8E=92=E5=BA=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/web/AdminTopicController.java         |  2 +-
 litemall-admin/src/views/promotion/topic.vue    | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

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<LitemallTopic> 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 @@
     <div class="filter-container">
       <el-input v-model="listQuery.title" clearable class="filter-item" style="width: 200px;" placeholder="请输入专题标题" />
       <el-input v-model="listQuery.subtitle" clearable class="filter-item" style="width: 200px;" placeholder="请输入专题子标题" />
+      <el-select v-model="listQuery.sort" class="filter-item" placeholder="请选择排序字段">
+        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
       <el-button v-permission="['GET /admin/topic/list']" class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
-      <el-button v-permission="['POST /admin/topic/create']" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button>
       <el-button :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">导出</el-button>
     </div>
 
     <div class="operator-container">
-      <el-button v-permission="['GET /admin/topic/list']" class="filter-item" type="danger" icon="el-icon-delete" @click="handleBatchDelete">批量删除</el-button>
+      <el-button v-permission="['POST /admin/topic/create']" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button>
+      <el-button v-permission="['GET /admin/topic/batch-delete']" class="filter-item" type="danger" icon="el-icon-delete" @click="handleBatchDelete">批量删除</el-button>
     </div>
 
     <!-- 查询结果 -->
@@ -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,