拒绝企业申请的藏品

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

@@ -1,7 +1,6 @@
 package com.izouma.nineth.domain;
 
 import com.izouma.nineth.annotations.Searchable;
-import com.izouma.nineth.annotations.SearchableOne;
 import com.izouma.nineth.converter.FileObjectConverter;
 import com.izouma.nineth.converter.FileObjectListConverter;
 import com.izouma.nineth.converter.PrivilegeListConverter;
@@ -27,6 +26,9 @@ import java.util.List;
 public class CompanyCollection extends BaseEntity {
     private Long userId;
 
+    @ApiModelProperty("铸造者")
+    private String minter;
+
     @ApiModelProperty("名称")
     @Searchable
     private String name;
@@ -47,9 +49,6 @@ public class CompanyCollection extends BaseEntity {
     @ApiModelProperty("分类")
     private String category;
 
-    @ApiModelProperty("库存")
-    private int stock;
-
     @ApiModelProperty("发行数量")
     private int total;
 

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

@@ -53,6 +53,7 @@ public class CompanyCollectionService {
         BeanUtils.copyProperties(collection, companyCollection);
         collection.setSource(CollectionSource.COMPANY);
         collection.setType(CollectionType.DEFAULT);
+        collection.setStock(companyCollection.getTotal());
 
         //铸造者/持有者
         Long userId = companyCollection.getUserId();

src/main/vue/src/router.js

@@ -556,12 +556,12 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/companyCollectionEdit',
-                    name: 'CompanyCollectionEdit',
+                    path: '/companyCollectionShow',
+                    name: 'CompanyCollectionShow',
                     component: () =>
-                        import(/* webpackChunkName: "companyCollectionEdit" */ '@/views/CompanyCollectionEdit.vue'),
+                        import(/* webpackChunkName: "companyCollectionShow" */ '@/views/CompanyCollectionShow.vue'),
                     meta: {
-                        title: '企业藏品编辑'
+                        title: '企业藏品详情'
                     }
                 },
                 {
@@ -573,6 +573,15 @@ const router = new Router({
                         title: '企业藏品'
                     }
                 },
+                {
+                    path: '/companyCollFailList',
+                    name: 'CompanyCollFailList',
+                    component: () =>
+                        import(/* webpackChunkName: "companyCollectionList" */ '@/views/CompanyCollFailList.vue'),
+                    meta: {
+                        title: '企业藏品'
+                    }
+                },
                 {
                     path: '/companyEdit',
                     name: 'CompanyEdit',
@@ -594,7 +603,9 @@ const router = new Router({
                     path: '/collectionPendingList',
                     name: 'CollectionPendingList',
                     component: () =>
-                        import(/* webpackChunkName: "collectionPendingList" */ '@/views/company/CollectionPendingList.vue'),
+                        import(
+                            /* webpackChunkName: "collectionPendingList" */ '@/views/company/CollectionPendingList.vue'
+                        ),
                     meta: {
                         title: '申请中藏品'
                     }
@@ -616,6 +627,17 @@ const router = new Router({
                     meta: {
                         title: '未通过藏品'
                     }
+                },
+                {
+                    path: '/companyCollectionEdit',
+                    name: 'CompanyCollectionEdit',
+                    component: () =>
+                        import(
+                            /* webpackChunkName: "companyCollectionEdit" */ '@/views/company/CompanyCollectionEdit.vue'
+                        ),
+                    meta: {
+                        title: '企业藏品编辑'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/CompanyCollFailList.vue

@@ -0,0 +1,268 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <!-- <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> -->
+        </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" width="100"></el-table-column>
+            <el-table-column prop="minter" label="企业名称" width="120"></el-table-column>
+            <el-table-column prop="name" label="名称"> </el-table-column>
+            <el-table-column prop="createdAt" label="创建时间" width="150">
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </el-table-column>
+            <el-table-column prop="pic" label="作品内容" width="90" align="center">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic[0].thumb || row.pic[0].url"
+                        fit="cover"
+                        :preview-src-list="row.pic.map(i => i.thumb || i.url)"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="total" label="发行数量" width="105" align="center">
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </el-table-column>
+            <el-table-column prop="price" label="价格"> </el-table-column>
+            <el-table-column prop="status" label="审核状态" :formatter="statusFormatter" width="120" align="center">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="120">
+                <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>
+
+        <el-dialog :visible.sync="showReasonDialog" width="600px" title="拒绝理由">
+            <el-form ref="denyForm" :model="denyForm" label-position="right" label-width="60px" :rules="denyRules">
+                <el-form-item prop="reason" label="理由">
+                    <el-input type="textarea" :autosize="{ minRows: 3 }" v-model="denyForm.reason"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="showReasonDialog = false">取消</el-button>
+                <el-button type="primary" @click="saveReason">保存</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'CompanyCollectionList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/companyCollection/all',
+            downloading: false,
+            statusOptions: [
+                { label: '审核中', value: 'PENDING' },
+                { label: '通过', value: 'SUCCESS' },
+                { label: '失败', value: 'FAIL' }
+            ],
+            typeOptions: [
+                { label: '默认', value: 'DEFAULT' },
+                { label: '盲盒', value: 'BLIND_BOX' },
+                { label: '拍卖', value: 'AUCTION' }
+            ],
+            denyForm: {},
+            denyRules: {
+                reason: [{ required: true, message: '请填写理由' }]
+            },
+            showReasonDialog: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        typeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        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, status: 'FAIL' } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/companyCollectionEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/companyCollectionShow',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/companyCollection/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(`/companyCollection/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        pass(row) {
+            this.$confirm('确定通过？')
+                .then(res => {
+                    return this.$http.post('/companyCollection/pass', { id: row.id });
+                })
+                .then(res => {
+                    this.$message.success('成功');
+                    this.getData();
+                })
+                .catch(e => {});
+        },
+        deny(row) {
+            this.showReasonDialog = true;
+            this.denyForm.id = row.id;
+        },
+        saveReason() {
+            this.$confirm('确定拒绝？')
+                .then(res => {
+                    return this.$http.post('/companyCollection/deny', { id: this.denyForm.id, reason: this.denyForm.reason });
+                })
+                .then(res => {
+                    this.$message.success('成功');
+                    this.showReasonDialog = false;
+                    this.getData();
+                })
+                .catch(e => {});
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/CompanyCollectionList.vue

@@ -44,6 +44,8 @@
         >
             <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" width="100"></el-table-column>
+            <el-table-column prop="minter" label="企业名称" width="120"></el-table-column>
             <el-table-column prop="name" label="名称"> </el-table-column>
             <el-table-column prop="createdAt" label="创建时间" width="150">
                 <template slot="header" slot-scope="{ column }">
@@ -60,7 +62,6 @@
                     ></el-image>
                 </template>
             </el-table-column>
-            <el-table-column prop="type" label="类型" :formatter="typeFormatter"> </el-table-column>
             <el-table-column prop="total" label="发行数量" width="105" align="center">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
@@ -69,11 +70,11 @@
             <el-table-column prop="price" label="价格"> </el-table-column>
             <el-table-column prop="status" label="审核状态" :formatter="statusFormatter" width="120" align="center">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150">
+            <el-table-column label="操作" align="center" fixed="right" width="210">
                 <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="pass(row)" type="primary" size="mini" plain v-if="row.status === 'PENDING'">
+                    <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="pass(row)" type="success" size="mini" plain v-if="row.status === 'PENDING'">
                         通过
                     </el-button>
                     <el-button @click="deny(row)" type="danger" size="mini" plain v-if="row.status === 'PENDING'">
@@ -103,6 +104,18 @@
             >
             </el-pagination>
         </div>
+
+        <el-dialog :visible.sync="showReasonDialog" width="600px" title="拒绝理由">
+            <el-form ref="denyForm" :model="denyForm" label-position="right" label-width="60px" :rules="denyRules">
+                <el-form-item prop="reason" label="理由">
+                    <el-input type="textarea" :autosize="{ minRows: 3 }" v-model="denyForm.reason"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="showReasonDialog = false">取消</el-button>
+                <el-button type="primary" @click="saveReason">保存</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -127,7 +140,12 @@ export default {
                 { label: '默认', value: 'DEFAULT' },
                 { label: '盲盒', value: 'BLIND_BOX' },
                 { label: '拍卖', value: 'AUCTION' }
-            ]
+            ],
+            denyForm: {},
+            denyRules: {
+                reason: [{ required: true, message: '请填写理由' }]
+            },
+            showReasonDialog: false
         };
     },
     computed: {
@@ -151,7 +169,7 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false } };
+            return { search: this.search, query: { del: false, status: 'PENDING' } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;
@@ -169,7 +187,7 @@ export default {
         },
         editRow(row) {
             this.$router.push({
-                path: '/companyCollectionEdit',
+                path: '/companyCollectionShow',
                 query: {
                     id: row.id
                 }
@@ -235,12 +253,17 @@ export default {
                 .catch(e => {});
         },
         deny(row) {
+            this.showReasonDialog = true;
+            this.denyForm.id = row.id;
+        },
+        saveReason() {
             this.$confirm('确定拒绝？')
                 .then(res => {
-                    return this.$http.post('/companyCollection/deny', { id: row.id });
+                    return this.$http.post('/companyCollection/deny', { id: this.denyForm.id, reason: this.denyForm.reason });
                 })
                 .then(res => {
-                    this.$message.success('成功'); 
+                    this.$message.success('成功');
+                    this.showReasonDialog = false;
                     this.getData();
                 })
                 .catch(e => {});

src/main/vue/src/views/CompanyCollectionShow.vue

@@ -0,0 +1,471 @@
+<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="120px"
+                    label-position="right"
+                    size="small"
+                >
+                    <el-form-item prop="reason" label="拒绝理由" v-if="formData.reason">
+                        <el-input
+                            type="textarea"
+                            v-model="formData.reason"
+                            :rows="3"
+                            style="width: calc(90vw - 450px)"
+                            disabled
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item prop="name" label="名称">
+                        <el-input v-model="formData.name" disabled style="width: 500px"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="图片">
+                        <object-upload
+                            v-model="formData.pic[0]"
+                            disabled
+                            compress
+                            width="3000"
+                            height="3000"
+                        ></object-upload>
+                        <div class="tip">支持JPG、PNG、GIF、MP4，推荐长宽比1:1</div>
+                    </el-form-item>
+                    <el-form-item prop="model3d" label="3D模型">
+                        <model-upload
+                            :limit="1"
+                            v-model="formData.model3d"
+                            :customUrl="customUrl"
+                            accept="application/zip"
+                            format="json"
+                            single
+                        ></model-upload>
+                        <div class="tip">请将FBX文件与贴图打包成zip压缩包上传</div>
+                    </el-form-item>
+                    <el-form-item label="相机距离" v-if="formData.model3d">
+                        <el-input-number v-model="scale" :min="0.1" :step="0.1"></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="Y轴偏移" v-if="formData.model3d">
+                        <el-input-number v-model="yOffset"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="category" label="分类">
+                        <el-select v-model="formData.category" disabled>
+                            <el-option v-for="item in cateogories" :label="item" :value="item" :key="item"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="detail" label="详情" style="width: calc(100vw - 450px)">
+                        <rich-text v-model="formData.detail"></rich-text>
+                    </el-form-item>
+                    <el-form-item prop="properties" label="特性" style="width: calc(100vw - 450px)" size="mini">
+                        <el-table :data="formData.properties">
+                            <el-table-column prop="name" label="名称">
+                                <template v-slot="{ row }">
+                                    <el-input
+                                        v-model="row.name"
+                                        placeholder="20字以内"
+                                        maxlength="20"
+                                        disabled
+                                    ></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="value" label="内容">
+                                <template v-slot="{ row }">
+                                    <el-input
+                                        v-model="row.value"
+                                        placeholder="20字以内"
+                                        maxlength="20"
+                                        disabled
+                                    ></el-input>
+                                </template>
+                            </el-table-column>
+                            <!-- <el-table-column width="80" align="center">
+                                <template v-slot="{ $index }">
+                                    <el-button type="danger" plain size="mini" @click="delProperty($index)">
+                                        删除
+                                    </el-button>
+                                </template>
+                            </el-table-column> -->
+                        </el-table>
+                    </el-form-item>
+                    <!-- <el-form-item>
+                        <el-button size="mini" @click="addProperty"> 添加特性 </el-button>
+                    </el-form-item> -->
+                    <el-form-item label="特权" prop="privileges" style="width: calc(100vw - 450px)">
+                        <el-table :data="privilegeOptions">
+                            <el-table-column prop="name" label="可选特权" width="150"></el-table-column>
+                            <el-table-column prop="description"></el-table-column>
+                            <el-table-column width="125" align="right">
+                                <template v-slot="{ row, $index }">
+                                    <!-- <el-button size="mini" v-if="!row.added" @click="addPrivilege(row, $index)">
+                                        添加
+                                    </el-button> -->
+                                    <el-button size="mini" v-if="!!row.added" plain @click="editPrivilege(row, $index)">
+                                        查看
+                                    </el-button>
+                                    <!-- <el-button
+                                        size="mini"
+                                        v-if="!!row.added"
+                                        type="danger"
+                                        plain
+                                        @click="delPrivilege(row, $index)"
+                                    >
+                                        删除
+                                    </el-button> -->
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </el-form-item>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="price" label="价格">
+                            <el-input-number type="number" v-model="formData.price" disabled></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="price" label="原价">
+                            <el-input-number type="number" v-model="formData.originalPrice" disabled></el-input-number>
+                        </el-form-item>
+                    </div>
+                    <el-form-item prop="total" label="发行数量">
+                        <el-input-number v-model="formData.total" disabled></el-input-number>
+                    </el-form-item>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="maxCount" label="限购">
+                            <el-input-number v-model="formData.maxCount" :min="0" :step="1" disabled></el-input-number>
+                            <div class="tip">0表示不限购</div>
+                        </el-form-item>
+                        <el-form-item prop="countId" label="限购识别码" v-if="formData.maxCount > 0">
+                            <el-input v-model="formData.countId" style="width: 300px" disabled></el-input>
+                            <div class="tip">相同识别码的藏品共享限购数量</div>
+                        </el-form-item>
+                    </div>
+                    <el-form-item class="form-submit">
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+
+        <el-dialog :visible.sync="showPrivilegeEditDialog" width="600px" :title="privilegeForm.name">
+            <el-form
+                ref="privilegeForm"
+                :model="privilegeForm"
+                label-position="right"
+                label-width="80px"
+                :rules="privelegeRules"
+            >
+                <el-form-item
+                    prop="detail"
+                    label="详细内容"
+                    v-if="privilegeForm.type === 'text' || privilegeForm.type === 'exchange'"
+                >
+                    <el-input
+                        type="textarea"
+                        :autosize="{ minRows: 3 }"
+                        v-model="privilegeForm.detail"
+                        disabled
+                    ></el-input>
+                </el-form-item>
+                <el-form-item prop="detail" label="二维码" v-if="privilegeForm.type === 'qrcode'">
+                    <single-upload v-model="privilegeForm.detail"></single-upload>
+                </el-form-item>
+                <el-form-item
+                    prop="remark"
+                    label="说明"
+                    v-if="privilegeForm.type === 'qrcode' || privilegeForm.type === 'code'"
+                >
+                    <el-input
+                        type="textarea"
+                        :autosize="{ minRows: 3 }"
+                        v-model="privilegeForm.remark"
+                        disabled
+                    ></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="showPrivilegeEditDialog = false">取消</el-button>
+                <!-- <el-button type="primary" @click="savePrivilege">保存</el-button> -->
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import resolveUrl from 'resolve-url';
+import ModelUpload from '../components/ModelUpload.vue';
+export default {
+    name: 'CompanyCollectionEdit',
+    components: { ModelUpload },
+    created() {
+        Promise.all([
+            new Promise((resolve, reject) => {
+                if (this.$route.query.id) {
+                    return this.$http
+                        .get('companyCollection/get/' + this.$route.query.id)
+                        .then(res => {
+                            if (res.model3d) {
+                                let url = new URL(res.model3d.url);
+                                this.scale = Number(url.searchParams.get('scale')) || 1;
+                                this.yOffset = Number(url.searchParams.get('yOffset')) || 0;
+                                res.model3d.url = url.origin + url.pathname;
+                            }
+                            res.properties = res.properties || [];
+                            res.privileges = res.privileges || [];
+                            this.formData = res;
+                            resolve();
+                        })
+                        .catch(e => {
+                            console.log(e);
+                            this.$message.error(e.error);
+                            resolve();
+                        });
+                }
+                return resolve();
+            }),
+            this.$http
+                .post('/privilegeOption/all', { size: 10000, query: { del: false } }, { body: 'json' })
+                .then(res => {
+                    this.privilegeOptions = res.content;
+                    return Promise.resolve();
+                })
+        ]).then(() => {
+            this.formData.privileges.forEach(p => {
+                let idx = this.privilegeOptions.findIndex(i => i.name === p.name);
+                if (idx > -1) {
+                    this.$set(this.privilegeOptions[idx], 'added', true);
+                }
+            });
+        });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                pic: [],
+                privileges: [],
+                properties: []
+            },
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        message: '请输入名称',
+                        trigger: 'blur'
+                    }
+                ],
+                pic: [
+                    {
+                        validator: (rule, value, callback) => {
+                            if (value) {
+                                if (!(value instanceof Array)) {
+                                    callback(new Error('请上传内容'));
+                                    return;
+                                } else {
+                                    for (let f of value) {
+                                        if (!f.url) {
+                                            callback(new Error('请上传内容'));
+                                            return;
+                                        }
+                                    }
+                                }
+                                callback();
+                            } else {
+                                callback(new Error('请上传内容'));
+                            }
+                        },
+                        trigger: 'blur'
+                    }
+                ],
+                detail: [
+                    {
+                        required: true,
+                        message: '请输入详情',
+                        trigger: 'blur'
+                    }
+                ],
+                type: [
+                    {
+                        required: true,
+                        message: '请输入类型',
+                        trigger: 'blur'
+                    }
+                ],
+                total: [
+                    {
+                        required: true,
+                        message: '请输入发行数量',
+                        trigger: 'blur'
+                    }
+                ],
+                price: [
+                    {
+                        required: true,
+                        message: '请输入价格',
+                        trigger: 'blur'
+                    }
+                ],
+                properties: [
+                    {
+                        validator: (rule, value, callback) => {
+                            if (value) {
+                                if (!(value instanceof Array)) {
+                                    callback(new Error('properties must be array!'));
+                                    return;
+                                } else {
+                                    for (let i = 0; i < value.length; i++) {
+                                        if (value[i].name === '' || value[i].name === undefined) {
+                                            callback(new Error('请填写名称'));
+                                            return;
+                                        }
+                                        if (value[i].value === '' || value[i].value === undefined) {
+                                            callback(new Error('请填写内容'));
+                                            return;
+                                        }
+                                    }
+                                }
+                            }
+                            callback();
+                        },
+                        trigger: 'blur'
+                    }
+                ],
+                category: [{ required: true, message: '请填写分类' }]
+            },
+            statusOptions: [
+                { label: '审核中', value: 'PENDING' },
+                { label: '通过', value: 'SUCCESS' },
+                { label: '失败', value: 'FAIL' }
+            ],
+            customUrl: resolveUrl(this.$baseUrl, 'upload/3dModel'),
+            cateogories: ['勋章', '收藏品', '数字艺术', '门票', '游戏', '音乐', '使用', '其他'],
+            scale: 1,
+            yOffset: 0,
+            privilegeOptions: [],
+            privilegeForm: {},
+            privelegeRules: {
+                detail: [{ required: true, message: '请填写内容' }],
+                remark: [{ required: true, message: '请填写说明' }]
+            },
+            showPrivilegeEditDialog: false
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+            data.status = 'PENDING';
+
+            this.saving = true;
+            this.$http
+                .post('/companyCollection/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(`/companyCollection/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 || '删除失败');
+                    }
+                });
+        },
+        addProperty() {
+            this.formData.properties.push({
+                name: '',
+                value: ''
+            });
+        },
+        delProperty(i) {
+            this.formData.properties.splice(i, 1);
+        },
+        addPrivilege(row, i) {
+            this.privilegeForm = { ...row };
+            this.showPrivilegeEditDialog = true;
+            if (this.$refs.privilegeForm) {
+                this.$nextTick(() => {
+                    this.$refs.privilegeForm.clearValidate();
+                });
+            }
+        },
+        editPrivilege(row, i) {
+            this.privilegeForm = { ...(this.formData.privileges.find(e => e.name === row.name) || {}) };
+            this.showPrivilegeEditDialog = true;
+            if (this.$refs.privilegeForm) {
+                this.$nextTick(() => {
+                    this.$refs.privilegeForm.clearValidate();
+                });
+            }
+        },
+        delPrivilege(row, i) {
+            let idx = this.formData.privileges.findIndex(e => e.name === row.name);
+            if (idx > -1) {
+                this.formData.privileges.splice(idx, 1);
+            }
+            this.$set(this.privilegeOptions[i], 'added', false);
+        },
+        savePrivilege() {
+            this.$refs.privilegeForm
+                .validate()
+                .then(() => {
+                    let i = this.formData.privileges.findIndex(e => e.name === this.privilegeForm.name);
+                    if (i > -1) {
+                        this.$set(this.formData.privileges, i, { ...this.privilegeForm });
+                    } else {
+                        this.formData.privileges.push({ ...this.privilegeForm });
+                    }
+                    let ii = this.privilegeOptions.findIndex(i => i.name === this.privilegeForm.name);
+                    console.log(ii);
+                    this.$set(this.privilegeOptions[ii], 'added', true);
+                    this.showPrivilegeEditDialog = false;
+                })
+                .catch(e => {
+                    console.log(e);
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.inline-wrapper {
+    .el-form-item {
+        display: inline-block;
+    }
+}
+.tip {
+    font-size: 12px;
+    color: @text3;
+    margin-top: 5px;
+}
+/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/CollectionFailList.vue

@@ -60,7 +60,6 @@
                     ></el-image>
                 </template>
             </el-table-column>
-            <el-table-column prop="type" label="类型" :formatter="typeFormatter"> </el-table-column>
             <el-table-column prop="total" label="发行数量" width="105" align="center">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
@@ -69,16 +68,9 @@
             <el-table-column prop="price" label="价格"> </el-table-column>
             <el-table-column prop="status" label="审核状态" :formatter="statusFormatter" width="120" align="center">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150">
+            <el-table-column label="操作" align="center" fixed="right" width="120">
                 <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="pass(row)" type="primary" size="mini" plain v-if="row.status === 'PENDING'">
-                        通过
-                    </el-button>
-                    <el-button @click="deny(row)" type="danger" size="mini" plain v-if="row.status === 'PENDING'">
-                        拒绝
-                    </el-button>
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -133,7 +125,8 @@ export default {
     computed: {
         selection() {
             return this.$refs.table.selection.map(i => i.id);
-        }
+        },
+        ...mapState(['userInfo'])
     },
     methods: {
         typeFormatter(row, column, cellValue, index) {
@@ -151,7 +144,7 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false } };
+            return { search: this.search, query: { del: false, userId: this.userInfo.id , status: 'FAIL' } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;
@@ -240,7 +233,7 @@ export default {
                     return this.$http.post('/companyCollection/deny', { id: row.id });
                 })
                 .then(res => {
-                    this.$message.success('成功'); 
+                    this.$message.success('成功');
                     this.getData();
                 })
                 .catch(e => {});

src/main/vue/src/views/company/CollectionPassList.vue

@@ -60,7 +60,6 @@
                     ></el-image>
                 </template>
             </el-table-column>
-            <el-table-column prop="type" label="类型" :formatter="typeFormatter"> </el-table-column>
             <el-table-column prop="total" label="发行数量" width="105" align="center">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
@@ -69,16 +68,9 @@
             <el-table-column prop="price" label="价格"> </el-table-column>
             <el-table-column prop="status" label="审核状态" :formatter="statusFormatter" width="120" align="center">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150">
+            <el-table-column label="操作" align="center" fixed="right" width="120">
                 <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="pass(row)" type="primary" size="mini" plain v-if="row.status === 'PENDING'">
-                        通过
-                    </el-button>
-                    <el-button @click="deny(row)" type="danger" size="mini" plain v-if="row.status === 'PENDING'">
-                        拒绝
-                    </el-button>
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -133,7 +125,8 @@ export default {
     computed: {
         selection() {
             return this.$refs.table.selection.map(i => i.id);
-        }
+        },
+        ...mapState(['userInfo'])
     },
     methods: {
         typeFormatter(row, column, cellValue, index) {
@@ -151,7 +144,7 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false } };
+            return { search: this.search, query: { del: false, userId: this.userInfo.id, status: 'SUCCESS' } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;
@@ -240,7 +233,7 @@ export default {
                     return this.$http.post('/companyCollection/deny', { id: row.id });
                 })
                 .then(res => {
-                    this.$message.success('成功'); 
+                    this.$message.success('成功');
                     this.getData();
                 })
                 .catch(e => {});

src/main/vue/src/views/company/CollectionPendingList.vue

@@ -60,7 +60,6 @@
                     ></el-image>
                 </template>
             </el-table-column>
-            <el-table-column prop="type" label="类型" :formatter="typeFormatter"> </el-table-column>
             <el-table-column prop="total" label="发行数量" width="105" align="center">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
@@ -69,16 +68,9 @@
             <el-table-column prop="price" label="价格"> </el-table-column>
             <el-table-column prop="status" label="审核状态" :formatter="statusFormatter" width="120" align="center">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150">
+            <el-table-column label="操作" align="center" fixed="right" width="120">
                 <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="pass(row)" type="primary" size="mini" plain v-if="row.status === 'PENDING'">
-                        通过
-                    </el-button>
-                    <el-button @click="deny(row)" type="danger" size="mini" plain v-if="row.status === 'PENDING'">
-                        拒绝
-                    </el-button>
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -133,7 +125,8 @@ export default {
     computed: {
         selection() {
             return this.$refs.table.selection.map(i => i.id);
-        }
+        },
+        ...mapState(['userInfo'])
     },
     methods: {
         typeFormatter(row, column, cellValue, index) {
@@ -151,7 +144,7 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false } };
+            return { search: this.search, query: { del: false, userId: this.userInfo.id, status: 'PENDING' } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;

src/main/vue/src/views/CompanyCollectionEdit.vue → src/main/vue/src/views/company/CompanyCollectionEdit.vue

@@ -15,17 +15,20 @@
                     label-position="right"
                     size="small"
                 >
+                    <el-form-item prop="reason" label="拒绝理由" v-if="formData.reason">
+                        <el-input
+                            type="textarea"
+                            v-model="formData.reason"
+                            :rows="3"
+                            style="width: calc(90vw - 450px)"
+                            disabled
+                        ></el-input>
+                    </el-form-item>
                     <el-form-item prop="name" label="名称">
-                        <el-input v-model="formData.name" :disabled="!canEdit" style="width: 500px"></el-input>
+                        <el-input v-model="formData.name" style="width: 500px"></el-input>
                     </el-form-item>
                     <el-form-item prop="pic" label="图片">
-                        <object-upload
-                            v-model="formData.pic[0]"
-                            :disabled="!canEdit"
-                            compress
-                            width="3000"
-                            height="3000"
-                        ></object-upload>
+                        <object-upload v-model="formData.pic[0]" compress width="3000" height="3000"></object-upload>
                         <div class="tip">支持JPG、PNG、GIF、MP4，推荐长宽比1:1</div>
                     </el-form-item>
                     <el-form-item prop="model3d" label="3D模型">
@@ -46,7 +49,7 @@
                         <el-input-number v-model="yOffset"></el-input-number>
                     </el-form-item>
                     <el-form-item prop="category" label="分类">
-                        <el-select v-model="formData.category" :disabled="!canEdit">
+                        <el-select v-model="formData.category">
                             <el-option v-for="item in cateogories" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </el-form-item>
@@ -104,22 +107,14 @@
                     </el-form-item>
                     <div class="inline-wrapper">
                         <el-form-item prop="price" label="价格">
-                            <el-input-number
-                                type="number"
-                                v-model="formData.price"
-                                :disabled="!canEdit"
-                            ></el-input-number>
+                            <el-input-number type="number" v-model="formData.price"></el-input-number>
                         </el-form-item>
                         <el-form-item prop="price" label="原价">
-                            <el-input-number
-                                type="number"
-                                v-model="formData.originalPrice"
-                                :disabled="!canEdit"
-                            ></el-input-number>
+                            <el-input-number type="number" v-model="formData.originalPrice"></el-input-number>
                         </el-form-item>
                     </div>
                     <el-form-item prop="total" label="发行数量">
-                        <el-input-number v-model="formData.total" :disabled="!canEdit"></el-input-number>
+                        <el-input-number v-model="formData.total"></el-input-number>
                     </el-form-item>
                     <div class="inline-wrapper">
                         <el-form-item prop="maxCount" label="限购">
@@ -152,11 +147,43 @@
                 </el-form>
             </div>
         </div>
+
+        <el-dialog :visible.sync="showPrivilegeEditDialog" width="600px" :title="privilegeForm.name">
+            <el-form
+                ref="privilegeForm"
+                :model="privilegeForm"
+                label-position="right"
+                label-width="80px"
+                :rules="privelegeRules"
+            >
+                <el-form-item
+                    prop="detail"
+                    label="详细内容"
+                    v-if="privilegeForm.type === 'text' || privilegeForm.type === 'exchange'"
+                >
+                    <el-input type="textarea" :autosize="{ minRows: 3 }" v-model="privilegeForm.detail"></el-input>
+                </el-form-item>
+                <el-form-item prop="detail" label="二维码" v-if="privilegeForm.type === 'qrcode'">
+                    <single-upload v-model="privilegeForm.detail"></single-upload>
+                </el-form-item>
+                <el-form-item
+                    prop="remark"
+                    label="说明"
+                    v-if="privilegeForm.type === 'qrcode' || privilegeForm.type === 'code'"
+                >
+                    <el-input type="textarea" :autosize="{ minRows: 3 }" v-model="privilegeForm.remark"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="showPrivilegeEditDialog = false">取消</el-button>
+                <el-button type="primary" @click="savePrivilege">保存</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 <script>
 import resolveUrl from 'resolve-url';
-import ModelUpload from '../components/ModelUpload.vue';
+import ModelUpload from '../../components/ModelUpload.vue';
 export default {
     name: 'CompanyCollectionEdit',
     components: { ModelUpload },
@@ -165,7 +192,7 @@ export default {
             new Promise((resolve, reject) => {
                 if (this.$route.query.id) {
                     return this.$http
-                        .get('collection/getInfo/' + this.$route.query.id)
+                        .get('companyCollection/get/' + this.$route.query.id)
                         .then(res => {
                             if (res.model3d) {
                                 let url = new URL(res.model3d.url);
@@ -201,17 +228,14 @@ export default {
             });
         });
     },
-    computed: {
-        canEdit() {
-            return !!!this.$route.query.id;
-        }
-    },
     data() {
         return {
             saving: false,
             formData: {
                 pic: [],
-                privileges: []
+                privileges: [],
+                properties: [],
+                status: 'PENDING'
             },
             rules: {
                 name: [
@@ -308,7 +332,13 @@ export default {
             cateogories: ['勋章', '收藏品', '数字艺术', '门票', '游戏', '音乐', '使用', '其他'],
             scale: 1,
             yOffset: 0,
-            privilegeOptions: []
+            privilegeOptions: [],
+            privilegeForm: {},
+            privelegeRules: {
+                detail: [{ required: true, message: '请填写内容' }],
+                remark: [{ required: true, message: '请填写说明' }]
+            },
+            showPrivilegeEditDialog: false
         };
     },
     methods: {
@@ -323,6 +353,8 @@ export default {
         },
         submit() {
             let data = { ...this.formData };
+            data.status = 'PENDING';
+            data.minter = this.userInfo.nickname;
 
             this.saving = true;
             this.$http
@@ -421,4 +453,7 @@ export default {
     color: @text3;
     margin-top: 5px;
 }
+/deep/.el-textarea.is-disabled .el-textarea__inner {
+    color: #7c7e7e;
+}
 </style>

src/main/vue/src/widgets/TopWidget.vue

@@ -33,7 +33,7 @@
                 <div class="no">NO.{{ index + 1 }}</div>
                 <div class="content">
                     <div class="text1">{{ item.to_user }}</div>
-                    <div class="text2">{{ item.total }}元</div>
+                    <div class="text2">{{ item.total || 0 }}元</div>
                 </div>
             </router-link>
         </div>