修改bug

src/components/layout/footer.vue

@@ -32,7 +32,7 @@
     </div>
     <div class="copyright">
       <div class="inner2">
-        <p>Copyright © 2017 Zijing Education. All rights reserved. 清控紫荆（北京）教育科技股份有限公司 京ICP证150431号</p>
+        <p>Copyright © 2020 Zijing Education. All rights reserved. 清控紫荆（北京）教育科技股份有限公司 京ICP证150431号</p>
         <a class="record" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010802023681">
           <img src="https://zws-imgs-pub.ezijing.com/e0a0ec47dfdfc1e0797b1d5254021d00.png" alt="">
           <p>安备 11010802023681号</p>

src/components/layout/header.vue

@@ -12,12 +12,21 @@
         </div>
         <ul class="nav-box">
           <template v-for="(item, index) in navList">
-            <router-link :to="item.path" :key="index">
-              <li :class="isClassShow(item)">{{ item.title }}</li>
+            <li :class="isClassShow(item)" :key="index">
+              <router-link :to="item.path">
+                <span>
+                  {{ item.title }}
+                </span>
               </router-link>
+              <div class="item-child">
+                <template v-for="(chi, index2) in item.itemChi">
+                  <div class="li" :key="'chi'+index2" @click="goPage(chi.path, chi.type)">{{ chi.title }}</div>
+                </template>
+              </div>
+            </li>
           </template>
         </ul>
-        <div class="login" @click="isLogin = true">用户登陆/注册</div>
+        <div class="login"><span @click="isLogin = true">用户登录</span>/<span @click="$router.push({ path: '/register' })">注册</span></div>
       </div>
     </div>
     <login v-if="isLogin" @reg="reg" @closeMask="closeMask"></login>
@@ -34,10 +43,69 @@ export default {
     return {
       title: '索菲亚大学金融方向工商管理硕士项目',
       navList: [
-        { title: '首页', path: '/index' },
-        { title: '通知公告', path: '/news', children: { path: ['/news/detail'] } },
-        { title: '办事大厅', path: '/hall', children: { path: ['/textBook/detail', '/textBook/chapter'] }},
-        { title: '教·学服务', path: '/service', children: { path: ['/train/detail', '/train/form'] } }
+        {
+          title: '首页',
+          path: '/index'
+        },
+        {
+          title: '通知公告',
+          path: '/news',
+          children: { path: ['/news/detail'] },
+          itemChi: [
+            {
+              title: '通知公告',
+              path: '/news'
+            },
+            {
+              title: '工作动态',
+              path: '/news?type=1'
+            }
+          ]
+        },
+        {
+          title: '办事大厅',
+          path: '/hall',
+          children: { path: ['/textBook/detail', '/textBook/chapter'] },
+          itemChi: [
+            {
+              title: '我是考生',
+              path: '/hall?role=0'
+            },
+            {
+              title: '我是老师',
+              path: '/hall?role=1'
+            },
+            {
+              title: '我是学校',
+              path: '/hall?role=2'
+            }
+          ]
+        },
+        {
+          title: '教·学服务',
+          path: '/service',
+          children: { path: ['/train/detail', '/train/form'] },
+          itemChi: [
+            {
+              title: '教材中心',
+              path: '/service'
+            },
+            {
+              title: '教学资源（老师）',
+              path: 'https://login.ezijing.com/xlearn/register',
+              type: 1
+            },
+            {
+              title: '课程学习（学生）',
+              path: 'http://xtraining.ezijing.com/',
+              type: 1
+            },
+            {
+              title: '实操学习',
+              path: '/hall?role=2'
+            }
+          ]
+        }
       ],
       isLogin: false,
       user: null,
@@ -74,9 +142,17 @@ export default {
   },
   mounted() {    
   },
-  watch: {
-  },
   methods: {
+    goPage(path, n) {
+      if (n) {
+        window.location.href = path
+      } else {
+        this.$router.push({
+          path: path
+        })
+        this.$router.go(0)
+      }
+    },
     reg() {
       this.isLogin = false
       this.$router.push({ path: '/register' })
@@ -152,10 +228,10 @@ export default {
       cursor: pointer;
       position: relative;
       z-index: 1;
-      width: 530px;
+      width: 430px;
       display: flex;
       align-items: center;
-      justify-content: center;
+      // justify-content: center;
       height: 100%;
       background: #fff;
       img{
@@ -172,7 +248,7 @@ export default {
     }
     .nav-box{
       position: relative;
-      z-index: 1;
+      z-index: 9;
       background: #A81A42;
       padding-left: 60px;
       display: flex;
@@ -181,9 +257,42 @@ export default {
         font-size: 14px;
         color: #FFFFFF;
         margin-right: 36px;
+        position: relative;
+        span{
+          position: relative;
+          z-index: 99;
+        }
         &.active{
           font-weight: bold;
         }
+        &:hover{
+          .item-child{
+            display: block;
+          }
+        }
+        .item-child{
+          display: none;
+          width: 128px;
+          position: absolute;
+          top:0;
+          left: 50%;
+          transform: translateX(-50%);
+          z-index: 9;
+          padding-top: 26px;
+          .li{
+            width: 100%;
+            height: 44px;
+            border-top: 1px solid rgba(221,221,221,0.2);
+            text-align: center;
+            line-height: 44px;
+            color: #fff;
+            background: #A81A42;
+            cursor: pointer;
+            &:nth-child(1){
+              border: none;
+            }
+          }
+        }
       }
     }
   }

src/components/tabs/btnTabs.vue

@@ -20,7 +20,11 @@ export default {
       tabsIndex: 0
     }    
   },
-  mounted() {},
+  mounted() {
+    if (this.data.index) {
+      this.tabsIndex = this.data.index
+    }
+  },
   methods: {
     tabs(n) {
       this.tabsIndex = n

src/pages/hall/components/schoolHelp.vue

@@ -19,9 +19,10 @@
     </div>
     <div class="module2">
       <div class="content-max-width">
-        <div class="title">考点申报</div>
-        <div class="p">有关单位意向申报成为1+X职业技能等级证书考核站点，请按要求登录政府网站申请试点院校业务平台（网址： https://vslc.ncb.edu.cn ）输入试点院校管理员的账号密码，在考试管理菜单中，打开申报考点栏目，即可自主申报考核站点</div>
-        <div class="all-btn con-btn" @click="goPage('https://vslc.ncb.edu.cn', 1)">去申请</div>
+        <div class="title">组织老师培训</div>
+        <div class="p">网站教学资源（老师）页面选择项目课程点击在线报名，填写培训申请表后，关注我司通知。<br/>线上学习系统以学习课程和辅助教学为主要功能。老师学习课程以视频展示为主，清晰、流畅且稳定。视频播放支持倍速、全屏切换、课程讲义和视频双频同步播放；<br/>培训对象：相关对口金融专业的老师</div>
+        <div class="all-btn con-btn" @click="goPage('/train')">去报名</div>
+        <div class="all-btn con-btn" @click="goPage('/news')">看通知</div>
         <div class="title mar-t36" id="points1">组织开班授课</div>
         <div class="item">
           <img src="https://zws-imgs-pub.ezijing.com/static/public/6a969be695f821530e26bda9cdd727fb.png" alt="">
@@ -154,7 +155,8 @@ export default {
       margin: 16px 0;
     }
     .con-btn{
-      margin: 0 auto;
+      // margin: 0 auto;
+      margin-bottom: 16px;
     }
     .item{
       display: flex;

src/pages/hall/index.vue

@@ -18,7 +18,10 @@
               <li :key="index" @click="goPage(item.path, item.pathType)">
                 <img :src="item.icon" alt="" class="img">
                 <img :src="item.iconActive" alt="" class="img-active">
-                <div class="text">{{ item.text }}</div>
+                <div class="text">
+                  <span class="span1">{{ item.text }}</span>
+                  <span class="span2">{{ item.textActive }}</span>
+                </div>
               </li>
             </template>
           </template>
@@ -27,7 +30,10 @@
               <li :key="index" @click="goPage(item.path, item.pathType)">
                 <img :src="item.icon" alt="" class="img">
                 <img :src="item.iconActive" alt="" class="img-active">
-                <div class="text">{{ item.text }}</div>
+                <div class="text">
+                  <span class="span1">{{ item.text }}</span>
+                  <span class="span2">{{ item.textActive }}</span>
+                </div>
               </li>
             </template>
           </template>
@@ -36,7 +42,10 @@
               <li :key="index" @click="goPage(item.path, item.pathType)">
                 <img :src="item.icon" alt="" class="img">
                 <img :src="item.iconActive" alt="" class="img-active">
-                <div class="text">{{ item.text }}</div>
+                <div class="text">
+                  <span class="span1">{{ item.text }}</span>
+                  <span class="span2">{{ item.textActive }}</span>
+                </div>
               </li>
             </template>
           </template>
@@ -69,41 +78,47 @@ export default {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/8617726397bcc6fa81020934c57d92bd.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/ef0878be9e9fa6deab5b9dcfac9af12b.png',
           text: '注册账号',
-          path: '/register'
+          path: '/register',
+          textActive: '注册后方可报名'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/5c7db419e6af3214fa53b1d4920cf7b5.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/76256d877bd6787af42d2f6010108a8b.png',
           text: '学生报名',
-          path: '/hall?role=0&point=1&home=1'
+          path: '/hall?role=0&point=1&home=1',
+          textActive: '可选择学校统一报名或在对应的考点报名'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/b5a6b0bf40f24545fd10cbf315e5839c.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/556e2554d2545d3d3a726dbcbaf20494.png',
           text: '学习课程',
           path: 'https://x-learning.ezijing.com/',
-          pathType: 1
+          pathType: 1,
+          textActive: '进入学习系统学习'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/9c4d618281f12680a367d212545cf041.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/53dd24cbf9c4c1a6ed078ab3b6049e95.png',
           text: '参加考试',
           path: 'https://x-exam.ezijing.com/login/6747074947782279168',
-          pathType: 1
+          pathType: 1,
+          textActive: '考点和考场安排，准考证打印领取时间'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/6bf9fedcbff1d13de413667b33787db3.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/3639914b6dbe79d4b2e745159fd49230.png',
           text: '成绩查询',
           path: 'https://vslc.ncb.edu.cn/csr-scoreCertificate',
-          pathType: 1
+          pathType: 1,
+          textActive: '进入成绩查询系统'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/1e6d8f785a106b17eb698d1d563ff479.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/e3088887b1e2fc9711c7ad692e2e53cd.png',
           text: '证书查询',
           path: 'https://vslc.ncb.edu.cn/csr-verification',
-          pathType: 1
+          pathType: 1,
+          textActive: '进入证书查询系统'
         }
       ],
       teacherNav: [
@@ -111,39 +126,45 @@ export default {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/2da6e70cac93900bdb1867458c9b7449.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/c92aa5f2800a9a5bbedce54bfa0d499b.png',
           text: '注册账号',
-          path: '/register'
+          path: '/register',
+          textActive: '注册后方可报名'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/284f07548eb240cc384a102f1b7efdda.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/0c9823481d85f209b4a498945f31ea83.png',
           text: '师资培训报名',
-          path: '/train'
+          path: '/train',
+          textActive: '提交报名资料，等待审核通知和培训通知'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/b278993ee5c29349ff83d1d9b4b596c9.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/8d24a5c20a8ab87d26db73ccfacd2fba.png',
           text: '老师培训',
           path: 'https://x-learning.ezijing.com/',
-          pathType: 1
+          pathType: 1,
+          textActive: '进入学习系统学习和线下统一培训'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/6f9583c270a3302a352ae9bbba64099d.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/8a16c6cd1dc986075a002fe314f21d0d.png',
           text: '参加考试',
-          path: '/hall?role=1&point=t1&home=1'
+          path: '/hall?role=1&point=t1&home=1',
+          textActive: '培训后参加统一考试'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/06f7b0220ab6d8d9d34f6d68258f2669.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/130affba0b6cefd278c31ddfab74acfc.png',
           text: '培训证书',
-          path: '/hall?role=1&point=t2&home=1'
+          path: '/hall?role=1&point=t2&home=1',
+          textActive: '颁发教学资源（老师）证书'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/70c3defef24fd1438ada43b3e1ccff87.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/fe6b2d4c31d7f6369468c675d5876671.png',
           text: '开班授课',
           path: 'https://x-learning.ezijing.com/',
-          pathType: 1
+          pathType: 1,
+          textActive: '进入学习系统教师端'
         }
       ],
       schoolNav: [
@@ -151,40 +172,46 @@ export default {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/00e366f3cc15ab30c1fd285d10989bed.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/66dd597f670a07584897d03a4c6bd9ab.png',
           text: '注册账号',
-          path: '/register'
+          path: '/register',
+          textActive: '注册后方可申报'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/1dc324792168ee1e6a07b5975e6e3d8b.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/02e1e75b3aed4a92f3038589091be1f2.png',
           text: '试点申报',
           path: 'https://vslc.ncb.edu.cn/csr-declaraPlatform',
-          pathType: 1
+          pathType: 1,
+          textActive: '提交报名资料，等待审核通知'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/17e3d75022ee88d4661bff4ca61f0966.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/073a7d9317d0ff8d8876c4ce53d15bc2.png',
           text: '考点申报',
           path: 'https://vslc.ncb.edu.cn/csr-declaraPlatform',
-          pathType: 1
+          pathType: 1,
+          textActive: '提交资料，等待审核通知'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/ea6a2917391444208d9084c3205227b2.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/55065b21e5ba9bc735a3d3527f07af79.png',
           text: '组织老师培训',
           path: 'https://x-learning.ezijing.com/',
-          pathType: 1
+          pathType: 1,
+          textActive: '给老师分配帐号进入学习系统学习和线下统一培训'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/cc4885f2f4b6f566954cdb15381916f8.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/901044f1465a5497fef8135f9e2ce4ff.png',
           text: '组织开授课',
-          path: '/hall?role=2&point=s1&home=1'
+          path: '/hall?role=2&point=s1&home=1',
+          textActive: '发通知组织统一上课'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/1505fd4535d858b4939e46f2534bfcaf.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/3c3d204e15a400a7f74b4a9dad44cd55.png',
           text: '考试报名',
-          path: '/hall?role=2&point=s2&home=1'
+          path: '/hall?role=2&point=s2&home=1',
+          textActive: '统计学员后统一报名'
         }
       ],
     }
@@ -262,12 +289,19 @@ export default {
         transform: translateY(-10px);
         .img{
           display: none;
+          margin: 43px auto 15px auto;
         }
         .img-active{
           display: block;
         }
         .text{
           color: #fff;
+          .span1{
+            display: none;
+          }
+          .span2{
+            display: block;
+          }
         }
       }
       img{
@@ -282,7 +316,13 @@ export default {
         text-align: center;
         font-size: 16px;
         color: #444444;
-        line-height: 16px;
+        line-height: 18px;
+        .span2{
+          display: none;
+        }
+        .span1{
+          display: block;
+        }
       }
     }
   }

src/pages/home/index.vue

@@ -18,7 +18,10 @@
               <li :key="index" @click="goPage(item.path, item.pathType)">
                 <img :src="item.icon" alt="" class="img">
                 <img :src="item.iconActive" alt="" class="img-active">
-                <div class="text">{{ item.text }}</div>
+                <div class="text">
+                  <span class="span1">{{ item.text }}</span>
+                  <span class="span2">{{ item.textActive }}</span>
+                </div>
               </li>
             </template>
           </template>
@@ -27,7 +30,10 @@
               <li :key="index" @click="goPage(item.path, item.pathType)">
                 <img :src="item.icon" alt="" class="img">
                 <img :src="item.iconActive" alt="" class="img-active">
-                <div class="text">{{ item.text }}</div>
+                <div class="text">
+                  <span class="span1">{{ item.text }}</span>
+                  <span class="span2">{{ item.textActive }}</span>
+                </div>
               </li>
             </template>
           </template>
@@ -36,7 +42,10 @@
               <li :key="index" @click="goPage(item.path, item.pathType)">
                 <img :src="item.icon" alt="" class="img">
                 <img :src="item.iconActive" alt="" class="img-active">
-                <div class="text">{{ item.text }}</div>
+                <div class="text">
+                  <span class="span1">{{ item.text }}</span>
+                  <span class="span2">{{ item.textActive }}</span>
+                </div>
               </li>
             </template>
           </template>
@@ -53,14 +62,14 @@
         <ul class="assist-list">
           <template v-for="(item, index) in list">
             <template v-if="index >= 1 && index <= 4">
-              <router-link :to="`/news/detail?id=${item.id}&type=home`" :key="index">
+              <router-link :to="`/news/detail?id=${item.id}&type=home&tabs=${newsTabIndex}`" :key="index">
                 <li>
                   <div class="text">{{ item.title }}</div>
                 </li>
               </router-link>
             </template>
             <template v-if="list < 4">
-              <router-link :to="`/news/detail?id=${item.id}&type=home`" :key="index">
+              <router-link :to="`/news/detail?id=${item.id}&type=home&tabs=${newsTabIndex}`" :key="index">
                 <li>
                   <div class="text">{{ item.title }}</div>
                 </li>
@@ -68,9 +77,9 @@
             </template>
           </template>
           <li class="border-none">
-            <router-link to="/news">
-              <div class="text">更多通知</div>
-            </router-link>
+            <!-- <router-link to='/news?type='> -->
+            <div class="text" @click="goNewsPage">更多通知</div>
+            <!-- </router-link> -->
           </li>
         </ul>
         <div class="slide-box" v-if="swiperList.length">
@@ -100,13 +109,13 @@
       </div>
       <ul>
         <template v-for="(item, index) in serviceList">
-          <li :key="index">
+          <li :key="index" @click="goPage(item.path, item.pathType)">
             <img :src="item.img" alt="">
             <div class="mask">
               <div class="content-box">
                 <span class="tit">{{ item.title }}</span>
                 <div class="desc">{{ item.desc }}</div>
-                <div class="more" @click="goPage(item.path, item.pathType)">查看更多 ></div>
+                <div class="more">查看更多 ></div>
               </div>
             </div>
           </li>  
@@ -172,41 +181,47 @@ export default {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/8617726397bcc6fa81020934c57d92bd.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/ef0878be9e9fa6deab5b9dcfac9af12b.png',
           text: '注册账号',
-          path: '/register'
+          path: '/register',
+          textActive: '注册后方可报名'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/5c7db419e6af3214fa53b1d4920cf7b5.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/76256d877bd6787af42d2f6010108a8b.png',
-          text: '学生报名',
-          path: '/hall?role=0&point=1'
+          text: '考生报名',
+          path: '/hall?role=0&point=1',
+          textActive: '可选择学校统一报名或在对应的考点报名'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/b5a6b0bf40f24545fd10cbf315e5839c.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/556e2554d2545d3d3a726dbcbaf20494.png',
           text: '学习课程',
           path: 'https://x-learning.ezijing.com/',
-          pathType: 1
+          pathType: 1,
+          textActive: '进入学习系统学习'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/9c4d618281f12680a367d212545cf041.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/53dd24cbf9c4c1a6ed078ab3b6049e95.png',
           text: '参加考试',
           path: 'https://x-exam.ezijing.com/login/6747074947782279168',
-          pathType: 1
+          pathType: 1,
+          textActive: '考点和考场安排，准考证打印领取时间'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/6bf9fedcbff1d13de413667b33787db3.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/3639914b6dbe79d4b2e745159fd49230.png',
           text: '成绩查询',
           path: 'https://vslc.ncb.edu.cn/csr-scoreCertificate',
-          pathType: 1
+          pathType: 1,
+          textActive: '进入成绩查询系统'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/1e6d8f785a106b17eb698d1d563ff479.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/e3088887b1e2fc9711c7ad692e2e53cd.png',
           text: '证书查询',
           path: 'https://vslc.ncb.edu.cn/csr-verification',
-          pathType: 1
+          pathType: 1,
+          textActive: '进入证书查询系统'
         }
       ],
       teacherNav: [
@@ -214,39 +229,45 @@ export default {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/2da6e70cac93900bdb1867458c9b7449.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/c92aa5f2800a9a5bbedce54bfa0d499b.png',
           text: '注册账号',
-          path: '/register'
+          path: '/register',
+          textActive: '注册后方可报名'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/284f07548eb240cc384a102f1b7efdda.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/0c9823481d85f209b4a498945f31ea83.png',
           text: '师资培训报名',
-          path: '/train'
+          path: '/train',
+          textActive: '提交报名资料，等待审核通知和培训通知'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/b278993ee5c29349ff83d1d9b4b596c9.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/8d24a5c20a8ab87d26db73ccfacd2fba.png',
           text: '老师培训',
           path: 'https://x-learning.ezijing.com/',
-          pathType: 1
+          pathType: 1,
+          textActive: '进入学习系统学习和线下统一培训'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/6f9583c270a3302a352ae9bbba64099d.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/8a16c6cd1dc986075a002fe314f21d0d.png',
           text: '参加考试',
-          path: '/hall?role=1&point=t1'
+          path: '/hall?role=1&point=t1',
+          textActive: '培训后参加统一考试'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/06f7b0220ab6d8d9d34f6d68258f2669.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/130affba0b6cefd278c31ddfab74acfc.png',
           text: '培训证书',
-          path: '/hall?role=1&point=t2'
+          path: '/hall?role=1&point=t2',
+          textActive: '颁发教学资源（老师）证书'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/70c3defef24fd1438ada43b3e1ccff87.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/fe6b2d4c31d7f6369468c675d5876671.png',
           text: '开班授课',
           path: 'https://x-learning.ezijing.com/',
-          pathType: 1
+          pathType: 1,
+          textActive: '进入学习系统教师端'
         }
       ],
       schoolNav: [
@@ -254,40 +275,46 @@ export default {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/00e366f3cc15ab30c1fd285d10989bed.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/66dd597f670a07584897d03a4c6bd9ab.png',
           text: '注册账号',
-          path: '/register'
+          path: '/register',
+          textActive: '注册后方可申报'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/1dc324792168ee1e6a07b5975e6e3d8b.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/02e1e75b3aed4a92f3038589091be1f2.png',
           text: '试点申报',
           path: 'https://vslc.ncb.edu.cn/csr-declaraPlatform',
-          pathType: 1
+          pathType: 1,
+          textActive: '提交报名资料，等待审核通知'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/17e3d75022ee88d4661bff4ca61f0966.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/073a7d9317d0ff8d8876c4ce53d15bc2.png',
           text: '考点申报',
           path: 'https://vslc.ncb.edu.cn/csr-declaraPlatform',
-          pathType: 1
+          pathType: 1,
+          textActive: '提交资料，等待审核通知'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/ea6a2917391444208d9084c3205227b2.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/55065b21e5ba9bc735a3d3527f07af79.png',
           text: '组织老师培训',
           path: 'https://x-learning.ezijing.com/',
-          pathType: 1
+          pathType: 1,
+          textActive: '给老师分配帐号进入学习系统学习和线下统一培训'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/cc4885f2f4b6f566954cdb15381916f8.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/901044f1465a5497fef8135f9e2ce4ff.png',
           text: '组织开授课',
-          path: '/hall?role=2&point=s1'
+          path: '/hall?role=2&point=s1',
+          textActive: '发通知组织统一上课'
         },
         {
           icon: 'https://zws-imgs-pub.ezijing.com/static/public/1505fd4535d858b4939e46f2534bfcaf.png',
           iconActive: 'https://zws-imgs-pub.ezijing.com/static/public/3c3d204e15a400a7f74b4a9dad44cd55.png',
           text: '考试报名',
-          path: '/hall?role=2&point=s2'
+          path: '/hall?role=2&point=s2',
+          textActive: '统计学员后统一报名'
         }
       ],
       offsetBtn: ['我是考生', '我是老师', '我是学校'],
@@ -323,14 +350,31 @@ export default {
     }
   },
   mounted() {
+    if (this.$route.query.type) {
+      this.offsetTabIndex = this.$route.query.type
+    }
     this.newsList()
   },
   methods: {
+    goNewsPage() {
+      this.$router.push({
+        path: '/news',
+        query: {
+          type: this.newsTabIndex
+        }
+      })
+    },  
     newsTab(n) {
       this.newsTabIndex = n
       this.newsList()
     },
     offsetTab(n) {
+      this.$router.push({
+        path: '/index',
+        query: {
+          type: n
+        }
+      })
       this.offsetTabIndex = n
     },
     tabs(n) {
@@ -345,13 +389,13 @@ export default {
         })
       }
     },
-    newsList(name) {
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'//
-      })
+    newsList() {
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: 'Loading',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'//
+      // })
       if (!Object.keys(this.$store.state.classify).length) {
         setTimeout(() => {
           this.articleClassify = this.$store.state.classify
@@ -374,7 +418,7 @@ export default {
               console.log(this.swiperList)
             }
           })
-          loading.close()
+          // loading.close()
         })
       }
     }
@@ -441,12 +485,19 @@ export default {
           transform: translateY(-10px);
           .img{
             display: none;
+            margin: 43px auto 15px auto;
           }
           .img-active{
             display: block;
           }
           .text{
             color: #fff;
+            .span1{
+              display: none;
+            }
+            .span2{
+              display: block;
+            }
           }
         }
         img{
@@ -461,7 +512,13 @@ export default {
           text-align: center;
           font-size: 16px;
           color: #444444;
-          line-height: 16px;
+          line-height: 18px;
+          .span2{
+            display: none;
+          }
+          .span1{
+            display: block;
+          }
         }
       }
     }

src/pages/news/components/listItem.vue

@@ -3,7 +3,7 @@
     <div class="title">{{ data.title }}</div>
     <div class="time">{{ data.created_at }}</div>
     <div class="content" v-html="data.excerpt"></div>
-    <router-link :to="`/news/detail?id=${data.id}`"><div class="detail-btn">查看详情</div></router-link>
+    <router-link :to="`/news/detail?id=${data.id}&tabs=${index}`"><div class="detail-btn">查看详情</div></router-link>
   </div>
 </template>
 <script>
@@ -12,7 +12,8 @@ export default {
     data: {
       type: Object,
       default: {}
-    }
+    },
+    index: {}
   }
 }
 </script>

src/pages/news/detail.vue

@@ -21,11 +21,7 @@ export default {
           name: '首页'
         },
         {
-          path: '/news',
-          name: '新闻列表'
-        },
-        {
-          name: '新闻详情'
+          name: this.$route.query.tabs ? '工作动态' : '通知公告'
         }
       ]
     }
@@ -39,7 +35,7 @@ export default {
           name: '首页'
         },
         {
-          name: '新闻详情'
+          name: this.$route.query.tabs ? '工作动态' : '通知公告'
         }
       ]
     }

src/pages/news/index.vue

@@ -2,11 +2,11 @@
   <div class="news-box">
     <haedBanner></haedBanner>
     <!-- <breadcrumb class="content-max-width crumb" :data="crumbData"/> -->
-    <btn-tabs class="tabs-box content-max-width" :data="tabsData"></btn-tabs>
+    <btn-tabs class="tabs-box content-max-width" @tabsChange='tabsChange' :data="tabsData"></btn-tabs>
     <ul class="content-max-width">
       <template v-for="(item, index) in list">
         <li :key="index">
-          <item :data="item"></item>
+          <item :data="item" :index="tabsDataIndex"></item>
         </li>
       </template>
     </ul>
@@ -14,7 +14,7 @@
       <el-pagination
         :page-size="pages.page_size"
         layout="prev, pager, next, jumper"
-        :total="pages.total">
+        :total="5">
       </el-pagination>
     </div>
   </div>
@@ -36,8 +36,10 @@ export default {
     return {
       articleClassify: this.$store.state.classify,
       tabsData: {
-        options: ['新闻动态', '活动公告']
+        options: ['新闻动态', '工作动态'],
+        index: 0
       },
+      tabsDataIndex: 0,
       list: [],
       pages: {},
       crumbData: [
@@ -52,11 +54,18 @@ export default {
     }    
   },
   created() {
+    if (this.$route.query.type) {
+      this.tabsData.index = this.$route.query.type
+    }
   },
   mounted() {
     this.newsList()
   },
   methods: {
+    tabsChange(n) {
+      this.tabsDataIndex = n
+      this.newsList()
+    },
     newsList() {
       const loading = this.$loading({
         lock: true,
@@ -71,7 +80,7 @@ export default {
         }, 2000)
       } else {
         const findId = this.articleClassify.children.find(item => {
-          return item.display_name === '新闻动态'
+          return item.display_name === (this.tabsDataIndex ? '工作动态' : '新闻动态')
         })
         console.log(findId.id)
         action.articleAction.getArticle({ category_id: findId.id }).then(res => {

src/pages/service/components/buy.vue

@@ -14,7 +14,7 @@
           </div>
         </div>
       </div>
-      <div class="v-code-box">
+      <div class="v-code-box" v-if="false">
         <div class="block"></div>
         <div class="text">手机扫码浏览</div>
       </div>
@@ -38,15 +38,16 @@
           <ul>
             <li>
               <div class="chapter">第一章</div>
-              <div class="node" @click="goChapter">第一节</div>
+               <!-- @click="goChapter" -->
+              <div class="node">第一节</div>
             </li>
             <li>
               <div class="chapter">第一章</div>
-              <div class="node" @click="goChapter">第一节</div>
+              <div class="node">第一节</div>
             </li>
             <li>
               <div class="chapter">第一章</div>
-              <div class="node" @click="goChapter">第一节</div>
+              <div class="node">第一节</div>
             </li>
           </ul>
         </div>