Merge branch 'master' into HK

src/views/pocAiClassroom/chatArea2.vue

@@ -16,13 +16,14 @@ export default {
 			userId: this.$store.state.user.userinfo.userid,
       org: this.$store.state.user.userinfo.org,
       oid: this.$store.state.user.userinfo.organizeid,
-			src:"https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=90bec943-65cf-11ef-9db4-12e77c4cb76b&isPbl=false"
+			src:`https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=90bec943-65cf-11ef-9db4-12e77c4cb76b&isPbl=false`
     };
   },
   methods: {
 
   },
   mounted() {
+		this.src = `https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=90bec943-65cf-11ef-9db4-12e77c4cb76b&isPbl=false&session_id=${this.userId}`
     console.log("聊聊天")
   }
 };

src/views/pocAiClassroom/doTask.vue

@@ -1278,7 +1278,6 @@ export default {
       }
     },
     back() {
-			window.localStorage.setItem("showDialog",1)
 			this.$router.go(-1)
       // this.$router.push(`/pocAiClassroom`)
     },
@@ -1729,6 +1728,7 @@ ${taskMsg}
     }
   },
   mounted() {
+		window.localStorage.setItem("showDialog",JSON.stringify({type:1,time:new Date().getTime()}))
     this.keepTime()
     this.sortTaskList()
     this.changeChapter(this.type)
@@ -2716,11 +2716,13 @@ ${taskMsg}
 }
 
 .dt_c_m_btnArea > span {
-  padding: 10px 30px;
+	max-width: 40vw;
+	white-space: nowrap;
+  padding: 10px 20px;
   border-radius: 8px;
   font-size: 16px;
   cursor: pointer;
-  margin-left: 20px;
+  margin-left: 10px;
   cursor: pointer;
   background-color: #fdfeff;
   box-sizing: border-box;

src/views/pocAiClassroom/index.vue

@@ -58,6 +58,7 @@
           <div class="pac_s_i_list">
             <div
               :class="['pac_s_i_l_item', chapter == index ? 'pac_s_i_l_itemActive' : '',[0,2].includes(index)?'pac_s_i_l_itemDisabled':'']"
+							style="justify-content: flex-start;padding-left: 2px;"
               v-for="(item, index) in classList"
               :key="index"
               @click.stop="changeChapter(index)"
@@ -697,14 +698,20 @@ export default {
 		getFirstEnterStatus(){
 			let data = window.localStorage.getItem('showDialog');
 			if(data){
-				if(data==1){
+				data = JSON.parse(data)
+				if(data.type==1){
+					if((new Date().getTime()-data.time)<=(1000*60)){
+						return window.localStorage.removeItem('showDialog')
+					};
 					this.dialogMessage = `同學仔，歡迎返嚟！請問你想要繼續學習，定係想同我傾吓偈呢？`
 					this.showDialog = true;
-					window.localStorage.removeItem('showDialog')
-				}else if(data==2){
+				}else if(data.type==2){
+					if((new Date().getTime()-data.time)<=(1000*60)){
+						return window.localStorage.removeItem('showDialog')
+					};
 					this.dialogMessage = `同學仔，歡迎返嚟！請問你想要繼續學習，定係想同我傾吓偈呢？`
 					this.showDialog = true;
-					window.localStorage.removeItem('showDialog')
+					
 				}
 				
 			}else{

src/views/pocAiClassroom/pocClass.vue

@@ -17,12 +17,11 @@ export default {
       org: this.$store.state.user.userinfo.org,
       oid: this.$store.state.user.userinfo.organizeid,
 			type:this.$route.query.type,
-			src:"https://beta.cloud.cocorobo.cn/aigpt/#/js?active_role=3"
+			src:"https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=798c3511-6b32-11ef-8ce0-12e77c4cb76b&isPbl=false&session_id=merenduihua444"
     };
   },
   methods: {
 		back(){
-			window.localStorage.setItem("showDialog",1)
 			this.$router.go(-1)
 		}
   },
@@ -30,14 +29,15 @@ export default {
     if (this.type == 1) {
 			// 2.1
 			console.log("2.1课程")
-      this.src = `https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=798c3511-6b32-11ef-8ce0-12e77c4cb76b&isPbl=false`;
+      this.src = `https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=798c3511-6b32-11ef-8ce0-12e77c4cb76b&isPbl=false&session_id=${this.userId}`;
 			console.log("5")
     } else if (this.type == 2) {
 			//2.2
 			console.log("2.2课程")
-      this.src = `https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=a9883cc4-6c3d-11ef-8ce0-12e77c4cb76b&isPbl=false`;
+      this.src = `https://beta.cloud.cocorobo.cn/aigpt/#/js?muti_agent_id=a9883cc4-6c3d-11ef-8ce0-12e77c4cb76b&isPbl=false&session_id=${this.userId}`;
 			console.log(3)
     }
+		window.localStorage.setItem("showDialog",JSON.stringify({type:1,time:new Date().getTime()}))
   }
 };
 </script>

src/views/pocAiClassroom/selfMessage.vue

@@ -36,7 +36,7 @@
         </div>
       </div>
       <div class="sm_f_item">
-        <div class="sm_f_item_label">手机号<span>*</span></div>
+        <div class="sm_f_item_label">手机号</div>
         <div class="sm_f_item_middle">
           <el-input class="sm_f_input" v-model.number="userInfo.phone" placeholder="请输入手机号" maxlength="11"></el-input>
         </div>

src/views/pocAiClassroom/startIndex.vue

@@ -811,7 +811,7 @@ export default {
 				
       } else {
 				if(this.userInfo.userId && this.userInfo.userId==this.userId){
-					window.localStorage.setItem('showDialog',2)
+					window.localStorage.setItem('showDialog',JSON.stringify({type:2,time:new Date().getTime()}))
 					return this.$router.push('/pocAiClassroom')
 				}
         if (!this.showOpeningRemarks) return;