xiongzhu 4 лет назад
Родитель
Сommit
6ee5c6b515

+ 2 - 0
src/main/java/com/izouma/nineth/domain/Collection.java

@@ -120,4 +120,6 @@ public class Collection extends BaseEntity {
     private int sort;
 
     private Long assetId;
+
+    private BigDecimal originalPrice;
 }

+ 5 - 5
src/main/vue/src/views/BlindBoxEdit.vue

@@ -19,9 +19,9 @@
                     <el-form-item prop="name" label="名称">
                         <el-input v-model="formData.name" :disabled="!canEdit"></el-input>
                     </el-form-item>
-                    <el-form-item prop="pics" label="图片">
+                    <el-form-item prop="pic" label="图片">
                         <object-upload
-                            v-model="formData.pics[0]"
+                            v-model="formData.pic[0]"
                             :disabled="!canEdit"
                             compress
                             width="3000"
@@ -215,7 +215,7 @@ export default {
 
         // this.formData = {
         //     name: 'OASISPUNK绿洲朋克',
-        //     pics: ['https://awesomeadmin.oss-cn-hangzhou.aliyuncs.com/image/2021-10-21-16-44-52kZqxuwhH.gif'],
+        //     pic: ['https://awesomeadmin.oss-cn-hangzhou.aliyuncs.com/image/2021-10-21-16-44-52kZqxuwhH.gif'],
         //     minter: '管理员',
         //     minterId: 1,
         //     minterAvatar: 'https://awesomeadmin.oss-cn-hangzhou.aliyuncs.com/image/avatar_male.png',
@@ -265,7 +265,7 @@ export default {
                 properties: [],
                 type: 'BLIND_BOX',
                 source: 'OFFICIAL',
-                pics: [{}]
+                pic: [{}]
             },
             rules: {
                 name: [
@@ -275,7 +275,7 @@ export default {
                         trigger: 'blur'
                     }
                 ],
-                pics: [
+                pic: [
                     {
                         validator: (rule, value, callback) => {
                             if (value) {

+ 3 - 3
src/main/vue/src/views/BlindBoxList.vue

@@ -45,13 +45,13 @@
             <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="name" label="名称"> </el-table-column>
-            <el-table-column prop="pics" label="作品内容">
+            <el-table-column prop="pic" label="作品内容">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"
-                        :src="row.pics[0].thumb || row.pics[0].url"
+                        :src="row.pic[0].thumb || row.pic[0].url"
                         fit="cover"
-                        :preview-src-list="row.pics.map(i => i.thumb || i.url)"
+                        :preview-src-list="row.pic.map(i => i.thumb || i.url)"
                     ></el-image>
                 </template>
             </el-table-column>

+ 17 - 4
src/main/vue/src/views/CollectionEdit.vue

@@ -19,8 +19,14 @@
                     <el-form-item prop="name" label="名称">
                         <el-input v-model="formData.name" :disabled="!canEdit"></el-input>
                     </el-form-item>
-                    <el-form-item prop="pics" label="图片">
-                        <object-upload v-model="formData.pics[0]" :disabled="!canEdit" compress width="3000" height="3000"></object-upload>
+                    <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="minterId" label="铸造者">
@@ -119,6 +125,13 @@
                     <el-form-item prop="price" label="价格">
                         <el-input-number type="number" v-model="formData.price" :disabled="!canEdit"></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-form-item>
                     <el-form-item prop="royalties" label="版税(%)">
                         <el-input-number v-model="formData.royalties" :min="0" :max="99" :disabled="!canEdit">
                         </el-input-number>
@@ -200,7 +213,7 @@ export default {
                 properties: [],
                 type: 'DEFAULT',
                 source: 'OFFICIAL',
-                pics: [],
+                pic: [],
                 scheduleSale: false,
                 sort: 0,
                 privileges: []
@@ -213,7 +226,7 @@ export default {
                         trigger: 'blur'
                     }
                 ],
-                pics: [
+                pic: [
                     {
                         validator: (rule, value, callback) => {
                             if (value) {

+ 3 - 3
src/main/vue/src/views/CollectionList.vue

@@ -50,13 +50,13 @@
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>
             </el-table-column>
-            <el-table-column prop="pics" label="作品内容" width="90" align="center">
+            <el-table-column prop="pic" label="作品内容" width="90" align="center">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"
-                        :src="row.pics[0].thumb || row.pics[0].url"
+                        :src="row.pic[0].thumb || row.pic[0].url"
                         fit="cover"
-                        :preview-src-list="row.pics.map(i => i.thumb || i.url)"
+                        :preview-src-list="row.pic.map(i => i.thumb || i.url)"
                     ></el-image>
                 </template>
             </el-table-column>