elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
master
ELF 5 years ago
parent 1f34a3a0ce
commit 4f41651654
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File

5
Application/Home/Controller/PromoteCoinController.class.php
Unescape Escape View File

@ -362,7 +362,8 @@ class PromoteCoinController extends BaseController
$startTime = I('time_end', ''); $startTime = I('time_end', '');
$endTime = I('time_start', ''); $endTime = I('time_start', '');
$conditions = []; $loginPromote = $this->getLoginPromote();
$conditions = ['promote_id' => $loginPromote['id']];
if ($startTime != '' || $endTime != '') { if ($startTime != '' || $endTime != '') {
if ($startTime != '') { if ($startTime != '') {
$conditions['create_time'] = ['egt', strtotime($startTime. ' 00:00:00')]; $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); list($logs, $pagination, $count) = $this->paginate($query);
$service = new PromoteCoinTransferLogService(); $service = new PromoteCoinTransferLogService();

2
Application/Home/View/default/Promote/children.html
Unescape Escape View File

@ -2,7 +2,7 @@
<block name="css"> <block name="css">
<link href="__CSS__/20180207/account.css" rel="stylesheet" > <link href="__CSS__/20180207/account.css" rel="stylesheet" >
<link href="https://cdn.bootcss.com/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdn.bootcss.com/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="http://www.jq22.com/jquery/font-awesome.4.6.0.css"> <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/font-awesome/4.6.0/css/font-awesome.min.css">
<link href="__CSS__/transfer.css" rel="stylesheet" > <link href="__CSS__/transfer.css" rel="stylesheet" >
</block> </block>
<block name="body"> <block name="body">

2
Application/Home/View/default/PromoteCoin/coinDetails.html
Unescape Escape View File

@ -137,7 +137,7 @@
</div> </div>
<div class="form-group normal_space fr"> <div class="form-group normal_space fr">
<label>对手账号类型：</label> <label>对手账号类型：</label>
<select id="handle_type" name="handle_type" class="reselect select_gallery" style="min-width:200px;width: 175px;"> <select id="target_type" name="target_type" class="reselect select_gallery" style="min-width:200px;width: 175px;">
<option value="">全部</option> <option value="">全部</option>
<volist name="targetTypeLevels" id="vo" key="k"> <volist name="targetTypeLevels" id="vo" key="k">
<option value="{$k}" title="{$vo}">{$vo}</option> <option value="{$k}" title="{$vo}">{$vo}</option>

6
Application/Home/View/default/PromoteCoin/shift.html
Unescape Escape View File

@ -210,11 +210,11 @@
} }
var data = {} var data = {}
var url = "{:U('PromoteCoin/promoteGames')}" var url = "{:U('PromoteCoin/promoteGames')}"
if (shiftUserType == 1 || shiftUserType == 2) { if (shiftUserType == 1 || shiftUserType == 2 || shiftUserType == 3) {
data = { data = {
promote_id: shiftUserId promote_id: shiftUserId
} }
} else if (shiftUserType == 3) { } else if (shiftUserType == 4) {
data = { data = {
user_id: shiftUserId user_id: shiftUserId
} }
@ -252,7 +252,7 @@
if(res.status==1){ if(res.status==1){
layer.msg(res.msg); layer.msg(res.msg);
setTimeout(function(){ setTimeout(function(){
window.location.href="{:U('record')}"; window.location.href="{:U('transferLogs')}";
}, 1500); }, 1500);
} else { } else {
layer.msg(res.msg); layer.msg(res.msg);

8
Application/Home/View/default/Public/promote_base.html
Unescape Escape View File

@ -115,16 +115,16 @@
</eq>--> </eq>-->
<!--<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>会长福利</span><i class="arrow_icon"></i></div>--> <!--<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>会长福利</span><i class="arrow_icon"></i></div>-->
<if condition="$loginer['level'] neq 4"> <?php if($loginer['level'] != 4):?>
<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>平台币管理</span><i class="arrow_icon"></i></div> <div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>平台币管理</span><i class="arrow_icon"></i></div>
<div class="navContent jsnavContent"> <div class="navContent jsnavContent">
<a href="{:U('PromoteCoin/myCoin')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq myCoin or ACTION_NAME eq coinRecord or ACTION_NAME eq coinRecordDesc) '>active</if> ">我的平台币</a> <a href="{:U('PromoteCoin/myCoin')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq myCoin or ACTION_NAME eq coinRecord or ACTION_NAME eq coinRecordDesc) '>active</if> ">我的平台币</a>
<a href="{:U('PromoteCoin/transferLogs')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq shift or ACTION_NAME eq transferLogs) '>active</if> ">平台币转移</a> <a href="{:U('PromoteCoin/transferLogs')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq shift or ACTION_NAME eq transferLogs) '>active</if> ">平台币转移</a>
<if condition="$loginer['level'] eq 1"> <?php if($loginer['level'] == 1):?>
<a href="{:U('CoinOrder/order_list')}" class="<if condition='CONTROLLER_NAME eq CoinOrder and (ACTION_NAME eq order_list or ACTION_NAME eq order_add or ACTION_NAME eq order_detail) '>active</if> ">平台币充值</a> <a href="{:U('CoinOrder/order_list')}" class="<if condition='CONTROLLER_NAME eq CoinOrder and (ACTION_NAME eq order_list or ACTION_NAME eq order_add or ACTION_NAME eq order_detail) '>active</if> ">平台币充值</a>
</if> <?php endif;?>
</div> </div>
</if> <?php endif;?>
<!--<div class="subNav jssubNav"><i class="prev_icon icon_zhandian"></i><span>联盟站点</span><i class="arrow_icon"></i></div>--> <!--<div class="subNav jssubNav"><i class="prev_icon icon_zhandian"></i><span>联盟站点</span><i class="arrow_icon"></i></div>-->
<!--<div class="navContent jsnavContent">--> <!--<div class="navContent jsnavContent">-->
<!--<a href="{:U('SiteApply/index')}" class="<if condition='CONTROLLER_NAME eq SiteApply and ACTION_NAME eq index '>active</if> ">站点申请</a>--> <!--<a href="{:U('SiteApply/index')}" class="<if condition='CONTROLLER_NAME eq SiteApply and ACTION_NAME eq index '>active</if> ">站点申请</a>-->

Write Preview
Loading…
Cancel
Save