Merge branch 'beta' into HK

js/Desktop/DeskTop.js

@@ -7567,7 +7567,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             U.MD.D.addOp('','cocoflowOpen','')
                 _formdiv = new U.UF.UI.form(
                     "CocoFlow",
-                    $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "","frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//cloud.cocorobo.hk/aigpt/#/WorkSpace?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "","frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//app.cocorobo.hk/#/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
                     "id": "appStore",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                     "onresize": function () { }

js/app/Onload.js

@@ -1121,16 +1121,16 @@ function loginSet(userInfo, res){
         loginPan(userInfo, userId)
         U.MD.D.I.openApplication('cocoflowDeskTop')
     }
-    // if($(".U_PBL_Check2")[0]){
-    //     $(".U_PBL_Check2")[0].style.display = "none";
-    // }
-    // $(".login")[0].style.display = "none";
-    // $(".register")[0].style.display = "none";
-    // $(".userName")[0].style.display = "block";
-    // $(".userName")[0].innerHTML = US.userInfo.username || US.userInfo.alias;
-    // $(".exit")[0].style.display = "block";
-    // let _vipbox = $('.U_MD_D_BD_vip_box')[0]
-    // _vipbox && (_vipbox.style.right = $(".U_MD_D_BD")[0].offsetWidth + 20 + 'px')
+    if($(".U_PBL_Check2")[0]){
+        $(".U_PBL_Check2")[0].style.display = "none";
+    }
+    $(".login")[0].style.display = "none";
+    $(".register")[0].style.display = "none";
+    $(".userName")[0].style.display = "block";
+    $(".userName")[0].innerHTML = US.userInfo.username || US.userInfo.alias;
+    $(".exit")[0].style.display = "block";
+    let _vipbox = $('.U_MD_D_BD_vip_box')[0]
+    _vipbox && (_vipbox.style.right = $(".U_MD_D_BD")[0].offsetWidth + 20 + 'px')
     // if(userInfo.type === 1 && userInfo.org == 'c95e0a56-c205-11ed-8d51-005056b86db5'){
     //     U.MD.D.I.ModeCheck(2)
     // }else{
@@ -1140,24 +1140,24 @@ function loginSet(userInfo, res){
     //     U.MD.D.I.openApplication("appStore")
     // }
 
-    // let shareCourseId = window.location.href.indexOf("?shareCourseId=")!=-1?window.location.href.split("?shareCourseId=")[1].toString():''
-    // if(shareCourseId){
-    //     console.log(shareCourseId);
-    //     U.MD.D.I.openInApplication("studyDetail", shareCourseId, 5, 1)
-    // }
-    // if(userInfo.type === 1 && window.location.hash.indexOf('project') != -1){
-    //     U.MD.D.I.openApplication("project")
-    // }
-    // if(userInfo.type === 1 && window.location.hash.indexOf('study') != -1){
-    //     U.MD.D.I.openApplication("study")
-    // }
-    // if(userInfo.type === 2 && window.location.hash.indexOf('study') != -1){
-    //     U.MD.D.I.openApplication("studentStudy")
-    // }
+    let shareCourseId = window.location.href.indexOf("?shareCourseId=")!=-1?window.location.href.split("?shareCourseId=")[1].toString():''
+    if(shareCourseId){
+        console.log(shareCourseId);
+        U.MD.D.I.openInApplication("studyDetail", shareCourseId, 5, 1)
+    }
+    if(userInfo.type === 1 && window.location.hash.indexOf('project') != -1){
+        U.MD.D.I.openApplication("project")
+    }
+    if(userInfo.type === 1 && window.location.hash.indexOf('study') != -1){
+        U.MD.D.I.openApplication("study")
+    }
+    if(userInfo.type === 2 && window.location.hash.indexOf('study') != -1){
+        U.MD.D.I.openApplication("studentStudy")
+    }
 
-    // if(userInfo.type === 1 && U.UF.C.queryString('tycode') && U.UF.C.queryString('app')){
-    //     U.MD.D.I.openApplication(U.UF.C.queryString('app'))
-    // }
+    if(userInfo.type === 1 && U.UF.C.queryString('tycode') && U.UF.C.queryString('app')){
+        U.MD.D.I.openApplication(U.UF.C.queryString('app'))
+    }
     U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
 }