Merge pull request '编辑商品-商品推荐回显、商品相册同名删除问题' (#24) from zyj into master

Reviewed-on: #24

src/views/product/productAdd/components/CustomUpload.vue

@@ -57,7 +57,7 @@ export default {
             this.fileList.push(Object.assign(file, { url }));
         },
         handleRemove(file) {
-            this.fileList = this.fileList.filter(item => item.name !== file.name)
+            this.fileList = this.fileList.filter(item => item !== file)
         },
         handlePictureCardPreview(file) {
             this.dialogImageUrl = file.url;

src/views/product/productAdd/newIndex.vue

@@ -637,6 +637,7 @@ export default {
       // })
       this.$refs.CustomUpload.fileList = [...this.formValidate.images.filter(item => item.mainMark == '1')]
       this.$refs.CustomLBUpload.fileList = [...this.formValidate.images.filter(item => item.mainMark != '1')]
+      this.formValidate.recommendOrNewMark = data.newMark == '1' ? '1' : '2'
       await this.confirm()
       this.$nextTick(() => {
         this.formValidate.attr = this.formValidate.attr