1 year ago · 6170933556
--- a/dist/index.html
+++ b/dist/index.html
@@ -25,11 +25,7 @@
 
				       height: 100%;
			
 
				       width: 100%;
			
 
				       background: #e6eaf0;
			
 
				-<<<<<<< HEAD
			
 
				-    }</style><link href=./static/css/app.242162ee2d7e77d022cdc0ea047a0e2a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f583576dfec9dfc9a295.js></script><script type=text/javascript src=./static/js/vendor.47326b7cf726c651fd28.js></script><script type=text/javascript src=./static/js/app.99755465fdd40095e602.js></script></body></html><script>function stopSafari() {
			
 
				-=======
			
 
				-    }</style><link href=./static/css/app.b4f606f16eaef4bad888922da038e445.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.8ffff308c091adcd1c07.js></script></body></html><script>function stopSafari() {
			
 
				->>>>>>> beta
			
 
				+    }</style><link href=./static/css/app.2e2dde51e5cc6d58aa6e3a2f8ad31f7c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f583576dfec9dfc9a295.js></script><script type=text/javascript src=./static/js/vendor.47326b7cf726c651fd28.js></script><script type=text/javascript src=./static/js/app.ded1e95a30c1862d0c74.js></script></body></html><script>function stopSafari() {
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.242162ee2d7e77d022cdc0ea047a0e2a.css
+++ b/dist/static/css/app.242162ee2d7e77d022cdc0ea047a0e2a.css
--- a/dist/static/css/app.242162ee2d7e77d022cdc0ea047a0e2a.css.map
+++ b/dist/static/css/app.242162ee2d7e77d022cdc0ea047a0e2a.css.map
--- a/dist/static/css/app.2e2dde51e5cc6d58aa6e3a2f8ad31f7c.css
+++ b/dist/static/css/app.2e2dde51e5cc6d58aa6e3a2f8ad31f7c.css
--- a/dist/static/css/app.2e2dde51e5cc6d58aa6e3a2f8ad31f7c.css.map
+++ b/dist/static/css/app.2e2dde51e5cc6d58aa6e3a2f8ad31f7c.css.map
--- a/dist/static/css/app.b4f606f16eaef4bad888922da038e445.css
+++ b/dist/static/css/app.b4f606f16eaef4bad888922da038e445.css
--- a/dist/static/css/app.b4f606f16eaef4bad888922da038e445.css.map
+++ b/dist/static/css/app.b4f606f16eaef4bad888922da038e445.css.map
--- a/dist/static/img/icon_add.0f4f852.png
+++ b/dist/static/img/icon_add.0f4f852.png
--- a/dist/static/img/icon_finish.d36cdce.png
+++ b/dist/static/img/icon_finish.d36cdce.png
--- a/dist/static/img/icon_last.6997540.png
+++ b/dist/static/img/icon_last.6997540.png
--- a/dist/static/img/icon_next.9c51962.png
+++ b/dist/static/img/icon_next.9c51962.png
--- a/dist/static/img/icon_return.cf697fa.png
+++ b/dist/static/img/icon_return.cf697fa.png
--- a/dist/static/js/app.8ffff308c091adcd1c07.js
+++ b/dist/static/js/app.8ffff308c091adcd1c07.js
--- a/dist/static/js/app.8ffff308c091adcd1c07.js.map
+++ b/dist/static/js/app.8ffff308c091adcd1c07.js.map
--- a/dist/static/js/app.99755465fdd40095e602.js
+++ b/dist/static/js/app.99755465fdd40095e602.js
--- a/dist/static/js/app.99755465fdd40095e602.js.map
+++ b/dist/static/js/app.99755465fdd40095e602.js.map
--- a/dist/static/js/app.ded1e95a30c1862d0c74.js
+++ b/dist/static/js/app.ded1e95a30c1862d0c74.js
--- a/dist/static/js/app.ded1e95a30c1862d0c74.js.map
+++ b/dist/static/js/app.ded1e95a30c1862d0c74.js.map
--- a/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
+++ b/dist/static/js/manifest.f583576dfec9dfc9a295.js.map