From b6da006a147f5434956f7ec6eb62d8a4b4483954 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Fri, 29 Apr 2022 14:56:19 +0800
Subject: [PATCH] customers_429_3

---
 admin/views/receiver/clues/lists.php    | 41 ++++++++++++++-----------
 admin/views/receiver/customer/lists.php | 29 +++++++++--------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/admin/views/receiver/clues/lists.php b/admin/views/receiver/clues/lists.php
index 7f9aa08a..83e8c931 100644
--- a/admin/views/receiver/clues/lists.php
+++ b/admin/views/receiver/clues/lists.php
@@ -115,13 +115,13 @@
                     </div>
                     <div class="am-para-inline" style="padding-top: 5px;">
                         <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="today"
-                           data-source="id-create-time">今天</a>
+                           data-source="id-create-time">今日</a>
                         <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="yesterday"
                            data-source="id-create-time">昨日</a>
-                        <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="7day"
-                           data-source="id-create-time">最近7天</a>
-                        <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="30day"
-                           data-source="id-create-time">最近30天</a>
+                        <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="weeks"
+                           data-source="id-create-time">本周</a>
+                        <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="month"
+                           data-source="id-create-time">本月</a>
                     </div>
                 </div>
             </div>
@@ -138,10 +138,10 @@
                            data-source="id-en-time">今天</a>
                         <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="yesterday"
                            data-source="id-en-time">昨日</a>
-                        <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="7day"
-                           data-source="id-en-time">最近7天</a>
-                        <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="30day"
-                           data-source="id-en-time">最近30天</a>
+                        <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="weeks"
+                           data-source="id-en-time">本周</a>
+                        <a class="mr10 id-day-btn" href="javascript:void (0);" data-date="month"
+                           data-source="id-en-time">本月</a>
                     </div>
                 </div>
             </div>
@@ -381,24 +381,29 @@
             elem: '#id-en-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-create-time';
+            var beginDate = '', endDate = '';
             switch (type) {
                 case 'today':
-                    date = d_obj.Format('yyyy-MM-dd');
-                    date = date + ' ~ ' + date;
+                    beginDate = endDate = nowDate.Format('yyyy-MM-dd');
                     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 * 30)).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/receiver/customer/lists.php b/admin/views/receiver/customer/lists.php
index ebb5912d..4cabbac4 100644
--- a/admin/views/receiver/customer/lists.php
+++ b/admin/views/receiver/customer/lists.php
@@ -109,10 +109,10 @@
                                    placeholder="<?= $value ?>范围" autocomplete="off"/>
                         </div>
                         <div class="am-para-inline" style="padding-top: 5px;">
-                            <a class="mr10 id-<?= $key ?>-btn" href="javascript:void (0);" data-date="today">今天</a>
+                            <a class="mr10 id-<?= $key ?>-btn" href="javascript:void (0);" data-date="today">今日</a>
                             <a class="mr10 id-<?= $key ?>-btn" href="javascript:void (0);" data-date="yesterday">昨日</a>
-                            <a class="mr10 id-<?= $key ?>-btn" href="javascript:void (0);" data-date="7day">最近7天</a>
-                            <a class="mr10 id-<?= $key ?>-btn" href="javascript:void (0);" data-date="30day">最近30天</a>
+                            <a class="mr10 id-<?= $key ?>-btn" href="javascript:void (0);" data-date="weeks">本周</a>
+                            <a class="mr10 id-<?= $key ?>-btn" href="javascript:void (0);" data-date="month">本月</a>
                         </div>
                     </div>
                 </div>
@@ -223,23 +223,28 @@
             elem: '#id-<?=$key?>', range: '~'
         });
         $('.id-<?=$key?>-btn').click(function () {
-            var type = $(this).data('date'), date = '', d_obj = new Date();
+            var type = $(this).data('date'), date = '', nowDate = new Date();
+            var beginDate = '', endDate = '';
             switch (type) {
                 case 'today':
-                    date = d_obj.Format('yyyy-MM-dd');
-                    date = date + ' ~ ' + date;
+                    beginDate = endDate = nowDate.Format('yyyy-MM-dd');
                     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 * 30)).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;
             $('#id-<?=$key?>').val(date);
         });
         <?}?>