Merge branch 'feature/4月会员分组'

src/view/manualTag/delete-tag-dialog.vue

 <template>
   <el-dialog :visible.sync="visible" custom-class="delete-dialog" width="416px" :show-close="false">
     <div class="delete-dialog-content">
-      <i class="el-alert__icon el-icon-warning is-big icon" />
+      <i class="el-alert__icon el-icon-warning is-big" />
       <h2>确认删除该标签吗？</h2>
       <p class="desc">{{ desc }}</p>
       <p v-for="item in list" :key="item.memberTagGroupId" class="item">
@@ -117,7 +117,7 @@ export default {
 .ml10 {
   margin-left: 10px;
 }
-.icon {
+.delete-dialog-content .el-alert__icon.is-big {
   font-size: 21px;
   position: absolute;
   color: #fa8c16;