m时间插件更新

@@ -60,8 +60,11 @@ class Seller extends Common
 
 
             $sid = $data['sid'] ? implode(',', $data['sid']) : '';
             $sid = $data['sid'] ? implode(',', $data['sid']) : '';
             $sellername = $data['key'] ? $data['key'] : '';
             $sellername = $data['key'] ? $data['key'] : '';
-            $stime = $data['stime'] ? strtotime(date($data['stime'],time())) : '';
-            $etime = $data['etime'] ? strtotime(date($data['etime'],time())) : '';
+
+            $time = $data['time'] ? explode(' - ', $data['time']) : '';
+
+            $stime = $time ? strtotime(date($time[0],time())) : '';
+            $etime = $time ? strtotime(date($time[1],time())) : '';
 
 
             $data['time_type'] = $data['time_type'] ? $data['time_type'] : 1;
             $data['time_type'] = $data['time_type'] ? $data['time_type'] : 1;
             $data['channel'] = $data['channel'] ? $data['channel'] : 1;
             $data['channel'] = $data['channel'] ? $data['channel'] : 1;

@@ -10,12 +10,7 @@
         </div>
         </div>
         日期范围：
         日期范围：
         <div class="layui-input-inline" >
         <div class="layui-input-inline" >
-            <!--<input type="text" style = "width:300px"; class="layui-input" id="time" placeholder="默认为当天的统计情况">-->
-            <input type="text" class="layui-input" id="stime" placeholder="开始日期">
-        </div>
-        -
-        <div class="layui-input-inline">
-            <input type="text" class="layui-input" id="etime" placeholder="结束日期">
+            <input type="text" style = "width:300px"; class="layui-input" id="time" placeholder="默认为当天的统计情况">
         </div>
         </div>
         商家来源：
         商家来源：
         <div class="layui-input-inline layui-form">
         <div class="layui-input-inline layui-form">
@@ -89,13 +84,9 @@
 
 
         //日期时间范围
         //日期时间范围
         laydate.render({
         laydate.render({
-            elem: '#stime',
-            type: 'datetime'
-        });
-
-        laydate.render({
-            elem: '#etime',
-            type: 'datetime'
+            elem: '#time'
+            ,type: 'datetime'
+            ,range: true
         });
         });
 
 
         //搜索
         //搜索
@@ -109,11 +100,9 @@
                 a.push(o.id);
                 a.push(o.id);
             });
             });
             console.log(a);
             console.log(a);
-            //选中的日期
-            var stime = $('#stime').val();
-            console.log(stime);
-            var etime = $('#etime').val();
-            console.log(etime);
+            
+            var time = $('#time').val();
+            console.log(time);
             //商家来源
             //商家来源
             var channel = $('#channel').val();
             var channel = $('#channel').val();
             console.log(channel);
             console.log(channel);
@@ -121,7 +110,7 @@
             var time_type = $('#time_type').val();
             var time_type = $('#time_type').val();
             console.log(time_type);
             console.log(time_type);
             //传参
             //传参
-            tableIn.reload({ page: {page: 1},where: {key: key,sid: a,stime: stime,time_type: time_type,etime: etime,channel: channel}});
+            tableIn.reload({ page: {page: 1},where: {key: key,sid: a,time_type: time_type,time: time,channel: channel}});
         });
         });
 
 
         var $ = layui.$, active = {
         var $ = layui.$, active = {