1 anno fa · 17371e1ed3
--- a/dist/index.html
+++ b/dist/index.html
@@ -18,11 +18,7 @@
 
				       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.14c6b77afbbd6e8be373d4dd39a5059f.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.f997da79de948e78b011.js></script><script type=text/javascript src=./static/js/app.ea2bde3ba8e83c857405.js></script></body></html><script>function stopSafari() {
			
 
				-=======
			
 
				-    }</style><link href=./static/css/app.ba10903d92e947f0a50f5c7a615b1813.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.2ea62301d5bc18e5b15b.js></script><script type=text/javascript src=./static/js/app.2969749ef052d6a4fdcd.js></script></body></html><script>function stopSafari() {
			
 
				->>>>>>> beta
			
 
				+    }</style><link href=./static/css/app.dc69f0c82cfc184b1f6ac4b22c00178c.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.db8aabf79454924ff575.js></script><script type=text/javascript src=./static/js/app.512c4f5c0503ee815266.js></script></body></html><script>function stopSafari() {
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.dc69f0c82cfc184b1f6ac4b22c00178c.css
+++ b/dist/static/css/app.dc69f0c82cfc184b1f6ac4b22c00178c.css
--- a/dist/static/css/app.dc69f0c82cfc184b1f6ac4b22c00178c.css.map
+++ b/dist/static/css/app.dc69f0c82cfc184b1f6ac4b22c00178c.css.map
--- a/dist/static/js/app.2969749ef052d6a4fdcd.js
+++ b/dist/static/js/app.2969749ef052d6a4fdcd.js
--- a/dist/static/js/app.2969749ef052d6a4fdcd.js.map
+++ b/dist/static/js/app.2969749ef052d6a4fdcd.js.map
--- a/dist/static/js/app.512c4f5c0503ee815266.js
+++ b/dist/static/js/app.512c4f5c0503ee815266.js
--- a/dist/static/js/app.512c4f5c0503ee815266.js.map
+++ b/dist/static/js/app.512c4f5c0503ee815266.js.map
--- a/dist/static/js/app.ea2bde3ba8e83c857405.js
+++ b/dist/static/js/app.ea2bde3ba8e83c857405.js
--- a/dist/static/js/app.ea2bde3ba8e83c857405.js.map
+++ b/dist/static/js/app.ea2bde3ba8e83c857405.js.map
--- a/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
+++ b/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
--- a/dist/static/js/vendor.2ea62301d5bc18e5b15b.js
+++ b/dist/static/js/vendor.2ea62301d5bc18e5b15b.js
--- a/dist/static/js/vendor.2ea62301d5bc18e5b15b.js.map
+++ b/dist/static/js/vendor.2ea62301d5bc18e5b15b.js.map
--- a/dist/static/js/vendor.db8aabf79454924ff575.js
+++ b/dist/static/js/vendor.db8aabf79454924ff575.js
--- a/dist/static/js/vendor.db8aabf79454924ff575.js.map
+++ b/dist/static/js/vendor.db8aabf79454924ff575.js.map
--- a/dist/static/js/vendor.f997da79de948e78b011.js.map
+++ b/dist/static/js/vendor.f997da79de948e78b011.js.map
--- a/src/components/studentIndex.vue
+++ b/src/components/studentIndex.vue
@@ -317,7 +317,7 @@ export default {
 
				     getCourse(typeName, ftypeId, typeid, type) {
			
 
				       this.page = 1;
			
 
				       this.zoneClass = [];
			
 
				-      if (typeName == "年级") {
			
 
				+      if (typeName == "年级" || typeid == "34628934-d02f-11ec-8c78-005056b86db5" || ftypeId == '34628934-d02f-11ec-8c78-005056b86db5') {
			
 
				         if (type == 1) {
			
 
				           if (this.typeE.indexOf(typeid) != -1) {
			
 
				             this.typeE.splice(this.typeE.indexOf(typeid), 1);