Merge remote-tracking branch 'origin/master'

package-lock.json

@@ -2899,8 +2899,7 @@
       "version": "4.6.0",
       "resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "coa": {
       "version": "2.0.2",
@@ -9861,8 +9860,7 @@
       "version": "4.0.8",
       "resolved": "https://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",

src/components/footer.vue

@@ -21,8 +21,8 @@
                     </div>
                 </div>
             </div>
-            <div class="bottom">
-                <h4>Copyright @ 芝麻开花科技有限公司  保留所有权利  京ICP备13040720号-8</h4>
+            <div class="bottom">    <!-- 京ICP备13040720号-8 -->
+                <h4>Copyright @ 芝麻开花科技有限公司  保留所有权利  <span @click="goMIIT">陕ICP备18005195号</span></h4>
             </div>
         </div>
     </div>
@@ -36,12 +36,17 @@ export default {
     data(){
         return{
             img1:img1,
-            webSite:"网址：http：//www.zhimakahua.com",
-            tel:"400-0018-318",
-            email:"123456789@163.com",
+            webSite:"网址：http://www.xazhima.com",
+            tel:"02981202650",
+            email:"mahailong@xazhima.com",
             address:"陕西省西安市曲江新区雁塔南路1201号金辉环球中心B座1209室"
         }
-    }
+    },
+   methods:{
+     goMIIT:function () {
+       window.open('http://www.beian.miit.gov.cn','_blank')
+     },
+   }
 }
 </script>
 
@@ -156,6 +161,10 @@ export default {
     font-size: 16px;
     color: #999999;
 }
+.footer .bottom h4 span {
+  color: cornflowerblue!important;
+  cursor: pointer;
+}
 @media screen and (max-width:900px){
     .footer .top div h4{
         font-size: 24px;

src/views/Home.vue

@@ -10,27 +10,39 @@
             <div class="bg" :class="{paddingMargin:activeFlag}">
               <p class="line"></p>
               <h6 v-bind:class="{titleMargin:activeFlag}">面对老板和客户</h6>
-              <ul v-show="activeFlag">
-                <li v-for="(box11Arr,index) in box11Arrs" :key="index">
-                  <p><span>· </span>{{box11Arr}}</p>
-                </li>
-              </ul>
+              <transition name="fade">
+                <ul v-show="activeFlag">
+                  <li v-for="(box11Arr,index) in box11Arrs" :key="index">
+                    <p><span>· </span>{{box11Arr}}</p>
+                  </li>
+                </ul>
+              </transition>
             </div>
-            <img src="./images/1@2x.png" alt="加载失败" v-if="!activeFlag">
-            <img src="./images/点击态1.png" alt="加载失败" v-else>
+            <!--<transition name="fade">-->
+              <img src="./images/1@2x.png" alt="加载失败">
+            <!--</transition>-->
+            <transition name="fade">
+             <img src="./images/shadow-left.png" alt="加载失败" v-show="activeFlag" style="top:210px;height:50px">
+            </transition>
           </div>
           <div class="second" @mouseover="mouseOverTeam" @mouseleave="mouseLeaveTeam" @touchstart="mouseOverTeam" @touchend="mouseLeaveTeam">
             <div class="bg" :class="{paddingMargin:activeTeamFlag}">
               <p class="line"></p>
               <h6 :class="{titleMargin:activeTeamFlag}">面对团队内部</h6>
+              <transition name="fade">
               <ul v-show="activeTeamFlag">
                 <li v-for="(box12Arr,index) in box12Arrs" :key="index">
                   <p><span>· </span>{{box12Arr}}</p>
                 </li>
               </ul>
+              </transition>
             </div>
-            <img src="./images/2@2x.png" alt="加载失败" v-if="!activeTeamFlag">
-            <img src="./images/点击状态1.png" alt="加载失败" v-else>
+            <!--<transition name="fade">-->
+             <img src="./images/2@2x.png" alt="加载失败">
+            <!--</transition>-->
+            <transition name="fade">
+             <img src="./images/shadow-right.png" alt="加载失败" v-show="activeTeamFlag" style="height: 65px;top:210px">
+            </transition>
           </div>
         </div>
       </div>
@@ -439,7 +451,8 @@ h5{
   }
   #content .box1 .picture .first img:hover,
   #content .box1 .picture .second img:hover{
-    height: 200px!important
+    height: 200px!important;
+    transition: all 1s linear;
   }
   .bg{
     padding:40px 0!important
@@ -724,6 +737,13 @@ h5{
   justify-content: space-between;
   align-items: center;
 }
+
+.fade-enter,.fade-leave-to{
+  opacity:0;
+}
+.fade-enter-active,.fade-leave-active{
+  transition:opacity 1.5s;
+}
 </style>
 
 <script>

src/views/Teach.vue

@@ -94,7 +94,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="padding5" id="padding5">
+                <div class="padding5" id="padding5" ref="padding5Top">
                     <h3>优秀学员毕业去向</h3>
                     <ul>
                         <li v-for="(goToArr,index) in goToArrs" :key="index"><img :src="goToArr" alt="优秀学员去向"></li>
@@ -219,26 +219,25 @@ export default {
    mounted () {
         // 事件监听滚动条
       window.addEventListener('scroll', this.watchScroll)
-
   },
   methods: {
     watchScroll () {
-          var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
-          let padding5Height=document.getElementById('padding5').offsetTop
-          this.padding5Height=padding5Height
-          //  当滚动超过500时，实现吸顶效果
-          if (scrollTop > 580&& scrollTop<=padding5Height) {
+        var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
+        var padding5Tops = this.$refs.padding5Top.offsetTop//padding5离页面顶端的距离
+        this.padding5Height = padding5Tops
+        //  当滚动超过580时，实现吸顶效果
+          if (scrollTop > 580&& padding5Tops>scrollTop) {
             this.navBarFixed = true;
             this.navabs=false;
-          } else if(scrollTop>padding5Height) {
-            this.navBarFixed = false
-            this.navabs=true
-          }else{
+          } else{
             this.navBarFixed = false
-            this.navabs=false;
+            this.navabs=true;
           }
           this.flag=!this.navBarFixed
     }
+  },
+  beforeDestroy(){
+      window.removeEventListener("scroll", this.watchScroll);
   }
 }
 </script>
@@ -326,6 +325,11 @@ export default {
     border-bottom: 2px solid black;
     margin-bottom: 0px;
 }
+
+#right .middle{
+    /* background: #000000; */
+    margin-top: 10px;
+}
 #right .middle img{
     float: left;
     margin-left: 40px;
@@ -592,9 +596,9 @@ display: inline-block;
 
 /*********************content*************************/
 /************************************右边样式********************************************/
-.navBarWrap {
+.navBarWrap{
     position:fixed;
-    top:40px;
+    top:0px;
     z-index: 999;
 }
 @media screen and (max-width: 1440px) {

src/views/global.vue

@@ -7,3 +7,4 @@ export default {
 };
 </script>
 
+