lsc 1 سال پیش
والد
کامیت
5f632c2627
3فایلهای تغییر یافته به همراه6 افزوده شده و 4 حذف شده
  1. 1 1
      js/Desktop/DeskTop.js
  2. 4 3
      js/Desktop/Onload.js
  3. 1 0
      uform.js

+ 1 - 1
js/Desktop/DeskTop.js

@@ -1319,7 +1319,7 @@ window.addEventListener('message', function (e) { // 监听 message 事件
     } else if (e.data.tools && e.data.tools == "1y") {
         U.MD.D.I.openApplicationYu("whiteboard", e.data.cid, e.data.stage, e.data.task, e.data.tool)
     } else if (e.data.tools && e.data.tools == "inviteLogin") {
-        U.MD.D.getuser2(e.data.userid)
+        U.MD.D.getuser2(e.data.userid, e.data.courseId)
     }
 
 });

+ 4 - 3
js/Desktop/Onload.js

@@ -411,7 +411,7 @@ U.MD.D.getuser = function () {
 
                                     US.userInfo = res.value[0][0];
                                     $(".avatar")[0].style.display = "block";
-                                    if(res.value[0][0].type === 1 && $(".U_PBL_Check")[0]){
+                                    if(res.value[0][0].type === 1 && $(".U_PBL_Check")[0] && res.value[0][0].org != '150e3120-9195-11ed-b13d-005056b86db5'){
                                         $(".U_PBL_Check")[0].style.display = "block";
                                     }
                                 }
@@ -513,7 +513,7 @@ U.MD.D.addLoginTime = function(){
     }
 }
 
-U.MD.D.getuser2 = function (userid) {
+U.MD.D.getuser2 = function (userid, cid) {
     U.A.Request(US.Config.pbl + "selectUser?userid=" + userid, [], function (res) { //US.userInfo.userid
         if ($("#U_MD_HomeC_Pop")[0]) {
             $("#U_MD_HomeC_Pop")[0].close(); //关闭登陆
@@ -590,7 +590,7 @@ U.MD.D.getuser2 = function (userid) {
 
         US.userInfo = res.value[0][0];
         $(".avatar")[0].style.display = "block";
-        if (res.value[0][0].type === 1 && $(".U_PBL_Check")[0]) {
+        if (res.value[0][0].type === 1 && $(".U_PBL_Check")[0] && res.value[0][0].org != '150e3120-9195-11ed-b13d-005056b86db5') {
             $(".U_PBL_Check")[0].style.display = "block";
         }
         $(".login")[0].style.display = "none";
@@ -600,6 +600,7 @@ U.MD.D.getuser2 = function (userid) {
         $(".exit")[0].style.display = "block";
         U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
         U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
+        U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
     }, [], { "type": "GET", "withCredentials": true });
 }
 

+ 1 - 0
uform.js

@@ -11578,6 +11578,7 @@ U.MD.U.L.login = U.MD.U.L.DLTC = function (fun) {
     else {
         if(U.UF.C.queryString('code')){
             var _iframe = $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "id": "UI_Login", "name": "UI_Login", "frameborder": "no", "border": "0", "scrolling ": "no", "src": "https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/inviteLogin?code="+U.UF.C.queryString('code') });
+            // var _iframe = $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "id": "UI_Login", "name": "UI_Login", "frameborder": "no", "border": "0", "scrolling ": "no", "src": "http://localhost:8080/#/inviteLogin?code="+U.UF.C.queryString('code') });
             new U.UF.UI.form("登录", _iframe,
                 {
                     "id": "U_MD_HomeC_Pop",