update: 标签

src/components/Trash.vue

@@ -2,7 +2,7 @@
   <div id="trash">
     <el-popover placement="top-start" trigger="hover" content="一键清除废弃标签值">
       <div slot="reference" class="trash" @click="dialogVisible = true">
-        <el-badge :value="trashList.length" class="badge">
+        <el-badge :value="trashList.length > 99 ? '99+' : trashList.length" class="badge">
           <i class="iconfont icon-delete trashIcon"></i>
         </el-badge>
       </div>

src/view/manualTag/manual-tag-value-edit-info.vue

@@ -254,7 +254,7 @@
       projectName="member-tag"
     ></vue-gic-export-excel>
     <!--表格字段导出-->
-    <dm-table-filed :visible.sync="tableFiledVisible" projectName="member-tag" pageName="memberTag" :max="8" :defaultDisabled="['memberName']" @submit="onSubmiTableFiled" />
+    <dm-table-filed :visible.sync="tableFiledVisible" projectName="member-tag" pageName="memberTag" :max="20" :defaultDisabled="['memberName']" @submit="onSubmiTableFiled" />
   </div>
 </template>
 <script>

src/view/platformTag/member-tag.vue

@@ -291,7 +291,7 @@ export default {
       ],
       tagList: [],
       memberTagList: [], // 会员标签列表
-      tagName: '全部标签',
+      tagName: '全部系统标签',
       memberTag: '', // 搜索会员标签关键字
       showSearchResult: false, // tagName后面加“搜索结果”
       tagCategory: '', // 当前标签类别
@@ -442,7 +442,7 @@ export default {
       this.params.id = '';
       this.params.type = -1;
       this.loadMemberTagList(this.params);
-      this.tagName = '全部标签';
+      this.tagName = '全部系统标签';
       this.handTag = null;
       this.pageNum = 1;
       this.$store.commit('modiftTagName', '我的用户');
@@ -594,12 +594,13 @@ export default {
     },
 
     async loadMemberTagList(opt) {
+      const tagType =  this.activeTag == 'active' ? '2' : this.activeTag == 'manual' ? '-1' : '0';
       try {
         const params = {
           requestProject: 'gic-member-tag-web',
           search: opt.searchName || null, // 标签名
           tagLevelGroupId: opt.id || '', // 标签层级
-          tagType: opt.type || null, // 标签类型
+          tagType, // 标签类型
           showMemberCount: 1, // 覆盖人数
           pageNum: opt.pageNum || 1,
           pageSize: opt.pageSize || 20,
@@ -659,7 +660,7 @@ export default {
       if (this.memberTag) {
         this.tagName = this.memberTag;
       } else {
-        this.tagName = '全部标签';
+        this.tagName = '全部系统标签';
       }
       this.handTag = null;
       this.loadMemberTagList({
@@ -667,7 +668,6 @@ export default {
         showSearchResult: true
       });
       this.pageNum = 1;
-      // this.tagName = '全部标签';
       this.handTag = null;
     },
     // 一级标签
@@ -686,7 +686,7 @@ export default {
       this.changeTagTitle(list.name);
     },
     changeTagTitle(name) {
-      this.tagName = name || '全部标签';
+      this.tagName = name || '全部系统标签';
       this.$store.commit('modiftTagName', this.tagName);
     },
     saveTagLevelGroupId(list = {}) {