Merge branch 'feature/7月迭代-会员' into test

src/components/allCustomers/components/customerlabelDialog.vue

@@ -305,7 +305,8 @@ export default {
 .customer-dialog .el-dialog__body {
   padding-bottom: 0;
   .tags-list {
-    max-height: 240px;
+    max-height: 55vh;
+    // max-height: 240px;
     overflow: auto;
   }
 }
@@ -317,7 +318,8 @@ export default {
     padding-top: 0;
   }
   .el-tabs__content {
-    height: 247px;
+    height: 56vh;
+    // height: 247px;
     padding-left: 20px;
     overflow-y: scroll;
     .tag-item-new {