Commit d239a5d3 authored by houdong's avatar houdong

整理vip下面的文件

parent 640f2aa2
......@@ -81,25 +81,25 @@ class PkTopAction extends IdentityAction{
$msg = empty($msg2) ? $msg1 : array_merge($msg2, $msg1);
//pk通关榜,1挑战者胜利,2被挑战者胜利
$allPassUsers = M('PktopData')->field('distinct active_id,active_name')->where(['pk_status' => 1])->order('add_time desc')->select();
// $allPassUsers = M('PktopData')->field('distinct active_id,active_name')->where(['pk_status' => 1])->order('add_time desc')->select();
// $passUsers = $this->formatPassUsers($allPassUsers);
//我的未结束的挑战
$where = ['pk_end_time' => ['egt', date('Y-m-d')], '_complex' => ['active_id' => $userId, 'passive_id' => $userId, '_logic' => 'or']];
$myPks = M('PktopData')->where($where)->order('add_time desc')->select();
if (!empty($myPks)) {
$myPk = $myPks[0];
$myPk['pk_begin_time'] = date('m月d日', strtotime($myPk['pk_begin_time']));
$myPk['pk_end_time'] = date('m月d日', strtotime($myPk['pk_end_time']));
}
$myPkUserId = [];
foreach ($myPks as $k => $value) {
//取我主动挑战的人
if ($value['active_id'] == $userId) {
$myPkUserId[] = $value['passive_id'];
}
}
// $where = ['pk_end_time' => ['egt', date('Y-m-d')], '_complex' => ['active_id' => $userId, 'passive_id' => $userId, '_logic' => 'or']];
//
// $myPks = M('PktopData')->where($where)->order('add_time desc')->select();
// if (!empty($myPks)) {
// $myPk = $myPks[0];
// $myPk['pk_begin_time'] = date('m月d日', strtotime($myPk['pk_begin_time']));
// $myPk['pk_end_time'] = date('m月d日', strtotime($myPk['pk_end_time']));
// }
// $myPkUserId = [];
// foreach ($myPks as $k => $value) {
// //取我主动挑战的人
// if ($value['active_id'] == $userId) {
// $myPkUserId[] = $value['passive_id'];
// }
// }
//最新挑战榜,每个月top10,不需要了
// $top10=$this->formatTop10();
......@@ -112,7 +112,8 @@ class PkTopAction extends IdentityAction{
$lastMonth = date('Y-m', strtotime(date('Y-m-01') . "-1 month"));
$lastMonthInt = intval(date('m', strtotime(date('Y-m-01') . "-1 month")));
$mingrentang = $this->getMingrentangData($myPkUserId);
// $mingrentang = $this->getMingrentangData($myPkUserId);//应该不用了
$rankNow = $this->rankNow('local');
//弹窗里面的pk时间段
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment