9 ヶ月前 · 1a0a9631bc
--- a/dist/index.html
+++ b/dist/index.html
@@ -32,7 +32,11 @@
 
															       width: 100%;
														
 
															       background: #e6eaf0;
														
 
															       font-family: '黑体';
														
 
															+<<<<<<< HEAD
														
 
															+    }</style><link href=./static/css/app.ae42e894bd9dc960fd7c14c14b183ff2.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.b8ca4864f3f84bfe39d6.js></script><script type=text/javascript src=./static/js/app.944e1e997768903315b3.js></script></body></html><script>function stopSafari() {
														
 
															+=======
														
 
															     }</style><link href=./static/css/app.ac9cc624e725fbc8a3aec71c48baf3d0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.d5f0d79dbb0d92c052d4.js></script><script type=text/javascript src=./static/js/app.1a546da32a74eafae154.js></script></body></html><script>function stopSafari() {
														
 
															+>>>>>>> f17e7ca1fc7f442e78e18c9d5d85fe68297996c2
														
 
															     //阻止safari浏览器双击放大功能
														
 
															     let lastTouchEnd = 0  //更新手指弹起的时间
														
 
															     document.documentElement.addEventListener("touchstart", function (event) {
														
--- a/dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
+++ b/dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
--- a/dist/static/js/vendor.d5f0d79dbb0d92c052d4.js
+++ b/dist/static/js/vendor.d5f0d79dbb0d92c052d4.js
--- a/dist/static/js/vendor.d5f0d79dbb0d92c052d4.js.map
+++ b/dist/static/js/vendor.d5f0d79dbb0d92c052d4.js.map
--- a/package-lock.json
+++ b/package-lock.json