Browse Source

update--------hk

lsc 6 months ago
parent
commit
104cde657a

+ 1 - 5
dist/index.html

@@ -32,11 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-<<<<<<< HEAD
-    }</style><link href=./static/css/app.4c895eb5731aa5633687bca5593cc585.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.0ad6c5648a38a6d1fa8f.js></script><script type=text/javascript src=./static/js/vendor.8db9a3f753f5644e3c5e.js></script><script type=text/javascript src=./static/js/app.bfff3a361abb57a4b3c9.js></script></body></html><script>function stopSafari() {
-=======
-    }</style><link href=./static/css/app.3faebb4ab7bb2a1bb7307791b753954b.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.77a666acfa8fe74a3d07.js></script><script type=text/javascript src=./static/js/app.e6dab380549fd9937e78.js></script></body></html><script>function stopSafari() {
->>>>>>> beta
+    }</style><link href=./static/css/app.98ad4941e19522a98f56fb9ed31c414e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.0ad6c5648a38a6d1fa8f.js></script><script type=text/javascript src=./static/js/vendor.77a666acfa8fe74a3d07.js></script><script type=text/javascript src=./static/js/app.aaf5614a9145a2933ddf.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.3faebb4ab7bb2a1bb7307791b753954b.css.map


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


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


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


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


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


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


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


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


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


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


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