Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/pintuan/pintuanSet.vue

@@ -326,8 +326,8 @@
             </el-switch>
           </el-form-item>
           <el-form-item label="样式选择" size="mini">
-            <div class="block-box" v-for="(item,index) in styleList" :key="index" :class="item.Style==msg.Style?'active':''"
-              @click="getStyleType(item)">
+            <div class="block-box" v-for="(item,index) in styleList" :key="index"
+              :class="item.Style==msg.Style?'active':''" @click="getStyleType(item)">
               <img src="../../assets/img/storeDesign/select.png" class="Cubeselect" alt="" />
               <div class="opacity"></div>
               <el-button class="imgCube_chooseBtn" type="primary">启用该样式</el-button>
@@ -544,6 +544,9 @@
         for (var i = 0; i < item.size.length; i++) {
           this.msg.MagicDataList.push(this.defaultMsg[i]);
         }
+        this.msg.MagicDataList.forEach((x, index) => {
+          x.size = this.styleList[(item.Id-1)].size[index]
+        })
       },
       //保存拼团配置
       saveGroupBuyConfig() {