Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

src/assets/style/theme/lng-theme.less

@@ -13,9 +13,10 @@
   }
 
   .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item:hover::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu:hover::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-active::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-active::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-open::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-open::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-selected::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-selected::after {
-    border-bottom: 2px solid #0960bd;
+    border-bottom: 2px solid #fff;
     right: 10px;
     left: 10px;
+    bottom: 4px;
 
     .ant-menu-title-content{
        color: #000 !important;
@@ -38,10 +39,45 @@
       background-image: url('/@/assets/style/theme/imgs/primary-top.png') !important;
       background-size: 100% 100% !important;
 
+      .vben-layout-header-left {
+
+        .vben-layout-header-trigger{
+            svg {
+              fill: #fff !important;
+            }
+
+            &.light:hover {
+              background-color: unset !important;
+              
+               svg {
+                  fill: #5e95ff !important;
+                }
+            }
+        }
+      }
 
       .ant-menu-title-content{
         color: #fff !important;
       }
+
+      .vben-layout-header-action {
+         svg {
+           fill: #fff !important;
+           color: #fff !important;
+         }
+
+         .vben-layout-header-action__item:hover{
+            background-color: #0960bd !important;
+         }
+      }
+
+      .vben-header-user-dropdown__name{
+        color: #fff !important;
+      }
+
+      .vben-header-user-dropdown--light:hover{
+        background-color: #0960bd !important;
+      }
   }
 
 }

src/layouts/default/trigger/HeaderTrigger.vue

@@ -1,7 +1,7 @@
 <template>
     <span :class="[prefixCls, theme]" @click="toggleCollapsed">
         <span style="border-left: 1px solid rgb(255, 255, 255, 0.3); height: 30px; padding-right: 15px"></span>
-        <MenuUnfoldOutlined v-if="getCollapsed" /> <MenuFoldOutlined v-else />
+        <MenuUnfoldOutlined two-tone-color="#ffffff" v-if="getCollapsed" /> <MenuFoldOutlined two-tone-color="#ffffff" v-else />
     </span>
 </template>
 <script lang="ts">

src/views/system/setting/UpdatePassword.vue

@@ -1,6 +1,7 @@
 <template>
     <CollapseContainer :title="t('密码修改')" :canExpan="false">
-        <div class="flex flex-col items-center justify-center py-8 bg-white">
+        <div class="flex flex-col items-center justify-center py-8 bg-white" style="width: 550px">
+            <div class="text-center mb-4 text-red-500">* 密码必须8-16位字符，包含大写字母，小写字母，数字和特殊字符中的三种及以上。</div>
             <BasicForm @register="register" />
             <div class="flex justify-center">
                 <a-button @click="resetFields"> {{ t('重置') }} </a-button>