展厅搜索

src/main/java/com/izouma/nineth/domain/Showroom.java

@@ -1,7 +1,7 @@
 package com.izouma.nineth.domain;
 
+import com.izouma.nineth.annotations.Searchable;
 import com.izouma.nineth.enums.AuthStatus;
-import com.izouma.nineth.enums.CollectionStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -29,6 +29,7 @@ import java.util.List;
 public class Showroom extends BaseEntity {
     private Long userId;
 
+    @Searchable
     private String nickname;
 
     private Long assetId;

src/main/vue/src/views/AdminList.vue

@@ -71,7 +71,7 @@ export default {
         return {
             multipleMode: false,
             search: '',
-            url: '/user/all',
+            url: '/user/adminAll',
             downloading: false
         };
     },

src/main/vue/src/views/ShowroomEdit.vue

@@ -25,7 +25,7 @@
                             disabled
                         ></el-input>
                     </el-form-item>
-                    <el-form-item prop="sort" label="排序" v-if="formData.status == 'SUCCESS'">
+                    <el-form-item prop="sort" label="排序">
                         <el-input-number v-model="formData.sort" :min="0"></el-input-number>
                         <div class="tip">数字越大排序越靠前，相同数值按创建时间倒序排列</div>
                     </el-form-item>

src/main/vue/src/views/ShowroomList.vue

@@ -22,7 +22,7 @@
         </page-title>
         <div class="filters-container">
             <el-input
-                placeholder="搜索..."
+                placeholder="搜索昵称..."
                 v-model="search"
                 clearable
                 class="filter-item search"
@@ -198,7 +198,11 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false, type: 'COMPANY', status: this.status } };
+            return {
+                sort: 'sort,desc;id,desc',
+                search: this.search,
+                query: { del: false, type: 'COMPANY', status: this.status }
+            };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;