合并分支 'hsx' 到 'master'

src/styles/common.scss

+/***背景作为卡片***/
+.background-as-card {
+    background-color: var(--color-primary-65);
+    border-radius: 10px;
+    border: 1px solid rgba(234, 236, 238, 1);
+    border-radius: 10px;
+    box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
+}
+
+.flex-display{
+    display: flex;
+}
+.text-base{
+    font-size: 16px;
+    line-height: 24px;
+    color: var(--text-primary-80-color);
+}
+.text-header {
+    @extend .text-base;
+    font-weight: Bold;
+}

src/styles/container.scss

+
+@use "common";
+
+/***通用页面***/
+.common-page {
+    font-family: "Microsoft Yahei", "PingFang SC", sans-serif;
+    margin: 16px auto;
+    width: 1600px;
+    align-items: center;
+}
\ No newline at end of file

src/styles/descriptions.scss

+@use "common";
+
+/***没有nav下划线***/
+.common-descriptions  .el-descriptions__label{
+    @extend .text-header;
+}
+.common-descriptions .el-descriptions__content{
+    @extend .text-base
+}
\ No newline at end of file

src/styles/main.css

@@ -17,24 +17,24 @@
   --btn-active-bg-color: rgba(231, 243, 255, 1);
   --btn-active-text-color: var(--color-main-active);
 
-  
+
   /* 标签按钮颜色 */
   --tag-btn1-bg-color: rgba(255, 241, 240, 1);
   --tag-btn1-border-color: rgba(255, 204, 199, 1);
   --tag-btn1-text-color: rgba(255, 77, 79, 1);
-  
+
   --tag-btn2-bg-color: rgba(255, 251, 230, 1);
   --tag-btn2-border-color: rgba(255, 241, 184, 1);
   --tag-btn2-text-color: rgba(250, 173, 20, 1);
-  
+
   --tag-btn2-bg-color: rgba(230, 244, 255, 1);
   --tag-btn2-border-color: rgba(186, 224, 255, 1);
   --tag-btn2-text-color: rgba(22, 119, 255, 1);
-  
+
   --tag-btn3-bg-color: rgba(246, 255, 237, 1);
   --tag-btn3-border-color: rgba(217, 247, 190, 1);
   --tag-btn3-text-color: rgba(82, 196, 26, 1);
-  
+
 
 
   /* 文字颜色 设计定义*/
@@ -52,7 +52,7 @@
   --bg-white-50: rgba(255, 255, 255, 0.5);
   --bg-white-35: rgba(255, 255, 255, 0.35);
 
-    /* 描边颜色 设计定义*/
+  /* 描边颜色 设计定义*/
   --border-black-10: #E6E7E8;
   --border-black-5: #EAECEE;
 
@@ -81,4 +81,4 @@
   line-height: 30px;
   letter-spacing: 0px;
   text-align: left;
-}
+}
\ No newline at end of file

src/styles/tabs.scss

+@use "common";
+
+/***没有nav下划线***/
+.tabs-nav-no-wrap .el-tabs__nav-wrap::after{
+    height: 0px !important;
+    width: 0px !important;
+}
+
+/***nav as card***/
+.tabs-header-as-card .el-tabs__header:not(.disinheritance .el-tabs__header) {
+    @extend .background-as-card;
+    padding: 2px;
+}
+
+/***作为按钮样式的tabs-bar***/
+/*选中无下划线*/
+.tabs-bar-as-btn .el-tabs__active-bar:not(.disinheritance .el-tabs__active-bar) {
+    height: 0px;
+}
+
+/*定义字体*/
+.tabs-bar-as-btn .el-tabs__item:not(.disinheritance .el-tabs__item) {
+    font-size: 20px;
+    font-family: "Source Han Sans CN-Regular";
+    font-weight: Regular;
+    line-height: 26px;
+    height: 50px;
+}
+
+/*激活时按钮样式*/
+.tabs-bar-as-btn .el-tabs__item.is-active:not(.disinheritance .el-tabs__item){
+
+    font-size: 24px;
+    font-family: "Source Han Sans CN-Bold";
+    font-weight: Bold;
+
+    color: var(--color-primary-100);
+    border-width: 1px;
+    border-style: solid;
+    border-color: var(--color-primary-35);
+    border-radius: 10px;
+    background-color: var(--color-primary-2);
+}
+
+/***tabs-bar左边悬浮***/
+.left-float-nav-tabs .el-tabs__item{
+    position:relative;
+}
+.left-float-nav-tabs .el-tabs__item.is-active{
+    background-color: aquamarine;
+}
\ No newline at end of file