Merge branch 'hotfix/query' into dev

master
ELF 5 years ago
commit 4917458099

@ -200,7 +200,7 @@ class SpendRepository {
$records = [];
foreach ($dayList as $day) {
$time = strtotime($day);
$time = strtotime($day) + 24 * 3600;
$conditions['pay_time'] = ['elt', $time];
$result = M('spend', 'tab_')->field('count(DISTINCT user_id) as count')->where($conditions)->find();
$records[$day] = $result['count'];

@ -135,6 +135,9 @@
<div class="form-group normal_space">
<select id="promote-select" name="sub_promote_id" class="reselect select_gallery" style="width: 220px;" data-promote="{:I('sub_promote_id', 0)}">
<option value="0">请选择推广员</option>
<volist name="subPromotes" id="promote">
<option ba-id="{$promote.id}" value="{$promote.id}" <if condition="I('promote_id') == $promote['id']">selected</if>>{$promote.account}({$promote.real_name})</option>
</volist>
</select>
</div>
</if>

Loading…
Cancel
Save