Merge branch 'beta' into HK

css/Desktop/Desktop.css

@@ -1123,4 +1123,53 @@ body div ::-webkit-scrollbar-resizer:vertical {
 
 .U_PBL_Check>.active{
     opacity: 1;
+}
+
+
+.U_MD_D_BD_vip_box {
+    display: none;
+    /* background-color: #586e86;
+    border: 1px solid #344558; */
+    position: absolute;
+    right: 100px;
+    top: 0;
+    border-radius: 10px;
+    width: 270px;
+    /* height: 100px; */
+    padding: 10px 10px;
+    box-sizing: border-box;
+    box-shadow: 0px 3px 6px 0px #0000003b;
+    background-image: url(../../img/icon/vip_box.png);
+    background-size: 100% 100%;
+}
+
+.vip_info{
+    display: flex;
+    align-items: center;
+}
+.vip_info > img{
+    width: 45px;
+    height: 45px;
+    object-fit: cover;
+}
+.vip_info > div {
+    margin-left: 10px;
+    display: flex;
+    flex-direction: column;
+    font-size: 14px;
+}
+.vip_info > div > span{}
+
+.vip_info > div > span + span{
+    margin-top: 8px;
+}
+
+.vip_school{
+    font-size: 14px;
+    margin-top: 8px;
+    color: #9baabd;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 100%;
 }

index.html

@@ -90,6 +90,18 @@
                 </div>
                 <div class="U_MD_D_BD" __top__="false">
                     <!-- style="max-width: 165px;" -->
+                    <div class="U_MD_D_BD_vip_box">
+                        <div class="vip_info">
+                            <img src="./img/icon/vip_img.png" alt="">
+                            <div>
+                                <span class="vip_member"></span>
+                                <span>使用期限至：<span class="vip_time"></span></span>
+                            </div>
+                        </div>
+                        <div class="vip_school">
+                            <!-- 深圳明德实验学校 -->
+                        </div>
+                    </div>
                     <div class="U_MD_D_BDA">
                         <!-- <div class="U_MD_D_BDI U_Img" id="U_MD_D_BDI" title="登錄">
                         </div> -->

js/Desktop/DeskTop.js

@@ -905,14 +905,15 @@ U.MD.D.I.dseiTeacherDeskIcon = [
     { "Name": "24點", "Url": "24game", "style": { "cssText": "background-image:url(/img/icon/24game.png)" } },
     { "Name": "數學畫板", "Url": "netWorkPanel", "style": { "cssText": "background-image:url(/img/icon/networkPanel.png)" } },
     { "Name": "GeoGebra", "Url": "GeoGebra", "style": { "cssText": "background-image:url(/img/icon/GeoGebra.png)" } },
-    { "Name": "課程進展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
-    { "Name": "教學資源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
-    { "Name": "學習分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
-    { "Name": "AI共創", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
-    { "Name": "AI協同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
-    { "Name": "協同建構", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
-    // { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
-    { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    // { "Name": "课程进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
+    { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
+    // { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
+    // { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    // { "Name": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    // { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
 
 //dsei
@@ -951,14 +952,15 @@ U.MD.D.I.dseiAdminDeskIcon = [
     { "Name": "24點", "Url": "24game", "style": { "cssText": "background-image:url(/img/icon/24game.png)" } },
     { "Name": "數學畫板", "Url": "netWorkPanel", "style": { "cssText": "background-image:url(/img/icon/networkPanel.png)" } },
     { "Name": "GeoGebra", "Url": "GeoGebra", "style": { "cssText": "background-image:url(/img/icon/GeoGebra.png)" } },
-    { "Name": "課程進展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
-    { "Name": "教學資源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
-    { "Name": "學習分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
-    { "Name": "AI共創", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
-    { "Name": "AI協同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
-    { "Name": "協同建構", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
-    // { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
-    { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    // { "Name": "课程进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
+    { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
+    // { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
+    // { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    // { "Name": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    // { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
 
 //dsei
@@ -1615,8 +1617,15 @@ U.MD.D.I.CUHKEDUStudentDeskIcon = [
 
 //010503
 U.MD.D.I.x010503TeacherDeskIcon = [
-    { "Name": "課程管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/project.png)" } },
-    { "Name": "課程中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    { "Name": "课程管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/project.png)" } },
+    { "Name": "课程中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
+    { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
+    { "Name": "项目管理", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
 
 //010503
@@ -1684,7 +1693,9 @@ U.MD.D.I.x010504TeacherDeskIcon = [
     { "Name": "項目管理", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
     { "Name": "項目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
     { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
-    { "Name": "協同建構", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "教师管理", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
+    { "Name": "教师中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
 ];
 
 //010504
@@ -1808,6 +1819,50 @@ U.MD.D.I.x020201StudentDeskIcon = [
     { "Name": "協同建構", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
+//010611
+U.MD.D.I.x010611TeacherDeskIcon = [
+    { "Name": "课程管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/project.png)" } },
+    { "Name": "课程中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
+    { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
+    { "Name": "项目管理", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
+];
+
+//010611
+U.MD.D.I.x010611StudentDeskIcon = [
+    { "Name": "项目管理", "Url": "studentCourse", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+    { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+];
+
+//tianyuan
+U.MD.D.I.tianyuanTeacherDeskIcon = [
+    { "Name": "课程管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/project.png)" } },
+    { "Name": "课程中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
+    { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
+    { "Name": "项目管理", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+    { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
+];
+
+//010611
+U.MD.D.I.tianyuanStudentDeskIcon = [
+    { "Name": "项目管理", "Url": "studentCourse", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+    { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+];
+
+
 
 //#region 桌面初始化a
 
@@ -1983,6 +2038,10 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _x010607TeacherDeskIconInfo = U.MD.D.I.x010607TeacherDeskIcon, //010607
         _x010608StudentDeskIconInfo = U.MD.D.I.x010608StudentDeskIcon, //010608
         _x010608TeacherDeskIconInfo = U.MD.D.I.x010608TeacherDeskIcon, //010608
+        _x010611StudentDeskIconInfo = U.MD.D.I.x010611StudentDeskIcon, //010611
+        _x010611TeacherDeskIconInfo = U.MD.D.I.x010611TeacherDeskIcon, //010611
+        _tianyuantudentDeskIconInfo = U.MD.D.I.tianyuanStudentDeskIcon, //tianyuan
+        _tianyuanTeacherDeskIconInfo = U.MD.D.I.tianyuanTeacherDeskIcon, //tianyuan
         _xhlyStudentDeskIconInfo = U.MD.D.I.xhlyStudentDeskIcon, //xhly
         _xhlyTeacherDeskIconInfo = U.MD.D.I.xhlyTeacherDeskIcon, //xhly
         _CUHKEDUStudentDeskIconInfo = U.MD.D.I.CUHKEDUStudentDeskIcon, //CUHK_EDU
@@ -2007,7 +2066,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _scnuaiAdminDeskIconInfo = U.MD.D.I.scnuaiAdminDeskIcon, //scnuai
         _scnuaiStudentDeskIconInfo = U.MD.D.I.scnuaiStudentDeskIcon, //scnuai
         _szscOrganizerDeskIconInfo = U.MD.D.I.szscOrganizerDeskIcon; //szsc
-    var _oidA = ['69893dca-1d47-11ed-8c78-005056b86db5', "91305d49-01ba-11ed-8c78-005056b86db5", "d9db3320-503a-11ed-8c78-005056b86db5", "05b62310-8cda-11ed-b13d-005056b86db5", '1c3b9def-8fbe-11ed-b13d-005056b86db5', '91305d49-01ba-11ed-8c78-005056b86db4', 'ea2a8c65-f38c-11ed-91d8-005056b86db5', '4c686762-1d0a-11ed-8c78-005056b86db5', 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41', '206c38d2-0cbe-11ee-91d8-005056b86db5', '2f30fe58-a94f-11ee-b534-005056b86db5', 'eaba9110-d1eb-11ee-b534-005056b86db5','c7df0bd4-6e75-401a-a137-4e163aa62263','8a352da2-56e1-11ef-b873-005056b86db5','9b46a3c9-7657-11ef-9b30-005056b86db5','857af1c7-c8ee-4b04-85b5-fd182903adb7','876030db-7a49-11ef-9b30-005056b86db5','b97fc213-86a9-11ef-9b30-005056b86db5', 'c636f63e-86f4-11ef-9b30-005056b86db5','6c16df93-8849-11ef-9b30-005056b86db5','72c16ee0-89fe-11ef-9b30-005056b86db5','369222a8-cddd-11ed-9546-005056b86db5'];
+    var _oidA = ['69893dca-1d47-11ed-8c78-005056b86db5', "91305d49-01ba-11ed-8c78-005056b86db5", "d9db3320-503a-11ed-8c78-005056b86db5", "05b62310-8cda-11ed-b13d-005056b86db5", '1c3b9def-8fbe-11ed-b13d-005056b86db5', '91305d49-01ba-11ed-8c78-005056b86db4', 'ea2a8c65-f38c-11ed-91d8-005056b86db5', '4c686762-1d0a-11ed-8c78-005056b86db5', 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41', '206c38d2-0cbe-11ee-91d8-005056b86db5', '2f30fe58-a94f-11ee-b534-005056b86db5', 'eaba9110-d1eb-11ee-b534-005056b86db5','c7df0bd4-6e75-401a-a137-4e163aa62263','8a352da2-56e1-11ef-b873-005056b86db5','9b46a3c9-7657-11ef-9b30-005056b86db5','857af1c7-c8ee-4b04-85b5-fd182903adb7','876030db-7a49-11ef-9b30-005056b86db5','b97fc213-86a9-11ef-9b30-005056b86db5', 'c636f63e-86f4-11ef-9b30-005056b86db5','6c16df93-8849-11ef-9b30-005056b86db5','72c16ee0-89fe-11ef-9b30-005056b86db5','369222a8-cddd-11ed-9546-005056b86db5','3fc7840d-a1c4-11ef-9b30-005056b86db5'];
     var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d", "383f207d-4ced-4eeb-a15a-7b0a2f3abe7b", "150e3120-9195-11ed-b13d-005056b86db5", "ee40e8e3-e36c-4872-8105-cf395481012s", '97c4ee8b-d010-4042-986d-e9d3c217264f', 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc', '4df1b570-f6ac-48fc-8d50-d0b157dae776', 'e632b86c-f89d-11ed-91d8-005056b86db5', 'b50cf65a-001c-11ee-91d8-005056b86db5', '578de748-05d2-11ee-91d8-005056b86db5', '54f09f1e-09f0-11ee-91d8-005056b86db5', '7b016f69-0f4f-11ee-91d8-005056b86db5', '1973f6c7-1561-11ee-91d8-005056b86db5', '2fa75e51-189a-11ee-91d8-005056b86db5', 'a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956', 'fbb00cc1-380b-4173-add4-59b3cf7682b5', '63060b4a-89dc-4f0c-bf04-a1de22d479ff', '777559d2-7239-11ee-b98c-005056b86db5', '03d24cf9-4fbc-4aeb-bb02-6f84f66e6344','884c5665-a453-46f3-b7b6-01d575290aa9','c9a6de59-8b4f-4be1-8565-a08081f649d3','7f280060-665e-4868-b68f-1eec9e1b4a07','f3b243b2-75e2-4b00-8f66-7644946a2a25','16ace517-b5c7-4168-a9bb-a9e0035df840','2fe1a080-4425-4620-b7a0-be2f3750ffd4','a5efd078-20f6-4185-bef9-6d1c688bee70','23bbe712-e35a-4888-9b4e-8d9e5a4fa2f6','ec84034b-8ea4-4d27-9cba-1adcb4720bb3'];
     //清楚桌面圖標
     el.innerHTML = "";
@@ -2032,11 +2091,12 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "教師中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
             { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
             { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
-            { "Name": "觀察記錄", "Url": "Record", "style": { "cssText": "background-image:url(/img/icon/Record.png)" } },
-            { "Name": "課堂觀察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
-            { "Name": "學生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
-            { "Name": "知識建構", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
-            { "Name": "教師管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+            { "Name": "观察记录", "Url": "Record", "style": { "cssText": "background-image:url(/img/icon/Record.png)" } },
+            { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
+            { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+            { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
+            { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+            { "Name": "应用中心", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
         )
     }
 
@@ -2624,6 +2684,40 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010608StudentDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010608StudentDeskIconInfo[i].Name }, _iconcontent);
             }
+        } else if (_type == 2 && (_oid == "3fc7840d-a1c4-11ef-9b30-005056b86db5")) {
+            for (i = 0; i < _x010611StudentDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010611StudentDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010611StudentDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010611StudentDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010611StudentDeskIconInfo[i].Name }, _iconcontent);
+            }
+        } else if (_type == 2 && (_oid == "e5cdf6b8-abdc-11ef-b887-005056b86db5")) {
+            for (i = 0; i < _tianyuantudentDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_tianyuantudentDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_tianyuantudentDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _tianyuantudentDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _tianyuantudentDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if (_type == 2 && (_oid == "4c686762-1d0a-11ed-8c78-005056b86db5")) {
             for (i = 0; i < _siesStudentDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -4149,6 +4243,46 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010608TeacherDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010608TeacherDeskIconInfo[i].Name }, _iconcontent);
             }
+        } else if ((_type == 1 || _type == 4) && _oid == "3fc7840d-a1c4-11ef-9b30-005056b86db5") {
+            for (i = 0; i < _x010611TeacherDeskIconInfo.length; i++) {
+                if(_role === 0 && _x010611TeacherDeskIconInfo[i].Url == 'testTeacher'){
+                    continue
+                }
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010611TeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010611TeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010611TeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010611TeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
+        } else if ((_type == 1 || _type == 4) && _oid == "e5cdf6b8-abdc-11ef-b887-005056b86db5") {
+            for (i = 0; i < _tianyuanTeacherDeskIconInfo.length; i++) {
+                if(_role === 0 && _tianyuanTeacherDeskIconInfo[i].Url == 'testTeacher'){
+                    continue
+                }
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_tianyuanTeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_tianyuanTeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _tianyuanTeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _tianyuanTeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else {
             for (i = 0; i < _teacherDesktopIconInfo.length; i++) {
                 if(_role === 0 && _teacherDesktopIconInfo[i].Url == 'testTeacher' && _oid != '45facc0a-1211-11ec-80ad-005056b86db5'){
@@ -7028,8 +7162,20 @@ U.MD.D.I.openApplication = function (str, obj, info) {
                     "onresize": function () { }
                 }, {
                     closecallback: function () { }
-                }, { "style": { "height": "36px" } }).form; //創建窗體
-                _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/pblCourse.png)" }, "name": "課堂觀察", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+                }, { "style": { "height": "36px" } }).form; //创建窗体
+                _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/pblCourse.png)" }, "name": "学生PBL", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+                break;
+        case "appStore":
+                _formdiv = new U.UF.UI.form(
+                    "应用中心",
+                    $$("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": US.Config.bpbl + "/pbl-teacher-table/dist/#/appStore?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                    "id": "pblCourse",
+                    "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
+                    "onresize": function () { }
+                }, {
+                    closecallback: function () { }
+                }, { "style": { "height": "36px" } }).form; //创建窗体
+                _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/appStore.png)" }, "name": "应用中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
                 break;
     }
     

js/Desktop/Onload.js

@@ -332,166 +332,7 @@ U.MD.D.getuser = function () {
                                 $("#U_MD_HomeC_Pop")[0].close(); //關閉登陸
                             }
                             U.A.Request(US.Config.pbl + "selectUser?userid=" + _user.userid, [], function (res) { //US.userInfo.userid
-                                if (res.value == null || res.value[0].length == 0) {
-                                    // U.MD.D.I.openApplication("my")
-
-                                    let _name = US.userInfo.alias ? US.userInfo.alias : US.userInfo.username
-                                    let _type = US.userInfo == 1 ? 2 : 1
-                                    // US.Config.pbl
-                                    // "http://localhost:7003/api/pbl/"
-                                    U.A.Request(US.Config.pbl + "updatePblMessage", [_user.userid, _name, _type, '16d397f3-b192-11ed-9211-005056b86db5', '', '', "0"], function (res) {
-                                        window.location.reload();
-                                    }, [], { "type": "POST", "withCredentials": true });
-                                } else {
-                                    if(res.value[0][0].isLogin1 == 2 || res.value[0][0].isLogin2 == 2){
-                                        U.MD.U.LO.logoutSystem2();
-                                        return;
-                                    }
-                                    U.A.Request(US.Config.pbl + "addLoginOperation", [_user.userid], function (res) {
-                                    }, [], { "type": "POST", "withCredentials": true });
-
-                                    if (res.value[0][0].organizeid == '91305d49-01ba-11ed-8c78-005056b86db4') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/mingdeBg.png")'
-                                        US.Config.background = 'url("/img/icon/mingdeBg.png")'
-                                    } else if (res.value[0][0].organizeid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhongshanBg.png")'
-                                        US.Config.background = 'url("/img/icon/zhongshanBg.png")'
-                                    } else if (res.value[0][0].organizeid == '580aac24-a939-49f7-a75a-40a7b5af3a17') {
-                                        // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longweiBg.png")'
-                                    } else if (res.value[0][0].organizeid == 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yunhaiBg.jpg")'
-                                        US.Config.background = 'url("/img/icon/yunhaiBg.png")'
-                                    } else if (res.value[0][0].organizeid == '857af1c7-c8ee-4b04-85b5-fd182903adb7') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/beijingBg.png")'
-                                        US.Config.background = 'url("/img/icon/beijingBg.png")'
-                                    } else if (res.value[0][0].organizeid == '69893dca-1d47-11ed-8c78-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/weilaiBg.png")'
-                                        US.Config.background = 'url("/img/icon/weilaiBg.png")'
-                                    } else if (res.value[0][0].organizeid == 'efdef564-4064-11ed-8c78-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/pz.jpg")'
-                                        US.Config.background = 'url("/img/icon/pz.png")'
-                                    } else if (res.value[0][0].organizeid == 'd9db3320-503a-11ed-8c78-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/hzBg.png")'
-                                        US.Config.background = 'url("/img/icon/hzBg.png")'
-                                    } else if (res.value[0][0].organizeid == 'ccb9754d-59c1-11ed-8c78-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")'
-                                        US.Config.background = 'url("/img/icon/nanfangBg.png")'
-                                    } else if (res.value[0][0].organizeid == 'f30a6615-5379-11ed-8c78-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaBg.png")'
-                                        US.Config.background = 'url("/img/icon/longhuaBg.png")'
-                                    } else if (res.value[0][0].organizeid == '4787cc87-6588-11ed-8c78-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")'
-                                        US.Config.background = 'url("/img/icon/nanfangBg.png")'
-                                    } else if (res.value[0][0].organizeid == '9f888eae-7558-11ed-8c78-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/song.png")'
-                                        US.Config.background = 'url("/img/icon/song.png")'
-                                    } else if (res.value[0][0].organizeid == '2b9ceb66-a1dd-11ed-b13d-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gmxxBg.png")'
-                                        US.Config.background = 'url("/img/icon/gmxxBg.png")'
-                                    } else if (res.value[0][0].organizeid == '1c3b9def-8fbe-11ed-b13d-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/wankeBg.png")'
-                                        US.Config.background = 'url("/img/icon/wankeBg.png")'
-                                    } else if (res.value[0][0].organizeid == '82fcb5c7-c13b-11ed-8d51-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qiaoxiangBg.png")'
-                                        US.Config.background = 'url("/img/icon/qiaoxiangBg.png")'
-                                    } else if (res.value[0][0].organizeid == '4c686762-1d0a-11ed-8c78-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")'
-                                        US.Config.background = 'url("/img/icon/sies.png")'
-                                    } else if (res.value[0][0].organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
-                                        US.Config.background = 'url("/img/icon/longhuaZXBg.png")'
-                                    } else if (res.value[0][0].organizeid == 'f297fbdc-f0a0-11ee-b534-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/010606.png")'
-                                        US.Config.background = 'url("/img/icon/010606.png")'
-                                    }
-                                    
-                                    
-
-                                    if (res.value[0][0].org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yantianOrgBg.png")'
-                                        US.Config.background = 'url("/img/icon/yantianOrgBg.png")'
-                                    } else if (res.value[0][0].org == '7ada499f-4ec7-11ed-8c78-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/csteamBg.png")'
-                                        US.Config.background = 'url("/img/icon/csteamBg.png")'
-                                    } else if (res.value[0][0].org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f0217') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gm/bg.png")'
-                                        US.Config.background = 'url("/img/icon/bg.png")'
-                                        U.MD.D.getNotice();
-                                    } else if (res.value[0][0].org == '97c4ee8b-d010-4042-986d-e9d3c217264f') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhoujia.jpg")'
-                                        US.Config.background = 'url("/img/icon/zhoujia.png")'
-                                    } else if (res.value[0][0].org == '150e3120-9195-11ed-b13d-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/tencentBg.jpg")'
-                                        US.Config.background = 'url("/img/icon/tencentBg.png")'
-                                        U.MD.D.getNotice();
-                                    } else if (res.value[0][0].org == 'ee40e8e3-e36c-4872-8105-cf395481012s') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szscBg.png")'
-                                        US.Config.background = 'url("/img/icon/szscBg.png")'
-                                        U.MD.D.getNotice();
-                                    } else if (res.value[0][0].org == 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/futianBg.png")'
-                                        US.Config.background = 'url("/img/icon/futianBg.png")'
-                                    } else if (res.value[0][0].org == 'e632b86c-f89d-11ed-91d8-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gdjgBg.png")'
-                                        US.Config.background = 'url("/img/icon/gdjgBg.png")'
-                                    } else if (res.value[0][0].org == '54f09f1e-09f0-11ee-91d8-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szlhyjBg.jpeg")'
-                                        US.Config.background = 'url("/img/icon/szlhyjBg.jpeg")'
-                                    } else if (res.value[0][0].org == '7b016f69-0f4f-11ee-91d8-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
-                                        US.Config.background = 'url("/img/icon/dseiBg.png")'
-                                    } else if (res.value[0][0].org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
-                                        US.Config.background = 'url("/img/icon/szjkyBg2.png")'
-                                    } else if (res.value[0][0].org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
-                                        US.Config.background = 'url("/img/icon/chjyjBg.png")'
-                                    } else if (res.value[0][0].org == '2a9f32ea-88df-49eb-aba1-0a286f691474') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.jpg")'
-                                        US.Config.background = 'url("/img/icon/qhBg.jpg")'
-                                    } else if (res.value[0][0].org == '884c5665-a453-46f3-b7b6-01d575290aa9') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/scnuaiBg.png")'
-                                        US.Config.background = 'url("/img/icon/scnuaiBg.png")'
-                                    } else if (res.value[0][0].org == '2fe1a080-4425-4620-b7a0-be2f3750ffd4') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/x010607bgImg.png")'
-                                        US.Config.background = 'url("/img/icon/x010607bgImg.png")'
-                                    } else if (res.value[0][0].org == 'ec84034b-8ea4-4d27-9cba-1adcb4720bb3') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/SPROUTLabBg.png")'
-                                        US.Config.background = 'url("/img/icon/SPROUTLabBg.png")'
-                                    }
-                            
-                                    
-                                    US.userInfo = res.value[0][0];
-                                    $(".avatar")[0].style.display = "block";
-                                    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";
-                                $(".register")[0].style.display = "none";
-                                $(".userName")[0].style.display = "block";
-                                $(".userName")[0].innerHTML = US.userInfo.username || US.userInfo.alias;
-                                $(".exit")[0].style.display = "block";
-                                if(res.value[0][0].type === 1 && res.value[0][0].org == 'c95e0a56-c205-11ed-8d51-005056b86db5'){
-                                    U.MD.D.I.ModeCheck(2)
-                                }else{
-                                    U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
-                                }
-                                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(res.value[0][0].type === 1 && window.location.hash.indexOf('project') != -1){
-                                    U.MD.D.I.openApplication("project")
-                                }
-                                if(res.value[0][0].type === 1 && window.location.hash.indexOf('study') != -1){
-                                    U.MD.D.I.openApplication("study")
-                                }
-                                if(res.value[0][0].type === 2 && window.location.hash.indexOf('study') != -1){
-                                    U.MD.D.I.openApplication("studentStudy")
-                                }
-                                U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
+                                loginSet(res.value[0][0], res)
                             }, [], { "type": "GET", "withCredentials": true });
                         }
 
@@ -551,166 +392,70 @@ U.MD.D.getuser = function () {
                                 let userId = a[0][0].userid
                                 US.userInfo.userid = userId
                                 U.A.Request(US.Config.pbl + "selectUser?userid=" + userId, [], function (res) { //US.userInfo.userid
-                                    if (res.value == null || res.value[0].length == 0) {
-                                        // U.MD.D.I.openApplication("my")
-    
-                                        let _name = US.userInfo.alias ? US.userInfo.alias : US.userInfo.username
-                                        let _type = US.userInfo == 1 ? 2 : 1
-                                        // US.Config.pbl
-                                        // "http://localhost:7003/api/pbl/"
-                                        U.A.Request(US.Config.pbl + "updatePblMessage", [userId, _name, _type, '16d397f3-b192-11ed-9211-005056b86db5', '', '', "0"], function (res) {
-                                            window.location.reload();
-                                        }, [], { "type": "POST", "withCredentials": true });
-                                    } else {
-                                        if(res.value[0][0].isLogin1 == 2 || res.value[0][0].isLogin2 == 2){
-                                            U.MD.U.LO.logoutSystem2();
-                                            return;
-                                        }
-                                        U.A.Request(US.Config.pbl + "addLoginOperation", [userId], function (res) {
-                                        }, [], { "type": "POST", "withCredentials": true });
-    
-                                        if (res.value[0][0].organizeid == '91305d49-01ba-11ed-8c78-005056b86db4') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/mingdeBg.png")'
-                                            US.Config.background = 'url("/img/icon/mingdeBg.png")'
-                                        } else if (res.value[0][0].organizeid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhongshanBg.png")'
-                                            US.Config.background = 'url("/img/icon/zhongshanBg.png")'
-                                        } else if (res.value[0][0].organizeid == '580aac24-a939-49f7-a75a-40a7b5af3a17') {
-                                            // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longweiBg.png")'
-                                        } else if (res.value[0][0].organizeid == 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yunhaiBg.jpg")'
-                                            US.Config.background = 'url("/img/icon/yunhaiBg.png")'
-                                        } else if (res.value[0][0].organizeid == '857af1c7-c8ee-4b04-85b5-fd182903adb7') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/beijingBg.png")'
-                                            US.Config.background = 'url("/img/icon/beijingBg.png")'
-                                        } else if (res.value[0][0].organizeid == '69893dca-1d47-11ed-8c78-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/weilaiBg.png")'
-                                            US.Config.background = 'url("/img/icon/weilaiBg.png")'
-                                        } else if (res.value[0][0].organizeid == 'efdef564-4064-11ed-8c78-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/pz.jpg")'
-                                            US.Config.background = 'url("/img/icon/pz.png")'
-                                        } else if (res.value[0][0].organizeid == 'd9db3320-503a-11ed-8c78-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/hzBg.png")'
-                                            US.Config.background = 'url("/img/icon/hzBg.png")'
-                                        } else if (res.value[0][0].organizeid == 'ccb9754d-59c1-11ed-8c78-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")'
-                                            US.Config.background = 'url("/img/icon/nanfangBg.png")'
-                                        } else if (res.value[0][0].organizeid == 'f30a6615-5379-11ed-8c78-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaBg.png")'
-                                            US.Config.background = 'url("/img/icon/longhuaBg.png")'
-                                        } else if (res.value[0][0].organizeid == '4787cc87-6588-11ed-8c78-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")'
-                                            US.Config.background = 'url("/img/icon/nanfangBg.png")'
-                                        } else if (res.value[0][0].organizeid == '9f888eae-7558-11ed-8c78-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/song.png")'
-                                            US.Config.background = 'url("/img/icon/song.png")'
-                                        } else if (res.value[0][0].organizeid == '2b9ceb66-a1dd-11ed-b13d-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gmxxBg.png")'
-                                            US.Config.background = 'url("/img/icon/gmxxBg.png")'
-                                        } else if (res.value[0][0].organizeid == '1c3b9def-8fbe-11ed-b13d-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/wankeBg.png")'
-                                            US.Config.background = 'url("/img/icon/wankeBg.png")'
-                                        } else if (res.value[0][0].organizeid == '82fcb5c7-c13b-11ed-8d51-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qiaoxiangBg.png")'
-                                            US.Config.background = 'url("/img/icon/qiaoxiangBg.png")'
-                                        } else if (res.value[0][0].organizeid == '4c686762-1d0a-11ed-8c78-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")'
-                                            US.Config.background = 'url("/img/icon/sies.png")'
-                                        } else if (res.value[0][0].organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
-                                            US.Config.background = 'url("/img/icon/longhuaZXBg.png")'
-                                        } else if (res.value[0][0].organizeid == 'f297fbdc-f0a0-11ee-b534-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/010606.png")'
-                                            US.Config.background = 'url("/img/icon/010606.png")'
-                                        }
-                                        
-                                        
-    
-                                        if (res.value[0][0].org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yantianOrgBg.png")'
-                                            US.Config.background = 'url("/img/icon/yantianOrgBg.png")'
-                                        } else if (res.value[0][0].org == '7ada499f-4ec7-11ed-8c78-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/csteamBg.png")'
-                                            US.Config.background = 'url("/img/icon/csteamBg.png")'
-                                        } else if (res.value[0][0].org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f0217') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gm/bg.png")'
-                                            US.Config.background = 'url("/img/icon/bg.png")'
-                                            U.MD.D.getNotice();
-                                        } else if (res.value[0][0].org == '97c4ee8b-d010-4042-986d-e9d3c217264f') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhoujia.jpg")'
-                                            US.Config.background = 'url("/img/icon/zhoujia.png")'
-                                        } else if (res.value[0][0].org == '150e3120-9195-11ed-b13d-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/tencentBg.jpg")'
-                                            US.Config.background = 'url("/img/icon/tencentBg.png")'
-                                            U.MD.D.getNotice();
-                                        } else if (res.value[0][0].org == 'ee40e8e3-e36c-4872-8105-cf395481012s') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szscBg.png")'
-                                            US.Config.background = 'url("/img/icon/szscBg.png")'
-                                            U.MD.D.getNotice();
-                                        } else if (res.value[0][0].org == 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/futianBg.png")'
-                                            US.Config.background = 'url("/img/icon/futianBg.png")'
-                                        } else if (res.value[0][0].org == 'e632b86c-f89d-11ed-91d8-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gdjgBg.png")'
-                                            US.Config.background = 'url("/img/icon/gdjgBg.png")'
-                                        } else if (res.value[0][0].org == '54f09f1e-09f0-11ee-91d8-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szlhyjBg.jpeg")'
-                                            US.Config.background = 'url("/img/icon/szlhyjBg.jpeg")'
-                                        } else if (res.value[0][0].org == '7b016f69-0f4f-11ee-91d8-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
-                                            US.Config.background = 'url("/img/icon/dseiBg.png")'
-                                        } else if (res.value[0][0].org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
-                                            US.Config.background = 'url("/img/icon/szjkyBg2.png")'
-                                        } else if (res.value[0][0].org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
-                                            US.Config.background = 'url("/img/icon/chjyjBg.png")'
-                                        } else if (res.value[0][0].org == '2a9f32ea-88df-49eb-aba1-0a286f691474') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.jpg")'
-                                            US.Config.background = 'url("/img/icon/qhBg.jpg")'
-                                        } else if (res.value[0][0].org == '884c5665-a453-46f3-b7b6-01d575290aa9') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/scnuaiBg.png")'
-                                            US.Config.background = 'url("/img/icon/scnuaiBg.png")'
-                                        } else if (res.value[0][0].org == '2fe1a080-4425-4620-b7a0-be2f3750ffd4') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/x010607bgImg.png")'
-                                            US.Config.background = 'url("/img/icon/x010607bgImg.png")'
-                                        } else if (res.value[0][0].org == 'ec84034b-8ea4-4d27-9cba-1adcb4720bb3') {
-                                            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/SPROUTLabBg.png")'
-                                            US.Config.background = 'url("/img/icon/SPROUTLabBg.png")'
-                                        }
-                                        
-                                        
-                                        US.userInfo = res.value[0][0];
-                                        $(".avatar")[0].style.display = "block";
-                                        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";
-                                    $(".register")[0].style.display = "none";
-                                    $(".userName")[0].style.display = "block";
-                                    $(".userName")[0].innerHTML = US.userInfo.username || US.userInfo.alias;
-                                    $(".exit")[0].style.display = "block";
-                                    if(res.value[0][0].type === 1 && res.value[0][0].org == 'c95e0a56-c205-11ed-8d51-005056b86db5'){
-                                        U.MD.D.I.ModeCheck(2)
-                                    }else{
-                                        U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
-                                    }
-                                    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(res.value[0][0].type === 1 && window.location.hash.indexOf('project') != -1){
-                                        U.MD.D.I.openApplication("project")
-                                    }
-                                    if(res.value[0][0].type === 1 && window.location.hash.indexOf('study') != -1){
-                                        U.MD.D.I.openApplication("study")
-                                    }
-                                    if(res.value[0][0].type === 2 && window.location.hash.indexOf('study') != -1){
-                                        U.MD.D.I.openApplication("studentStudy")
-                                    }
-                                    U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
+                                    loginSet(res.value[0][0], res)
+                                }, [], { "type": "GET", "withCredentials": true });
+                            }
+                            
+                        })
+                        .catch(error => {
+                            LoginState = false
+                            console.log('error', error)
+                        });
+                    
+                }, [], { "type": "POST", "withCredentials": true })
+            }else{
+                U.Alert("用户登录已失效，请重新获取登录信息！");
+            }
+        })
+        .catch(error => {
+            LoginState = false
+            console.log('error', error)
+        });
+    }else if(!LoginState &&Object.keys(userInfo).length === 0 && U.UF.C.queryString('code').length < 32 && U.UF.C.queryString('code').length > 9){
+        if($("#U_MD_HomeC_Pop")[0]){
+            $("#U_MD_HomeC_Pop")[0].close()
+        }
+        LoginState = true
+        let url = "https:" + US.Config.pbl + "luohugetTeacherInfo?code=" + encodeURIComponent(U.UF.C.queryString('code'));
+        var myHeaders = new Headers();
+        myHeaders.append("Content-Type", "application/json");
+
+        var requestOptions = {
+            method: 'GET',
+            redirect: 'follow'
+        };
+
+        fetch(url, requestOptions)
+        .then(response => response.text())
+        .then(result => {
+            // console.log(result)
+            let data = JSON.parse(result).data
+            // return
+            if(JSON.parse(result).code == 0){
+                let diqu = ``
+                let diquId = data.loginid
+                U.A.Request(US.Config.pbl + "batchRegistrationSzdjg3", [data.empname, data.loginid+"@luohu.com", 'c05b87d3-3d8e-4415-9dba-f3deccac4822', data.schoolname || "", data.mobile, "", data.identity === 1 ? 1 : 2, data.loginid,diqu,diquId], function (res) {
+                    // console.log(res);
+                    let loginData = JSON.stringify({
+                        openid: data.loginid,
+                        edu: true
+                    })
+                    var requestOptionsLogin = {
+                        method: 'POST',
+                        headers: myHeaders,
+                        body: loginData,
+                        redirect: 'follow'
+                     };
+                     
+                     fetch("https://beta.api.cocorobo.cn/api/user", requestOptionsLogin)
+                        .then(response => response.text())
+                        .then(result => {
+                            let a = JSON.parse(result)
+                            if(a.length>0){
+                                let userId = a[0][0].userid
+                                US.userInfo.userid = userId
+                                U.A.Request(US.Config.pbl + "selectUser?userid=" + userId, [], function (res) { //US.userInfo.userid
+                                    loginSet(res.value[0][0], res)
                                 }, [], { "type": "GET", "withCredentials": true });
                             }
                             
@@ -846,117 +591,7 @@ U.MD.D.getuser2 = function (userid, cid) {
         if ($("#U_MD_HomeC_Pop")[0]) {
             $("#U_MD_HomeC_Pop")[0].close(); //關閉登陸
         }
-        if(res.value[0][0].isLogin1 == 2 || res.value[0][0].isLogin2 == 2){
-            U.MD.U.LO.logoutSystem2();
-            return;
-        }
-        U.A.Request(US.Config.pbl + "addLoginOperation", [userid], function (res) {
-        }, [], { "type": "POST", "withCredentials": true });
-
-        if (res.value[0][0].organizeid == '91305d49-01ba-11ed-8c78-005056b86db4') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/mingdeBg.png")'
-            US.Config.background = 'url("/img/icon/mingdeBg.png")'
-        } else if (res.value[0][0].organizeid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhongshanBg.png")'
-            US.Config.background = 'url("/img/icon/zhongshanBg.png")'
-        } else if (res.value[0][0].organizeid == '580aac24-a939-49f7-a75a-40a7b5af3a17') {
-            // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longweiBg.png")'
-        } else if (res.value[0][0].organizeid == 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yunhaiBg.jpg")'
-            US.Config.background = 'url("/img/icon/yunhaiBg.png")'
-        } else if (res.value[0][0].organizeid == '857af1c7-c8ee-4b04-85b5-fd182903adb7') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/beijingBg.png")'
-            US.Config.background = 'url("/img/icon/beijingBg.png")'
-        } else if (res.value[0][0].organizeid == '69893dca-1d47-11ed-8c78-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/weilaiBg.png")'
-            US.Config.background = 'url("/img/icon/weilaiBg.png")'
-        } else if (res.value[0][0].organizeid == 'efdef564-4064-11ed-8c78-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/pz.jpg")'
-            US.Config.background = 'url("/img/icon/pz.png")'
-        } else if (res.value[0][0].organizeid == 'd9db3320-503a-11ed-8c78-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/hzBg.png")'
-            US.Config.background = 'url("/img/icon/hzBg.png")'
-        } else if (res.value[0][0].organizeid == 'ccb9754d-59c1-11ed-8c78-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")'
-            US.Config.background = 'url("/img/icon/nanfangBg.png")'
-        } else if (res.value[0][0].organizeid == 'f30a6615-5379-11ed-8c78-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaBg.png")'
-            US.Config.background = 'url("/img/icon/longhuaBg.png")'
-        } else if (res.value[0][0].organizeid == '4787cc87-6588-11ed-8c78-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")'
-            US.Config.background = 'url("/img/icon/nanfangBg.png")'
-        } else if (res.value[0][0].organizeid == '9f888eae-7558-11ed-8c78-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/song.png")'
-            US.Config.background = 'url("/img/icon/song.png")'
-        } else if (res.value[0][0].organizeid == '2b9ceb66-a1dd-11ed-b13d-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gmxxBg.png")'
-            US.Config.background = 'url("/img/icon/gmxxBg.png")'
-        } else if (res.value[0][0].organizeid == '1c3b9def-8fbe-11ed-b13d-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/wankeBg.png")'
-            US.Config.background = 'url("/img/icon/wankeBg.png")'
-        } else if (res.value[0][0].organizeid == '82fcb5c7-c13b-11ed-8d51-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qiaoxiangBg.png")'
-            US.Config.background = 'url("/img/icon/qiaoxiangBg.png")'
-        } else if (res.value[0][0].organizeid == '4c686762-1d0a-11ed-8c78-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")'
-        } else if (res.value[0][0].organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
-        } else if (res.value[0][0].organizeid == 'f297fbdc-f0a0-11ee-b534-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/010606.png")'
-        }
-
-        if (res.value[0][0].org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yantianOrgBg.png")'
-            US.Config.background = 'url("/img/icon/yantianOrgBg.png")'
-        } else if (res.value[0][0].org == '7ada499f-4ec7-11ed-8c78-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/csteamBg.png")'
-            US.Config.background = 'url("/img/icon/csteamBg.png")'
-        } else if (res.value[0][0].org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f0217') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gm/bg.png")'
-            US.Config.background = 'url("/img/icon/bg.png")'
-            U.MD.D.getNotice();
-        } else if (res.value[0][0].org == '97c4ee8b-d010-4042-986d-e9d3c217264f') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhoujia.jpg")'
-            US.Config.background = 'url("/img/icon/zhoujia.png")'
-        } else if (res.value[0][0].org == '150e3120-9195-11ed-b13d-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/tencentBg.jpg")'
-            US.Config.background = 'url("/img/icon/tencentBg.png")'
-            U.MD.D.getNotice();
-        } else if (res.value[0][0].org == 'ee40e8e3-e36c-4872-8105-cf395481012s') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szscBg.png")'
-            US.Config.background = 'url("/img/icon/szscBg.png")'
-            U.MD.D.getNotice();
-        } else if (res.value[0][0].org == 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/futianBg.png")'
-            US.Config.background = 'url("/img/icon/futianBg.png")'
-        } else if (res.value[0][0].org == 'e632b86c-f89d-11ed-91d8-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gdjgBg.png")'
-            US.Config.background = 'url("/img/icon/gdjgBg.png")'
-        } else if (res.value[0][0].org == '54f09f1e-09f0-11ee-91d8-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szlhyjBg.jpeg")'
-            US.Config.background = 'url("/img/icon/szlhyjBg.jpeg")'
-        } else if (res.value[0][0].org == '7b016f69-0f4f-11ee-91d8-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
-            US.Config.background = 'url("/img/icon/dseiBg.png")'
-        } else if (res.value[0][0].org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
-            US.Config.background = 'url("/img/icon/szjkyBg2.png")'
-        } else if (res.value[0][0].org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
-            US.Config.background = 'url("/img/icon/chjyjBg.png")'
-        } else if (res.value[0][0].org == '2a9f32ea-88df-49eb-aba1-0a286f691474') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.jpg")'
-            US.Config.background = 'url("/img/icon/qhBg.jpg")'
-        } else if (res.value[0][0].org == '884c5665-a453-46f3-b7b6-01d575290aa9') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/scnuaiBg.png")'
-            US.Config.background = 'url("/img/icon/scnuaiBg.png")'
-        } else if (res.value[0][0].org == '2fe1a080-4425-4620-b7a0-be2f3750ffd4') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/x010607bgImg.png")'
-            US.Config.background = 'url("/img/icon/x010607bgImg.png")'
-        } else if (res.value[0][0].org == 'ec84034b-8ea4-4d27-9cba-1adcb4720bb3') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/SPROUTLabBg.png")'
-            US.Config.background = 'url("/img/icon/SPROUTLabBg.png")'
-        }
+        loginPan(res.value[0][0], userid)
 
         US.userInfo = res.value[0][0];
         $(".avatar")[0].style.display = "block";
@@ -968,6 +603,8 @@ U.MD.D.getuser2 = function (userid, cid) {
         $(".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(res.value[0][0].type === 1 && res.value[0][0].org == 'c95e0a56-c205-11ed-8d51-005056b86db5'){
             U.MD.D.I.ModeCheck(2)
         }else{
@@ -984,6 +621,7 @@ U.MD.D.getuser2 = function (userid, cid) {
         }
         U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
         U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
+        U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
     }, [], { "type": "GET", "withCredentials": true });
 }
 
@@ -1107,4 +745,300 @@ U.MD.D.getNotice = function () {
 //  // 在視頻播放完成後刪除 video 元素
 //  video.addEventListener("ended", () => {
 //    document.body.removeChild(video);
-//  });
+//  });
+
+
+function formatDate(_date) {
+    let time = _date.replace(/-/g, '/')
+    let date = new Date(time);
+
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, "0");
+    const day = date.getDate().toString().padStart(2, "0");
+    const hours = date.getHours().toString().padStart(2, "0");
+    const minutes = date.getMinutes().toString().padStart(2, "0");
+    const seconds = date.getSeconds().toString().padStart(2, "0");
+
+    return `${year}年${month}月${day}日`;
+}
+
+function formatDate2(_date) {
+    let date = _date;
+
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, "0");
+    const day = date.getDate().toString().padStart(2, "0");
+    const hours = date.getHours().toString().padStart(2, "0");
+    const minutes = date.getMinutes().toString().padStart(2, "0");
+    const seconds = date.getSeconds().toString().padStart(2, "0");
+
+    return `${year}年${month}月${day}日`;
+}
+
+
+
+function loginPan(userInfo, userId) {
+  const currentDate = new Date();
+
+  // 判断 isLogin1 和 isLogin2 是否为 2 或者是否过期（且过期时间是有效的日期格式）
+  if (
+    userInfo.isLogin1 == 2 ||
+    (userInfo.isLogin1 &&
+      userInfo.isLogin1 != 1 &&
+      userInfo.isLogin1 != 2 &&
+      new Date(userInfo.isLogin1) < currentDate) ||
+    userInfo.isLogin2 == 2 ||
+    (userInfo.isLogin2 != 1 &&
+      userInfo.isLogin2 != 2 &&
+      new Date(userInfo.isLogin2) < currentDate) ||
+    userInfo.state != 1
+  ) {
+    U.MD.U.LO.logoutSystem2();
+    return;
+  }
+
+  let vipbox = $(".U_MD_D_BD_vip_box")[0];
+  vipbox && (vipbox.style.display = "block");
+  let vip_time = $(".vip_time")[0];
+  let vtime = "";
+  let vMember = "基础用户";
+  // 获取 isLogin1 和 isLogin2 的值
+  let isLogin1 = userInfo.isLogin1;
+  let isLogin2 = userInfo.isLogin2;
+
+  if (isLogin2 != 1 && isLogin2 != null) {
+    vtime = formatDate(isLogin2);
+    vMember = "高级用户";
+  } else if (isLogin1 != 1 && isLogin1 != null) {
+    vtime = formatDate(isLogin1);
+    vMember = "高级用户";
+  } else if (
+    (isLogin1 == 1 && isLogin2 == 1) ||
+    (isLogin1 == null && isLogin2 == 1)
+  ) {
+    vtime = formatDate2(new Date(currentDate.setFullYear(currentDate.getFullYear() + 1)));
+    vMember = "基础用户";
+  }
+  vip_time && (vip_time.innerHTML = vtime);
+  let orgName = userInfo.orgName;
+  let schoolName = userInfo.schoolName;
+  let vip_school = $(".vip_school")[0];
+  vip_school && (vip_school.innerHTML = orgName ? orgName : schoolName);
+  let vip_member = $(".vip_member")[0];
+  vip_member && (vip_member.innerHTML = vMember);
+
+  U.A.Request(
+    US.Config.pbl + "addLoginOperation",
+    [userId],
+    function (res) {},
+    [],
+    { type: "POST", withCredentials: true }
+  );
+
+  if (userInfo.organizeid == "91305d49-01ba-11ed-8c78-005056b86db4") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/mingdeBg.png")';
+    US.Config.background = 'url("/img/icon/mingdeBg.png")';
+  } else if (
+    userInfo.organizeid == "c7df0bd4-6e75-401a-a137-4e163aa62263"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage =
+      'url("/img/icon/zhongshanBg.png")';
+    US.Config.background = 'url("/img/icon/zhongshanBg.png")';
+  } else if (
+    userInfo.organizeid == "580aac24-a939-49f7-a75a-40a7b5af3a17"
+  ) {
+    // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longweiBg.png")'
+  } else if (
+    userInfo.organizeid == "b1095a3c-1d06-4ac8-854f-7c0d97f4ab41"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yunhaiBg.jpg")';
+    US.Config.background = 'url("/img/icon/yunhaiBg.png")';
+  } else if (
+    userInfo.organizeid == "857af1c7-c8ee-4b04-85b5-fd182903adb7"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/beijingBg.png")';
+    US.Config.background = 'url("/img/icon/beijingBg.png")';
+  } else if (
+    userInfo.organizeid == "69893dca-1d47-11ed-8c78-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/weilaiBg.png")';
+    US.Config.background = 'url("/img/icon/weilaiBg.png")';
+  } else if (
+    userInfo.organizeid == "efdef564-4064-11ed-8c78-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/pz.jpg")';
+    US.Config.background = 'url("/img/icon/pz.png")';
+  } else if (
+    userInfo.organizeid == "d9db3320-503a-11ed-8c78-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/hzBg.png")';
+    US.Config.background = 'url("/img/icon/hzBg.png")';
+  } else if (
+    userInfo.organizeid == "ccb9754d-59c1-11ed-8c78-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")';
+    US.Config.background = 'url("/img/icon/nanfangBg.png")';
+  } else if (
+    userInfo.organizeid == "f30a6615-5379-11ed-8c78-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaBg.png")';
+    US.Config.background = 'url("/img/icon/longhuaBg.png")';
+  } else if (
+    userInfo.organizeid == "4787cc87-6588-11ed-8c78-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")';
+    US.Config.background = 'url("/img/icon/nanfangBg.png")';
+  } else if (
+    userInfo.organizeid == "9f888eae-7558-11ed-8c78-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/song.png")';
+    US.Config.background = 'url("/img/icon/song.png")';
+  } else if (
+    userInfo.organizeid == "2b9ceb66-a1dd-11ed-b13d-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gmxxBg.png")';
+    US.Config.background = 'url("/img/icon/gmxxBg.png")';
+  } else if (
+    userInfo.organizeid == "1c3b9def-8fbe-11ed-b13d-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/wankeBg.png")';
+    US.Config.background = 'url("/img/icon/wankeBg.png")';
+  } else if (
+    userInfo.organizeid == "82fcb5c7-c13b-11ed-8d51-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage =
+      'url("/img/icon/qiaoxiangBg.png")';
+    US.Config.background = 'url("/img/icon/qiaoxiangBg.png")';
+  } else if (
+    userInfo.organizeid == "4c686762-1d0a-11ed-8c78-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")';
+    US.Config.background = 'url("/img/icon/sies.png")';
+  } else if (
+    userInfo.organizeid == "ea2a8c65-f38c-11ed-91d8-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage =
+      'url("/img/icon/longhuaZXBg.png")';
+    US.Config.background = 'url("/img/icon/longhuaZXBg.png")';
+  } else if (
+    userInfo.organizeid == "f297fbdc-f0a0-11ee-b534-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/010606.png")';
+    US.Config.background = 'url("/img/icon/010606.png")';
+  } else if (
+    userInfo.organizeid == "e5cdf6b8-abdc-11ef-b887-005056b86db5"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/Tianyuan.png")';
+    US.Config.background = 'url("/img/icon/Tianyuan.png")';
+  }
+
+  if (userInfo.org == "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d") {
+    $("#U_MD_D_BG")[0].style.backgroundImage =
+      'url("/img/icon/yantianOrgBg.png")';
+    US.Config.background = 'url("/img/icon/yantianOrgBg.png")';
+  } else if (userInfo.org == "7ada499f-4ec7-11ed-8c78-005056b86db5") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/csteamBg.png")';
+    US.Config.background = 'url("/img/icon/csteamBg.png")';
+  } else if (userInfo.org == "eb2af5e9-ac3d-46b6-9fe3-3c1c364f0217") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gm/bg.png")';
+    US.Config.background = 'url("/img/icon/bg.png")';
+    U.MD.D.getNotice();
+  } else if (userInfo.org == "97c4ee8b-d010-4042-986d-e9d3c217264f") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhoujia.jpg")';
+    US.Config.background = 'url("/img/icon/zhoujia.png")';
+  } else if (userInfo.org == "150e3120-9195-11ed-b13d-005056b86db5") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/tencentBg.jpg")';
+    US.Config.background = 'url("/img/icon/tencentBg.png")';
+    U.MD.D.getNotice();
+  } else if (userInfo.org == "ee40e8e3-e36c-4872-8105-cf395481012s") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szscBg.png")';
+    US.Config.background = 'url("/img/icon/szscBg.png")';
+    U.MD.D.getNotice();
+  } else if (userInfo.org == "ec0af97a-7c10-4259-a7eb-db9cc8174cdc") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/futianBg.png")';
+    US.Config.background = 'url("/img/icon/futianBg.png")';
+  } else if (userInfo.org == "e632b86c-f89d-11ed-91d8-005056b86db5") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gdjgBg.png")';
+    US.Config.background = 'url("/img/icon/gdjgBg.png")';
+  } else if (userInfo.org == "54f09f1e-09f0-11ee-91d8-005056b86db5") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szlhyjBg.jpeg")';
+    US.Config.background = 'url("/img/icon/szlhyjBg.jpeg")';
+  } else if (userInfo.org == "7b016f69-0f4f-11ee-91d8-005056b86db5") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")';
+    US.Config.background = 'url("/img/icon/dseiBg.png")';
+  } else if (userInfo.org == "1973f6c7-1561-11ee-91d8-005056b86db5") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")';
+    US.Config.background = 'url("/img/icon/szjkyBg2.png")';
+  } else if (userInfo.org == "2fa75e51-189a-11ee-91d8-005056b86db5") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")';
+    US.Config.background = 'url("/img/icon/chjyjBg.png")';
+  } else if (userInfo.org == "2a9f32ea-88df-49eb-aba1-0a286f691474") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.jpg")';
+    US.Config.background = 'url("/img/icon/qhBg.jpg")';
+  } else if (userInfo.org == "884c5665-a453-46f3-b7b6-01d575290aa9") {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/scnuaiBg.png")';
+    US.Config.background = 'url("/img/icon/scnuaiBg.png")';
+  } else if (userInfo.org == "2fe1a080-4425-4620-b7a0-be2f3750ffd4") {
+    $("#U_MD_D_BG")[0].style.backgroundImage =
+      'url("/img/icon/x010607bgImg.png")';
+    US.Config.background = 'url("/img/icon/x010607bgImg.png")';
+  } else if (userInfo.org == "ec84034b-8ea4-4d27-9cba-1adcb4720bb3") {
+    $("#U_MD_D_BG")[0].style.backgroundImage =
+      'url("/img/icon/SPROUTLabBg.png")';
+    US.Config.background = 'url("/img/icon/SPROUTLabBg.png")';
+  }
+
+  US.userInfo = userInfo;
+  $(".avatar")[0].style.display = "block";
+  if (
+    userInfo.type === 1 &&
+    $(".U_PBL_Check")[0] &&
+    userInfo.org != "150e3120-9195-11ed-b13d-005056b86db5"
+  ) {
+    $(".U_PBL_Check")[0].style.display = "block";
+  }
+}
+
+function loginSet(userInfo, res){
+    let userId = userInfo.userid
+    if (res.value == null || res.value[0].length == 0) {
+        // U.MD.D.I.openApplication("my")
+
+        let _name = US.userInfo.alias ? US.userInfo.alias : US.userInfo.username
+        let _type = US.userInfo == 1 ? 2 : 1
+        // US.Config.pbl
+        // "http://localhost:7003/api/pbl/"
+        U.A.Request(US.Config.pbl + "updatePblMessage", [userId, _name, _type, '16d397f3-b192-11ed-9211-005056b86db5', '', '', "0"], function (res) {
+            window.location.reload();
+        }, [], { "type": "POST", "withCredentials": true });
+    } else {
+        loginPan(userInfo, userId)
+    }
+    $(".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{
+        U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
+    }
+    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")
+    }
+    U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
+}

uform.js

@@ -11980,7 +11980,7 @@ U.MD.U.LO.logoutSystem2 = function (callback) {
     if (US.userInfo.userid) {
         //弹出退出登录的提示
         // U.UF.UI.confirm("是否退出" + US.userInfo.username + "账号", function () {
-        U.alert("您的账号已禁止登陆!")
+        U.alert("您的账号已超过使用期限!")
         U.A.Request(US.Config.server + "logout", [], function (res) {
             U.A.Request(US.SCOKET, ["logout", US.userInfo.userid, US.pageId], function () {
                 setTimeout(() => {