2 år sedan · 01a3267c8d
--- 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.8cffda4c8970d34babcaa3fcbd2372ce.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.87f137c6eceb0da0df7b.js></script></body></html><script>function stopSafari() {
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.f73a1c5dbb06bd453d686cb0b8875b4b.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.32f53e738c34e435ee86.js></script></body></html><script>function stopSafari() {
			
 
				+>>>>>>> beta
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.8cffda4c8970d34babcaa3fcbd2372ce.css
+++ b/dist/static/css/app.8cffda4c8970d34babcaa3fcbd2372ce.css
--- a/dist/static/css/app.8cffda4c8970d34babcaa3fcbd2372ce.css.map
+++ b/dist/static/css/app.8cffda4c8970d34babcaa3fcbd2372ce.css.map
--- a/dist/static/css/app.f73a1c5dbb06bd453d686cb0b8875b4b.css
+++ b/dist/static/css/app.f73a1c5dbb06bd453d686cb0b8875b4b.css
--- a/dist/static/css/app.f73a1c5dbb06bd453d686cb0b8875b4b.css.map
+++ b/dist/static/css/app.f73a1c5dbb06bd453d686cb0b8875b4b.css.map
--- a/dist/static/js/app.32f53e738c34e435ee86.js
+++ b/dist/static/js/app.32f53e738c34e435ee86.js
--- a/dist/static/js/app.32f53e738c34e435ee86.js.map
+++ b/dist/static/js/app.32f53e738c34e435ee86.js.map
--- a/dist/static/js/app.87f137c6eceb0da0df7b.js.map
+++ b/dist/static/js/app.87f137c6eceb0da0df7b.js.map
--- a/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
+++ b/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
--- a/src/components/easy2/studyStudent.vue
+++ b/src/components/easy2/studyStudent.vue
@@ -16666,6 +16666,13 @@ export default {
 
				           this.askJson.askTitle = this.chapTools.askJson.askTitle;
			
 
				           this.askJson.askCount = this.chapTools.askJson.askCount;
			
 
				         }
			
 
				+        for (var k = 0; k < this.askJson.askJson.length; k++) {
			
 
				+          if (this.askJson.askJson[k].type == "2") {
			
 
				+            this.radio.push([]);
			
 
				+          } else {
			
 
				+            this.radio.push("");
			
 
				+          }
			
 
				+        }
			
 
				         this.dialogVisible5Teacher = true;
			
 
				       } else if (t == 45) {
			
 
				         this.noteName = "";
			
--- a/src/components/easy3/studyStudent.vue
+++ b/src/components/easy3/studyStudent.vue
@@ -16521,6 +16521,13 @@ export default {
 
				           this.askJson.askTitle = this.chapTools.askJson.askTitle;
			
 
				           this.askJson.askCount = this.chapTools.askJson.askCount;
			
 
				         }
			
 
				+        for (var k = 0; k < this.askJson.askJson.length; k++) {
			
 
				+          if (this.askJson.askJson[k].type == "2") {
			
 
				+            this.radio.push([]);
			
 
				+          } else {
			
 
				+            this.radio.push("");
			
 
				+          }
			
 
				+        }
			
 
				         this.dialogVisible5Teacher = true;
			
 
				       } else if (t == 45) {
			
 
				         this.noteName = "";
			
--- a/src/components/studyStudent.vue
+++ b/src/components/studyStudent.vue
@@ -15806,6 +15806,13 @@ export default {
 
				           this.askJson.askTitle = this.chapTools.askJson.askTitle;
			
 
				           this.askJson.askCount = this.chapTools.askJson.askCount;
			
 
				         }
			
 
				+        for (var k = 0; k < this.askJson.askJson.length; k++) {
			
 
				+          if (this.askJson.askJson[k].type == "2") {
			
 
				+            this.radio.push([]);
			
 
				+          } else {
			
 
				+            this.radio.push("");
			
 
				+          }
			
 
				+        }
			
 
				         this.dialogVisible5Teacher = true;
			
 
				       } else if (t == 45) {
			
 
				         this.noteName = "";