1 year ago · 8233fa9c59
--- a/dist/index.html
+++ b/dist/index.html
@@ -25,15 +25,7 @@
 
				       height: 100%;
			
 
				       width: 100%;
			
 
				       background: #e6eaf0;
			
 
				-<<<<<<< HEAD
			
 
				-    }</style><link href=./static/css/app.1ea0745f8759c3ccb5b47f66c4bd31d9.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.64f9c3f2d941ed21657e.js></script></body></html><script>function stopSafari() {
			
 
				-=======
			
 
				-<<<<<<< HEAD
			
 
				-    }</style><link href=./static/css/app.8db61530cac78e086e080ad56f8b3372.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4ae2783fdfe7ab52e4d5.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.a8d9b67ee56036db82da.js></script></body></html><script>function stopSafari() {
			
 
				-=======
			
 
				-    }</style><link href=./static/css/app.58a6b41197bea4871a9880be0e71c882.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.fe4284aa32465342a4e0.js></script></body></html><script>function stopSafari() {
			
 
				->>>>>>> 02df65c2f33f546c3b41100979e63a9a1d4d6f96
			
 
				->>>>>>> 69e7b6e8668f04bafa6685cf32902519d369efb9
			
 
				+    }</style><link href=./static/css/app.b3af82350d3918113dbf3971ad336703.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.a47c8be119f09bb91676.js></script></body></html><script>function stopSafari() {
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.8db61530cac78e086e080ad56f8b3372.css
+++ b/dist/static/css/app.8db61530cac78e086e080ad56f8b3372.css
--- a/dist/static/css/app.8db61530cac78e086e080ad56f8b3372.css.map
+++ b/dist/static/css/app.8db61530cac78e086e080ad56f8b3372.css.map
--- a/dist/static/css/app.b3af82350d3918113dbf3971ad336703.css
+++ b/dist/static/css/app.b3af82350d3918113dbf3971ad336703.css
--- a/dist/static/css/app.b3af82350d3918113dbf3971ad336703.css.map
+++ b/dist/static/css/app.b3af82350d3918113dbf3971ad336703.css.map
--- a/dist/static/js/0.7bd37c6227e5d67b75fe.js
+++ b/dist/static/js/0.7bd37c6227e5d67b75fe.js
--- a/dist/static/js/0.7bd37c6227e5d67b75fe.js.map
+++ b/dist/static/js/0.7bd37c6227e5d67b75fe.js.map
--- a/dist/static/js/app.a47c8be119f09bb91676.js
+++ b/dist/static/js/app.a47c8be119f09bb91676.js
--- a/dist/static/js/app.a47c8be119f09bb91676.js.map
+++ b/dist/static/js/app.a47c8be119f09bb91676.js.map
--- a/dist/static/js/app.a8d9b67ee56036db82da.js
+++ b/dist/static/js/app.a8d9b67ee56036db82da.js
--- a/dist/static/js/app.a8d9b67ee56036db82da.js.map
+++ b/dist/static/js/app.a8d9b67ee56036db82da.js.map
--- a/dist/static/js/manifest.3512a67a6213c2df4180.js.map
+++ b/dist/static/js/manifest.3512a67a6213c2df4180.js.map
--- a/dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js
+++ b/dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js
@@ -1,2 +0,0 @@
 
				-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={4:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"7bd37c6227e5d67b75fe",1:"994623639438b244a74c"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
			
 
				-//# sourceMappingURL=manifest.4ae2783fdfe7ab52e4d5.js.map
			
--- a/dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js.map
+++ b/dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js.map