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

src/components/CommodityMan/goodsListEdit.vue

@@ -1422,7 +1422,6 @@
             GradeCommissionList: this.GradeCommissionList
           };
           this.disList1.push(objNew);
-          console.log("this.addMsg.GoodsDetails",this.addMsg.GoodsDetails)
           this.$refs.ue.SetVal(this.addMsg.GoodsDetails);
         })
       },

src/components/StoreDesign/special.vue

@@ -141,7 +141,7 @@
                     <img :src="domainManager().ImageUrl+'/Static/video.png'" alt="">
                     <div class="component-name">视频</div>
                   </div>
-                  <div class="component-item" @click="setPlugin('imgtext')">
+                  <div class="component-item" @click="setPlugin('image-text')">
                     <img :src="domainManager().ImageUrl+'/Static/image-text.png'" alt="">
                     <div class="component-name">图文详情</div>
                   </div>
@@ -166,7 +166,7 @@
                         :index="index" :dataLeng="pluginData.length"></rubik>
                       <myvideo v-if="item.Id=='video'" :videoData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
                         :index="index" :dataLeng="dataList.length"></myvideo>
-                      <imageText v-if="item.Id=='imgtext'" :imageData="item" @getSord="getSord"
+                      <imageText v-if="item.Id=='image-text'" :imageData="item" @getSord="getSord"
                         @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></imageText>
                     </div>
                   </div>
@@ -328,7 +328,6 @@
       },
       //修改
       EditRole(item) {
-        console.log(item,'itemmm');
         this.speciaIsShowAdd=false;
         this.activeName='first';
         this.apipost("/api/MContent/GetTopic", {
@@ -404,9 +403,9 @@
             this.pluginData.push(videoObj);
             break;
             //图文详情
-          case 'imgtext':
+          case 'image-text':
             let tuwenObj = {
-              Id: 'imgtext',
+              Id: 'image-text',
               isCked: false,
               data: {
                 content: '',
@@ -448,7 +447,6 @@
         this.apipost("/api/MContent/GetTopicTypeList", {}, res => {
           if (res.data.resultCode == 1) {
             this.TypeList = res.data.data;
-
           } else {
             this.Info(res.data.message);
           }