PC数据统计调整

teemitop
1 parent 70df8ac5
Showing 3 changed files with 46 additions and 23 deletions
application/admin/controller/Seller.php
application/admin/view/seller/get_reserve_list.html
application/admin/view/seller/get_statistics.html
--- a/application/admin/controller/Seller.php
View file @3098305
+++ b/application/admin/controller/Seller.php
View file @3098305
@@ -100,6 +100,7 @@ class Seller extends Common
             $list= file_get_contents(ON_LINE.'App.Report.GetReserveData'.$parame);
             $array = json_decode($list,TRUE);
+
             $new_array = array();
             foreach ($array['data'] as $key => $value) {
                 if(is_array($value)){
@@ -107,8 +108,8 @@ class Seller extends Common
                     $new_array[$key]['sellername'] = $value['sellername'];
                     $new_array[$key]['contacts_total'] = $value['contacts_total'];
                     $new_array[$key]['inviting'] = $value['inviting'];
-                    $new_array[$key]['reserve_count'] = $value['appReserveCount'] .'/'. $value['AndroidReserveCount'];
-                    $new_array[$key]['reserve_count_sort'] = $value['appReserveCount'] + $value['AndroidReserveCount'];
+                    $new_array[$key]['reserve_count'] = $value['appReserveCount'] .'/'. $value['AndroidReserveCount'].'/'. $value['CReserveCount'];
+                    $new_array[$key]['reserve_count_sort'] = $value['appReserveCount'] + $value['AndroidReserveCount'] + $value['CReserveCount'];
                     $new_array[$key]['sms_send_count'] = $value['appSmsCount'] .'/'. $value['AndroidSmsCount'];
                     $new_array[$key]['sms_send_count_sort'] = $value['appSmsCount'] + $value['AndroidSmsCount'];
                     $new_array[$key]['table_room_total'] = $value['table_total'] .'/'. $value['room_total'];
@@ -119,11 +120,12 @@ class Seller extends Common
                 'code'=>0,'msg'=>'获取成功!',
                 'data'=>$new_array,
                 'count'=>$array['data']['total'],
-                'countReserve'=>$array['data']['appReserveCount']+$array['data']['AndroidReserveCount'],
+                'countReserve'=>$array['data']['appReserveCount']+$array['data']['AndroidReserveCount']+$array['data']['CReserveCount'],
                 'countSms'=>$array['data']['appSmsCount']+$array['data']['AndroidSmsCount'],
                 'inviteeCount'=>$array['data']['inviteeCount'],
                 'appReserveCount'=>$array['data']['appReserveCount'],
                 'AndroidReserveCount'=>$array['data']['AndroidReserveCount'],
+                'CReserveCount'=>$array['data']['CReserveCount'],
                 'appSmsCount'=>$array['data']['appSmsCount'],
                 'AndroidSmsCount'=>$array['data']['AndroidSmsCount'],
                 'Contacts'=>$array['data']['Contacts'],
@@ -608,10 +610,15 @@ class Seller extends Common
             $stime = $time ? strtotime(date($time[0],time())) : strtotime(date('Y-m-d 00:00:00',time()));
             $etime = $time ? strtotime(date($time[1],time())) : strtotime(date('Y-m-d 23:59:59',time()));
+            $dtime = $data['dtime'] ? explode(' - ', $data['dtime']) : '';
+
+            $sdtime = $dtime ? strtotime(date($dtime[0],time())) : '';
+            $edtime = $dtime ? strtotime(date($dtime[1],time())) : '';
+
             $data['status'] = $data['status'] ? $data['status'] : 2;
             $data['channel'] = $data['channel'] ? $data['channel'] : 1;
-            $parame = '&offset='.$data["page"].'&limit='.$data["limit"].'&sellername='.@$sellername.'&stime='.@$stime.'&etime='.@$etime.'&channel='.@$data['channel'].'&id='.$id.'&status='.@$data['status'];
+            $parame = '&offset='.$data["page"].'&limit='.$data["limit"].'&sellername='.@$sellername.'&stime='.@$stime.'&etime='.@$etime.'&channel='.@$data['channel'].'&id='.$id.'&status='.@$data['status'].'&sdtime='.$sdtime.'&edtime='.$edtime;
             //获取运营人员列表
             $list= file_get_contents(ON_LINE.'App.Customer.GetReserveList'.$parame);
--- a/application/admin/view/seller/get_reserve_list.html
View file @3098305
+++ b/application/admin/view/seller/get_reserve_list.html
View file @3098305
@@ -6,26 +6,19 @@
     <div class="demoTable">
         订单编号：
         <div class="layui-input-inline">
-            <input class="layui-input" name="nokey" id="nokey"  placeholder="{:lang('pleaseEnter')}订单编号" autocomplete="off">
+            <input class="layui-input" style = "width:130px"; name="nokey" id="nokey"  placeholder="{:lang('pleaseEnter')}订单编号" autocomplete="off">
         </div>
         商家：
         <div class="layui-input-inline">
-            <input class="layui-input" name="key" id="key"  placeholder="{:lang('pleaseEnter')}店铺名称" autocomplete="off">
+            <input class="layui-input" style = "width:130px"; name="key" id="key"  placeholder="{:lang('pleaseEnter')}店铺名称" autocomplete="off">
         </div>
         日期范围：
         <div class="layui-input-inline" >
-            <input type="text" style = "width:300px"; class="layui-input" id="time" placeholder="默认为当天的统计情况">
+            <input type="text" style = "width:200px"; class="layui-input" id="time" placeholder="默认为当天的统计情况">
         </div>
-        商家来源：
-        <div class="layui-input-inline layui-form">
-                <div class="layui-input-8">
-                    <select name="class" id="channel" lay-filter="myselect">
-                            <option value="-1">全部</option>
-                            <option value="1" selected="true">合作</option>
-                            <option value="2">推广</option>
-                            <option value="3">测试</option>
-                    </select>
-                </div>
+        到店日期：
+        <div class="layui-input-inline" >
+            <input type="text" style = "width:200px"; class="layui-input" id="dtime" placeholder="无默认值">
         </div>
         订单状态：
         <div class="layui-input-inline layui-form">
@@ -39,6 +32,18 @@
                     </select>
                 </div>
         </div>
+        商家来源：
+        <div class="layui-input-inline layui-form"  style = "width:200px";>
+                <div class="layui-input-4">
+                    <select name="class" id="channel" lay-filter="myselect">
+                            <option value="-1">全部</option>
+                            <option value="1" selected="true">合作</option>
+                            <option value="2">推广</option>
+                            <option value="3">测试</option>
+                    </select>
+                </div>
+        </div>
+        
         <button class="layui-btn"  id="search" data-type="reload">查询统计</button>
     </div>
     <br>
@@ -109,6 +114,13 @@
             ,range: true
         });
+        //日期时间范围
+        laydate.render({
+            elem: '#dtime'
+            ,type: 'datetime'
+            ,range: true
+        });
+
         //搜索
         $('#search').on('click', function() {
             //ID
@@ -118,6 +130,9 @@
             var time = $('#time').val();
             console.log(time);
+
+            var dtime = $('#dtime').val();
+
             //商家来源
             var channel = $('#channel').val();
             console.log(channel);
@@ -125,7 +140,7 @@
             var status = $('#status').val();
             console.log(status);
             //传参
-            tableIn.reload({ page: {page: 1},where: {nokey: nokey,key: key,status: status,time: time,channel: channel}});
+            tableIn.reload({ page: {page: 1},where: {nokey: nokey,key: key,status: status,time: time,dtime:dtime,channel: channel}});
         });
         var $ = layui.$, active = {
--- a/application/admin/view/seller/get_statistics.html
View file @3098305
+++ b/application/admin/view/seller/get_statistics.html
View file @3098305
@@ -41,7 +41,7 @@
     </table>
 </div>
 <script type="text/html" id="toolbarDemo">
-    <span>订单总数：<i id="count">X</i>条 【小程序 <i id="appReserveCount">X</i>  / 座机 <i id="AndroidReserveCount">D</i>】</span>
+    <span>订单总数：<i id="count">X</i>条 【小程序 <i id="appReserveCount">X</i>  / 座机 <i id="AndroidReserveCount">D</i>  / C端 <i id="CReserveCount">C</i>】</span>
     <span>短信发送数量：<i id="size">Y</i>条 【小程序 <i id="appSmsCount">Y</i>  / 座机 <i id="AndroidSmsCount">Y</i>】</span>
     <span>邀请总数：<i id="invitee">Z</i>条</span>
     <span>联系人总数：<i id="Contacts">W</i>条</span>
@@ -64,10 +64,10 @@
                 {field: 'id', title: '{:lang("id")}',width:60, fixed: true},
                 {field: 'address_component', title: '省-市', sort: true},
                 {field: 'sellername', title: '商家名称'},
-                {field: 'contacts_total', title: '联系人总数', sort: true},
-                {field: 'table_room_total', title: '桌位/包间(总数)'},
-                {field: 'reserve_count_sort', align: 'right', title: '预定总量', sort: true},
-                {field: 'reserve_count', align: 'left', title: '订单构成（小程序/座机）'},
+                {field: 'contacts_total', title: '联系人总数',width:110, sort: true},
+                {field: 'table_room_total', title: '桌位/包间(总数)',width:130},
+                {field: 'reserve_count_sort', align: 'right', title: '预定总量',width:100, sort: true},
+                {field: 'reserve_count', align: 'left', title: '订单构成（小程序/座机/C端）',width:220},
                 {field: 'sms_send_count_sort', align: 'right',title: '短信发送总量',colspan:1, sort: true},
                 {field: 'sms_send_count', align: 'left',title: '短信发送构成（小程序/座机）'},
                 {field: 'inviting', align: 'center',title: '当前商户通过邀请函拉到的顾客', sort: true},
@@ -78,6 +78,7 @@
                 $('#invitee').html(res.inviteeCount);
                 $('#appReserveCount').html(res.appReserveCount);
                 $('#AndroidReserveCount').html(res.AndroidReserveCount);
+                $('#CReserveCount').html(res.CReserveCount);
                 $('#appSmsCount').html(res.appSmsCount);
                 $('#AndroidSmsCount').html(res.AndroidSmsCount);
                 $('#Contacts').html(res.Contacts);