diff --git a/admin/views/app/licheb/userslog/lists.php b/admin/views/app/licheb/userslog/lists.php index 9e037944..0d35fc7b 100644 --- a/admin/views/app/licheb/userslog/lists.php +++ b/admin/views/app/licheb/userslog/lists.php @@ -59,14 +59,12 @@ placeholder="开始时间 ~ 结束时间" autocomplete="off"/>
- 今天 昨日 - 最近7天 - 最近30天 + 本周 + 本月
@@ -137,24 +135,27 @@ elem: '#id-time', range: '~' }); $('.id-day-btn').click(function () { - var type = $(this).data('date'), date = '', d_obj = new Date(); + var type = $(this).data('date'), date = '', nowDate = new Date(); var source_id = $(this).data('source') || 'id-time'; + var beginDate = ''; + var endDate = ''; switch (type) { - case 'today': - date = d_obj.Format('yyyy-MM-dd'); - date = date + ' ~ ' + date; - break; case 'yesterday': - date = (new Date(d_obj.getTime() - 86400000)).Format('yyyy-MM-dd'); - date = date + ' ~ ' + date; + beginDate = endDate = (new Date(nowDate.getTime() - 86400000)).Format('yyyy-MM-dd'); break; - case '7day': - date = (new Date(d_obj.getTime() - 86400000 * 7)).Format('yyyy-MM-dd') + ' ~ ' + d_obj.Format('yyyy-MM-dd'); + case 'weeks': + nowDate.setDate(nowDate.getDate() - nowDate.getDay() + 1); + beginDate = nowDate.getFullYear() + "-" + (nowDate.getMonth() + 1) + "-" + nowDate.getDate(); + nowDate.setDate(nowDate.getDate() + 6); + endDate = nowDate.getFullYear() + "-" + (nowDate.getMonth() + 1) + "-" + nowDate.getDate(); break; - case '30day': - date = (new Date(d_obj.getTime() - 86400000 * 29)).Format('yyyy-MM-dd') + ' ~ ' + d_obj.Format('yyyy-MM-dd'); + case 'month': + beginDate = nowDate.getFullYear() + "-" + (nowDate.getMonth() + 1) + "-01"; + var day = new Date(nowDate.getFullYear(), nowDate.getMonth() + 1, 0); + endDate = nowDate.getFullYear() + "-" + (nowDate.getMonth() + 1) + "-" + day.getDate(); break; } + date = beginDate + ' ~ ' + endDate; $('#' + source_id).val(date); }); }); diff --git a/admin/views/biz/store/lists.php b/admin/views/biz/store/lists.php index 5c6ed53a..87e1cc50 100755 --- a/admin/views/biz/store/lists.php +++ b/admin/views/biz/store/lists.php @@ -99,11 +99,11 @@
- +
+ placeholder="创建时间范围" autocomplete="off"/>
今天 diff --git a/api/controllers/wxapp/content/Subject.php b/api/controllers/wxapp/content/Subject.php index 35a0f6a0..3ebd3c0a 100644 --- a/api/controllers/wxapp/content/Subject.php +++ b/api/controllers/wxapp/content/Subject.php @@ -179,7 +179,9 @@ class Subject extends Wxapp{ $imgs = []; if(is_array($json_imgs)){ foreach($json_imgs as $val){ - $val['img'] && $imgs[] = build_qiniu_image_url($val['img'],750); + //$val['img'] && $imgs[] = build_qiniu_image_url($val['img'],750); + $height = intval($val['height']); + $val['img'] && $imgs[] = ['img' => build_qiniu_image_url($val['img'], 750), 'height' => $height]; } } @@ -199,7 +201,7 @@ class Subject extends Wxapp{ "type" => intval($row_sub["type"]), 'imgs' => $imgs, 'video' => $row_sub['video'], - 'status' => isset($v['status']) ? intval($v['status']) : 1, + 'status' => isset($row_sub['status']) ? intval($row_sub['status']) : 1, ); return $data;