update

src/views/pocAiClassroom/startIndex.vue

@@ -816,13 +816,8 @@ export default {
       } else {
 				if(this.userInfo.userId && this.userInfo.userId==this.userId){
 					window.localStorage.setItem('showDialog',JSON.stringify({type:2,time:new Date().getTime()}))
-<<<<<<< HEAD
-					if(this.$route.name=='pocStartIndex')this.$router.push('/pocAiClassroom');
-					return;
-=======
 					if(this.$route.name=='pocStartIndex')this.$router.push('/pocAiClassroom')
 					return 
->>>>>>> master
 				}
         if (!this.showOpeningRemarks) return;
         this.showOpeningRemarks = false;
@@ -966,7 +961,6 @@ export default {
 			this.userInfo.userId = this.userId;
 			this.userInfo.phone = "";
 			this.userInfo.birthday = "";
-			window.localStorage.setItem('firstEnter',1)
 			window.localStorage.setItem('pocUserInfo', JSON.stringify(this.userInfo));
 
 			this.$router.push('/pocAiClassroom')