Merge remote-tracking branch 'origin/feature/pageRevision' into feature/startPage

src/assets/scss/modules/home.scss

@@ -6,6 +6,8 @@
 }
 
 .home_bg_img {
-  background: url(~@/assets/img/home_bg.png) no-repeat;
+  background: url(~@/assets/img/login_bg5.png) no-repeat;
   background-position: center;
+  background-size: 100% 100%;
+  // position: relative;
 }

src/assets/scss/pages/login.scss

@@ -12,7 +12,7 @@
   }
 
   &::before {
-    background: url(~@/assets/img/login_bg.jpg) no-repeat;
+    background: url(~@/assets/img/login_bg5.png) no-repeat;
     background-size: 100% 100%;
   }
 

src/i18n/zh-CN.js

@@ -3,7 +3,7 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '精致锦水党建引领管理后台'
+t.brand.lg = 'e锦水党建引领基层智慧治理平台'
 t.brand.mini = '党群'
 
 t.add = '新增'

src/views/modules/home.vue

@@ -2,7 +2,7 @@
   <el-card shadow="never"
            class="aui-card--fill home_bg_img">
     <div class="mod-home">
-      <h1>欢迎使用精致锦水党建引领管理后台</h1>
+      <h1 style="color: #fff;">欢迎使用e锦水党建引领管理后台</h1>
     </div>
   </el-card>
 </template>

src/views/pages/login.vue

@@ -4,7 +4,7 @@
       <main class="aui-content">
         <div class="login-header">
           <h2 class="login-brand"
-              style="text-transform: none;color:red;">{{ $t('brand.lg') }}</h2>
+              style="text-transform: none;font-weight: bold;color:#D61618;">{{ $t('brand.lg') }}</h2>
         </div>
         <div class="login-body">
           <h3 class="login-title">{{ $t('login.title') }}</h3>