From 344df35614b3f7e4c9a09878873ae5d2b4f8644f Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 12 Oct 2021 10:06:09 +0800
Subject: [PATCH 1/2] commit

---
 src/App.vue                                        |  4 ++++
 src/components/navMenu/index.vue                   | 14 ++++++++++++--
 src/pages/home2/components/release/index.vue       |  2 +-
 src/pages/home2/index.vue                          |  2 +-
 .../page/listOther.vue                             |  4 +---
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6290e5be0..f1615e762 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -273,6 +273,7 @@
     overflow-y: auto;
     background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
     background-size: 100% 100%;
+    font-family: MicrosoftYaHei,微软雅黑;
     & > div{
       position: absolute;
       top: 0;
@@ -304,5 +305,8 @@
         }
       }
     }
+    /deep/.el-menu--vertical {
+      background: red;
+    }
   }
 </style>
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 2e58d256d..f12abb8e1 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -14,8 +14,8 @@
       <el-menu
               unique-opened
               :default-active="defaultActive"
-              background-color="#013483"
-              text-color="#000"
+              background-color="#5ea9f6"
+              text-color="#fff"
               active-text-color="#ffd04b"
               router
               :collapse="isCollapse"
@@ -544,6 +544,16 @@
   .nav-menu::-webkit-scrollbar {
     display: none; /* Chrome Safari */
   }
+  .nav-menu-popper .el-menu .el-menu-item.is-active {
+    background-color: #fff !important;
+    color: #5ea9f6 !important;
+    font-weight: bold;
+  }
+  .nav-menu-popper .el-menu .el-menu-item:hover {
+    background-color: #fff !important;
+    color: #5ea9f6 !important;
+    font-weight: bold;
+  }
   .el-menu-item {
     padding: 0 16px !important;
     span {
diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index 3ce38997b..b3b3d089f 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -31,7 +31,7 @@
           </el-table-column>
           <el-table-column
                   width="120"
-                  label="结束时间">
+                  label="发布时间">
               <template slot-scope="scope">
                   <span>{{scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
               </template>
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index 22cd29e48..5887e4cc7 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -117,7 +117,7 @@ export default {
       display: flex;
       flex: 1;
       flex-direction: column;
-      width: 48vw;
+      width: 47vw;
       height: calc(~'100% - 10px');
       margin-right: 10px;
       .more {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 400df4978..4fe2fbc89 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -44,10 +44,8 @@
         class="common-button-primary add-button"
         size="mini"
         @click="openModal(null,'addOpt')"
-        v-btn-permission="'389d3690eeea9d3808bdff4d02dddbd8'">
-        <i class="el-icon-plus"></i>
+        v-btn-permission="'389d3690eeea9d3808bdff4d02dddbd8'"><i class="el-icon-plus"></i>新增
 <!--        <i class="el-icon-plus"></i>-->
-        新增
       </el-button>
       <el-button
         class="common-button-default delete-button"

From aac560e2d3b7e0adef8b19cd1b8c09414e5c1b57 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 12 Oct 2021 14:26:11 +0800
Subject: [PATCH 2/2] commit

---
 src/components/navMenu/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index f12abb8e1..6d99f893f 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -15,7 +15,7 @@
               unique-opened
               :default-active="defaultActive"
               background-color="#5ea9f6"
-              text-color="#fff"
+              text-color="#000"
               active-text-color="#ffd04b"
               router
               :collapse="isCollapse"
@@ -544,6 +544,9 @@
   .nav-menu::-webkit-scrollbar {
     display: none; /* Chrome Safari */
   }
+  .nav-menu-popper .el-menu .el-menu-item {
+    color: #fff !important;
+  }
   .nav-menu-popper .el-menu .el-menu-item.is-active {
     background-color: #fff !important;
     color: #5ea9f6 !important;