Merge branch 'feature/version_1028' of wmtx/platform into release

修改bug

Application/Home/Controller/DownloadController.class.php

@@ -2172,7 +2172,7 @@ class DownloadController extends BaseController {
         $roleMap = ['_string' => '1=1'];
         $map = [];
 
-        $betweenTime = [strtotime($start . ' 00:00:00'), strtotime($start . ' 23:59:59')];
+        $betweenTime = [strtotime($start . ' 00:00:00'), strtotime($end . ' 23:59:59')];
         $spendMap['pay_time'] = ['between', $betweenTime];
         $roleMap['create_time'] = ['between', $betweenTime];
         

Application/Home/Controller/QueryController.class.php

@@ -2976,7 +2976,7 @@ class QueryController extends BaseController
         $roleMap = ['_string' => '1=1'];
         $map = [];
 
-        $betweenTime = [strtotime($start . ' 00:00:00'), strtotime($start . ' 23:59:59')];
+        $betweenTime = [strtotime($start . ' 00:00:00'), strtotime($end . ' 23:59:59')];
         $spendMap['pay_time'] = ['between', $betweenTime];
         $roleMap['create_time'] = ['between', $betweenTime];
         

Application/Home/View/default/PromoteGrade/index.html

@@ -57,7 +57,7 @@
             </div>
             <?php if ($prevParentId > 0):?>
             <div class="form-group">
-              <a class="submit normal_space" href="{:U('PromoteGrade/index', ['row'=>I('get.row'), 'parent_id' => $prevParentId, 'month'=>$month])}" style="line-height: 36px; display: inline-block; text-align: center; background: #E5E5E5; color: #2bd8ed; cursor: pointer;">返回上级</a>
+              <a class="submit normal_space" href="{:U('PromoteGrade/index', ['row'=>I('get.row'), 'parent_id' => $prevParentId, 'base_game_id' => I('base_game_id', 0), 'month'=>$month])}" style="line-height: 36px; display: inline-block; text-align: center; background: #E5E5E5; color: #2bd8ed; cursor: pointer;">返回上级</a>
             </div>
             <?php endif;?>
           </form>