9 months ago · 3a3372405d
--- a/dist/index.html
+++ b/dist/index.html
@@ -27,11 +27,7 @@
 
				     html,
			
 
				     body{
			
 
				       font-family: '黑体';
			
 
				-<<<<<<< HEAD
			
 
				-    }</style><link href=./static/css/app.47e6f630f330ffe39e84e98cfc387595.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.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.a3d21806e84fdfbb5fe9.js></script></body></html><script>function stopSafari() {
			
 
				-=======
			
 
				-    }</style><link href=./static/css/app.dc47f591b6b6eadadfd41709629ede28.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.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.c5adf6495f99c2c4e9e3.js></script></body></html><script>function stopSafari() {
			
 
				->>>>>>> beta
			
 
				+    }</style><link href=./static/css/app.80ff2a5c014d63fa7e2c553e6e2d32d2.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.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.549c5361c5664100b86a.js></script></body></html><script>function stopSafari() {
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.47e6f630f330ffe39e84e98cfc387595.css
+++ b/dist/static/css/app.47e6f630f330ffe39e84e98cfc387595.css
--- a/dist/static/css/app.47e6f630f330ffe39e84e98cfc387595.css.map
+++ b/dist/static/css/app.47e6f630f330ffe39e84e98cfc387595.css.map
--- a/dist/static/css/app.80ff2a5c014d63fa7e2c553e6e2d32d2.css
+++ b/dist/static/css/app.80ff2a5c014d63fa7e2c553e6e2d32d2.css
--- a/dist/static/css/app.80ff2a5c014d63fa7e2c553e6e2d32d2.css.map
+++ b/dist/static/css/app.80ff2a5c014d63fa7e2c553e6e2d32d2.css.map
--- a/dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css
+++ b/dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css
--- a/dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css.map
+++ b/dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css.map
--- a/dist/static/img/aiTalk.1469289.svg
+++ b/dist/static/img/aiTalk.1469289.svg
--- a/dist/static/img/aiVanish.cc2e3bf.svg
+++ b/dist/static/img/aiVanish.cc2e3bf.svg
--- a/dist/static/img/aiWait2.c8d31c6.svg
+++ b/dist/static/img/aiWait2.c8d31c6.svg
--- a/dist/static/img/practice.25766a7.svg
+++ b/dist/static/img/practice.25766a7.svg
--- a/dist/static/img/robot3.c50070a.svg
+++ b/dist/static/img/robot3.c50070a.svg
--- a/dist/static/js/app.549c5361c5664100b86a.js
+++ b/dist/static/js/app.549c5361c5664100b86a.js
--- a/dist/static/js/app.549c5361c5664100b86a.js.map
+++ b/dist/static/js/app.549c5361c5664100b86a.js.map
--- a/dist/static/js/app.a3d21806e84fdfbb5fe9.js
+++ b/dist/static/js/app.a3d21806e84fdfbb5fe9.js
--- a/dist/static/js/app.a3d21806e84fdfbb5fe9.js.map
+++ b/dist/static/js/app.a3d21806e84fdfbb5fe9.js.map
--- a/dist/static/js/app.c5adf6495f99c2c4e9e3.js
+++ b/dist/static/js/app.c5adf6495f99c2c4e9e3.js
--- a/dist/static/js/app.c5adf6495f99c2c4e9e3.js.map
+++ b/dist/static/js/app.c5adf6495f99c2c4e9e3.js.map
--- a/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
+++ b/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
--- a/src/components/classRoomHelper/component/searchArea.vue
+++ b/src/components/classRoomHelper/component/searchArea.vue
@@ -1506,7 +1506,7 @@ export default {
 
				       isReadonly: true,
			
 
				       showTips: false,
			
 
				 			showTipsList:[],
			
 
				-			languageSetting:0,
			
 
				+			languageSetting:1,
			
 
				     };
			
 
				   },
			
 
				   computed: {
			
--- a/src/components/classRoomHelper/index.vue
+++ b/src/components/classRoomHelper/index.vue
@@ -370,7 +370,7 @@ export default {
 
				 			getWangLoading:false,
			
 
				 			canUseWangData:false,
			
 
				 			wangData:"",
			
 
				-			languageSetting:0,
			
 
				+			languageSetting:1,
			
 
				     };
			
 
				   },
			
 
				   mounted() {