Merge branch 'enterprise-wmp' of…

client/src/components/learnSysLayout/sidebar.vue

@@ -53,7 +53,7 @@ export default {
   data () {
     const _global = this.$GLOBAL
     const _path = (_global && _global.sidebar && _global.sidebar.defaultPath) || '/'
-    let defaultActive = '1-1'
+    let defaultActive = ''
     switch (_path) {
       case '/app/tips/learning-tips': defaultActive = '1-1'; break
       case '/app/tips/examina-tips': defaultActive = '1-2'; break

client/src/pages/tips/learningTips.vue

 <template>
-  <div class="mian" id="catalog1">
+  <div class="mian" ref="catalog1" id="catalog1">
     <div class="content fl">
       <div class="title">学习须知</div>
       <div class="cont-left">
         <div class="h2">学习须知</div>
-        <div class="explain" ref="catalog1">
+        <div class="explain">
           <div class="tits">尊敬的学员：</div>
           <div class="txt">您好!欢迎您参加中国银行业协会“高级财富管理师”证书培训项目。为顺利完成学习及考试，请您阅读以下事项。预祝大家学习愉快，学有所获！</div>
         </div>
@@ -140,13 +140,14 @@ export default {
     }
   },
   mounted() {
-    window.addEventListener('scroll', this.handleScrollx, true)
+    document.addEventListener('scroll', this.handleScrollx, true)
   },
   methods: {
     handleScrollx () {
       this.catalogList.map((item, index) => {
+        if (!this.$refs[item.id]) { return }
         const offH = this.$refs[item.id].getBoundingClientRect().top
-        if (offH < 200 && offH > -200) {
+        if (offH < 150 && offH > -150) {
           for (let i = 0; i < this.catalogList.length; i++) {
             this.catalogList[i].active = ''
           }
@@ -271,11 +272,11 @@ export default {
     .cont-right.susp{
       position: fixed;
       right: -10px;
-      top: 100px;
+      top: 80px;
     }
     .cont-right{
       position: absolute;
-      top: 100px;
+      top: 80px;
       right: 0;
       width: 30%;
       .cont{