qgt 18 hours ago
parent
commit
ed10bfcfb7

+ 0 - 4
dist/index.html

@@ -37,11 +37,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-<<<<<<< HEAD
     }</style><link href=./static/css/app.7a80cc3ed965af112bbc262c977e79ad.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.13ce8e475898fba4b86d.js></script><script type=text/javascript src=./static/js/vendor.715d92365c85ab803f65.js></script><script type=text/javascript src=./static/js/app.3138bdf0c4c48f8e2462.js></script></body></html><script>function stopSafari() {
-=======
-    }</style><link href=./static/css/app.2cdb376c168dceff82bb39f1b2f3f426.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.13ce8e475898fba4b86d.js></script><script type=text/javascript src=./static/js/vendor.715d92365c85ab803f65.js></script><script type=text/javascript src=./static/js/app.bc3c8f94c3c7e98454ce.js></script></body></html><script>function stopSafari() {
->>>>>>> beta
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 1
dist/static/css/app.2cdb376c168dceff82bb39f1b2f3f426.css


File diff suppressed because it is too large
+ 0 - 1
dist/static/css/app.2cdb376c168dceff82bb39f1b2f3f426.css.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/css/app.7a80cc3ed965af112bbc262c977e79ad.css


File diff suppressed because it is too large
+ 0 - 1
dist/static/css/app.7a80cc3ed965af112bbc262c977e79ad.css.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/app.3138bdf0c4c48f8e2462.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/app.3138bdf0c4c48f8e2462.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/app.bc3c8f94c3c7e98454ce.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.bc3c8f94c3c7e98454ce.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.13ce8e475898fba4b86d.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/vendor.715d92365c85ab803f65.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


Some files were not shown because too many files changed in this diff