update: 会员分组

src/view/memberGroup/memberGroupEdit.vue

@@ -632,7 +632,8 @@ export default {
         tagType, // 标签类型 手工标签传1
         pageNum: this.pageNum,
         pageSize: this.pageSize,
-        orderType: -1
+        orderType: -1,
+        showMemberCount: 1
       };
       getMemberTagList(params).then(res => {
         if (res.result.result && res.result.result.length) {

src/view/memberGroup/memberGroupList.vue

@@ -4,7 +4,7 @@
       <el-tabs v-model="activeType" class="tabs" @tab-click="onTabClick">
         <el-tab-pane label="我的客户分组" name="1"></el-tab-pane>
         <el-tab-pane label="固化分组" name="2"></el-tab-pane>
-        <el-tab-pane label="金字塔客户分组" name="3" v-if="!($store.state.enableAccessControl && !$store.state.isSuperAdmin)"></el-tab-pane>
+        <el-tab-pane label="金字塔客户分组" name="3"></el-tab-pane>
       </el-tabs>
     </div>
     <div class="right-content">
@@ -481,18 +481,23 @@
     <batch-list :batchVisiable.sync="batchVisiable" @refresh-list="refreshList" :operateNumber="operateNumber" :multipleSelection="multipleSelection" @submit="getGroupList" @after-del="handleDelGroupMsg"></batch-list>
 
     <el-dialog title="提示" :visible.sync="dialogDelTips.show" width="480px">
-      <p>{{ dialogDelTips.isSingle ? '当前' : '存在' }}分组正在被以下模块使用，请先删除对应的内容后再来删除分组</p>
-      <div v-if="dialogDelTips.isSingle" class="error-tips">
-        <p v-for="i in dialogDelTips.list" :key="i.link">
-          <a target="_blank" class="error-tip-link" :href="i.link">{{ i.name }}</a>
-        </p>
-      </div>
-      <div v-else class="error-tips">
-        <div class="error-tip-row" v-for="(row, k) in dialogDelTips.list" :key="k">
-          <span class="label">{{ row.groupName }}：</span>
-          <p v-for="i in row.list" :key="i.link">
-            <a target="_blank" class="error-tip-link" :href="i.link">{{ i.name }}</a>
-          </p>
+      <div class="fixed-dialog">
+        <i class="el-alert__icon el-icon-warning is-big icon" />
+        <div>
+          <p>{{ dialogDelTips.isSingle ? '当前' : '存在' }}分组正在被以下模块使用，请先删除对应的内容后再来删除分组</p>
+          <div v-if="dialogDelTips.isSingle" class="error-tips">
+            <p v-for="i in dialogDelTips.list" :key="i.link">
+              <a target="_blank" class="error-tip-link" :href="i.link">{{ i.name }}</a>
+            </p>
+          </div>
+          <div v-else class="error-tips">
+            <div class="error-tip-row" v-for="(row, k) in dialogDelTips.list" :key="k">
+              <span class="label">{{ row.groupName }}：</span>
+              <p v-for="i in row.list" :key="i.link">
+                <a target="_blank" class="error-tip-link" :href="i.link">{{ i.name }}</a>
+              </p>
+            </div>
+          </div>
         </div>
       </div>
     </el-dialog>
@@ -1761,4 +1766,15 @@ export default {
   width: 100%;
   margin-top: 12px;
 }
+.icon {
+  font-size: 21px;
+  position: relative;
+  top: -4px;
+  display: inline-block;
+  color: #fa8c16;
+}
+.fixed-dialog {
+  display: flex;
+  align-items: flex-start;
+}
 </style>