diff --git a/Application/Home/Controller/PromoteCoinController.class.php b/Application/Home/Controller/PromoteCoinController.class.php index e35099eb0..ecc22e293 100644 --- a/Application/Home/Controller/PromoteCoinController.class.php +++ b/Application/Home/Controller/PromoteCoinController.class.php @@ -362,7 +362,8 @@ class PromoteCoinController extends BaseController $startTime = I('time_end', ''); $endTime = I('time_start', ''); - $conditions = []; + $loginPromote = $this->getLoginPromote(); + $conditions = ['promote_id' => $loginPromote['id']]; if ($startTime != '' || $endTime != '') { if ($startTime != '') { $conditions['create_time'] = ['egt', strtotime($startTime. ' 00:00:00')]; @@ -372,7 +373,7 @@ class PromoteCoinController extends BaseController } } - $query = M('promote_coin_transfer_log', 'tab_')->where($conditions); + $query = M('promote_coin_transfer_log', 'tab_')->where($conditions)->order('create_time desc'); list($logs, $pagination, $count) = $this->paginate($query); $service = new PromoteCoinTransferLogService(); diff --git a/Application/Home/View/default/Promote/children.html b/Application/Home/View/default/Promote/children.html index d6e5badec..5f3dd1903 100644 --- a/Application/Home/View/default/Promote/children.html +++ b/Application/Home/View/default/Promote/children.html @@ -2,7 +2,7 @@ - + diff --git a/Application/Home/View/default/PromoteCoin/coinDetails.html b/Application/Home/View/default/PromoteCoin/coinDetails.html index 398fdeeb5..10ef9f9ac 100644 --- a/Application/Home/View/default/PromoteCoin/coinDetails.html +++ b/Application/Home/View/default/PromoteCoin/coinDetails.html @@ -137,7 +137,7 @@
- diff --git a/Application/Home/View/default/PromoteCoin/shift.html b/Application/Home/View/default/PromoteCoin/shift.html index e91b412d8..d75e2ea77 100644 --- a/Application/Home/View/default/PromoteCoin/shift.html +++ b/Application/Home/View/default/PromoteCoin/shift.html @@ -210,11 +210,11 @@ } var data = {} var url = "{:U('PromoteCoin/promoteGames')}" - if (shiftUserType == 1 || shiftUserType == 2) { + if (shiftUserType == 1 || shiftUserType == 2 || shiftUserType == 3) { data = { promote_id: shiftUserId } - } else if (shiftUserType == 3) { + } else if (shiftUserType == 4) { data = { user_id: shiftUserId } @@ -252,7 +252,7 @@ if(res.status==1){ layer.msg(res.msg); setTimeout(function(){ - window.location.href="{:U('record')}"; + window.location.href="{:U('transferLogs')}"; }, 1500); } else { layer.msg(res.msg); diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html index 3a6e743f6..780cb4109 100644 --- a/Application/Home/View/default/Public/promote_base.html +++ b/Application/Home/View/default/Public/promote_base.html @@ -115,16 +115,16 @@ --> - + - +