修改bug

master
ELF 5 years ago
parent 6f4ec4ff30
commit 47e2706e26

@ -337,4 +337,9 @@ class SpendRepository
$items = M('spend', 'tab_')->field('count(DISTINCT user_id) as count, game_id')->where($conditions)->group('game_id')->find();
return $this->assembleRecords($items, $gameIds, 'count', 'game_id');
}
public function getCommonQuery($params, $columns = '*')
{
// return M('spend', 'tab_')->field($columns)->where($map);
}
}

@ -376,7 +376,9 @@ $(function(){
$('.cancel-shift-btn').on({
click: function() {
var id = $(this).parents('tr').eq(0).attr('data-id')
var tr = $(this).parents('tr').eq(0)
var id = tr.attr('data-id')
var parentId = tr.attr('data-parent-id')
var shiftType = $(this).attr('data-promote-shift-type')
var shiftTypeName = getShiftTypeName(shiftType)
layer.confirm('是否要取消' + shiftTypeName, {icon: 3, title:'提示'}, function(index){

Loading…
Cancel
Save