Commit 3edacb26 by 林翔

Merge branch 'lx_xinhot_h5_20190307'

parents f22f29ac 5062e9e2
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<link rel="icon" href="favicon.ico"> <link rel="icon" href="favicon.ico">
<link rel="stylesheet" type="text/css" href="./css/mui.min.css"> <link rel="stylesheet" type="text/css" href="./css/mui.min.css">
<link rel="stylesheet" type="text/css" href="./css/style.css"> <!-- <link rel="stylesheet" type="text/css" href="./css/style.css"> -->
<script>document.write("<link rel='stylesheet' type='text/css' href='./css/style.css?v=" + Date.now() + "'>");</script>
<script type="text/javascript" src="./js/font.js"></script> <script type="text/javascript" src="./js/font.js"></script>
</head> </head>
<body> <body>
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<link rel="icon" href="favicon.ico"> <link rel="icon" href="favicon.ico">
<link rel="stylesheet" type="text/css" href="./css/mui.min.css"> <link rel="stylesheet" type="text/css" href="./css/mui.min.css">
<link rel="stylesheet" type="text/css" href="./css/style.css"> <!-- <link rel="stylesheet" type="text/css" href="./css/style.css"> -->
<script>document.write("<link rel='stylesheet' type='text/css' href='./css/style.css?v=" + Date.now() + "'>");</script>
<script type="text/javascript" src="./js/font.js"></script> <script type="text/javascript" src="./js/font.js"></script>
</head> </head>
<body> <body>
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<link rel="icon" href="favicon.ico"> <link rel="icon" href="favicon.ico">
<link rel="stylesheet" type="text/css" href="./css/mui.min.css"> <link rel="stylesheet" type="text/css" href="./css/mui.min.css">
<link rel="stylesheet" type="text/css" href="./css/style.css"> <!-- <link rel="stylesheet" type="text/css" href="./css/style.css"> -->
<script>document.write("<link rel='stylesheet' type='text/css' href='./css/style.css?v=" + Date.now() + "'>");</script>
<script type="text/javascript" src="./js/font.js"></script> <script type="text/javascript" src="./js/font.js"></script>
</head> </head>
<body> <body>
......
...@@ -45,7 +45,7 @@ var xinhot = { ...@@ -45,7 +45,7 @@ var xinhot = {
// $("body,html").animate({scrollTop:(top-50)+"px"},500); // $("body,html").animate({scrollTop:(top-50)+"px"},500);
$("body,html").css({"overflow":"hidden"}); $("body,html").css({"overflow":"hidden"});
$(".mask,.mask-content").bind("touchmove",function(e){ $(".container").bind("touchmove",function(e){
e.prevenDefault(); e.prevenDefault();
}); });
...@@ -79,7 +79,7 @@ var xinhot = { ...@@ -79,7 +79,7 @@ var xinhot = {
// $("body,html").animate({scrollTop:(top-50)+"px"},500); // $("body,html").animate({scrollTop:(top-50)+"px"},500);
$("body,html").css({"overflow":"hidden"}); $("body,html").css({"overflow":"hidden"});
$(".mask,.mask-content").bind("touchmove",function(e){ $(".container").bind("touchmove",function(e){
e.prevenDefault(); e.prevenDefault();
}); });
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<link rel="icon" href="favicon.ico"> <link rel="icon" href="favicon.ico">
<link rel="stylesheet" type="text/css" href="./css/mui.min.css"> <link rel="stylesheet" type="text/css" href="./css/mui.min.css">
<link rel="stylesheet" type="text/css" href="./css/style.css"> <!-- <link rel="stylesheet" type="text/css" href="./css/style.css"> -->
<script>document.write("<link rel='stylesheet' type='text/css' href='./css/style.css?v=" + Date.now() + "'>");</script>
<script type="text/javascript" src="./js/font.js"></script> <script type="text/javascript" src="./js/font.js"></script>
</head> </head>
<body> <body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment