diff --git a/src/views/productService/components/addProduct.vue b/src/views/productService/components/addProduct.vue index 13e515c..917fbce 100644 --- a/src/views/productService/components/addProduct.vue +++ b/src/views/productService/components/addProduct.vue @@ -352,8 +352,8 @@ poster: res?.poster, poster_url: res?.poster_url, merchantId: { - label: res.merchant.name, - value: res.merchant.id + label: res.merchant?.name, + value: res.merchant?.id }, shopIds: res?.shop_ids, productTypePid: res?.product_type_pid, @@ -423,7 +423,7 @@ submit() { - if (this.type === 'add') { + if (this.type === 'add'||this.type === 'copy') { store({ name: this.form.name, poster: this.form.poster, @@ -486,10 +486,10 @@ watch: { isShow(newVal) { if (newVal) { - - if (this.type === 'editor') { + if (this.type === 'editor'||this.type === 'copy') { this.getDetail() - } + } + } else { this.$refs['tinymce'].setContent(' ') this.$refs['dialog'].reset() diff --git a/src/views/productService/productServiceManage.vue b/src/views/productService/productServiceManage.vue index aed37c1..2adb918 100644 --- a/src/views/productService/productServiceManage.vue +++ b/src/views/productService/productServiceManage.vue @@ -99,9 +99,10 @@