调整样式

src/view/memberGroup/edit-tag.vue

@@ -104,6 +104,7 @@ export default {
       display: inline-block;
       margin-bottom: 5px;
       font-weight: 600;
+      color: #303133;
       .tag-flag {
         margin-left: 6px;
         padding: 3px 10px;

src/view/memberGroup/memberGroupEdit.vue

@@ -6,7 +6,7 @@
         <div class="memberGroupEdit-wrap__body">
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-ruleForm">
             <el-form-item label="" prop="selectedTag">
-              <div class="label-title">
+              <div :class="['label-title', {'m-l-60': ruleForm.selectedTags.length > 1}]">
                 已选标签
                 <span class="color-909399 font-14">（同一个输入框内标签关系为且）</span>
               </div>
@@ -21,12 +21,12 @@
               />
 
             </el-form-item>
-            <el-form-item label="" prop="groupName" class="w-220">
+            <el-form-item label="" prop="groupName" :class="['w-220', {'m-l-60': ruleForm.selectedTags.length > 1}]">
               <div class="label-title">分组名称</div>
               <el-input class="w-220" v-model="ruleForm.groupName" :maxlength="10" placeholder="请输入分组名称"> </el-input>
               <label class="input-label">{{ ruleForm.groupName.length }}/10</label>
             </el-form-item>
-            <el-form-item label="" prop="effectiveDateTmp">
+            <el-form-item label="" prop="effectiveDateTmp" :class="{'m-l-60': ruleForm.selectedTags.length > 1}">
               <div class="effective label-title">
                 分组有效期
                 <el-tooltip content="分组有效期需早于所用标签的最早有效期，且最长不超过365天">
@@ -36,12 +36,12 @@
               <el-date-picker v-model="ruleForm.effectiveDateTmp" type="date" value-format="yyyy-MM-dd HH:mm:ss" default-time="23:59:59" :picker-options="pickerOptions">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="" prop="describle" class="w-548">
+            <el-form-item label="" prop="describle" :class="['w-400', {'m-l-60': ruleForm.selectedTags.length > 1}]">
               <div class="label-title">分组描述</div>
-              <el-input class="w-548" type="textarea" v-model="ruleForm.describle" :maxlength="200" rows="4"> </el-input>
+              <el-input class="w-400" type="textarea" v-model="ruleForm.describle" :maxlength="200" rows="4"> </el-input>
               <label class="textarea-label">{{ ruleForm.describle.length }}/200</label>
             </el-form-item>
-            <el-form-item label="" prop="updateDay" v-show="ruleForm.isActive == 0">
+            <el-form-item label="" prop="updateDay" v-show="ruleForm.isActive == 0" :class="{'m-l-60': ruleForm.selectedTags.length > 1}">
               <div class="label-title">更新频率 <span class="form-tip-text">(更新时间预计选择日期的凌晨0点至6点)</span></div>
               <el-select class="w-200" v-model="ruleForm.updateType" placeholder="请选择" @change="ruleForm.updateDay = ''">
                 <el-option v-for="(item, index) in rateData" :key="item.label" :label="item.label" :value="index + 1"></el-option>
@@ -50,7 +50,7 @@
                 <el-option v-for="(item, index) in rateData[ruleForm.updateType ? ruleForm.updateType - 1 : 0].options" :key="item" :label="item" :value="index + 1"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="">
+            <el-form-item label="" :class="{'m-l-60': ruleForm.selectedTags.length > 1}">
               <el-button type="primary" @click.stop="confirmSavePost">{{$route.query.memberTagGroupId ? '保存': '创建会员分组'}}</el-button>
               <el-button>
                 <router-link to="/memberGroupList">返回</router-link>
@@ -570,6 +570,9 @@ export default {
 .m-l-60 {
   margin-left: 60px;
 }
+.w-460 {
+  width: 460px;
+}
 
 .memberGroupEdit-wrap__body {
   width: 100%;

src/view/memberGroup/tags-group.vue

@@ -13,7 +13,7 @@
         </el-popover>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item v-if="showAddMenu" @click.native="addTags">添加标签</el-dropdown-item>
-          <el-dropdown-item v-if="showDelMenu" @click.native="showDelPop = true">删除</el-dropdown-item>
+          <el-dropdown-item v-if="showDelMenu" @click.native="handleDelTagsGroup">删除</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
       <!--展示选中的标签-->
@@ -95,6 +95,14 @@ export default {
         tagsGroupIndex: this.tagsGroupIndex
       });
     },
+    // 删除一个标签组
+    handleDelTagsGroup() {
+      if (this.tagsData.length === 0) {
+        this.delTagsGroup();
+      } else {
+        this.showDelPop = true;
+      }
+    },
     // 添加一个标签
     addTags() {
       this.$emit('addTags', {
@@ -195,14 +203,6 @@ export default {
     &:hover {
       color: #303133;
       background: #e6e8ed;
-
-      i.icon-bianji1 {
-        color: #1890ff;
-      }
-
-      i.icon-guanbi {
-        color: #f56c6c;
-      }
     }
 
     &:last-child {
@@ -228,9 +228,15 @@ export default {
     i.icon-bianji1 {
       right: 25px;
       color: #c0c4cc;
+      &:hover {
+        color: #1890ff;
+      }
     }
     i.icon-guanbi {
       right: 5px;
+      &:hover {
+        color: #f56c6c;
+      }
     }
 
     .tags-group__tag-name {

src/view/platformTag/member-tag.vue

@@ -20,9 +20,7 @@
           <div class="tag-all">
             <p class="tag-name">
               <!--{{ tagName }}-->
-              <span>
-                {{showSearchResult ? `【${tagName}】搜索结果` : tagName}}
-              </span>
+              {{showSearchResult ? `【${tagName}】搜索结果` : tagName}}
               <el-button type="primary" class="add-newtag" @click="addNewTag" v-show="handTag == 1">新增标签</el-button>
             </p>
 
@@ -693,6 +691,7 @@ export default {
   .member-box {
     padding-bottom: 20px;
     margin: 20px 32px 0;
+    min-height: 70vh;
     background-color: #fff;
     .tag-input {
       padding: 16px 20px;

src/view/platformTag/second-tag.vue

 <template>
   <div class="second">
-    <span class="name" :class="{ 'manual-name': tagName === '手工标签', 'light-active': tagList.name === tagRealName }" @click="handleSecondtag(tagList)"> {{ tagList.name }} </span>
+    <span class="name" :class="{ 'manual-name': tagName === '手工标签', 'light-active': tagList.name === tagRealName }" @click="handleSecondtag(tagList)">
+      <span>{{ tagList.name }}</span>
+    </span>
     <i class="arrow-line iconfont icon-next-" v-if="tagName !== '手工标签'"></i>
     <el-popover placement="bottom" width="30" trigger="click">
       <li class="more" @click="addNewType">新增子分类</li>
@@ -289,7 +291,7 @@ export default {
     position: relative;
     top: 1px;
     float: left;
-    &:hover {
+    span:hover {
       color: #1890ff;
     }
   }