3 недель назад · 1bd3b80d1c
--- a/dist/index.html
+++ b/dist/index.html
@@ -27,11 +27,7 @@
 
				     html,
			
 
				     body{
			
 
				       font-family: '黑体';
			
 
				-<<<<<<< HEAD
			
 
				-    }</style><link href=./static/css/app.087ed75c6e02dde53878e3a7c0f4d50c.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.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.00718c0f7edc70b09ce5.js></script></body></html><script>function stopSafari() {
			
 
				-=======
			
 
				-    }</style><link href=./static/css/app.db882188fc25ddb57d0257f07bfeebc8.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.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.6ea52106497e30cadfaf.js></script></body></html><script>function stopSafari() {
			
 
				->>>>>>> beta
			
 
				+    }</style><link href=./static/css/app.9d7189a9e7cf4c82f7d016c5e252d170.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.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.8295d0bc13b4021732f0.js></script></body></html><script>function stopSafari() {
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.087ed75c6e02dde53878e3a7c0f4d50c.css
+++ b/dist/static/css/app.087ed75c6e02dde53878e3a7c0f4d50c.css
--- a/dist/static/css/app.087ed75c6e02dde53878e3a7c0f4d50c.css.map
+++ b/dist/static/css/app.087ed75c6e02dde53878e3a7c0f4d50c.css.map
--- a/dist/static/css/app.9d7189a9e7cf4c82f7d016c5e252d170.css
+++ b/dist/static/css/app.9d7189a9e7cf4c82f7d016c5e252d170.css
--- a/dist/static/css/app.9d7189a9e7cf4c82f7d016c5e252d170.css.map
+++ b/dist/static/css/app.9d7189a9e7cf4c82f7d016c5e252d170.css.map
--- a/dist/static/js/app.00718c0f7edc70b09ce5.js
+++ b/dist/static/js/app.00718c0f7edc70b09ce5.js
--- a/dist/static/js/app.00718c0f7edc70b09ce5.js.map
+++ b/dist/static/js/app.00718c0f7edc70b09ce5.js.map
--- a/dist/static/js/app.6ea52106497e30cadfaf.js
+++ b/dist/static/js/app.6ea52106497e30cadfaf.js
--- a/dist/static/js/app.6ea52106497e30cadfaf.js.map
+++ b/dist/static/js/app.6ea52106497e30cadfaf.js.map
--- a/dist/static/js/app.8295d0bc13b4021732f0.js
+++ b/dist/static/js/app.8295d0bc13b4021732f0.js
--- a/dist/static/js/app.8295d0bc13b4021732f0.js.map
+++ b/dist/static/js/app.8295d0bc13b4021732f0.js.map
--- a/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
+++ b/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
--- a/package-lock.json
+++ b/package-lock.json
@@ -13942,7 +13942,7 @@
 
				     },
			
 
				     "node_modules/language-hk-loader": {
			
 
				       "version": "1.0.1",
			
 
				-      "resolved": "https://registry.npmmirror.com/language-hk-loader/-/language-hk-loader-1.0.1.tgz",
			
 
				+      "resolved": "https://mirrors.cloud.tencent.com/npm/language-hk-loader/-/language-hk-loader-1.0.1.tgz",
			
 
				       "integrity": "sha512-OmOLx119bkmabkQYn4GvxzMrnp2PAxX6lhHkMwqyaHA6Casi6SyO5uhst1+svPJcR+kA7r8d7H3ri97N1JKXng=="
			
 
				     },
			
 
				     "node_modules/last-call-webpack-plugin": {
			
@@ -35776,7 +35776,7 @@
 
				     },
			
 
				     "language-hk-loader": {
			
 
				       "version": "1.0.1",
			
 
				-      "resolved": "https://registry.npmmirror.com/language-hk-loader/-/language-hk-loader-1.0.1.tgz",
			
 
				+      "resolved": "https://mirrors.cloud.tencent.com/npm/language-hk-loader/-/language-hk-loader-1.0.1.tgz",
			
 
				       "integrity": "sha512-OmOLx119bkmabkQYn4GvxzMrnp2PAxX6lhHkMwqyaHA6Casi6SyO5uhst1+svPJcR+kA7r8d7H3ri97N1JKXng=="
			
 
				     },
			
 
				     "last-call-webpack-plugin": {
			
@@ -49397,7 +49397,7 @@
 
				         },
			
 
				         "language-hk-loader": {
			
 
				           "version": "1.0.1",
			
 
				-          "resolved": "https://registry.npmmirror.com/language-hk-loader/-/language-hk-loader-1.0.1.tgz",
			
 
				+          "resolved": "https://mirrors.cloud.tencent.com/npm/language-hk-loader/-/language-hk-loader-1.0.1.tgz",
			
 
				           "integrity": "sha512-OmOLx119bkmabkQYn4GvxzMrnp2PAxX6lhHkMwqyaHA6Casi6SyO5uhst1+svPJcR+kA7r8d7H3ri97N1JKXng=="
			
 
				         },
			
 
				         "last-call-webpack-plugin": {