合并dev分支

src/view/memberGroup/memberGroupEdit.vue

@@ -4,28 +4,11 @@
     <div class="right-content">
       <div class="right-box">
         <div class="memberGroupEdit-wrap__body">
-<<<<<<< .merge_file_a08516
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm">
             <el-form-item label="" prop="selectedTags">
               <div>
                 已选标签
                 <span class="color-909399 font-14">（同一个输入框内标签关系为且）</span>
-=======
-          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-ruleForm">
-            <el-form-item label="" prop="selectedTag">
-              <div class="memberGroupEdit-wrap__item__title">
-                已选标签<span class="color-c0c4cc font-14">（筛选同时符合下列条件的会员）</span>
-                <el-button type="text" class="m-l-220" @click="showAddTag">添加标签</el-button>
-              </div>
-
-              <div class="memberGroupEdit-wrap__tags w-548 border-box">
-                <div class="memberGroupEdit-wrap__tagcell" v-for="(item, index) in selectedTagData" :key="index">
-                  <span>{{ item.tagName }}</span>
-                  <span class="memberGroupEdit-wrap__tag-name">【选择:{{ item.newTagVal }}】</span>
-                  <i class="el-icon-edit" @click="editSelTag(index, item)"></i>
-                  <i class="el-icon-delete" @click="delSelTag(index, item)"></i>
-                </div>
->>>>>>> .merge_file_a11172
               </div>
               <tags-group-list
                 :selectedTagsData="ruleForm.selectedTags"
@@ -487,11 +470,7 @@ export default {
           searchName: this.searchData
         });
       }
-<<<<<<< .merge_file_a08516
-=======
-      console.log(this.selectedTagData);
       that.handleReturnData(that.selectedTagData);
->>>>>>> .merge_file_a11172
     },
     // 点击tree 选择标签组
     treeClick(data, node) {