瀏覽代碼

style: 调整antd日历组件暗黑模式样式

Jack Zhou 3 周之前
父節點
當前提交
f7dd711d58

+ 35 - 12
src/styles/Antdui.scss

@@ -24,8 +24,8 @@
 .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-selected .ant-picker-cell-inner,
 .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-start .ant-picker-cell-inner,
 .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-range-end .ant-picker-cell-inner {
-  background-color: var(--color-theme);
-  color: #ffffff;
+  background-color: var(--color-theme) !important;
+  color: #ffffff !important;
 }
 .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range::before {
   background-color: var(--color-orange-6);
@@ -43,9 +43,29 @@
 .ant-picker-dropdown .ant-picker-cell-in-view.ant-picker-cell-in-range {
   color: var(--color-theme);
 }
-.ant-picker-cell:hover:not(.ant-picker-cell-in-view):not(.custom-delivery-calendar .ant-picker-cell) {
+
+.ant-picker-dropdown .ant-picker-cell::before {
+  height: 32px;
+}
+.ant-picker-cell.ant-picker-cell-in-view:hover .ant-picker-cell-inner {
   background-color: var(--color-orange-6) !important;
+  color: var(--color-theme) !important;
+}
+.ant-picker-dropdown .ant-picker-cell:hover:not(.ant-picker-cell-selected):not(.ant-picker-cell-range-start):not(.ant-picker-cell-range-end):not(.ant-picker-cell-range-hover-start):not(.ant-picker-cell-range-hover-end) .ant-picker-cell-inner {
+  background-color: var(--color-orange-6);
+}
+.ant-picker-dropdown .ant-picker-cell .ant-picker-cell-inner {
+  height: 32px;
+  width: 32px;
+  margin: 0 auto;
+}
+.ant-picker-cell:hover:not(.ant-picker-cell-in-view):not(.custom-delivery-calendar .ant-picker-cell) {
+  background-color: transparent ;
   color: var(--color-theme);
+  .ant-picker-cell-inner {
+    background-color: var(--color-orange-6) !important;
+    color: var(--color-theme) !important;
+  }
 }
 .ant-picker-dropdown
   .ant-picker-date-panel
@@ -199,16 +219,14 @@ tr
     color: var(--color-neutral-1);
   }
 }
-:where(.css-dev-only-do-not-override-1p3hq3p).ant-picker-dropdown  div.ant-picker-cell-inner{
+.ant-picker-dropdown  div.ant-picker-cell-inner{
   color: var(--color-el-date-prev);
 }
 
-:where(.css-dev-only-do-not-override-1p3hq3p).ant-picker-dropdown .ant-picker-cell-in-view .ant-picker-cell-inner{
+.ant-picker-dropdown .ant-picker-cell-in-view .ant-picker-cell-inner{
   color: var(--color-neutral-1);
 }
-// :not(.ant-picker-cell-in-view).ant-picker-dropdown .ant-picker-cell .ant-picker-cell-inner {
-//   color: var(--color-el-date-prev);
-// }
+
 .ant-checkbox-checked .ant-checkbox-inner {
   background-color: var(--color-theme) !important;
   border-color: var(--color-theme) !important;
@@ -255,7 +273,7 @@ tr
   }
 }
 
-:where(.css-dev-only-do-not-override-1p3hq3p).ant-select-dropdown {
+div.ant-select-dropdown {
   background-color: var(--management-bg-color);
 }
 .ant-select:not(.ant-select-customize-input) div.ant-select-selector {
@@ -263,9 +281,14 @@ tr
   border-color: var(--color-select-border);
 }
 
- :where(.css-dev-only-do-not-override-1p3hq3p).ant-select-single.ant-select-open .ant-select-selection-item {
-    color: var(--color-neutral-1);
- }
+.ant-select-focused.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer) div.ant-select-selector {
+  border-color: var(--color-theme) !important;
+}
+
+.ant-select-single.ant-select-open span.ant-select-selection-item {
+  color: var(--color-neutral-1);
+}
+
 
  .rc-virtual-list-scrollbar-thumb {
   background-color: var(--color-scrollbar-thumb) !important;

+ 18 - 11
src/views/DestinationDelivery/src/components/CreateNewBooking/src/CreateNewbooking.vue

@@ -256,9 +256,13 @@ const getCurrentStyle = (current: any) => {
   const dateString = current.format('YYYY.MM.DD')
   if (specialDates.value != undefined && specialDates.value.includes(dateString)) {
     return {
-      background: 'red',
+      background: 'var(--color-delivery-date-picker-cell-bg)',
       borderRadius: '6px',
-      color: `var(--color-neutral-1)`
+      color: `var(--color-neutral-1)`,
+      margin: 'auto',
+      width: '32px',
+      height: '32px',
+      lineHeight: '33px'
     }
   }
   // 默认样式
@@ -364,7 +368,7 @@ const SaveNewAddress = () => {
 }
 // 点击按钮
 const handleclickbutton = (val: any) => {
-  Requirements.value = Requirements.value ? Requirements.value + ',' + val : val
+  Requirements.value = Requirements.value ? Requirements.value + ', ' + val : val
 }
 let delivery_address = ''
 const changeAddressRadio = () => {
@@ -568,6 +572,13 @@ const handleClickAddress = () => {
 
 //选择日期
 const changeDatePicker = (val: any) => {
+  console.log('val', val)
+  if (val === null) {
+    isRecommendDate.value = false
+    recommendateWarning.value = ''
+    isConsistent.value = false
+    return
+  }
   if (specialDates.value.length != 0) {
     if (isConsistent.value) {
       isRecommendDate.value = true
@@ -1785,13 +1796,9 @@ div.warning-header .font_family {
 }
 </style>
 <style lang="scss">
-.delivery-date-picker {
-  .ant-picker-cell-inner {
-    width: 24px !important;
-    margin: 0 auto !important;
-    &[style] {
-      background: var(--color-delivery-date-picker-current-cell-bg) !important;
-    }
-  }
+.ant-picker-dropdown .ant-picker-cell .ant-picker-cell-inner {
+  height: 32px;
+  width: 32px;
+  margin: 0 auto;
 }
 </style>

+ 1 - 1
src/views/DestinationDelivery/src/components/DeliveryDate.vue

@@ -252,7 +252,7 @@ div.delivery-date-range-picker {
     }
 
     &:not(.ant-picker-cell-range-end):hover {
-      background-color: var(--border-hover-color);
+      background-color: var(--border-hover-color) !important;
       border-radius: 12px;
     }
     &.ant-picker-cell-selected.ant-picker-cell-in-view,