|
|
@@ -32,7 +32,11 @@
|
|
|
width: 100%;
|
|
|
background: #e6eaf0;
|
|
|
font-family: '黑体';
|
|
|
+<<<<<<< HEAD
|
|
|
}</style><link href=./static/css/app.7e896e7aa595f6e5e9ca5a096679ee5d.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.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.93cd36aef6d887376ff9.js></script></body></html><script>function stopSafari() {
|
|
|
+=======
|
|
|
+ }</style><link href=./static/css/app.93e2a97e4bc201442b4ea9b8960111c0.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.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.75958274eaf0b6922a37.js></script></body></html><script>function stopSafari() {
|
|
|
+>>>>>>> e45a23adb1ae37176b1f4ac869603f366c2f72f7
|
|
|
//阻止safari浏览器双击放大功能
|
|
|
let lastTouchEnd = 0 //更新手指弹起的时间
|
|
|
document.documentElement.addEventListener("touchstart", function (event) {
|
