up

src/views/productService/components/addProduct.vue

@@ -352,8 +352,8 @@
           poster: res?.poster,
           poster_url: res?.poster_url,
           merchantId: {
-            label: res.merchant.name,
+            label: res.merchant?.name,
-            value: res.merchant.id
+            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'||this.type === 'copy') {
-          if (this.type === 'editor') {
             this.getDetail()
-          }
+          }
+          
         } else {
           this.$refs['tinymce'].setContent(' ')
           this.$refs['dialog'].reset()

src/views/productService/productServiceManage.vue

@@ -99,9 +99,10 @@
 
     <xy-table :total="total" :list="list" :table-item="table"  @pageSizeChange="pageSizeChange" @pageIndexChange="pageChange">
       <template v-slot:btns>
-        <el-table-column fixed="right" label="操作" width="230" header-align="center">
+        <el-table-column fixed="right" label="操作" width="300" header-align="center">
           <template slot-scope="scope">
-            <Button type="primary" size="small" @click="editorShow(scope.row.id)">编辑</Button>
+            <Button type="primary" size="small" @click="editorShow(scope.row.id,'editor')">编辑</Button>
+            <Button type="primary" size="small" style="margin-left: 10px;" @click="editorShow(scope.row.id,'copy')">复制新增</Button>
             <Poptip
               transfer
               confirm
@@ -253,10 +254,10 @@ this.searchProducts();
         this.getProducts()
       })
     },
-    editorShow(id){
+    editorShow(id,type){
-      this.$refs['addProduct'].type = 'editor'
+      this.$refs['addProduct'].type = type;
-      this.$refs['addProduct'].id = id
+      this.$refs['addProduct'].id = id;
-      this.$refs['addProduct'].isShow = true
+      this.$refs['addProduct'].isShow = true;
     },
 
     async getProducts(){