licailing 3 лет назад
Родитель
Сommit
a0f2696d87

+ 12 - 0
src/main/java/com/izouma/nineth/domain/News.java

@@ -34,4 +34,16 @@ public class News extends BaseEntity {
 
     @Transient
     private boolean liked;
+
+    @ApiModelProperty("跳转")
+    private boolean link;
+
+    @ApiModelProperty("按钮名称")
+    private String buttonName;
+
+    @ApiModelProperty("跳转类型")
+    private String linkType;
+
+    @ApiModelProperty("跳转内容")
+    private String linkContent;
 }

+ 41 - 7
src/main/vue/src/views/NewsEdit.vue

@@ -11,10 +11,10 @@
                     :model="formData"
                     :rules="rules"
                     ref="form"
-                    label-width="66px"
+                    label-width="90px"
                     label-position="right"
                     size="small"
-                    style="max-width: 550px"
+                    style="max-width: 600px"
                 >
                     <el-form-item prop="title" label="标题">
                         <el-input v-model="formData.title"></el-input>
@@ -33,10 +33,32 @@
                         <div class="tip">数字越大排序越靠前,相同数值按创建时间倒序排列</div>
                     </el-form-item>
                     <el-form-item prop="display" label="显示">
-                        <el-radio-group v-model="formData.dispaly">
-                            <el-radio :label="true">是</el-radio>
-                            <el-radio :label="false">否</el-radio>
-                        </el-radio-group>
+                        <el-radio v-model="formData.display" :label="true">是</el-radio>
+                        <el-radio v-model="formData.display" :label="false">否</el-radio>
+                    </el-form-item>
+                    <el-form-item prop="link" label="跳转">
+                        <el-switch v-model="formData.link"></el-switch>
+                    </el-form-item>
+                    <el-form-item prop="buttonName" label="按钮名称" v-if="formData.link">
+                        <el-input v-model="formData.buttonName"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="linkType" label="跳转类型" v-if="formData.link">
+                        <el-select v-model="formData.linkType">
+                            <el-option
+                                v-for="item in linkTypeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="linkContent" label="跳转内容" v-if="formData.link">
+                        <el-input
+                            v-if="formData.linkType === 'collections'"
+                            v-model="formData.linkContent"
+                            placeholder="输入藏品名称"
+                        ></el-input>
+                        <el-input v-else v-model="formData.linkContent" placeholder="输入ID"></el-input>
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
@@ -85,7 +107,19 @@ export default {
                         trigger: 'blur'
                     }
                 ]
-            }
+            },
+            typeOptions: [
+                { label: '首页', value: 'HOME' },
+                { label: '发现页', value: 'DISCOVER' },
+                { label: '铸造者', value: 'MINTER' },
+                { label: '二手市场', value: 'MARKET' }
+            ],
+            linkTypeOptions: [
+                { label: '藏品/盲盒', value: 'collection' },
+                { label: '铸造者', value: 'user' },
+                { label: '活动', value: 'activity' },
+                { label: '多个藏品', value: 'collections' }
+            ]
         };
     },
     methods: {

+ 14 - 1
src/main/vue/src/views/NewsList.vue

@@ -64,6 +64,13 @@
                     <el-tag type="info" v-else>否</el-tag>
                 </template>
             </el-table-column>
+             <el-table-column prop="link" label="跳转">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.link ? 'success' : 'info'">{{ row.link ? '是' : '否' }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="linkType" label="跳转类型" :formatter="linkTypeFormatter"> </el-table-column>
+            <el-table-column prop="linkContent" label="跳转内容"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="150">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
@@ -106,7 +113,13 @@ export default {
             multipleMode: false,
             search: '',
             url: '/news/all',
-            downloading: false
+            downloading: false,
+            typeOptions: [
+                { label: '首页', value: 'HOME' },
+                { label: '发现页', value: 'DISCOVER' },
+                { label: '铸造者', value: 'MINTER' },
+                { label: '二手市场', value: 'MARKET' }
+            ]
         };
     },
     computed: {