拍卖

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

@@ -74,6 +74,13 @@ public class AuctionRecordService {
         BeanUtils.copyProperties(record, save);
         record.setId(null);
         record.setBidderPrice(amount);
-        return auctionRecordRepo.save(save);
+        save = auctionRecordRepo.save(save);
+
+        if (save.isPayDeposit()) {
+            //保证金支付过，改成交价
+            auction.setPurchasePrice(amount);
+            auctionActivityRepo.save(auction);
+        }
+        return save;
     }
 }

src/main/vue/src/views/AuctionActivityEdit.vue

@@ -2,117 +2,162 @@
     <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="94px" label-position="right"
-                         size="small"
-                         style="max-width: 500px;">
-                        <el-form-item prop="sellerId" label="起拍人ID">
-                                    <el-input-number type="number" v-model="formData.sellerId"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="seller" label="起拍人昵称">
-                                    <el-input v-model="formData.seller"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="sellerAvatar" label="起拍人头像">
-                                    <el-input v-model="formData.sellerAvatar"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="name" label="拍卖名称">
-                                    <el-input v-model="formData.name"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="auctionType" label="拍卖类型">
-                                    <el-select v-model="formData.auctionType" clearable filterable placeholder="请选择">
-                                        <el-option
-                                                v-for="item in auctionTypeOptions"
-                                                :key="item.value"
-                                                :label="item.label"
-                                                :value="item.value">
-                                        </el-option>
-                                    </el-select>
-                        </el-form-item>
-                        <el-form-item prop="minter" label="铸造者">
-                                    <el-input v-model="formData.minter"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="assetId" label="藏品ID">
-                                    <el-input-number type="number" v-model="formData.assetId"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="pic" label="图片">
-                                    <el-input v-model="formData.pic"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="model3d" label="model3d">
-                                    <el-input v-model="formData.model3d"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="detail" label="详情">
-                                    <el-input v-model="formData.detail"></el-input>
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="110px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 700px"
+                >
+                    <el-form-item prop="name" label="拍卖名称">
+                        <el-input v-model="formData.name"></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>
+                        <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>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="minterId" label="铸造者">
+                            <minter-select
+                                v-model="formData.minterId"
+                                @detail="onMinterDetail"
+                                :disabled="!canEdit"
+                            ></minter-select>
                         </el-form-item>
                         <el-form-item prop="category" label="分类">
-                                    <el-input v-model="formData.category"></el-input>
+                            <el-select v-model="formData.category" :disabled="!canEdit">
+                                <el-option
+                                    v-for="item in cateogories"
+                                    :label="item"
+                                    :value="item"
+                                    :key="item"
+                                ></el-option>
+                            </el-select>
                         </el-form-item>
+                    </div>
+
+                    <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="auctionType" label="拍卖类型">
+                        <el-select v-model="formData.auctionType" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in auctionTypeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <div class="inline-wrapper">
                         <el-form-item prop="startingPrice" label="起拍价">
-                                    <el-input-number type="number" v-model="formData.startingPrice"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="deposit" label="保证金">
-                                    <el-input-number type="number" v-model="formData.deposit"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="fixedPrice" label="一口价">
-                                    <el-input-number type="number" v-model="formData.fixedPrice"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="startTime" label="开始时间">
-                                    <el-date-picker
-                                            v-model="formData.startTime"
-                                            type="datetime"
-                                            value-format="yyyy-MM-dd HH:mm:ss"
-                                            placeholder="选择日期时间">
-                                    </el-date-picker>
+                            <el-input-number type="number" v-model="formData.startingPrice"></el-input-number>
                         </el-form-item>
                         <el-form-item prop="increment" label="加价幅度">
-                                    <el-input-number type="number" v-model="formData.increment"></el-input-number>
+                            <el-input-number type="number" v-model="formData.increment"></el-input-number>
                         </el-form-item>
-                        <el-form-item prop="endTime" label="截止时间">
-                                    <el-date-picker
-                                            v-model="formData.endTime"
-                                            type="datetime"
-                                            value-format="yyyy-MM-dd HH:mm:ss"
-                                            placeholder="选择日期时间">
-                                    </el-date-picker>
-                        </el-form-item>
-                        <el-form-item prop="purchasePrice" label="成交价">
-                                    <el-input-number type="number" v-model="formData.purchasePrice"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="purchaserId" label="买家id">
-                                    <el-input-number type="number" v-model="formData.purchaserId"></el-input-number>
+                    </div>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="deposit" label="保证金">
+                            <el-input-number type="number" v-model="formData.deposit"></el-input-number>
                         </el-form-item>
-                        <el-form-item prop="purchaser" label="买家">
-                                    <el-input v-model="formData.purchaser"></el-input>
+                        <el-form-item prop="fixedPrice" label="一口价">
+                            <el-input-number type="number" v-model="formData.fixedPrice"></el-input-number>
                         </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>
+                    </div>
+                    <el-form-item prop="startTime" label="拍卖开始时间">
+                        <el-date-picker
+                            v-model="formData.startTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择日期时间"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item prop="endTime" label="截止时间">
+                        <el-date-picker
+                            v-model="formData.endTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择日期时间"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <!-- <el-form-item prop="purchasePrice" label="出价">
+                        <el-input-number type="number" v-model="formData.purchasePrice"></el-input-number>
+                    </el-form-item> -->
+                    <div class="inline-wrapper">
+                        <el-form-item prop="royalties" label="版税(%)">
+                            <el-input-number v-model="formData.royalties" :min="0" :max="99" :disabled="!canEdit">
+                            </el-input-number>
                         </el-form-item>
-                        <el-form-item prop="source" label="状态">
-                                    <el-select v-model="formData.source" clearable filterable placeholder="请选择">
-                                        <el-option
-                                                v-for="item in sourceOptions"
-                                                :key="item.value"
-                                                :label="item.label"
-                                                :value="item.value">
-                                        </el-option>
-                                    </el-select>
+                        <el-form-item prop="serviceCharge" label="手续费(%)">
+                            <el-input-number v-model="formData.serviceCharge" :min="0" :max="99" :disabled="!canEdit">
+                            </el-input-number>
                         </el-form-item>
+                    </div>
+                    <!-- <el-form-item prop="purchaserId" label="买家id">
+                        <el-input-number type="number" v-model="formData.purchaserId"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="purchaser" label="买家">
+                        <el-input v-model="formData.purchaser"></el-input>
+                    </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="source" label="状态">
+                        <el-select v-model="formData.source" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in sourceOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </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>
@@ -124,74 +169,124 @@
     </div>
 </template>
 <script>
-    export default {
-        name: 'AuctionActivityEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('auctionActivity/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: {
-                },
-                auctionTypeOptions: [{"label":"虚拟藏品","value":"NFT"},{"label":"实物","value":"ENTITY"}],
-                statusOptions: [{"label":"未开始","value":"NOTSTARTED"},{"label":"进行中","value":"ONGOING"},{"label":"成交","value":"PURCHASED"},{"label":"流拍","value":"PASS"},{"label":"完成","value":"FINISH"}],
-                sourceOptions: [{"label":"官方拍卖","value":"OFFICIAL"},{"label":"转让拍卖","value":"TRANSFER"}],
-            }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
+import resolveUrl from 'resolve-url';
+import ModelUpload from '../components/ModelUpload.vue';
+export default {
+    name: 'AuctionActivityEdit',
+    components: { ModelUpload },
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('auctionActivity/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: {
+                pic: [],
+                source: 'OFFICIAL'
             },
-            submit() {
-                let data = {...this.formData};
+            rules: {},
+            auctionTypeOptions: [
+                { label: '虚拟藏品', value: 'NFT' },
+                { label: '实物', value: 'ENTITY' }
+            ],
+            statusOptions: [
+                { label: '未开始', value: 'NOTSTARTED' },
+                { label: '进行中', value: 'ONGOING' },
+                { label: '成交', value: 'PURCHASED' },
+                { label: '流拍', value: 'PASS' },
+                { label: '完成', value: 'FINISH' }
+            ],
+            sourceOptions: [
+                { label: '官方拍卖', value: 'OFFICIAL' },
+                { label: '转让拍卖', value: 'TRANSFER' }
+            ],
+            cateogories: ['勋章', '收藏品', '数字艺术', '门票', '游戏', '音乐', '使用', '其他'],
+            customUrl: resolveUrl(this.$baseUrl, 'upload/3dModel')
+        };
+    },
+    computed: {
+        canEdit() {
+            return !!!this.$route.query.id;
+        }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+            if (data.model3d) {
+                data.model3d.url = data.model3d.url + '?scale=' + this.scale + '&yOffset=' + this.yOffset;
+            }
 
-                this.saving = true;
-                this.$http
-                    .post('/auctionActivity/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(`/auctionActivity/del/${this.formData.id}`)
-                }).then(() => {
+            this.saving = true;
+            
+            this.$http
+                .post('/auctionActivity/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(`/auctionActivity/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 || '删除失败');
                     }
-                })
-            },
-        }
+                });
+        },
+        onMinterDetail(e) {
+            console.log(e);
+            this.$set(this.formData, 'minter', e.nickname);
+            this.$set(this.formData, 'minterAvatar', e.avatar);
+
+            this.$set(this.formData, 'sellerId', e.id);
+            this.$set(this.formData, 'seller', e.nickname);
+            this.$set(this.formData, 'sellerAvatar', e.avatar);
+        },
     }
+};
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.tip {
+    font-size: 12px;
+    color: @text3;
+    margin-top: 5px;
+}
+.inline-wrapper {
+    .el-form-item {
+        display: inline-block;
+    }
+}
+</style>

src/main/vue/src/views/AuctionActivityList.vue

@@ -1,109 +1,81 @@
 <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>
         </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-column>
-            <el-table-column prop="id" label="ID" width="100">
+        <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="sellerId" label="起拍人ID"> </el-table-column>
+            <el-table-column prop="seller" label="起拍人昵称"> </el-table-column>
+            <!-- <el-table-column prop="sellerAvatar" label="起拍人头像"> </el-table-column> -->
+            <el-table-column prop="name" label="拍卖名称"> </el-table-column>
+            <el-table-column prop="auctionType" label="拍卖类型" :formatter="auctionTypeFormatter"> </el-table-column>
+            <el-table-column prop="minter" label="铸造者"> </el-table-column>
+            <el-table-column prop="assetId" label="藏品ID"> </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="sellerId" label="起拍人ID"
->
-                    </el-table-column>
-                    <el-table-column prop="seller" label="起拍人昵称"
->
-                    </el-table-column>
-                    <el-table-column prop="sellerAvatar" label="起拍人头像"
->
-                    </el-table-column>
-                    <el-table-column prop="name" label="拍卖名称"
->
-                    </el-table-column>
-                    <el-table-column prop="auctionType" label="拍卖类型"
-                            :formatter="auctionTypeFormatter"
-                        >
-                    </el-table-column>
-                    <el-table-column prop="minter" label="铸造者"
->
-                    </el-table-column>
-                    <el-table-column prop="assetId" label="藏品ID"
->
-                    </el-table-column>
-                    <el-table-column prop="pic" label="图片"
->
-                    </el-table-column>
-                    <el-table-column prop="model3d" label="model3d"
->
-                    </el-table-column>
-                    <el-table-column prop="detail" label="详情"
->
-                    </el-table-column>
-                    <el-table-column prop="category" label="分类"
->
-                    </el-table-column>
-                    <el-table-column prop="startingPrice" label="起拍价"
->
-                    </el-table-column>
-                    <el-table-column prop="deposit" label="保证金"
->
-                    </el-table-column>
-                    <el-table-column prop="fixedPrice" label="一口价"
->
-                    </el-table-column>
-                    <el-table-column prop="startTime" label="开始时间"
->
-                    </el-table-column>
-                    <el-table-column prop="increment" label="加价幅度"
->
-                    </el-table-column>
-                    <el-table-column prop="endTime" label="截止时间"
->
-                    </el-table-column>
-                    <el-table-column prop="purchasePrice" label="成交价"
->
-                    </el-table-column>
-                    <el-table-column prop="purchaserId" label="买家id"
->
-                    </el-table-column>
-                    <el-table-column prop="purchaser" label="买家"
->
-                    </el-table-column>
-                    <el-table-column prop="status" label="状态"
-                            :formatter="statusFormatter"
-                        >
-                    </el-table-column>
-                    <el-table-column prop="source" label="状态"
-                            :formatter="sourceFormatter"
-                        >
-                    </el-table-column>
-            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    width="150">
-                <template slot-scope="{row}">
+            <!-- <el-table-column prop="detail" label="详情"> </el-table-column> -->
+            <el-table-column prop="category" label="分类"> </el-table-column>
+            <el-table-column prop="startingPrice" label="起拍价"> </el-table-column>
+            <el-table-column prop="deposit" label="保证金"> </el-table-column>
+            <el-table-column prop="fixedPrice" label="一口价"> </el-table-column>
+            <el-table-column prop="startTime" label="开始时间"> </el-table-column>
+            <el-table-column prop="increment" label="加价幅度"> </el-table-column>
+            <el-table-column prop="endTime" label="截止时间"> </el-table-column>
+            <el-table-column prop="purchasePrice" label="成交价"> </el-table-column>
+            <el-table-column prop="purchaserId" label="买家id"> </el-table-column>
+            <el-table-column prop="purchaser" label="买家"> </el-table-column>
+            <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
+            <el-table-column prop="source" label="来源" :formatter="sourceFormatter"> </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>
                 </template>
@@ -118,136 +90,152 @@
                     <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: 'AuctionActivityList',
-        mixins: [pageableTable],
-        data() {
-            return {
-                multipleMode: false,
-                search: "",
-                url: "/auctionActivity/all",
-                downloading: false,
-                        auctionTypeOptions:[{"label":"虚拟藏品","value":"NFT"},{"label":"实物","value":"ENTITY"}],
-                        statusOptions:[{"label":"未开始","value":"NOTSTARTED"},{"label":"进行中","value":"ONGOING"},{"label":"成交","value":"PURCHASED"},{"label":"流拍","value":"PASS"},{"label":"完成","value":"FINISH"}],
-                        sourceOptions:[{"label":"官方拍卖","value":"OFFICIAL"},{"label":"转让拍卖","value":"TRANSFER"}],
+export default {
+    name: 'AuctionActivityList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/auctionActivity/all',
+            downloading: false,
+            auctionTypeOptions: [
+                { label: '虚拟藏品', value: 'NFT' },
+                { label: '实物', value: 'ENTITY' }
+            ],
+            statusOptions: [
+                { label: '未开始', value: 'NOTSTARTED' },
+                { label: '进行中', value: 'ONGOING' },
+                { label: '成交', value: 'PURCHASED' },
+                { label: '流拍', value: 'PASS' },
+                { label: '完成', value: 'FINISH' }
+            ],
+            sourceOptions: [
+                { label: '官方拍卖', value: 'OFFICIAL' },
+                { label: '转让拍卖', value: 'TRANSFER' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        auctionTypeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.auctionTypeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
             }
+            return '';
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
             }
+            return '';
         },
-        methods: {
-                    auctionTypeFormatter(row, column, cellValue, index) {
-                        let selectedOption = this.auctionTypeOptions.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 '';
-                    },
-                    sourceFormatter(row, column, cellValue, index) {
-                        let selectedOption = this.sourceOptions.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();
+        sourceFormatter(row, column, cellValue, index) {
+            let selectedOption = this.sourceOptions.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: '/auctionActivityEdit',
+                query: {
+                    ...this.$route.query
                 }
-            },
-            addRow() {
-                this.$router.push({
-                    path: "/auctionActivityEdit",
-                    query: {
-                        ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/auctionActivityEdit",
-                    query: {
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/auctionActivityEdit',
+                query: {
                     id: row.id
-                    }
-                });
-            },
-            download() {
-                this.downloading = true;
-                this.$axios
-                    .get("/auctionActivity/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('/auctionActivity/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(`/auctionActivity/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(`/auctionActivity/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>