Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Home/Controller/PromoteCoinController.class.php

@@ -424,7 +424,7 @@ class PromoteCoinController extends BaseController
                 $targetAccount = isset($promotes[$log['target_id']]) ? $promotes[$log['target_id']]['account'] : '未知推广账号';
             }
             if ($log['target_type'] == 2) {
-                $targetAccount = isset($promotes[$log['target_id']]) ? $promotes[$log['target_id']]['account'] : '未知玩家';
+                $targetAccount = isset($users[$log['target_id']]) ? $users[$log['target_id']]['account'] : '未知玩家';
             }
             $records[] = [
                 'id' => $log['id'],

Application/Home/Controller/QueryController.class.php

@@ -1850,7 +1850,7 @@ class QueryController extends BaseController
                 $list['server_name'] = empty($list['server_name']) ? '--' : $list['server_name'];
                 $list['role_name'] = empty($list['role_name']) ? '--' : $list['role_name'];
                 $list['role_level'] = empty($list['role_level']) ? '--' : $list['role_level'];
-                $list['unlogin_day'] = empty($list['unlogin_day']) ? '--' : intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $list['play_time']))) / (24 * 3600));
+                $list['unlogin_day'] = empty($list['play_time']) ? '--' : intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $list['play_time']))) / (24 * 3600));
                 $list['play_time'] = empty($list['play_time']) ? '--' : date('Y-m-d H:i:s', $list['play_time']);
                 $list['promote_account'] = empty($list['promote_account']) ? '--' : $list['promote_account'];
             }

Application/Home/View/default/Home/landingPage.html

@@ -286,6 +286,7 @@
         });
       });
     $('.down-link').on('click', function () {
+        var downLink = $(this).attr('down-link');
 
         // if ($('.bn-rule').length > 0) {
       //   $('.bn-rule').css('display','block')
@@ -305,10 +306,11 @@
           return
         }
       }
-      var downLink = $(this).attr('down-link');
-      console.log(downLink);
+
+      $.post("/mobile.php?s=/AjaxDown/down_file/game_id/{$apply.game_id}/type/2", {}, function (res) {
           location.href = downLink
       });
+    });
 
     $('.no-package').click(function() {
       layer.msg('暂无下载', {