From 74dd2d10df5dcfb87c5986434a5f7101a687cb5f Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Tue, 11 Oct 2022 17:21:53 +0800
Subject: [PATCH] transfer_10111

---
 admin/controllers/items/Transfer.php       |  7 +++-
 admin/views/items/transfer/lists.php       | 37 ++++++++--------------
 market/controllers/api/sylive/Activity.php |  8 +++--
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/admin/controllers/items/Transfer.php b/admin/controllers/items/Transfer.php
index 5c862ef5..273ab0ba 100644
--- a/admin/controllers/items/Transfer.php
+++ b/admin/controllers/items/Transfer.php
@@ -44,7 +44,7 @@ class Transfer extends HD_Controller
             $autoList[2] = $this->mdAutoSeries->select(array('status' => 1, 'brand_id' => $params['brand_id']), 'id desc', 0, 0, 'id,name');
         }
         if ($params['s_id']) {
-            $autoList[3] = $this->mdAutoAttr->select(array('status' => 1,'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name');
+            $autoList[3] = $this->mdAutoAttr->select(array('status' => 1, 'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name');
         }
         $total = $re['total'];
         $this->data['params'] = $re['params'];
@@ -151,6 +151,11 @@ class Transfer extends HD_Controller
             $in_time[0] && $where["in_time >="] = $in_time[0] . ' 00:00:00';
             $in_time[1] && $where["in_time <="] = $in_time[1] . ' 23:59:59';
         }
+        if ($params['c_time']) {
+            $c_time = explode(' ~ ', $params['c_time']);
+            $c_time[0] && $where["c_time >="] = strtotime($c_time[0] . ' 00:00:00');
+            $c_time[1] && $where["c_time <="] = strtotime($c_time[1] . ' 23:59:59');
+        }
         $total = $this->mdTransfer->count($where);
         $lists = array();
         if ($total) {
diff --git a/admin/views/items/transfer/lists.php b/admin/views/items/transfer/lists.php
index c75235f7..38723d9d 100644
--- a/admin/views/items/transfer/lists.php
+++ b/admin/views/items/transfer/lists.php
@@ -68,7 +68,7 @@
                     </div>
                 </div>
                 <div class="am-form-group fl">
-                    <div class="am-para-inline w220">
+                    <div class="am-para-inline w260">
                         <select id="v_id" name="v_id">
                             <option value="0">选择车型</option>
                             <?php if ($autoList[3]) {
@@ -80,6 +80,13 @@
                         </select>
                     </div>
                 </div>
+                <div class="am-form-group fl">
+                    <label class="am-para-label w70">调拨人：</label>
+                    <div class="am-para-inline w200">
+                        <input id="admin_name" name="admin_name" type="text" placeholder="输入调拨人"
+                               value="<?= $params['admin_name'] ?>"/>
+                    </div>
+                </div>
                 <div class="am-form-group" style="margin-bottom: 0px;"></div>
                 <div class="am-form-group fl">
                     <label class="am-para-label w70">提车时间：</label>
@@ -96,10 +103,10 @@
                     </div>
                 </div>
                 <div class="am-form-group fl">
-                    <label class="am-para-label w70">调拨人：</label>
+                    <label class="am-para-label w90">调拨时间：</label>
                     <div class="am-para-inline w200">
-                        <input id="admin_name" name="admin_name" type="text" placeholder="输入调拨人"
-                               value="<?= $params['admin_name'] ?>"/>
+                        <input id="c_time" name="c_time" type="text" value="<?= $params['c_time'] ?>"
+                               placeholder="调拨时间范围" autocomplete="off"/>
                     </div>
                 </div>
                 <div class="am-form-group" style="margin-bottom: 0px;"></div>
@@ -656,26 +663,8 @@
             laydate.render({
                 elem: '#in_time', range: '~'
             });
-            $('.id-day-btn').click(function () {
-                var type = $(this).data('date'), date = '', d_obj = new Date();
-                var source_id = $(this).data('source') || 'out_time';
-                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;
-                        break;
-                    case '7day':
-                        date = (new Date(d_obj.getTime() - 86400000 * 7)).Format('yyyy-MM-dd') + ' ~ ' + d_obj.Format('yyyy-MM-dd');
-                        break;
-                    case '30day':
-                        date = (new Date(d_obj.getTime() - 86400000 * 30)).Format('yyyy-MM-dd') + ' ~ ' + d_obj.Format('yyyy-MM-dd');
-                        break;
-                }
-                $('#' + source_id).val(date);
+            laydate.render({
+                elem: '#c_time', range: '~'
             });
         });
     });
diff --git a/market/controllers/api/sylive/Activity.php b/market/controllers/api/sylive/Activity.php
index fd429b9b..aaeadeed 100644
--- a/market/controllers/api/sylive/Activity.php
+++ b/market/controllers/api/sylive/Activity.php
@@ -284,8 +284,12 @@ class Activity extends BaseController
             $this->return_json('活动不存在');
         }
         $jsondata = $re['jsondata'] ? json_decode($re['jsondata'], true) : [];
-        $item = ['title' => $title, 'price' => $price, 'timeStart' => $dateRange[0], 'timeEnd' => $dateRange[1]
-            , 'useTimeStart' => $dateUseRange[0], 'useTimeEnd' => $dateUseRange[1], 'introduction' => $introduction];
+        $timeStart = $dateRange[0] ? $dateRange[0] : '';
+        $timeEnd = $dateRange[1] ? $dateRange[1] : '';
+        $useTimeStart = $dateUseRange[0] ? $dateUseRange[0] : '';
+        $useTimeEnd = $dateUseRange[1] ? $dateUseRange[1] : '';
+        $item = ['title' => $title, 'price' => $price, 'timeStart' => $timeStart, 'timeEnd' => $timeEnd
+            , 'useTimeStart' => $useTimeStart, 'useTimeEnd' => $useTimeEnd, 'introduction' => $introduction];
         if ($itemImg) {
             $setItemImg = [];
             foreach ($itemImg as $v) {