update: 标签

src/components/Trash.vue

@@ -18,7 +18,7 @@
       </ul>
       <span slot="footer">
         <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="doClean" :disabled="delTime > 0 || !trashList.length">{{ delTime > 0 ? getDelTime() : '删除' }}</el-button>
+        <el-button type="primary" @click="doClean" :disabled="!trashList.length">{{ delTime > 0 ? getDelTime() : '删除' }}</el-button>
       </span>
     </el-dialog>
   </div>
@@ -79,7 +79,7 @@ export default {
       return `倒计时: ${h}h:${m}min:${s}s`;
     },
     doClean() {
-      if (this.delTime) return;
+      if (this.delTime > 0) return this.$message.error('当前有正在删除的标签/标签值，删除完成后才能再次操作删除任务');
       cleanTrashList().then(res => {
         const { errorCode, message } = res;
         if (errorCode != 1) return this.$message.error(message);

src/view/manualTag/manualTagEdit.vue

@@ -67,7 +67,7 @@ const validateTagValue = (rule, value, cb) => {
 const validateTagSort = (rule, value, cb) => {
   const res = /^[0-9]+$/;
   if (!res.test(value) || value > 100000 || value < 1) {
-    cb(new Error('仅支持输入1-1-100000之间的整数'))
+    cb(new Error('仅支持输入1-100000之间的整数'))
   }
   cb();
 }

src/view/platformTag/member-tag.vue

@@ -19,7 +19,7 @@
 
           <div class="tag-all">
             <p class="tag-name">
-              <span class="sub-title"><dm-sub-title :text="showSearchResult ? `【${tagName}】搜索结果` : tagName"/></span>
+              <span class="sub-title"></span>
               <el-button
                 type="primary"
                 class="add-newtag"
@@ -40,7 +40,7 @@
                 class="add-newtag"
                 placeholder="请输入标签名称"
                 prefix-icon="el-icon-search"
-                style="width: 260px"
+                style="width: 260px;float: left"
                 v-model="memberTag"
                 @keyup.native.enter="searchMemberList"
                 @clear="allTagList"
@@ -757,6 +757,7 @@ export default {
     },
     // 点击活动标签、手工标签
     handleClick() {
+      this.params.pageNum = 1;
       this.memberTag = '';
       const { activeTag, tagList, allTagList, handleFristTag } = this;
       if (activeTag === 'system') {
@@ -939,6 +940,7 @@ export default {
       padding-bottom: 40px;
       overflow-y: auto;
       .tag-name {
+        overflow: hidden;
         line-height: 34px;
         padding: 20px;
         font-size: 16px;
@@ -951,7 +953,6 @@ export default {
       }
       .add-newtag {
         float: right;
-        margin-bottom: 10px;
         margin-left: 15px;
       }
     }

src/view/platformTag/tag-container-active.vue

@@ -179,6 +179,7 @@ export default {
   cursor: pointer;
   color: #303133;
   transition: all .3s;
+  color: #2f54eb;
   &:hover {
     transform: scale(1.25);
   }

src/view/platformTag/tag-container-system.vue

@@ -124,6 +124,7 @@ export default {
   cursor: pointer;
   color: #303133;
   transition: all 0.3s;
+  color: #2f54eb;
   &:hover {
     transform: scale(1.25);
   }
@@ -143,11 +144,9 @@ export default {
   line-height: 22px;
   font-size: 12px;
   &.keep-active {
-    background: #dee3fc;
     color: #2f54eb;
   }
   &.no-active {
-    background: #feecda;
     color: #fa8c16;
   }
 }

src/view/platformTag/tag-container.vue

@@ -236,6 +236,7 @@ export default {
   font-size: 16px;
   cursor: pointer;
   transition: all .3s;
+  color: #2f54eb;
   &:hover {
     transform: scale(1.25);
   }