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

src/components/pintuan/pintuanPlugin/goodsSpecifica.vue

@@ -49,6 +49,47 @@
     align-items: center;
     padding: 10px 0;
 }
+.goodsSpecifica .app-attr-group .attr-list {
+    display: inline-block;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    position: relative;
+}
+.goodsSpecifica .app-attr-group .close {
+    position: absolute;
+    top: -4px;
+    right: -4px;
+    font-size: 16px;
+    cursor: pointer;
+}
+.goodsSpecifica .box-grow-0 {
+    min-width: 0;
+    -webkit-box-flex: 0;
+    flex-grow: 0;
+    flex-shrink: 0;
+}
+.goodsSpecifica .app-attr-group .img-box {
+    position: relative;
+    height: 100px;
+    width: 100px;
+    margin-top: 8px;
+    border: 1px solid #ebeef5;
+}
+
+.goodsSpecifica .app-attr-group .attr-jt {
+    background: #ffffff;
+    width: 6px;
+    height: 6px;
+    border-top: 1px solid rgb(235, 238, 245);
+    border-right: 1px solid #ebeef5;
+    transform: rotate(-45deg);
+    -o-transform: rotate(-45deg);
+    -webkit-transform: rotate(-45deg);
+    -moz-transform: rotate(-45deg);
+    -ms-transform: rotate(-45deg);
+    position: absolute;
+    top: -5px;
+}
 </style>
 <template>
   <div>
@@ -202,12 +243,20 @@
         <el-button type="primary" size="small" @click="chooseSpecificationValueList">确定选择</el-button>
       </div>
     </el-dialog>
+    <!-- 选择图片 -->
+    <el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
+      <ChooseImg @SelectId="SelectId" :IsMultiple="true"></ChooseImg>
+    </el-dialog>
 
   </div>
 
 </template>
 <script>
+  import ChooseImg from "@/components/global/ChooseImg.vue";
   export default {
+    components:{
+      ChooseImg
+    },
     data() {
       return {
         SpecificationList: [], //规格数组
@@ -228,6 +277,7 @@
         ggplList: [],
         speciList: [],
         DropdownList: [],
+        huiyList: [],
 
         SeparateDistributionType: 1,  //待传递给父组件
         EnjoyMember: 1,  //待传父组件
@@ -546,6 +596,33 @@
           });
         });
       },
+      //选择图片
+      SelectId(msg) {
+        let that = this;
+        if (msg && msg.length > 0) {
+          if (this.imgType == 1) {
+            msg.forEach(item => {
+              let obj = {
+                Id: item.selectId,
+                Path: that.getIconLink(item.url),
+              };
+              this.addMsg.CarouselImageList.push(obj);
+            })
+          }
+          if (this.imgType == 2) {
+            this.addMsg.CustomShareImage = that.getIconLink(msg[0].url);
+          }
+          if (this.imgType == 3) {
+            let imgListIndex1 = this.imgListIndex1;
+            let imgListIndex2 = this.imgListIndex2;
+            this.SpecificationList[imgListIndex1].SpecificationValueList[
+              imgListIndex2
+            ].Image = that.getIconLink(msg[0].url);
+          }
+        }
+        this.changeState = false;
+      },
+
       TbaleSelectionChange(val) {
         this.ggplList = val;
       },
@@ -587,6 +664,9 @@
           }
         });
       },
+      CheckBox(val) {
+        console.log(val,'valll');
+      },
 
     },
     mounted() {

src/components/sallCenter/plugin/rubik.vue

@@ -12,6 +12,7 @@
     cursor: pointer;
     color: #c9c9c9;
     z-index: 11;
+    background-color: #fff;
   }
 
   .diy-component-preview {
@@ -78,8 +79,9 @@
         style="right: -25px; top: 30px;"></el-button>
     </div>
     <div class="diy-rubik">
-      <div class="diy-component-preview">
-        <div :style="{marginTop:rubData.data.top+'px',marginRight:rubData.data.right+'px',marginBottom:rubData.data.bottom+'px',marginLeft:rubData.data.left+'px'}">
+      <div class="diy-component-preview" :style="{backgroundColor:rubData.data.background}">
+        <div :style="{marginTop:rubData.data.top+'px',marginRight:rubData.data.right+'px',marginBottom:rubData.data.bottom+'px',
+        marginLeft:rubData.data.left+'px'}">
           <div class="layout" :style="blockStyle(rubData.data.style)" :class="{'defaultImg':rubData.data.style==8}"
             @click="blockClick">
             <div class="rubik" style="width:100%;height:100%;" @mousemove="blockMove"
@@ -142,6 +144,13 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="背景色">
+                    <el-color-picker v-model="rubData.data.background"></el-color-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <el-form-item label="样式">
                 <div flex="dir:left" style="flex-wrap: wrap;">
                   <div class="block" @click="selectStyle(index)" :class="blockActive(index)"

src/components/sallCenter/templateEdit.vue

@@ -651,7 +651,8 @@
                 top:0, // 上边距
                 right:0, //右边距
                 bottom:0, //下边距
-                left:0 //左边距
+                left:0, //左边距
+                background:'', //背景颜色
               }
             }
             this.dataList.push(rubObj);