Merge branch 'xiaxs' into '1a86cad6'

Xiaxs

See merge request !27

src/components/Tab/index.vue

 <template>
-    <div class="tab">
+    <div class="tab" :class="{ init: activeIndex === null }">
         <div class="item" :class="{ active: activeIndex === 0 }" @click="grow"></div>
         <div class="item" :class="{ active: activeIndex === 1 }"  @click="progress"></div>
         <div class="item" :class="{ active: activeIndex === 2 }"  @click="safety"></div>
@@ -17,7 +17,7 @@ export default {
     mounted () {
         const { index = null } = this.$route.query
 
-        this.activeIndex = Number(index)
+        this.activeIndex = index === null ? null : Number(index)
     },
 
     methods: {
@@ -46,6 +46,10 @@ export default {
     justify-content: center;
     align-items: center;
 
+    &.init {
+        top: 45px;
+    }
+
     .item {
         cursor: pointer;
         width: 126px;

src/pages/progress.vue

@@ -37,9 +37,9 @@
 
         <!-- 轮播图 -->
         <div class="carousel">
-            <img src="../../static/images/progress/carousel.png" style="position: relative; top: -45px;" />
-            <!-- <div class="swiper-container swiper-container-horizontal">
-                <div class="swiper-wrapper" style="transition-duration: 0ms; transform: translate3d(-3300px, 0px, 0px);">
+            <!-- <img src="../../static/images/progress/carousel.png" style="position: relative; top: -45px;" /> -->
+            <div class="swiper-container swiper-container-horizontal">
+                <div class="swiper-wrapper">
                     <div class="swiper-slide">
                         <img src="../../static/images/progress/img1.png">
                     </div>
@@ -56,7 +56,7 @@
                         <img src="../../static/images/progress/img5.png">
                     </div>
                 </div>
-            </div> -->
+            </div>
         </div>
 
         <!-- 视频 -->
@@ -255,10 +255,7 @@ export default {
             if (this.teacherName === '陈涛') {
                 this.visible = true
             } else {
-                this.$alert('暂无数据', '提示', {
-                    confirmButtonText: '确定',
-                    center: true
-                })
+                this.$message('暂无数据')
             }
         }
     }
@@ -271,35 +268,6 @@ export default {
     left: 50% !important;
     transform: translate(-50%, -50%);
 }
-
-.carousel {
-    .swiper-container {
-        width: 100%;
-        height: 100%;
-
-        .swiper-slide {
-            width: 394px !important;
-            height: 210px;
-            background: rgba(0, 34, 36, 0.3);
-            border-radius: 10px;
-            overflow: hidden;
-
-            &.swiper-slide-prev, &.swiper-slide-next {
-                opacity: .5 !important;
-            }
-
-            &.swiper-slide-active {
-                z-index: 10;
-                opacity: 1 !important;
-            }
-            img {
-                display: block;
-                width: 100%;
-                height: 100%;
-            }
-        }
-    }
-}
 </style>
 
 <style lang="less" scoped>
@@ -414,7 +382,10 @@ export default {
     width: 1200px;
 
     .swiper-container {
+        top: -42px;
+        left: -190px;
         padding-bottom: 60px;
+        transform: scale(.85);
     }
 
     .swiper-slide {

src/pages/safety.vue

 <template>
     <div class="safety-page">
+        <page-back />
         <div class="header">
             <div class="loge" @click="loge"></div>
 

src/pages/sixthFormStudent.vue

@@ -258,14 +258,16 @@ export default {
         position: absolute;
         top: 111px;
         left: 408px;
+        cursor: pointer;
     }
     .left-bottom{
         width: 96px;
         height: 22px;
         background: url('@{imagePath}btn.png') no-repeat;
         position: absolute;
-        bottom: 271px;
+        bottom: 267px;
         left: 408px;
+        cursor: pointer;
     }
     .research{
         width: 828px;
@@ -324,6 +326,7 @@ export default {
         position: absolute;
         top: 110px;
         left: 1798px;
+        cursor: pointer;
     }
     .right-bottom{
         position: absolute;