From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/assets/style/style.scss |   94 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 insertions(+), 0 deletions(-)

diff --git a/admin/src/assets/style/style.scss b/admin/src/assets/style/style.scss
index 114ca0e..4718bce 100644
--- a/admin/src/assets/style/style.scss
+++ b/admin/src/assets/style/style.scss
@@ -5,13 +5,26 @@
   padding: 0;
   margin: 0;
   color: $font-color;
+  // overflow: hidden;
   font-family: 'Avenir', Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  scrollbar-width: none; /* firefox */
+  -ms-overflow-style: none; /* IE 10+ */
+  &::-webkit-scrollbar {
+    display: none; /* Chrome Safari */
+  }
   body {
     height: 100%;
     padding: 0;
     margin: 0;
+    overflow: scroll;
+    overflow: hidden;
+    scrollbar-width: none; /* firefox */
+    -ms-overflow-style: none; /* IE 10+ */
+    &::-webkit-scrollbar {
+      display: none; /* Chrome Safari */
+    }
   }
   h1,h2,h3,h4,h5,h6,ul {
     margin: 0;
@@ -23,10 +36,91 @@
   #app {
     height: 100%;
     min-width: $page-min-width;
+    // overflow: hidden;
   }
+}
+
+.bg {
+  z-index: 9990 !important;
+}
+.windows {
+  z-index: 9991 !important;
 }
 
 // 绌挎妗嗙殑鎸夐挳
 .el-transfer__buttons {
   padding: 0 16px !important;
 }
+
+.table-header {
+  background-color: #F5F6F8!important;
+  th {
+    background-color: #F5F6F8!important;
+    color: #3F4F69 !important;
+    font-size: 14px;
+  }
+}
+
+.doumee-element-table {
+  border-color: #DFE2E8;
+  tr, th, td {
+    border-color: #DFE2E8;
+  }
+}
+
+::v-deep .el-table__fixed {
+  height: 100% !important;
+}
+::v-deep .el-table__fixed-right {
+  height: 100% !important;
+}
+::v-deep .el-table__cell {
+  height: 100% !important;
+}
+.apply-status0, .apply-status2 , .apply-status3, .apply-status10,
+.change-status0,.change-status1,.change-status2,
+.settle-status0,.settle-status2,.settle-status3,
+.tax-status0,
+.du-status0 {
+  color: #216EEE  !important;
+}
+  .apply-status1 , .apply-status4, .apply-status6, .apply-status7, .apply-status8, .apply-status11,
+.change-status3,.change-status4,.change-status5,.change-status8,
+.settle-status1,
+.tax-status2,
+.du-status2 {
+  color: #F95601 !important;
+}
+  .apply-status5,.change-status7,.settle-status7,.tax-status1,.du-status1,.settle-status4  {
+  color: #00BA92  !important;
+
+}
+::v-deep  .el-dialog{
+    margin-top: 300px;
+  }
+.center-title .el-dialog__title {
+  text-align: center;
+  width: 100%;
+  font-size: 18px;
+  font-weight: bold;
+}
+
+.tip {
+  em {
+    font-style: normal;
+    color: $primary-color;
+    font-weight: bold;
+  }
+}
+.tip-warn {
+  margin: 4px 0 12px 0;
+  font-size: 12px;
+  color: #999;
+  i {
+    color: orange;
+    margin-right: 4px;
+    font-size: 14px;
+    position: relative;
+    top: 1px;
+  }
+}

--
Gitblit v1.9.3