Kaynağa Gözat

Revert "滚动调修改"

This reverts commit 391d3817d914dbb1211b95d351a217bc872a2fb5.
zhangxc 5 yıl önce
ebeveyn
işleme
424d29c0c5
3 değiştirilmiş dosya ile 8 ekleme ve 15 silme
  1. 0 3
      src/css/roll.css
  2. 5 6
      src/js/console.js
  3. 3 6
      src/js/scrollBar.js

+ 0 - 3
src/css/roll.css

@@ -55,7 +55,4 @@ div,p {margin: 0; padding: 0;}
 }
 .explainPan_scroll_wrap{
 	height: 180px;
-}
-.scroll_wrap .explainPan_scroll_bar{
-	top: 20px;
 }

+ 5 - 6
src/js/console.js

@@ -1688,11 +1688,6 @@ function panDetailB(data){
     $(".explainPan").css({
         marginTop:-($(".explainPan").height()/2-20)+'px'
     })
-    new CusScrollBar({
-        contentSelector: '.explainPan_scroll_cont' , //滚动内容区
-        barSelector: '.explainPan_scroll_bar', //滚动条
-        sliderSelector: '.explainPan_scroll_slider' //滚动滑块
-    });
 }
 //时间获取
 function getTimeDetail(){
@@ -1849,5 +1844,9 @@ $(function() {
         barSelector: '.console_scroll_bar', //滚动条
         sliderSelector: '.console_scroll_slider' //滚动滑块
     });
-    
+    new CusScrollBar({
+        contentSelector: '.explainPan_scroll_cont' , //滚动内容区
+        barSelector: '.explainPan_scroll_bar', //滚动条
+        sliderSelector: '.explainPan_scroll_slider' //滚动滑块
+    });
 });

+ 3 - 6
src/js/scrollBar.js

@@ -1,5 +1,3 @@
-const e = require("express");
-
 /*
 用途项目:自定义滚动条实现
 */
@@ -20,7 +18,7 @@ const e = require("express");
         contentSelector: '',  //滚动内容区选择器
         barSelector: '',      //滚动条选择器
         sliderSelector: '',   //滚动滑块选择器
-        wheelStep: 10,        //滚动步长(鼠标移动一下,内容滚动的幅度)
+        wheelStep: 100,        //滚动步长(鼠标移动一下,内容滚动的幅度)
       }
       // 覆盖参数
       $.extend(true, self.options, options||{});
@@ -55,7 +53,7 @@ const e = require("express");
      },
      // 根据内容来定义滑块的高度
      _initSliderHeight: function() {
-       console.log(this.$cont.height(),this.$cont[0].scrollHeight)
+       console.log(this.$cont.height(),this.$cont)
       var rate = this.$cont.height() /this.$cont[0].scrollHeight;
       var sliderHeight = rate*this.$bar.height();
       console.log("rate",rate)
@@ -132,8 +130,7 @@ const e = require("express");
     // 监听内容的滚动,同步滑块的位置
     _bindContentScroll: function() {
       var self = this;
-      self.$cont.on('scroll', function(e){
-        // e.stopPropagation()
+      self.$cont.on('scroll', function(){
         var sliderEl = self.$slider && self.$slider[0];
         if (sliderEl) {
           // 设置滑块的位置