Merge branch 'beta'

index.html

@@ -94,7 +94,7 @@
                         <div class="vip_info">
                             <img src="./img/icon/vip_img.png" alt="">
                             <div>
-                                <span>VIP会员 授权有效</span>
+                                <span class="vip_member"></span>
                                 <span>使用期限至：<span class="vip_time"></span></span>
                             </div>
                         </div>

js/Desktop/Onload.js

@@ -355,23 +355,28 @@ U.MD.D.getuser = function () {
                                     vipbox && (vipbox.style.display = 'block')
                                     let vip_time = $('.vip_time')[0]
                                     let vtime = ''
+                                    let vMember = '基础用户'
                                     // 获取 isLogin1 和 isLogin2 的值
                                     let isLogin1 = res.value[0][0].isLogin1;
                                     let isLogin2 = res.value[0][0].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 = "无限制";
+                                        vMember = '基础用户'
                                     }
                                     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)
-                                    
+                                    let vip_member = $('.vip_member')[0]
+                                    vip_member && (vip_member.innerHTML = vMember)
 
                                     U.A.Request(US.Config.pbl + "addLoginOperation", [_user.userid], function (res) {
                                     }, [], { "type": "POST", "withCredentials": true });
@@ -604,22 +609,28 @@ U.MD.D.getuser = function () {
                                         vipbox && (vipbox.style.display = 'block')
                                         let vip_time = $('.vip_time')[0]
                                         let vtime = ''
+                                        let vMember = '基础用户'
                                         // 获取 isLogin1 和 isLogin2 的值
                                         let isLogin1 = res.value[0][0].isLogin1;
                                         let isLogin2 = res.value[0][0].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 = "无限制";
+                                            vMember = '基础用户'
                                         }
                                         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)
+                                        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 });
@@ -918,22 +929,28 @@ U.MD.D.getuser2 = function (userid, cid) {
         vipbox && (vipbox.style.display = 'block')
         let vip_time = $('.vip_time')[0]
         let vtime = ''
+        let vMember = '基础用户'
         // 获取 isLogin1 和 isLogin2 的值
         let isLogin1 = res.value[0][0].isLogin1;
         let isLogin2 = res.value[0][0].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 = "无限制";
+            vMember = '基础用户'
         }
         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)
+        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 });