Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -5769,6 +5769,20 @@ U.MD.D.I.openApplication = function (str, obj, info) {
     if (str == 'my' && _type == 2 && (_oid == "69893dca-1d47-11ed-8c78-005056b86db5" || _oid == "05b62310-8cda-11ed-b13d-005056b86db5")) {
         return;
     }
+    let opArray = [ "project", "study", "appStore", "futureClass", "evaluate", "student"]
+    if(opArray.includes(str)){
+        let _str = str
+        if(str == 'appStore'){
+            _str = "cocoFlow"
+        }else if(str == "futureClass"){
+            _str = "cocoNote"
+        }
+        try {
+            U.MD.D.addOp3('1', "", { type: _str+'Open' }, "success")
+        } catch (error) {
+            console.log(error);
+        }
+    }
     if (_type == 2 && _oid != "91305d49-01ba-11ed-8c78-005056b86db5") {
         switch (str) {
 

js/Desktop/Onload.js

@@ -1221,23 +1221,16 @@ function detectBrowser() {
 }
 
 U.MD.D.addOp3 = async (userTime, loadTime, object, status) => {
-    let userJson = {}
-    try {
-        userJson = await fetch(US.Config.pbl + "selectUser?userid=" + US.userInfo.userId, { method: 'GET', credentials: 'include' });
-        userJson = await userJson.json();
-    } catch (e) {
-        console.log(e);
-        this.addOp3(userTime, loadTime, object, status)
-    }
-    let browser = this.detectBrowser()
+    let browser = detectBrowser()
+    let _time = new Date().toLocaleString('zh-CN', { hour12: false, timeZone: 'Asia/Shanghai' }).replace(/\//g, '-');
     let params = {
-        userid: US.userInfo.userId,
-        username: US.userInfo.userName,
-        accountNumber: userJson.data[0][0].accountNumber,
-        org: userJson.data[0][0].orgName,
-        school: userJson.data[0][0].schoolName,
+        userid: US.userInfo.userid,
+        username: US.userInfo.name,
+        accountNumber: US.userInfo.accountNumber,
+        org: US.userInfo.orgName,
+        school: US.userInfo.schoolName,
         browser: browser,
-        userTime: userTime, // 使用时间 1次的就1 其次传秒
+        userTime: userTime == '1' ? _time : userTime, // 使用时间 1次的就1 其次传秒
         loadTime: loadTime, //load的时间没有就“”
         object: JSON.stringify(object), //执行信息传json
         status: status, //成功返回success。失败返回error的信息