Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/new_era

public/static/js/main_2020_show.js

@@ -7595,20 +7595,19 @@ window.Modernizr = function (n, e, t) {
                     })
                     
                     let dragstart 
-                    scrollFrame.on("pointerdown",  function() { 
+                    /* scrollFrame.on("pointerdown",  function() { 
                         dragstart = true
                     })
                     scrollFrame.on("pointerup",  function() {
                         dragstart = false
-                    })
+                    }) */
                     scrollFrame.on("pointermove",  function() {
-                        if(dragstart){
+                        //if(dragstart){
                             lastMoveScrollTime = Date.now()
-                        }
+                        //}
                     })
-                    
-                    
-                    
+                        
+                        
                     
             }
             function w() {