From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug

---
 src/pages/settings/views/keyboardLanguage.vue |   92 +++++++++++++++++++++++++--------------------
 1 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/src/pages/settings/views/keyboardLanguage.vue b/src/pages/settings/views/keyboardLanguage.vue
index a7e17b8..5dd7d88 100644
--- a/src/pages/settings/views/keyboardLanguage.vue
+++ b/src/pages/settings/views/keyboardLanguage.vue
@@ -7,16 +7,17 @@
           v-for="(item, i) in tabList"
           :class="activePage == i ? 'menu-item-active' : ''"
           :key="i"
-          @click="openRight(item, i)"
+          @click="openRight( i)"
           ref="leftbar"
         >
-          <span class="iconfont">{{ item.icon }}</span>
+          <img :src="item.icon_black" alt="" v-if="activePage != i" class="secondIcon">
+          <img :src="item.icon_white" alt="" v-else class="secondIcon">
           <span class="title">{{ item.name }}</span>
         </div>
       </div>
       <div class="language-right">
         <div class="lang" v-if="activePage == 0">
-          <div class="title">璇█鍒楄〃</div>
+          <div class="bar title">璇█鍒楄〃</div>
           <div
             class="bar"
             v-for="(item, i) in langList"
@@ -26,14 +27,14 @@
             <span class="name">{{ item.Name }}</span>
             <span
               class="icon iconfont"
-              style="color: #3d68e1;font-size:18px;"
+              style="color: var(--colorCard);font-size:16px;"
               v-show="activeLang == item.Lang"
-              >&#xe6f1;</span
+              >&#xe759;</span
             >
           </div>
         </div>
         <div class="lang" v-if="activePage == 1">
-          <div class="title">閿洏甯冨眬</div>
+          <div class="title bar">閿洏甯冨眬</div>
           <div
             class="bar"
             v-for="(item, i) in keyboardList"
@@ -43,9 +44,9 @@
             <span class="name">{{ item.name }}</span>
             <span
               class="icon iconfont"
-              style="color: #3d68e1;font-size:18px;"
+              style="color: #4E94FF;font-size:16px;"
               v-show="activeKb == item.id"
-              >&#xe6f1;</span
+              >&#xe759;</span
             >
           </div>
         </div>
@@ -72,8 +73,8 @@
       langList: [],
       keyboardList: [],
       tabList: [
-        { name: "绯荤粺璇█", icon: "\ue6e8" },
-        { name: "閿洏绠＄悊", icon: "\ue6fe" },
+        { name: "绯荤粺璇█", icon: "\ue74a" ,icon_white:"/images/settings/璇█-鐧�.png",icon_black:"/images/settings/璇█-榛�.png"},
+        { name: "閿洏绠＄悊", icon: "\ue74e" ,icon_white:"/images/settings/閿洏-鐧�.png",icon_black:"/images/settings/閿洏-榛�.png"},
       ],
       activePage: 0,
     };
@@ -143,7 +144,7 @@
         }
       );
     },
-    openRight(item, i) {
+    openRight(i) {
       this.activePage = i;
     },
   },
@@ -155,6 +156,7 @@
 }
 
 .kb-content {
+  font-weight: 700;
   height: 100%;
   display: flex;
   flex-direction: row;
@@ -163,38 +165,43 @@
   box-sizing: border-box;
   .kb-center {
     height: 100%;
-    width: 280px;
+    width: 300px;
     overflow: auto;
     box-sizing: border-box;
     flex-shrink: 0;
-    padding: 10px;
-    border-right: 5px solid #f8f8f8;
+    padding: 6px 10px 0px 10px;
+    background-color: #FBFAFF;
+    border-right: 4px solid #F2F2F7;
+    border-top: 4px solid #F2F2F7;
+    border-left: 4px solid #F2F2F7;
     .menu-item {
-      background-color: #f8f8f8;
-      height: 50px;
-      margin-bottom: 10px;
+    /*   background-color: #F2F2F7; */
+      height: 56px;
+      margin-bottom: 4px;
       border-radius: 8px;
-      line-height: 50px;
+      line-height: 56px;
       box-sizing: border-box;
-      font-size: 14px;
-      padding: 0 20px;
+      padding: 0 20px;cursor: pointer;
       display: flex;
       align-items: center;
+      color: #4F4F4F;
       .title {
         font-size: 16px;
+        font-weight: 700;
       }
-      .iconfont {
-        margin-right: 10px;
-        font-size: 19px;
+      .secondIcon {
+        margin: 15px;
+        width: 24px;
+        height: 24px;
       }
     }
     .menu-item-active {
-      background-color: #3d68e1;
+      background-color: var(--colorCard) !important;
       color: white;
+      
     }
     .menu-item:hover {
-      background-color: #3d68e1;
-      color: white;
+      background-color: #F2F2F7;
     }
   }
   .language-right {
@@ -203,7 +210,9 @@
     overflow: auto;
     box-sizing: border-box;
     position: relative;
-    padding: 20px 40px;
+    padding: 10px;
+    padding-top: 6px;
+    border-top: 4px solid #F2F2F7;
     .el-form-item.is-required:not(.is-no-asterisk)
       > .el-form-item__label:before,
     .el-form-item.is-required:not(.is-no-asterisk)
@@ -236,32 +245,33 @@
       max-width: none !important;
     }
     .lang {
-      .title {
-        height: 30px;
-        line-height: 30px;
-        font-size: 16px;
-        margin-bottom: 10px;
-      }
       .bar {
         height: 48px;
         background-color: #f8f8f8;
-        border-radius: 10px;
+        border-radius: 8px;
         line-height: 50px;
-        box-sizing: border-box;
-        padding: 0 20px;
+        box-sizing: content-box;
+        padding: 0 15px 0 20px;
         display: flex;
         justify-content: space-between;
         cursor: pointer;
-        margin-bottom: 12px;
+        margin-bottom: 4px;
+        border: 2px solid #f8f8f8;
         .name{
-               font-size: 15px;
+               font-size: 14px;
         }
       }
       .bar:hover{
-            background-color: #e9e9e9;
+            border: 2px solid var(--colorCard);
+      }
+      .title {
+         cursor:default ;
+        font-size: 16px;
+       justify-content: center;
+       border: 2px solid #f8f8f8 !important;
       }
     }
-    .save-btn {
+    /* .save-btn {
       background-color: #3d68e1;
       width: 240px;
       height: 40px;
@@ -271,7 +281,7 @@
       line-height: 40px;
       font-size: 14px;
       margin-top: 20px;
-    }
+    } */
   }
 }
 </style>

--
Gitblit v1.8.0