Merge branch 'bugfix/保存标签' into master

src/components/tagDetail/mixin/index.js

@@ -863,8 +863,8 @@ export default {
       }
 
       /* 属于/不属于+ 选项 */
-
       if (that.templateData.length == 2) {
+       
         for (let ele of that.templateData) {
           // 选项
           if (ele.templateCode === 'tag001') {
@@ -1265,7 +1265,7 @@ export default {
             that.closeTagShortDialog();
             // 如果来源是 会员标签编辑的时候
             // if (that.fromFlag == 'memberGroup') {
-              console.log(tagParams, JSON.stringify(tagParams));
+              // console.log(tagParams, JSON.stringify(tagParams));
               let sendObj = {
                 tagId: that.tagShortId || this.tagId,
                 tagValue: JSON.stringify(tagValue),
@@ -1274,7 +1274,6 @@ export default {
                 isActive: that.tagData.isActive,
                 templateCode: this.templateCode
               };
-              console.log(sendObj);
               this.$emit('returnTagData', sendObj);
           }
         })
@@ -1888,7 +1887,7 @@ export default {
               return false;
             }
             that.templateData.push(that[resData.result.templateCode]);
-
+console.log('that.templateData===>',that.templateData)
             /**
              * 这里处理编辑回显数据
              * 这里拿到编辑的数据 然后把tagValue的value值传解析传给模板的v-model
@@ -1896,7 +1895,6 @@ export default {
              */
             setTimeout(_ => {
               this.templateCode = this.templateData.map(el => el.templateCode);
-
               if (this.templateDataList.editCondition) {
                 this.replaceTemplateValue();
               } else {

src/view/manualTag/manualTagDetail.vue

@@ -2151,7 +2151,6 @@ export default {
       const para = {
         widgetId: id
       };
-
       getRequest('/memberTag/findWidget', para)
         .then(res => {
           // console.log(res,res.data,res.data.errorCode)

src/view/platformTag/platformTagDetail.vue

@@ -2100,7 +2100,6 @@ export default {
       const para = {
         widgetId: id
       };
-
       getRequest('/memberTag/findWidget', para)
         .then(res => {
           let resData = res.data;