展厅显示

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

@@ -61,6 +61,11 @@ public class Showroom extends BaseEntity {
     @ApiModelProperty("拒绝理由")
     private String reason;
 
+    @Column(columnDefinition = "bit default false")
+    private int sort;
+
+    private Long settingId;
+
     @Transient
     private List<ShowCollection> collections;
 

src/main/java/com/izouma/nineth/repo/ShowCollectionRepo.java

@@ -28,6 +28,8 @@ public interface ShowCollectionRepo extends JpaRepository<ShowCollection, Long>,
 
     List<ShowCollection> findAllByShowroomId(Long showroomId);
 
+    List<ShowCollection> findAllByShowroomIdOrderBySort(Long showroomId);
+
     List<ShowCollection> findAllByShowroomIdIn(Collection<Long> showroomId);
 
     @Query("update ShowCollection t set t.del = true where t.showroomId = ?1")

src/main/java/com/izouma/nineth/service/ShowroomService.java

@@ -5,6 +5,7 @@ import com.izouma.nineth.domain.*;
 import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.AssetStatus;
+import com.izouma.nineth.enums.AuthStatus;
 import com.izouma.nineth.enums.CollectionType;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.*;
@@ -153,6 +154,7 @@ public class ShowroomService {
                 .userId(user.getId())
                 .nickname(user.getNickname())
                 .type("COMPANY")
+                .status(AuthStatus.NOT_AUTH)
                 .build();
         showroom = showroomRepo.save(showroom);
 

src/main/java/com/izouma/nineth/web/ShowroomController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -71,6 +72,7 @@ public class ShowroomController extends BaseController {
 
         Map<Long, Long> finalLikesMap = likesMap;
         return all.map(showroom -> {
+            collect.get(showroom.getId()).sort(Comparator.comparingInt(ShowCollection::getSort));
             showroom.setCollections(collect.get(showroom.getId()));
             showroom.setLiked(ObjectUtils.isNotEmpty(finalLikesMap.get(showroom.getId())));
             return showroom;
@@ -80,7 +82,7 @@ public class ShowroomController extends BaseController {
     @GetMapping("/get/{id}")
     public Showroom get(@PathVariable Long id) {
         Showroom showroom = showroomRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-        showroom.setCollections(showCollectionRepo.findAllByShowroomId(id));
+        showroom.setCollections(showCollectionRepo.findAllByShowroomIdOrderBySort(id));
         User user = SecurityUtils.getAuthenticatedUser();
 
         if (user != null && !user.isAdmin()) {

src/main/vue/src/router.js

@@ -655,17 +655,34 @@ const router = new Router({
                     name: 'ShowroomEdit',
                     component: () => import(/* webpackChunkName: "showroomEdit" */ '@/views/ShowroomEdit.vue'),
                     meta: {
-                       title: '展厅编辑',
-                    },
+                        title: '展厅编辑'
+                    }
                 },
                 {
                     path: '/showroomList',
                     name: 'ShowroomList',
                     component: () => import(/* webpackChunkName: "showroomList" */ '@/views/ShowroomList.vue'),
                     meta: {
-                       title: '展厅',
-                    },
-               }
+                        title: '展厅'
+                    }
+                },
+                {
+                    path: '/companyRoomEdit',
+                    name: 'CompanyRoomEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "companyRoomEdit" */ '@/views/company/CompanyRoomEdit.vue'),
+                    meta: {
+                        title: '展厅编辑'
+                    }
+                },
+                {
+                    path: '/companyRoomList',
+                    name: 'CompanyRoomList',
+                    component: () => import(/* webpackChunkName: "companyRoomList" */ '@/views/company/CompanyRoomList.vue'),
+                    meta: {
+                        title: '展厅'
+                    }
+                }
                 /**INSERT_LOCATION**/
             ]
         },

src/main/vue/src/views/CompanyList.vue

@@ -25,9 +25,9 @@
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="username" label="用户名" min-width="300"> </el-table-column>
-            <el-table-column prop="nickname" label="昵称" min-width="300"> </el-table-column>
-            <el-table-column label="头像" min-width="300">
+            <el-table-column prop="username" label="用户名"> </el-table-column>
+            <el-table-column prop="nickname" label="昵称"> </el-table-column>
+            <el-table-column label="头像">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"
@@ -39,7 +39,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="180">
                 <template slot-scope="{ row }">
-                    <el-button @click="editRow(row)" type="success" size="mini" plain>发放展厅</el-button>
+                    <el-button @click="createShowroom(row)" type="success" size="mini" plain>发放展厅</el-button>
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
                 </template>
             </el-table-column>
@@ -154,7 +154,7 @@ export default {
                     .then(res => {
                         let el = document.createElement('div');
                         new ClipboardJS(el, {
-                            text: function(trigger) {
+                            text: function (trigger) {
                                 return res;
                             }
                         });
@@ -166,6 +166,30 @@ export default {
                         this.$message.error(e.error);
                     });
             }
+        },
+        createShowroom(row) {
+            this.$confirm('确认发布展厅吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            })
+                .then(() => {
+                    this.$http.post('/showroom/create', { userId: row.id });
+                })
+                .then(() => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    if (e === 'cancel') {
+                        this.$message.error('已取消发布');
+                    } else {
+                        this.$message.error(e.error);
+                    }
+                });
         }
     }
 };

src/main/vue/src/views/MinterList.vue

@@ -25,9 +25,9 @@
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="username" label="用户名" min-width="300"> </el-table-column>
-            <el-table-column prop="nickname" label="昵称" min-width="300"> </el-table-column>
-            <el-table-column label="头像" min-width="300">
+            <el-table-column prop="username" label="用户名" min-width="200"> </el-table-column>
+            <el-table-column prop="nickname" label="昵称" min-width="200"> </el-table-column>
+            <el-table-column label="头像" min-width="100">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"

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

@@ -2,60 +2,65 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                删除
-            </el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
             <div class="edit-view__content-section">
-                <el-form :model="formData" :rules="rules" ref="form" label-width="136px" label-position="right"
-                         size="small"
-                         style="max-width: 500px;">
-                        <el-form-item prop="userId" label="用户ID">
-                                    <el-input-number type="number" v-model="formData.userId"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="nickname" label="昵称">
-                                    <el-input v-model="formData.nickname"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="pic" label="logo">
-                                    <single-upload v-model="formData.pic"></single-upload>
-                        </el-form-item>
-                        <el-form-item prop="introduction" label="简介">
-                                    <el-input type="textarea" v-model="formData.introduction"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="likes" label="点赞">
-                                    <el-input-number type="number" v-model="formData.likes"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="publish" label="发布">
-                                    <el-switch v-model="formData.publish"></el-switch>
-                        </el-form-item>
-                        <el-form-item prop="maxCollection" label="最多可放藏品数量">
-                                    <el-input-number type="number" v-model="formData.maxCollection"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="headBg" label="头部背景">
-                                    <single-upload v-model="formData.headBg"></single-upload>
-                        </el-form-item>
-                        <el-form-item prop="showroomBg" label="展厅背景">
-                                    <single-upload v-model="formData.showroomBg"></single-upload>
-                        </el-form-item>
-                        <el-form-item prop="status" label="状态">
-                                    <el-select v-model="formData.status" clearable filterable placeholder="请选择">
-                                        <el-option
-                                                v-for="item in statusOptions"
-                                                :key="item.value"
-                                                :label="item.label"
-                                                :value="item.value">
-                                        </el-option>
-                                    </el-select>
-                        </el-form-item>
-                        <el-form-item prop="reason" label="拒绝理由">
-                                    <el-input type="textarea" v-model="formData.reason"></el-input>
-                        </el-form-item>
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="130px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 700px"
+                >
+                    <el-form-item prop="userId" label="用户ID">
+                        <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="nickname" label="昵称">
+                        <el-input v-model="formData.nickname"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="logo">
+                        <single-upload v-model="formData.pic"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="introduction" label="简介">
+                        <el-input type="textarea" v-model="formData.introduction"></el-input>
+                    </el-form-item>
+                    <!-- <el-form-item prop="likes" label="点赞">
+                        <el-input-number type="number" v-model="formData.likes"></el-input-number>
+                    </el-form-item> -->
+                    <el-form-item prop="maxCollection" label="最多可放藏品数量">
+                        <el-input-number type="number" v-model="formData.maxCollection"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="headBg" label="头部背景">
+                        <single-upload v-model="formData.headBg"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="showroomBg" label="展厅背景">
+                        <single-upload v-model="formData.showroomBg"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="publish" label="发布">
+                        <!-- <el-switch v-model="formData.publish"></el-switch> -->
+                        <el-radio v-model="formData.publish" :label="true">是</el-radio>
+                        <el-radio v-model="formData.publish" :label="false">否</el-radio>
+                    </el-form-item>
+                    <el-form-item prop="status" label="状态">
+                        <el-select v-model="formData.status" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in statusOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="reason" label="拒绝理由">
+                        <el-input type="textarea" v-model="formData.reason"></el-input>
+                    </el-form-item>
                     <el-form-item class="form-submit">
-                        <el-button @click="onSave" :loading="saving" type="primary">
-                            保存
-                        </el-button>
+                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
                         <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
                             删除
                         </el-button>
@@ -67,72 +72,78 @@
     </div>
 </template>
 <script>
-    export default {
-        name: 'ShowroomEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('showroom/get/' + this.$route.query.id)
-                    .then(res => {
-                        this.formData = res;
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {
-                },
-                rules: {
-                },
-                statusOptions: [{"label":"未审核","value":"NOT_AUTH"},{"label":"认证中","value":"PENDING"},{"label":"已认证","value":"SUCCESS"},{"label":"失败","value":"FAIL"}],
-            }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
+export default {
+    name: 'ShowroomEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('showroom/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
                 });
-            },
-            submit() {
-                let data = {...this.formData};
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {},
+            statusOptions: [
+                { label: '未审核', value: 'NOT_AUTH' },
+                { label: '认证中', value: 'PENDING' },
+                { label: '已认证', value: 'SUCCESS' },
+                { label: '失败', value: 'FAIL' }
+            ]
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
 
-                this.saving = true;
-                this.$http
-                    .post('/showroom/save', data, {body: 'json'})
-                    .then(res => {
-                        this.saving = false;
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.saving = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            onDelete() {
-                this.$confirm('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/showroom/del/${this.formData.id}`)
-                }).then(() => {
+            this.saving = true;
+            this.$http
+                .post('/showroom/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/showroom/del/${this.formData.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.$router.go(-1);
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         console.log(e);
                         this.$message.error((e || {}).error || '删除失败');
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped></style>

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

@@ -1,94 +1,95 @@
 <template>
-    <div  class="list-view">
+    <div class="list-view">
         <page-title>
-            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">
+            <!-- <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
                 新增
             </el-button>
-            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData" class="filter-item">
+            <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
                 导出
-            </el-button>
+            </el-button> -->
         </page-title>
         <div class="filters-container">
             <el-input
-                    placeholder="搜索..."
-                    v-model="search"
-                    clearable
-                    class="filter-item search"
-                    @keyup.enter.native="getData"
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
             >
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
         </div>
-        <el-table :data="tableData" row-key="id" ref="table"
-                  header-row-class-name="table-header-row"
-                  header-cell-class-name="table-header-cell"
-                  row-class-name="table-row" cell-class-name="table-cell"
-                  :height="tableHeight" v-loading="fetchingData">
-            <el-table-column v-if="multipleMode" align="center" type="selection"
-                             width="50">
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="userId" label="用户ID"> </el-table-column>
+            <el-table-column prop="nickname" label="昵称"> </el-table-column>
+            <el-table-column prop="pic" label="logo">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic"
+                        fit="cover"
+                        :preview-src-list="[row.pic]"
+                    ></el-image>
+                </template>
             </el-table-column>
-            <el-table-column prop="id" label="ID" width="100">
+            <el-table-column prop="introduction" label="简介"> </el-table-column>
+            <el-table-column prop="publish" label="发布">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.publish ? 'success' : 'info'">{{ row.publish ? '是' : '否' }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="likes" label="点赞"> </el-table-column>
+            <!-- <el-table-column prop="maxCollection" label="最多可放藏品数量"> </el-table-column> -->
+            <!-- <el-table-column prop="headBg" label="头部背景">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.headBg"
+                        fit="cover"
+                        :preview-src-list="[row.headBg]"
+                    ></el-image>
+                </template>
             </el-table-column>
-                                <el-table-column prop="userId" label="用户ID"
->
-                    </el-table-column>
-                    <el-table-column prop="nickname" label="昵称"
->
-                    </el-table-column>
-                    <el-table-column prop="pic" label="logo"
->
-                            <template slot-scope="{row}">
-                                <el-image style="width: 30px; height: 30px"
-                                          :src="row.pic" fit="cover"
-                                          :preview-src-list="[row.pic]"></el-image>
-                            </template>
-                    </el-table-column>
-                    <el-table-column prop="introduction" label="简介"
->
-                    </el-table-column>
-                    <el-table-column prop="likes" label="点赞"
->
-                    </el-table-column>
-                    <el-table-column prop="publish" label="发布"
->
-                            <template slot-scope="{row}">
-                                <el-tag :type="row.publish?'':'info'">{{row.publish}}</el-tag>
-                            </template>
-                    </el-table-column>
-                    <el-table-column prop="maxCollection" label="最多可放藏品数量"
->
-                    </el-table-column>
-                    <el-table-column prop="headBg" label="头部背景"
->
-                            <template slot-scope="{row}">
-                                <el-image style="width: 30px; height: 30px"
-                                          :src="row.headBg" fit="cover"
-                                          :preview-src-list="[row.headBg]"></el-image>
-                            </template>
-                    </el-table-column>
-                    <el-table-column prop="showroomBg" label="展厅背景"
->
-                            <template slot-scope="{row}">
-                                <el-image style="width: 30px; height: 30px"
-                                          :src="row.showroomBg" fit="cover"
-                                          :preview-src-list="[row.showroomBg]"></el-image>
-                            </template>
-                    </el-table-column>
-                    <el-table-column prop="status" label="状态"
-                            :formatter="statusFormatter"
-                        >
-                    </el-table-column>
-                    <el-table-column prop="reason" label="拒绝理由"
->
-                    </el-table-column>
-            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    width="150">
-                <template slot-scope="{row}">
+            <el-table-column prop="showroomBg" label="展厅背景">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.showroomBg"
+                        fit="cover"
+                        :preview-src-list="[row.showroomBg]"
+                    ></el-image>
+                </template>
+            </el-table-column> -->
+            <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
+            <!-- <el-table-column prop="reason" label="拒绝理由"> </el-table-column> -->
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                    <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
             </el-table-column>
         </el-table>
@@ -101,120 +102,129 @@
                     <el-button @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div> -->
-            <el-pagination background @size-change="onSizeChange"
-                           @current-change="onCurrentChange" :current-page="page"
-                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="totalElements">
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
             </el-pagination>
         </div>
-
     </div>
 </template>
 <script>
-    import { mapState } from "vuex";
-    import pageableTable from "@/mixins/pageableTable";
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
 
-    export default {
-        name: 'ShowroomList',
-        mixins: [pageableTable],
-        data() {
-            return {
-                multipleMode: false,
-                search: "",
-                url: "/showroom/all",
-                downloading: false,
-                        statusOptions:[{"label":"未审核","value":"NOT_AUTH"},{"label":"认证中","value":"PENDING"},{"label":"已认证","value":"SUCCESS"},{"label":"失败","value":"FAIL"}],
+export default {
+    name: 'ShowroomList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/showroom/all',
+            downloading: false,
+            statusOptions: [
+                { label: '未审核', value: 'NOT_AUTH' },
+                { label: '认证中', value: 'PENDING' },
+                { label: '已认证', value: 'SUCCESS' },
+                { label: '失败', value: 'FAIL' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
             }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        methods: {
-                    statusFormatter(row, column, cellValue, index) {
-                        let selectedOption = this.statusOptions.find(i => i.value === cellValue);
-                        if (selectedOption) {
-                            return selectedOption.label;
-                        }
-                        return '';
-                    },
-            beforeGetData() {
-                return { search: this.search, query: { del: false } };
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+        addRow() {
+            this.$router.push({
+                path: '/showroomEdit',
+                query: {
+                    ...this.$route.query
                 }
-            },
-            addRow() {
-                this.$router.push({
-                    path: "/showroomEdit",
-                    query: {
-                        ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/showroomEdit",
-                    query: {
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/showroomEdit',
+                query: {
                     id: row.id
-                    }
-                });
-            },
-            download() {
-                this.downloading = true;
-                this.$axios
-                    .get("/showroom/excel", { 
-                        responseType: "blob",
-                        params: { size: 10000 }
-                    })
-                    .then(res => {
-                        console.log(res);
-                        this.downloading = false;
-                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-                        const link = document.createElement("a");
-                        link.href = downloadUrl;
-                        link.setAttribute(
-                            "download",
-                            res.headers["content-disposition"].split("filename=")[1]
-                        );
-                        document.body.appendChild(link);
-                        link.click();
-                        link.remove();
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.downloading = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/showroom/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
                 });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/showroom/del/${row.id}`)
-                }).then(() => {
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/showroom/del/${row.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.getData();
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         this.$message.error(e.error);
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/views/company/CompanyRoomEdit.vue

@@ -0,0 +1,265 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button> -->
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="130px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 700px"
+                >
+                    <el-form-item prop="reason" label="拒绝理由" v-if="formData.reason">
+                        <el-input
+                            type="textarea"
+                            v-model="formData.reason"
+                            :rows="3"
+                            style="width: 500px"
+                            disabled
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item prop="userId" label="用户ID">
+                        <el-input-number
+                            type="number"
+                            v-model="formData.userId"
+                            style="width: 200px"
+                            disabled
+                        ></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="nickname" label="昵称">
+                        <el-input v-model="formData.nickname" style="width: 280px" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="logo">
+                        <single-upload v-model="formData.pic"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="introduction" label="简介">
+                        <el-input type="textarea" :rows="4" v-model="formData.introduction"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="maxCollection" label="最多可放藏品数量">
+                        <el-input-number
+                            type="number"
+                            v-model="formData.maxCollection"
+                            style="width: 280px"
+                            disabled
+                        ></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="settingId" label="模版">
+                        <el-select v-model="formData.settingId" style="width: 280px" @change="changeBg">
+                            <el-option
+                                v-for="item in settings"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="headBg" label="头部背景">
+                        <single-upload v-model="formData.headBg" disabled></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="showroomBg" label="展厅背景">
+                        <single-upload v-model="formData.showroomBg"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="collections" label="藏品">
+                        <el-table :data="formData.collections">
+                            <el-table-column type="index" label="#"></el-table-column>
+                            <el-table-column prop="collection" label="ID" width="80"></el-table-column>
+                            <el-table-column prop="pic" label="图"></el-table-column>
+                            <el-table-column width="80" align="center">
+                                <template v-slot="{ $index }">
+                                    <el-button type="danger" plain @click="delCollection($index)" size="mini">
+                                        删除
+                                    </el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <el-button @click="addCollection" size="mini">添加</el-button>
+                    </el-form-item>
+                    <el-form-item prop="publish" label="发布" v-if="formData.status == 'SUCCESS'">
+                        <el-radio v-model="formData.publish" :label="true">是</el-radio>
+                        <el-radio v-model="formData.publish" :label="false">否</el-radio>
+                    </el-form-item>
+
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+                        <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button> -->
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <el-dialog title="添加藏品" :visible.sync="showCollectionDialog" width="500px">
+                <div style="margin-bottom: 10px">如果找到没有藏品，请先查看藏品是否审核通过</div>
+                <el-form :model="{ collectionId }" ref="collectionForm" inline>
+                    <el-form-item prop="collectionId" :rules="{ required: true, message: '请选择藏品' }">
+                        <el-select v-model="collectionId" style="width: 350px">
+                            <el-option
+                                v-for="item in collections"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer">
+                    <el-button @click="showCollectionDialog = false">取消</el-button>
+                    <el-button type="primary" size="mini" @click="saveCollection">确定</el-button>
+                </div>
+            </el-dialog>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'ShowroomEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('showroom/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .post('/setting/byFlag', { flag: 2 })
+            .then(res => {
+                this.settings = res;
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .post(
+                '/collection/all',
+                {
+                    sort: 'sort,desc;createdAt,desc',
+                    query: { del: false }
+                },
+                { body: 'json' }
+            )
+            .then(res => {
+                this.collections = res.content;
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                showCollections: []
+            },
+            rules: {},
+            statusOptions: [
+                { label: '未审核', value: 'NOT_AUTH' },
+                { label: '认证中', value: 'PENDING' },
+                { label: '已认证', value: 'SUCCESS' },
+                { label: '失败', value: 'FAIL' }
+            ],
+            settings: [],
+            collections: [],
+            showCollectionDialog: false,
+            collectionId: []
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/showroom/update', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/showroom/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        },
+        changeBg(res) {
+            let data = this.settings.find(item => {
+                return item.id === res;
+            });
+            this.formData.headBg = data.pic;
+            this.formData.showroomBg = data.description;
+        },
+        addCollection() {
+            this.showCollectionDialog = true;
+            if (this.$refs.collectionForm) {
+                this.$nextTick(() => {
+                    this.$refs.collectionForm.clearValidate();
+                });
+            }
+        },
+        delCollection(index) {
+            this.formData.collections.splice(index, 1);
+        },
+        saveCollection() {
+            this.$refs.collectionForm
+                .validate()
+                .then(() => {
+                    if (!this.formData.collections.find(i => i.id === this.collectionId)) {
+                        let data = this.collections.find(i => i.id === this.collectionId);
+                        this.formData.collections.push(item => {
+                            item.showroomId = this.formData.id;
+                            item.collectionId = data.id;
+                        });
+                        // console.log(this.formData.collections);
+                        this.showCollectionDialog = false;
+                    } else {
+                        this.$message.error('请勿重复添加');
+                    }
+                })
+                .catch(() => {});
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+/deep/.el-input.is-disabled .el-input__inner {
+    color: #7c7e7e;
+}
+/deep/.el-textarea.is-disabled .el-textarea__inner {
+    color: #7c7e7e;
+}
+</style>

src/main/vue/src/views/company/CompanyRoomList.vue

@@ -0,0 +1,189 @@
+<template>
+    <div class="list-view">
+        <page-title> </page-title>
+        <div class="filters-container">
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="userId" label="用户ID"> </el-table-column>
+            <el-table-column prop="nickname" label="昵称"> </el-table-column>
+            <el-table-column prop="pic" label="logo">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic"
+                        fit="cover"
+                        :preview-src-list="[row.pic]"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="introduction" label="简介"> </el-table-column>
+            <el-table-column prop="publish" label="发布">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.publish ? 'success' : 'info'">{{ row.publish ? '是' : '否' }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="likes" label="点赞"> </el-table-column>
+            <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'ShowroomList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/showroom/all',
+            downloading: false,
+            statusOptions: [
+                { label: '未审核', value: 'NOT_AUTH' },
+                { label: '认证中', value: 'PENDING' },
+                { label: '已认证', value: 'SUCCESS' },
+                { label: '失败', value: 'FAIL' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        },
+        ...mapState(['userInfo'])
+    },
+    methods: {
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search, query: { del: false, userId: this.userInfo.id } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/showroomEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/companyRoomEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/showroom/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/showroom/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>