Merge remote-tracking branch 'origin/feature/0905_登录注册流程重构' into test

README.md

@@ -11,7 +11,7 @@
 - dayjs
 - lodash
 - ant-design-vue
-- less
+- scss
 - eslint + prettier
 
 ### 项目启动

src/styles/components/ant-select.scss

@@ -35,6 +35,74 @@
   &.ant-select-status-error {
     border-color: $color-error !important;
   }
+
+
+}
+
+.ant-select {
+  .ant-select-selector {
+    height: 32px !important;
+  }
+
+  &.ant-select-lg {
+    .ant-select-selector {
+      height: 36px !important;
+    }
+  }
+
+  &.ant-select-sm {
+    .ant-select-selector {
+      height: 28px !important;
+    }
+  }
+
+  &.ant-select-multiple {
+    .ant-select-selector {
+      padding: 0 12px 0 4px !important;
+
+      .ant-select-selection-overflow-item {
+        .ant-select-selection-item {
+          border-radius: 4px;
+          background: #E6E6E8;
+          border: none;
+          padding: 1px 8px;
+
+          .ant-select-selection-item-remove {
+            color: #737478;
+          }
+        }
+      }
+    }
+
+    &.ant-select-lg {
+      .ant-select-selector {
+        .ant-select-selection-overflow-item {
+          .ant-select-selection-item {
+            height: 24px;
+            line-height: 24px;
+          }
+
+        }
+      }
+    }
+
+    &.ant-select-sm {
+      .ant-select-selector {
+        .ant-select-selection-overflow-item {
+          .ant-select-selection-item {
+            height: 22px;
+            line-height: 22px;
+
+            .ant-select-selection-item-content {
+              font-size: 12px;
+            }
+          }
+
+        }
+      }
+    }
+  }
+
 }
 
 .ant-select.ant-select-single {
@@ -52,18 +120,3 @@
     }
   }
 }
-.ant-select.ant-select-multiple {
-  .ant-select-selection-search-input {
-    min-height: 32px !important;
-  }
-  &.ant-select-lg {
-    .ant-select-selection-search-input {
-      min-height: 36px !important;
-    }
-  }
-  &.ant-select-sm {
-    .ant-select-selection-search-input {
-      min-height: 28px !important;
-    }
-  }
-}

src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue

@@ -297,7 +297,7 @@ export default {
           model={form.value}
           rules={rules}
           layout="horizontal"
-          labelAlign="right"  
+          labelAlign="right"
           labelCol={{ span: 4 }}
           wrapperCol={{ span: 20 }}
         >