před 1 měsícem · 3b0d485752
--- 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.28a2c4d63a86dd61d3513fa5cb9c603f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.9811ebe9d5c4458a1b2a.js></script><script type=text/javascript src=./static/js/vendor.bb486323f0fa002ba2e7.js></script><script type=text/javascript src=./static/js/app.b062ea701f9d5fdc25c2.js></script></body></html><script>function stopSafari() {
														
 
															-=======
														
 
															     }</style><link href=./static/css/app.156045663f5343f214c4a79f74d1c8ea.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.5d0ddd6e68b49886c989.js></script></body></html><script>function stopSafari() {
														
 
															->>>>>>> beta
														
 
															     //阻止safari浏览器双击放大功能
														
 
															     let lastTouchEnd = 0  //更新手指弹起的时间
														
 
															     document.documentElement.addEventListener("touchstart", function (event) {
														
--- a/dist/static/css/app.156045663f5343f214c4a79f74d1c8ea.css.map
+++ b/dist/static/css/app.156045663f5343f214c4a79f74d1c8ea.css.map
--- a/dist/static/js/app.5d0ddd6e68b49886c989.js
+++ b/dist/static/js/app.5d0ddd6e68b49886c989.js
--- a/dist/static/js/app.5d0ddd6e68b49886c989.js.map
+++ b/dist/static/js/app.5d0ddd6e68b49886c989.js.map
--- a/dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
+++ b/dist/static/js/manifest.161e82026ac2ae03ab6f.js.map