Merge branch 'beta' into HK

js/UForm/DynamicLoad.js

@@ -161,12 +161,12 @@ U.UF.DL.loading = function (el) {
                 "style": {
                     "display": "block",
                     "z-index": "1000",
-                    "width": "37px",
-                    "height": "17px",
+                    "width": "100px",
+                    "height": "100px",
                     "position": "absolute"
                 }
             }, _lodingel); //判断loading元素的样式display是否隐藏或者显示
-            var _img = $$("img", { "src": "/img/Loading.gif" }, _loginimg); //创建一个存放loading图片的img元素
+            var _img = $$("img", { "src": "/img/Loading.gif","style":{'width': '100%'} }, _loginimg); //创建一个存放loading图片的img元素
             el.appendChild(_lodingel); //插入loading元素
             _loginimg.style.left = ($(el)[0].offsetWidth - _loginimg.offsetWidth) / 2 + 'px'; //获取需要loading元素的父级元素的宽度减去loading元素的宽度除以2 
             _loginimg.style.top = ($(el)[0].offsetHeight - _loginimg.offsetHeight) / 2 + 'px'; //获取需要loading元素的父级元素的高度减去loading元素的高度除以2 

js/app/Onload.js

@@ -931,13 +931,14 @@ function loginPan(userInfo, userId) {
   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 }
-  );
+  addOp('','cocoflowLogin','')
+//   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")';
@@ -1173,4 +1174,12 @@ function selectUser(uid, callback) {
         U.alert("登录失败，正在重试!")
         requestUser();
     }
-}
+}
+
+function addOp(text,type,time){
+    var userInfo = US.userInfo;
+    if(Object.keys(userInfo).length !== 0){
+        U.A.Request(US.Config.pbl + "addOperationTimeT", [userInfo.userid,text,type,time], function (res) {
+        }, [], { "type": "POST", "withCredentials": true });
+    }
+}

uform.js

@@ -3192,12 +3192,12 @@ U.UF.DL.loading = function (el) {
                 "style": {
                     "display": "block",
                     "z-index": "1000",
-                    "width": "37px",
-                    "height": "17px",
+                    "width": "100px",
+                    "height": "100px",
                     "position": "absolute"
                 }
             }, _lodingel); //判断loading元素的样式display是否隐藏或者显示
-            var _img = $$("img", { "src": "/img/Loading.gif" }, _loginimg); //创建一个存放loading图片的img元素
+            var _img = $$("img", { "src": "/img/Loading.gif","style":{'width': '100%'} }, _loginimg); //创建一个存放loading图片的img元素
             el.appendChild(_lodingel); //插入loading元素
             _loginimg.style.left = ($(el)[0].offsetWidth - _loginimg.offsetWidth) / 2 + 'px'; //获取需要loading元素的父级元素的宽度减去loading元素的宽度除以2 
             _loginimg.style.top = ($(el)[0].offsetHeight - _loginimg.offsetHeight) / 2 + 'px'; //获取需要loading元素的父级元素的高度减去loading元素的高度除以2