chore: update

src/components/SvgIcon/svgicon.vue

-<template>
-  <svg class="svg-icon" aria-hidden="true">
-    <use :xlink:href="iconName" />
-    {{iconClass}}
-  </svg>
-</template>
-
-<script>
-export default {
-  name: 'SvgIcon',
-  props: {
-    iconClass: {
-      type: String,
-      required: true
-    }
-  },
-  computed: {
-    iconName() {
-      return `#icon-${this.iconClass}`
-    }
-  }
-}
-</script>
-
-<style scoped>
-.svg-icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-</style>

src/components/layout/header.vue

 <template>
-  <header class="header" :class="{ 'is-fixed': fixed }">
+  <header class="header" :class="{ 'is-fixed': fixed, 'is-enter': isEnter && fixed }">
     <HeaderNews />
     <div class="header-inner">
       <div class="header-main">
         <div class="logo">
           <router-link to="/">
-            <img src="https://webapp-pub.ezijing.com/project/cuw/cuw_logo_white.svg" v-if="fixed" />
-            <img src="https://webapp-pub.ezijing.com/project/cuw/cuw_logo_blue.svg" v-else />
+            <img src="https://webapp-pub.ezijing.com/project/cuw/cuw_logo_white.svg" v-show="fixed && !isEnter" />
+            <img src="https://webapp-pub.ezijing.com/project/cuw/cuw_logo_blue.svg" v-show="isEnter || !fixed" />
           </router-link>
         </div>
         <nav class="nav">
@@ -28,6 +28,7 @@ export default {
   components: { HeaderNews },
   data() {
     return {
+      scrollTop: 0,
       navList: [
         { title: '首页', path: '/index' },
         { title: '家庭教育硕士', path: '/profession' },
@@ -36,6 +37,22 @@ export default {
         { title: '联系我们', path: '/contact' }
       ]
     }
+  },
+  computed: {
+    isEnter() {
+      return this.scrollTop > 0
+    }
+  },
+  methods: {
+    handleScroll() {
+      this.scrollTop = document.documentElement.scrollTop || document.body.scrollTop
+    }
+  },
+  mounted() {
+    window.addEventListener('scroll', this.handleScroll)
+  },
+  beforeDestroy() {
+    window.removeEventListener('scroll', this.handleScroll)
   }
 }
 </script>
@@ -50,6 +67,7 @@ export default {
   &.is-fixed {
     .header-inner {
       position: fixed;
+      top: 40px;
       background-color: rgba(0, 0, 0, 0.4);
     }
     .nav {
@@ -58,6 +76,19 @@ export default {
       }
     }
   }
+  &.is-enter {
+    .header-inner {
+      background-color: #fff;
+    }
+    .header-main {
+      height: 60px;
+    }
+    .nav {
+      .nav-item {
+        color: #000;
+      }
+    }
+  }
 }
 .header-inner {
   width: 100%;
@@ -70,6 +101,7 @@ export default {
   width: 80%;
   height: 80px;
   margin: 0 auto;
+  transition: all 0.5s;
 
   .logo {
     flex: 1;

src/components/slide-list.vue

@@ -3,7 +3,6 @@
     <div class="slide-list" v-for="(item, index) in list" :key="index" :class="{ 'bg-ye': index === active }">
       <span class="sl" v-if="index === active"></span>
       <div class="slide-list-title">
-        <svg-icon :iconClass="item.icon" class="font-size-25"></svg-icon>
         <span class="font-size-14">{{ item.title }}</span>
       </div>
     </div>

src/icons/index.js

-import Vue from 'vue'
-import SvgIcon from '@/components/SvgIcon/svgicon.vue'
-
-// register globally
-Vue.component('svg-icon', SvgIcon)
-
-const req = require.context('./svg', false, /\.svg$/)
-const requireAll = requireContext => requireContext.keys().map(requireContext)
-requireAll(req)

src/icons/svg/test.svg

-<svg t="1595689248459" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1794" width="200" height="200"><path d="M822.5 652.2L655.7 484.5c10.7-30.1 16.2-61.7 16.2-94 0-154.3-124.9-279.8-278.4-279.8-38.2 0-75.4 7.7-110.5 23l-16.6 7.2s0.1 0 0.1 0.1c-1.6 0.7-3.1 1.7-4.3 3-5.5 5.5-5.5 14.5 0 20.1 0.1 0.1-0.1 0.1 0 0.2L418 321l-93.8 94.2-152.7-153.5c-0.2 0-0.5 0-0.8-0.3-6.5-6.5-17-6.5-23.4 0-1.8 1.8-3.1 3.9-3.9 6.1-0.1 0.2-0.2 0.1-0.3 0.1l-5.2 12c-15.2 35.2-22.9 72.6-22.9 111 0 154.3 124.9 279.8 278.4 279.8 32.1 0 63.5-5.5 93.5-16.3l166.8 167.7c22.5 22.6 52.5 35.1 84.4 35.1 31.8 0 61.8-12.5 84.4-35.1C869 775 869 699 822.5 652.2z m-37.4 131.9c-12.5 12.6-29.2 19.5-46.9 19.5s-34.4-6.9-46.9-19.5L499.4 591.3l-16.5 7.2c-28.4 12.4-58.5 18.6-89.4 18.6-124.3 0-225.4-101.6-225.4-226.5 0-17.4 1.9-34.4 5.8-51.1l140.2 140.9c5.9 4.7 14 4.8 19.9 0.3l147.4-148.1c0.1-0.1-0.1-0.1 0-0.2 6-6 6.2-15.5 1-22L342.6 169.9c16.6-3.9 33.6-5.8 50.9-5.8 124.3 0 225.4 101.6 225.4 226.5 0 31.1-6.2 61.3-18.5 89.8l-7.1 16.6L785 689.9c25.9 26 25.9 68.2 0.1 94.2z" p-id="1795"></path></svg>
\ No newline at end of file

src/icons/svg/user.svg

-<svg t="1598603711890" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1794" width="48" height="48"><path d="M857.002494 319.156194M843.258344 840.825751c-4.865186-36.488894-15.568595-71.639862-31.866968-104.601497-3.162371-6.446371-6.568001-12.771113-10.095261-18.974225 0 0 0 0 0 0-15.446965-26.150374-34.42119-50.354674-56.436156-72.126381l0 0c-4.743556-4.743556-9.730372-9.243853-14.838817-13.74415-36.245635-31.745338-78.207863-55.341489-122.845944-69.693788 8.027557-4.500297 15.933484-9.487112 23.474522-15.082076 8.514075-6.324742 16.663262-13.257632 24.325929-20.920299 40.259413-40.259413 62.517639-93.776458 62.517639-150.820763s-22.136596-110.561349-62.517639-150.820763c-39.529635-39.529635-91.952013-61.666231-147.658392-62.396009-0.851408 0-1.824445 0-2.675852 0-0.851408 0-1.824445 0-2.675852 0-55.828008 0.851408-108.128756 22.866374-147.658392 62.396009-40.259413 40.259413-62.517639 93.776458-62.517639 150.820763s22.136596 110.561349 62.517639 150.820763c7.662668 7.662668 15.811854 14.717187 24.325929 20.920299 7.541038 5.594964 15.325336 10.581779 23.474522 15.082076-44.638081 14.352298-86.600309 37.94845-122.845944 69.693788-5.108445 4.500297-10.095261 9.000594-14.838817 13.74415-22.136596 21.650077-40.989191 45.976007-56.436156 72.126381-3.52726 6.203112-6.93289 12.527854-10.095261 18.974225-16.176743 32.961634-26.880152 68.112602-31.866968 104.601497-1.581185 11.676446 6.568001 22.379855 18.244447 23.961041 0.973037 0.12163 1.946074 0.243259 2.919112 0.243259 0.851408 0 1.702815 0 2.554223-0.12163 8.392446-1.824445 15.203706-8.757335 16.541632-17.757928 9.852001-67.504454 41.962228-128.805796 88.181494-175.389951 54.854971-55.463119 129.535574-90.249198 210.17603-90.370828l0.486519 0c80.518826 0.243259 154.956171 35.029338 209.689512 90.370828 46.219266 46.705785 78.329493 108.007127 88.181494 175.389951 1.337926 9.000594 8.149186 15.933484 16.541632 17.757928 0 0 0 0 0 0 0.851408 0.12163 1.702815 0.12163 2.554223 0.12163 0.973037 0 1.946074-0.12163 2.919112-0.243259C836.568714 863.327236 844.83953 852.502197 843.258344 840.825751L843.258344 840.825751zM504.154888 545.508968c-0.486519 0-0.851408 0-1.337926 0-79.545789-0.608148-150.577503-55.828008-169.916617-130.022093-0.243259-0.851408-0.486519-1.581185-0.608148-2.432593-3.040741-12.284594-4.621927-25.055707-4.621927-38.07008 0-13.136002 1.581185-26.028745 4.621927-38.434969 0.243259-0.851408 0.364889-1.702815 0.608148-2.432593 19.460744-76.01853 91.100606-136.468464 171.254543-136.468464l0.973037 0c80.153938 0 151.7938 60.449935 171.254543 136.468464 0.243259 0.851408 0.486519 1.702815 0.608148 2.432593 3.040741 12.527854 4.621927 25.420596 4.621927 38.434969 0 13.136002-1.581185 25.785485-4.621927 38.07008-0.243259 0.851408-0.364889 1.581185-0.608148 2.432593-19.339114 74.194085-90.370828 129.413945-169.916617 130.022093C505.614444 545.508968 504.884666 545.508968 504.154888 545.508968L504.154888 545.508968zM504.154888 545.508968" p-id="1795"></path></svg>
\ No newline at end of file

src/main.js

@@ -11,7 +11,6 @@ import store from './store'
 import './assets/css/reset.css'
 import './assets/css/animate.min.css'
 import VueLazyComponent from '@xunlei/vue-lazy-component'
-import './icons/index.js'
 
 Vue.use(VueForm)
 

src/pages/major-set/index.vue

@@ -59,6 +59,21 @@
       <div class="subtitle">
         <h2>学习相关</h2>
       </div>
+      <div class="project-study-bd">
+        <div class="project-study-left">
+          <img src="https://webapp-pub.ezijing.com/project/cuw/project_study.png" width="547px" />
+        </div>
+        <div class="project-study-right">
+          <h3>项目学制</h3>
+          <ul>
+            <li><span>20</span>个月</li>
+            <li>修满<span>30</span>学分</li>
+          </ul>
+          <p>
+            修满全部学分并考核合格后，由威斯康星协和大学授予教育学硕士学位。学位证书与出国留学学习所获得的学位证书相同。
+          </p>
+        </div>
+      </div>
     </section>
     <FormBox />
   </div>
@@ -417,4 +432,49 @@ export default {
     }
   }
 }
+.project-study-bd {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.project-study-right {
+  width: 452px;
+  margin-left: 45px;
+  color: #fff;
+  h3 {
+    font-size: 26px;
+    font-family: SourceHanSansCN-Bold, SourceHanSansCN;
+    font-weight: bold;
+    color: #ffffff;
+    line-height: 34px;
+  }
+  ul {
+    margin-top: 66px;
+    margin-bottom: 20px;
+    display: flex;
+  }
+  li {
+    font-size: 22px;
+    font-family: SourceHanSansCN-Regular, SourceHanSansCN;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 1;
+    padding-right: 30px;
+    span {
+      font-size: 66px;
+      font-family: 思源黑体 CN Regular;
+    }
+  }
+  li + li {
+    padding-left: 30px;
+    border-left: 1px solid #fff;
+  }
+  p {
+    font-size: 18px;
+    font-family: SourceHanSansCN-Regular, SourceHanSansCN;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 30px;
+  }
+}
 </style>

src/pages/my/application/complete.vue

@@ -48,12 +48,12 @@ export default {
             title: '推荐信',
             code: 'applicationTjx',
             view: { to: { path: '/my/application', query: { active: 'application_tjx' } } }
+          },
+          {
+            title: '无犯罪声明',
+            code: 'applicationWfzzm',
+            view: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } }
           }
-          // {
-          //   title: '无犯罪证明',
-          //   code: 'applicationWfzzm',
-          //   view: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } }
-          // }
         ],
         [
           {
@@ -121,7 +121,7 @@ export default {
           // 推荐信
           const applicationTjx = { progress: 0 }
           applicationTjx.progress = progress.FILLING.reco_letters.progress
-          // 无犯罪证明
+          // 无犯罪声明
           const applicationWfzzm = { progress: 0 }
           applicationWfzzm.progress = fillingMissedRequiredList.NO_CRIMINAL_CERT ? 0 : 1
 

src/pages/my/application/form/declare.js

@@ -34,7 +34,7 @@ export default function(_this) {
       }
     },
     form: {
-      prev: { to: { query: { active: 'application_tjx' } } },
+      prev: { to: { query: { active: 'application_wfzzm' } } },
       submitText: '提交报名申请',
       model: { isAgree: [] },
       options: {},

src/pages/my/application/form/index.js

 import info from './info'
 import tjx from './tjx'
-// import wfzsm from './wfzzm'
+import wfzsm from './wfzzm'
 import declare from './declare'
 
 export default function(_this) {
@@ -10,7 +10,7 @@ export default function(_this) {
     children: [
       info(_this),
       tjx(_this),
-      // wfzsm(_this),
+      wfzsm(_this),
       declare(_this)
       // {
       //   id: 'application_pay',

src/pages/my/application/form/tjx.js

@@ -46,7 +46,7 @@ export default function(_this) {
     form: {
       minlength: 2,
       prev: { to: { query: { active: 'application_info', tab: 'application_info_honor' } }, isSubmit: true },
-      next: { to: { query: { active: 'application_declare' } }, isSubmit: true },
+      next: { to: { query: { active: 'application_wfzzm' } }, isSubmit: true },
       hasAdd: true,
       disabled(data) {
         return !!data.letter_content

src/pages/my/application/form/wfzzm.js

 export default function(_this) {
   return {
     id: 'application_wfzzm',
-    title: '无犯罪证明',
+    title: '无犯罪声明',
     visible() {
       return _this.visible
     },
@@ -34,7 +34,7 @@ export default function(_this) {
             limit: 1
           },
           prepend: `
-          <p>第一步：点击下载按键获取无犯罪证明模板</p>
+          <p>第一步：点击下载按键获取无犯罪声明模板</p>
           <p><a href="https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/cu/%E6%97%A0%E7%8A%AF%E7%BD%AA%E8%AE%B0%E5%BD%95%E8%AF%81%E6%98%8E.docx" target="_blank" download>下载模板</a></p>
           <p>第二步：打印文件后填写内容并签字上传至电脑，点击下方按钮上传文件</p>
         `

src/pages/my/application/preview.vue

@@ -326,7 +326,7 @@ export default {
           ]
         }
         // {
-        //   title: '无犯罪证明',
+        //   title: '无犯罪声明',
         //   code: 'attachments',
         //   edit: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } },
         //   computed(data) {