11 月之前 · d3b7760b5d
--- a/dist/index.html
+++ b/dist/index.html
@@ -32,10 +32,14 @@
 
				       width: 100%;
			
 
				       background: #e6eaf0;
			
 
				       font-family: '黑体';
			
 
				+<<<<<<< HEAD
			
 
				 <<<<<<< HEAD
			
 
				     }</style><link href=./static/css/app.c76147f69cd84f8bf20497e63aa207d1.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.35dfb1d95a63059f336f.js></script><script type=text/javascript src=./static/js/app.a818aaf926b8efb24844.js></script></body></html><script>function stopSafari() {
			
 
				 =======
			
 
				     }</style><link href=./static/css/app.1e602bf0ee3bde0afd61f22d6f20be1d.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.99ecd68f0ea1b548f2f6.js></script><script type=text/javascript src=./static/js/app.37c454d4b79befdd32ae.js></script></body></html><script>function stopSafari() {
			
 
				+>>>>>>> beta
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.fae9808d5b86c796d7979e25d4cd0bc0.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.99ecd68f0ea1b548f2f6.js></script><script type=text/javascript src=./static/js/app.0297fc483c44865a60df.js></script></body></html><script>function stopSafari() {
			
 
				 >>>>>>> beta
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
--- a/dist/static/css/app.fae9808d5b86c796d7979e25d4cd0bc0.css
+++ b/dist/static/css/app.fae9808d5b86c796d7979e25d4cd0bc0.css
--- a/dist/static/css/app.fae9808d5b86c796d7979e25d4cd0bc0.css.map
+++ b/dist/static/css/app.fae9808d5b86c796d7979e25d4cd0bc0.css.map
--- a/dist/static/img/bg2.dbe40e4.png
+++ b/dist/static/img/bg2.dbe40e4.png
--- a/dist/static/js/app.0297fc483c44865a60df.js
+++ b/dist/static/js/app.0297fc483c44865a60df.js
--- a/dist/static/js/app.0297fc483c44865a60df.js.map
+++ b/dist/static/js/app.0297fc483c44865a60df.js.map
--- a/dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
+++ b/dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -10,10 +10,10 @@ const store = new Vuex.Store({
 
				         userInfo: {},
			
 
				         nCount: 0,
			
 
				         report:"",
			
 
				-        // api: 'https://pbl.cocorobo.cn/api/pbl/',
			
 
				+        api: 'https://pbl.cocorobo.cn/api/pbl/',
			
 
				         socket: "https://poll.cocorobo.cn",
			
 
				         // socket: "http://localhost:1473",
			
 
				-        api: 'http://localhost:7003/api/pbl/',
			
 
				+        // api: 'http://localhost:7003/api/pbl/',
			
 
				     },
			
 
				 
			
 
				     mutations: {