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

public/static/js/main_2020_show.js

@@ -2609,7 +2609,8 @@ window.Modernizr = function (n, e, t) {
                 at.locked = 0,
                 at.history = [0, 0, 0, 0],
                 at.pathToLock = i ? a ? 30 : 10 : 0,
-                b.on(a ? z : I, ae),
+                b.on(a ? z : I,  ae),
+                //b.on((a ? z : I)+' pointermove',  ae),//如果touchstart被外层占用的话
                 ye.pause(1),
                 (i ? Pe : Se).addClass(ge.draggedClass),
                 pe("moveStart"),
@@ -2995,10 +2996,10 @@ window.Modernizr = function (n, e, t) {
                         Be[0] && Be.on(B, ce),
                         Re && ge.activateOn && be.on(ge.activateOn + "." + g, "*", ue),
                         De[0] && ge.activatePageOn && De.on(ge.activatePageOn + "." + g, "*", fe),
-                        We.on(P, {
+                        We.on(P /*+ ' pointerdown'*/, {
                             source: "slidee"
                         }, te),
-                        Se && Se.on(P, {
+                        Se && Se.on(P/* + ' pointerdown'*/, {
                             source: "handle"
                         }, te),
                         b.on("keydown", de),
@@ -7607,7 +7608,9 @@ window.Modernizr = function (n, e, t) {
                         //}
                     })
                         
-                        
+                    //scrollFrame.on("pointerdown", function() {
+                    //     lastMoveScrollTime = Date.now()
+                    //})  
                     
             }
             function w() {