xiongzhu 5 年之前
父節點
當前提交
afbc142cf8

+ 7 - 2
src/main/java/com/izouma/jiashanxia/domain/Package.java

@@ -1,5 +1,6 @@
 package com.izouma.jiashanxia.domain;
 package com.izouma.jiashanxia.domain;
 
 
+import com.izouma.jiashanxia.converter.StringArrayConverter;
 import com.izouma.jiashanxia.enums.SetType;
 import com.izouma.jiashanxia.enums.SetType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +11,7 @@ import lombok.NoArgsConstructor;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.util.List;
 
 
 @Data
 @Data
 @Builder
 @Builder
@@ -26,7 +28,8 @@ public class Package extends BaseEntity {
     private String title;
     private String title;
 
 
     @ApiModelProperty(value = "套餐标签")
     @ApiModelProperty(value = "套餐标签")
-    private String tag;
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> tag;
 
 
     @ApiModelProperty(value = "金额")
     @ApiModelProperty(value = "金额")
     private BigDecimal amount;
     private BigDecimal amount;
@@ -39,7 +42,9 @@ public class Package extends BaseEntity {
     private SetType type;
     private SetType type;
 
 
     @ApiModelProperty(value = "图")
     @ApiModelProperty(value = "图")
-    private String img;
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> img;
 
 
 //    @OneToMany(cascade = CascadeType.DETACH)
 //    @OneToMany(cascade = CascadeType.DETACH)
 //    @JoinColumn(name = "set_goods_id")
 //    @JoinColumn(name = "set_goods_id")

+ 0 - 8
src/main/vue/src/components/PackageEdit.vue

@@ -70,12 +70,6 @@ export default {
                 .get('package/get/' + this.$route.query.id)
                 .get('package/get/' + this.$route.query.id)
                 .then(res => {
                 .then(res => {
                     this.formData = res;
                     this.formData = res;
-                    if (res.tag !== '') {
-                        this.dynamicTags = res.tag.split(',');
-                    }
-                    if (res.img !== '') {
-                        this.formData.img = res.img.split(',');
-                    }
                 })
                 })
                 .catch(e => {
                 .catch(e => {
                     console.log(e);
                     console.log(e);
@@ -133,8 +127,6 @@ export default {
         },
         },
         submit() {
         submit() {
             let data = { ...this.formData };
             let data = { ...this.formData };
-            data.tag = this.dynamicTags.join(',');
-            data.img = this.formData.img.join(',');
             this.saving = true;
             this.saving = true;
             this.$http
             this.$http
                 .post('/package/save', data, { body: 'json' })
                 .post('/package/save', data, { body: 'json' })

+ 2 - 5
src/main/vue/src/views/PackageList.vue

@@ -31,9 +31,9 @@
                 <template slot-scope="{ row }">
                 <template slot-scope="{ row }">
                     <el-image
                     <el-image
                         style="width: 30px; height: 30px"
                         style="width: 30px; height: 30px"
-                        :src="splImg(row.img)[0]"
+                        :src="row.img[0]"
                         fit="cover"
                         fit="cover"
-                        :preview-src-list="splImg(row.img)"
+                        :preview-src-list="row.img"
                     ></el-image>
                     ></el-image>
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
@@ -175,9 +175,6 @@ export default {
                         this.$message.error(e.error);
                         this.$message.error(e.error);
                     }
                     }
                 });
                 });
-        },
-        splImg(row) {
-            return row != null ? row.split(',') : [];
         }
         }
     }
     }
 };
 };