Browse Source

update---hk

lsc 9 months ago
parent
commit
ac12a22d06

+ 1 - 5
dist/index.html

@@ -27,11 +27,7 @@
     html,
     body{
       font-family: '黑体';
-<<<<<<< HEAD
-    }</style><link href=./static/css/app.6eafa9a63f4694e69b03b99df493a173.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.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.4579deb74f0108cc27a9.js></script></body></html><script>function stopSafari() {
-=======
-    }</style><link href=./static/css/app.7abebab11ed1dee687dd09c63f6dc604.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.264e3d6e7c524117db80.js></script><script type=text/javascript src=./static/js/app.ba7d6680f576337472b1.js></script></body></html><script>function stopSafari() {
->>>>>>> beta
+    }</style><link href=./static/css/app.8aad9ff5a5a29247b3642dcb691f1549.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.264e3d6e7c524117db80.js></script><script type=text/javascript src=./static/js/app.c85f8b424404082f677c.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 - 1
dist/static/css/app.6eafa9a63f4694e69b03b99df493a173.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.6eafa9a63f4694e69b03b99df493a173.css.map


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


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.8aad9ff5a5a29247b3642dcb691f1549.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.8aad9ff5a5a29247b3642dcb691f1549.css.map


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.c85f8b424404082f677c.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