4 月之前 · 1013b4e3ee
--- a/dist/index.html
+++ b/dist/index.html
@@ -32,11 +32,7 @@
 
															       width: 100%;
														
 
															       background: #e6eaf0;
														
 
															       font-family: '黑体';
														
 
															-<<<<<<< HEAD
														
 
															     }</style><link href=./static/css/app.89d25105094258ef50e6fa29112ecd4c.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.6bffbf9058a42e825dbc.js></script><script type=text/javascript src=./static/js/app.c46c6936840b30fee220.js></script></body></html><script>function stopSafari() {
														
 
															-=======
														
 
															-    }</style><link href=./static/css/app.a436b78c6192f09506fd36e97ea3d034.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.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.e5e64b348dc9224fa748.js></script></body></html><script>function stopSafari() {
														
 
															->>>>>>> fe3e446ab971b29c34d20ed82dd836e4095ae265
														
 
															     //阻止safari浏览器双击放大功能
														
 
															     let lastTouchEnd = 0  //更新手指弹起的时间
														
 
															     document.documentElement.addEventListener("touchstart", function (event) {