|
|
@@ -27,7 +27,11 @@
|
|
|
html,
|
|
|
body{
|
|
|
font-family: '黑体';
|
|
|
+<<<<<<< HEAD
|
|
|
}</style><link href=./static/css/app.28f96951c1830232e7e04975f9e228c5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.df892e136e42207122b9.js></script></body></html><script>function stopSafari() {
|
|
|
+=======
|
|
|
+ }</style><link href=./static/css/app.28f96951c1830232e7e04975f9e228c5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.de8742f2140c202cd3d0.js></script></body></html><script>function stopSafari() {
|
|
|
+>>>>>>> a0ef6eb69855e1e8d31b91f534596e29d691fc58
|
|
|
//阻止safari浏览器双击放大功能
|
|
|
let lastTouchEnd = 0 //更新手指弹起的时间
|
|
|
document.documentElement.addEventListener("touchstart", function (event) {
|
