From 8ff0eef01fa38bf7cc94d168c7b7f3eb79f474f6 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Fri, 4 Sep 2020 11:33:23 +0800
Subject: [PATCH] =?UTF-8?q?bug=E6=96=B0=E5=A2=9E=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activity/combination/form.vue | 6 +++---
 src/views/activity/seckill/form.vue     | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/views/activity/combination/form.vue b/src/views/activity/combination/form.vue
index a41ed7d..cca973e 100644
--- a/src/views/activity/combination/form.vue
+++ b/src/views/activity/combination/form.vue
@@ -774,6 +774,8 @@ export default {
           that.formValidate.header = [];
           that.generate(data.productId);
           that.manyFormValidate = data.attrs;
+          that.form1.good.productId = data.productId;
+          that.form1.good.image = data.image
           if(data.spec_type === 0){
             that.manyFormValidate = [];
           }else {
@@ -796,12 +798,10 @@ export default {
             ]
           }
         }
-
         that.treeSelect = res.cateList;
         that.ruleList = res.ruleList;
         that.templateList = res.tempList;
-        that.form1.good.productId = data.productId;
-        that.form1.good.image = data.image
+
       }).catch(res => {
         console.log('err:'+res)
         return this.$message({
diff --git a/src/views/activity/seckill/form.vue b/src/views/activity/seckill/form.vue
index fc74929..f396765 100644
--- a/src/views/activity/seckill/form.vue
+++ b/src/views/activity/seckill/form.vue
@@ -730,11 +730,9 @@ export default {
             ]
           }
         }
-
         that.treeSelect = res.cateList;
         that.ruleList = res.ruleList;
         that.templateList = res.tempList;
-
       }).catch(res => {
         console.log('err:'+res)
         return this.$message({
@@ -759,6 +757,8 @@ export default {
           that.formValidate.header = [];
           that.formValidate.image = data.image
           that.formValidate.sliderImageArr = data.slider_image
+          that.form1.good.productId = data.productId
+          that.form1.good.image = data.image
           that.generate(data.productId);
           that.manyFormValidate = data.attrs;
           if(data.spec_type === 0){
@@ -783,8 +783,7 @@ export default {
             ]
           }
         }
-        that.form1.good.productId = data.productId
-        that.form1.good.image = data.image
+
         that.treeSelect = res.cateList;
         that.ruleList = res.ruleList;
         that.templateList = res.tempList;
@@ -797,8 +796,6 @@ export default {
         });
       })
     },
-
-
     // 提交
     handleSubmit (name) {
       this.$refs[name].validate((valid) => {