Merge branch 'beta'

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>VIP会员 授权有效</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

@@ -714,11 +714,11 @@ U.MD.D.I.hkteacherDeskIcon = [
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
     // { "Name": "工作管理", "Url": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
     // { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.png)" } },
-    { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
-    { "Name": "年级管理", "Url": "Grade", "style": { "cssText": "background-image:url(/img/icon/Grade.png)" } },
-    { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
+    // { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
+    // { "Name": "年级管理", "Url": "Grade", "style": { "cssText": "background-image:url(/img/icon/Grade.png)" } },
+    // { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.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": "学习分析", "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)" } },
@@ -747,11 +747,11 @@ U.MD.D.I.hkaceteacherDeskIcon = [
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
     // { "Name": "工作管理", "Url": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
     // { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.png)" } },
-    { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
-    { "Name": "年级管理", "Url": "Grade", "style": { "cssText": "background-image:url(/img/icon/Grade.png)" } },
-    { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
+    // { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
+    // { "Name": "年级管理", "Url": "Grade", "style": { "cssText": "background-image:url(/img/icon/Grade.png)" } },
+    // { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.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": "学习分析", "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)" } },
@@ -1595,7 +1595,7 @@ U.MD.D.I.CUHKEDUTeacherDeskIcon = [
     { "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": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
+    // { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.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)" } },
@@ -1808,6 +1808,28 @@ 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)" } },
+];
+
+
 
 //#region 桌面初始化a
 
@@ -1983,6 +2005,8 @@ 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
         _xhlyStudentDeskIconInfo = U.MD.D.I.xhlyStudentDeskIcon, //xhly
         _xhlyTeacherDeskIconInfo = U.MD.D.I.xhlyTeacherDeskIcon, //xhly
         _CUHKEDUStudentDeskIconInfo = U.MD.D.I.CUHKEDUStudentDeskIcon, //CUHK_EDU
@@ -2007,7 +2031,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','aefa1488-a1c6-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 = "";
@@ -2624,6 +2648,23 @@ 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 == "aefa1488-a1c6-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 == "4c686762-1d0a-11ed-8c78-005056b86db5")) {
             for (i = 0; i < _siesStudentDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -4149,6 +4190,26 @@ 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 == "aefa1488-a1c6-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 {
             for (i = 0; i < _teacherDesktopIconInfo.length; i++) {
                 if(_role === 0 && _teacherDesktopIconInfo[i].Url == 'testTeacher' && _oid != '45facc0a-1211-11ec-80ad-005056b86db5'){

js/Desktop/Onload.js

@@ -342,10 +342,37 @@ U.MD.D.getuser = function () {
                                         window.location.reload();
                                     }, [], { "type": "POST", "withCredentials": true });
                                 } else {
-                                    if(res.value[0][0].isLogin1 == 2 || res.value[0][0].isLogin2 == 2){
+                                    const currentDate = new Date();
+                                    
+                                    // 判断 isLogin1 和 isLogin2 是否为 2 或者是否过期（且过期时间是有效的日期格式）
+                                    if ((res.value[0][0].isLogin1 == 2 || (res.value[0][0].isLogin1 && res.value[0][0].isLogin1 != 1 && res.value[0][0].isLogin1 != 2 && new Date(res.value[0][0].isLogin1) < currentDate)) ||
+                                        (res.value[0][0].isLogin2 == 2 || (res.value[0][0].isLogin2 != 1 && res.value[0][0].isLogin2 != 2 && new Date(res.value[0][0].isLogin2) < currentDate))) {
                                         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 = ''
+                                    // 获取 isLogin1 和 isLogin2 的值
+                                    let isLogin1 = res.value[0][0].isLogin1;
+                                    let isLogin2 = res.value[0][0].isLogin2;
+
+                                    if (isLogin2 != 1 && isLogin2 != null){
+                                        vtime = formatDate(isLogin2);
+                                    }else if(isLogin1 != 1 && isLogin1 != null){
+                                        vtime = formatDate(isLogin1);
+                                    }else if ((isLogin1 == 1 && isLogin2 == 1) || (isLogin1 == null && isLogin2 == 1)) {
+                                        vtime = "无限制";
+                                    }
+                                    vip_time && (vip_time.innerHTML = vtime)
+                                    let orgName = res.value[0][0].orgName;
+                                    let schoolName = res.value[0][0].schoolName;
+                                    let vip_school = $('.vip_school')[0]
+                                    vip_school && (vip_school.innerHTML = orgName ? orgName : schoolName)
+                                    
+
                                     U.A.Request(US.Config.pbl + "addLoginOperation", [_user.userid], function (res) {
                                     }, [], { "type": "POST", "withCredentials": true });
 
@@ -471,6 +498,8 @@ U.MD.D.getuser = function () {
                                 $(".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{
@@ -561,10 +590,36 @@ U.MD.D.getuser = function () {
                                             window.location.reload();
                                         }, [], { "type": "POST", "withCredentials": true });
                                     } else {
-                                        if(res.value[0][0].isLogin1 == 2 || res.value[0][0].isLogin2 == 2){
+                                        const currentDate = new Date();
+
+                                        // 判断 isLogin1 和 isLogin2 是否为 2 或者是否过期（且过期时间是有效的日期格式）
+                                        if ((res.value[0][0].isLogin1 == 2 || (res.value[0][0].isLogin1 && res.value[0][0].isLogin1 != 1 && res.value[0][0].isLogin1 != 2 && new Date(res.value[0][0].isLogin1) < currentDate)) ||
+                                            (res.value[0][0].isLogin2 == 2 || (res.value[0][0].isLogin2 != 1 && res.value[0][0].isLogin2 != 2 && new Date(res.value[0][0].isLogin2) < currentDate))) {
                                             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 = ''
+                                        // 获取 isLogin1 和 isLogin2 的值
+                                        let isLogin1 = res.value[0][0].isLogin1;
+                                        let isLogin2 = res.value[0][0].isLogin2;
+
+                                        if (isLogin2 != 1 && isLogin2 != null){
+                                            vtime = formatDate(isLogin2);
+                                        }else if(isLogin1 != 1 && isLogin1 != null){
+                                            vtime = formatDate(isLogin1);
+                                        }else if ((isLogin1 == 1 && isLogin2 == 1) || (isLogin1 == null && isLogin2 == 1)) {
+                                            vtime = "无限制";
+                                        }
+                                        vip_time && (vip_time.innerHTML = vtime)
+                                        let orgName = res.value[0][0].orgName;
+                                        let schoolName = res.value[0][0].schoolName;
+                                        let vip_school = $('.vip_school')[0]
+                                        vip_school && (vip_school.innerHTML = orgName ? orgName : schoolName)
+                                        
                                         U.A.Request(US.Config.pbl + "addLoginOperation", [userId], function (res) {
                                         }, [], { "type": "POST", "withCredentials": true });
     
@@ -690,6 +745,8 @@ U.MD.D.getuser = function () {
                                     $(".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{
@@ -845,10 +902,36 @@ 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){
+        const currentDate = new Date();
+
+        // 判断 isLogin1 和 isLogin2 是否为 2 或者是否过期（且过期时间是有效的日期格式）
+        if ((res.value[0][0].isLogin1 == 2 || (res.value[0][0].isLogin1 && res.value[0][0].isLogin1 != 1 && res.value[0][0].isLogin1 != 2 && new Date(res.value[0][0].isLogin1) < currentDate)) ||
+            (res.value[0][0].isLogin2 == 2 || (res.value[0][0].isLogin2 != 1 && res.value[0][0].isLogin2 != 2 && new Date(res.value[0][0].isLogin2) < currentDate))) {
             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 = ''
+        // 获取 isLogin1 和 isLogin2 的值
+        let isLogin1 = res.value[0][0].isLogin1;
+        let isLogin2 = res.value[0][0].isLogin2;
+
+        if (isLogin2 != 1 && isLogin2 != null){
+            vtime = formatDate(isLogin2);
+        }else if(isLogin1 != 1 && isLogin1 != null){
+            vtime = formatDate(isLogin1);
+        }else if ((isLogin1 == 1 && isLogin2 == 1) || (isLogin1 == null && isLogin2 == 1)) {
+            vtime = "无限制";
+        }
+        vip_time && (vip_time.innerHTML = vtime)
+        let orgName = res.value[0][0].orgName;
+        let schoolName = res.value[0][0].schoolName;
+        let vip_school = $('.vip_school')[0]
+        vip_school && (vip_school.innerHTML = orgName ? orgName : schoolName)
         U.A.Request(US.Config.pbl + "addLoginOperation", [userid], function (res) {
         }, [], { "type": "POST", "withCredentials": true });
 
@@ -967,6 +1050,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{
@@ -1106,4 +1191,17 @@ U.MD.D.getNotice = function () {
 //  // 在视频播放完成后删除 video 元素
 //  video.addEventListener("ended", () => {
 //    document.body.removeChild(video);
-//  });
+//  });
+
+
+function formatDate(_date) {
+    let date = new 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}日`;
+}

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(() => {