Merge branch 'seg' of https://gitlab.ezijing.com/ezijing/node-ciis into seg

src/assets/css/reset.css

@@ -190,5 +190,5 @@ textarea {
 }
 
 :root {
-  --main-color: #e27f4d;
+  --main-color: #af1818;
 }

src/components/layout/components/slider.vue

@@ -23,10 +23,8 @@
         <!-- <div class="logo-new-3"></div> -->
       </div>
       <div class="slider-icon" v-show="tempRoute.meta && tempRoute.meta.details">
-        <el-image
-          class="logo-new-1"
-          src="https://zws-imgs-pub.ezijing.com/static/public/2a5dca328ca63abcf1c8496180adc485.png"
-        ></el-image>
+        <img src="../../../assets/images/logofff-2.png" />
+        <img src="../../../assets/images/logoend.png" />
       </div>
       <div class="slider-banner">
         <div v-for="item in navList" :key="item.path" class="tab-item">
@@ -98,6 +96,10 @@ export default {
     justify-content: space-between;
     .slider-icon {
       flex: 1;
+      img {
+        margin-top: 10px;
+        margin-right: 20px;
+      }
       .el-image {
         top: 50%;
         transform: translateY(-50%);

src/pages/letter/index.vue

@@ -3,9 +3,10 @@
     <header class="header">
       <div class="inner">
         <div class="logo">
-          <router-link to="/"
-            ><img src="https://zws-imgs-pub.ezijing.com/static/public/2a5dca328ca63abcf1c8496180adc485.png"
-          /></router-link>
+          <router-link to="/">
+            <img src="../../assets/images/logofff-2.png" />
+            <img src="../../assets/images/logoend.png" />
+          </router-link>
         </div>
       </div>
     </header>
@@ -134,11 +135,12 @@ export default {
       padding: 14px 0;
       img {
         height: 50px;
+        margin-right: 20px;
       }
     }
   }
   .nav {
-    background-color: #e27f4d;
+    background-color: #af1818;
     .title {
       font-size: 24px;
       font-weight: 600;

src/pages/login/index.vue

@@ -4,7 +4,10 @@
       <div class="bg"></div>
       <div class="content">
         <div class="title">
-          <span class="icon"></span>
+          <span class="icon">
+            <img src="../../assets/images/logofff-2.png" height="50px" style="margin-right:10px;" />
+            <img src="../../assets/images/logofff-3.png" height="50px" />
+          </span>
           <p>报名系统</p>
         </div>
         <div class="login">
@@ -126,10 +129,11 @@ export default {
     color: #fff;
   }
   .main .title .icon {
-    background: url('~@/assets/images/logofff.png') no-repeat center center;
-    background-size: contain;
-    width: 166px;
-    height: 40px;
+    // background: url('~@/assets/images/logofff.png') no-repeat center center;
+    // background-size: contain;
+    // width: 166px;
+    // height: 40px;
+    text-align: center;
     margin-bottom: 30px;
   }
   .main .title p {

src/style.scss

@@ -35,7 +35,7 @@ body {
 }
 
 /* 改变主题色变量 */
-$--color-primary: #E27F4D;
+$--color-primary: #AF1818;
 /* 改变 icon 字体路径变量，必需 */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';
 /* 引入element-ui对应scss文件，重新编译 */