lsc 3 months ago
parent
commit
94b0a3be01

+ 1 - 5
dist/index.html

@@ -32,11 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-<<<<<<< HEAD
-    }</style><link href=./static/css/app.0c665e7eda3f6e1c31634bf3ff6d6f2f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bc3479efe4e7d435ff02.js></script><script type=text/javascript src=./static/js/app.f2060b8312e08c780dd8.js></script></body></html><script>function stopSafari() {
-=======
-    }</style><link href=./static/css/app.9954fb857add13c904e4bf951029d5b7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bc3479efe4e7d435ff02.js></script><script type=text/javascript src=./static/js/app.3d0f9106110b5ebb0f42.js></script></body></html><script>function stopSafari() {
->>>>>>> beta
+    }</style><link href=./static/css/app.9954fb857add13c904e4bf951029d5b7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bc3479efe4e7d435ff02.js></script><script type=text/javascript src=./static/js/app.f17fc64d08d450cd6d73.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


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