|
|
@@ -32,7 +32,11 @@
|
|
|
width: 100%;
|
|
|
background: #e6eaf0;
|
|
|
font-family: '黑体';
|
|
|
+<<<<<<< HEAD
|
|
|
}</style><link href=./static/css/app.7a0cb1561e75ad229de627f9ba86ff60.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3eade43afd174522bb8a.js></script><script type=text/javascript src=./static/js/vendor.5e9ad9b4b6b6930254c8.js></script><script type=text/javascript src=./static/js/app.c343f868dae8d6eb89e5.js></script></body></html><script>function stopSafari() {
|
|
|
+=======
|
|
|
+ }</style><link href=./static/css/app.7151a583a7405eaeec41c4beff753920.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.c046dd5e92c8da101466.js></script><script type=text/javascript src=./static/js/app.b3c4654a892d9cde1ab9.js></script></body></html><script>function stopSafari() {
|
|
|
+>>>>>>> 7704f96753378d774f61410fe1b634de2e1686c9
|
|
|
//阻止safari浏览器双击放大功能
|
|
|
let lastTouchEnd = 0 //更新手指弹起的时间
|
|
|
document.documentElement.addEventListener("touchstart", function (event) {
|
