Selaa lähdekoodia

Merge branch 'feat_theme' into feat_theme_zyh

zhouyuhao 11 kuukautta sitten
vanhempi
commit
fe15ee0226

+ 1 - 1
src/views/Dashboard/src/components/TopMap.vue

@@ -226,7 +226,7 @@ defineExpose({
 }
 /* 示例:将所有地图图片的颜色反转 */
 .dark-mode img:not(.leaflet-marker-icon) {
-  filter: invert(1) hue-rotate(200deg);
+  filter: invert(1) hue-rotate(170deg);
 }
 // 防止暗黑模式下地图超出容器
 #map {

+ 1 - 1
src/views/OperationLog/src/OperationLog.vue

@@ -272,7 +272,7 @@ const DateChange = (date: any) => {
 :deep(.ETD_title) {
   margin-bottom: 0;
 }
-:deep(:where(.css-dev-only-do-not-override-19iuou).ant-picker-range) {
+:deep(.ant-picker-range) {
   width: 250px !important;
   height: 32px;
   background-color: var(--color-mode) !important;

+ 8 - 1
src/views/OperationLog/src/components/BookingTable/src/BookingTable.vue

@@ -5,6 +5,9 @@ import DownloadDialog from './components/DownloadDialog.vue'
 import { autoWidth } from '@/utils/table'
 import { useRowClickStyle } from '@/hooks/rowClickStyle'
 import dayjs from 'dayjs'
+import { useThemeStore } from '@/stores/modules/theme'
+
+const themeStore = useThemeStore()
 
 const props = defineProps({
   height: {
@@ -353,7 +356,11 @@ defineExpose({
     <div class="table-tools">
       <div class="left-total-records">{{ selectedNumber }} Selected</div>
       <div class="right-tools-btn">
-        <el-button class="el-button--main" @click="handleDownload">
+        <el-button
+          :class="{ 'el-button--pain-theme': themeStore.theme === 'dark' }"
+          class="el-button--main"
+          @click="handleDownload"
+        >
           <span style="margin-right: 8px" class="font_family icon-icon_download_b"></span>
           Download
         </el-button>

+ 1 - 1
src/views/Tracking/src/components/TrackingDetail/src/components/MapView.vue

@@ -626,7 +626,7 @@ onUnmounted(() => {
 
 /* 示例:将所有地图图片的颜色反转 */
 .dark-mode img:not(.leaflet-marker-icon) {
-  filter: invert(1) hue-rotate(200deg);
+  filter: invert(1) hue-rotate(170deg);
 }
 // 防止暗黑模式下地图超出容器
 .tracking-map {

+ 1 - 1
src/views/Tracking/src/components/TrackingDetail/src/components/TransportStep.vue

@@ -43,7 +43,7 @@ const handleTabClick = (name: string) => {
 .transport-step {
   width: 400px;
   height: 484px;
-  background-color: #fff;
+  background-color: var(--color-header-bg);
   border-radius: 12px;
   border: 1px solid var(--color-border);
   box-shadow: -2px 2px 12px 0px var(--color-shipment-status-shadow);