преди 2 години · 562dbc5f59
--- a/dist/index.html
+++ b/dist/index.html
@@ -18,7 +18,11 @@
 
				       border-radius: 10px;
			
 
				       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
			
 
				       background-color: rgba(0, 0, 0, 0.1);
			
 
				+<<<<<<< HEAD
			
 
				     }</style><link href=./static/css/app.65d1a9348682ab8fd8db6bf83f5af83f.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.e272a0df0fb3ce5b6fea.js></script><script type=text/javascript src=./static/js/app.3caa1b4651c622e4006e.js></script></body></html><script>function stopSafari() {
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.00c820436c4d11ccd7ae39b734628f14.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.115eaac89edc844b96f9.js></script></body></html><script>function stopSafari() {
			
 
				+>>>>>>> beta
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.00c820436c4d11ccd7ae39b734628f14.css
+++ b/dist/static/css/app.00c820436c4d11ccd7ae39b734628f14.css
--- a/dist/static/css/app.00c820436c4d11ccd7ae39b734628f14.css.map
+++ b/dist/static/css/app.00c820436c4d11ccd7ae39b734628f14.css.map
--- a/dist/static/css/app.65d1a9348682ab8fd8db6bf83f5af83f.css
+++ b/dist/static/css/app.65d1a9348682ab8fd8db6bf83f5af83f.css
--- a/dist/static/css/app.65d1a9348682ab8fd8db6bf83f5af83f.css.map
+++ b/dist/static/css/app.65d1a9348682ab8fd8db6bf83f5af83f.css.map
--- a/dist/static/js/app.115eaac89edc844b96f9.js
+++ b/dist/static/js/app.115eaac89edc844b96f9.js
--- a/dist/static/js/app.115eaac89edc844b96f9.js.map
+++ b/dist/static/js/app.115eaac89edc844b96f9.js.map
--- a/dist/static/js/app.3caa1b4651c622e4006e.js.map
+++ b/dist/static/js/app.3caa1b4651c622e4006e.js.map
--- a/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
+++ b/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
--- a/src/components/easy3/studyStudent.vue
+++ b/src/components/easy3/studyStudent.vue
@@ -8847,7 +8847,7 @@ export default {
 
				               }
			
 
				             }
			
 
				             this.isClickNav = 0;
			
 
				-            if (_chapterData[taskCount].length || _chapterData[taskCount][0].type == 12) {
			
 
				+            if (!_chapterData[taskCount].length || _chapterData[taskCount][0].type == 12) {
			
 
				               this.isClickNav = '';
			
 
				               this.showType = ''
			
 
				             }