Merge remote-tracking branch 'origin/master'

resources/views/admin/index.blade.php

@@ -108,101 +108,78 @@
                 </dd>
             </dl>
             <dl id="menu-order">
-                <dt @if(!isset($res['statistics/manage'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe623;</i> 报表管理<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
+                <dt @if(!isset($res['statistics/manage'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe623;</i>业务数据报表<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
                 <dd>
                     <ul>                       
-                        <li @if(!isset($res['statistics/fanDay'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/fanDay')}}" data-title="当日数据统计" href="javascript:void(0)">当日数据统计</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/orderDay'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderDay')}}" data-title="分片数据统计" href="javascript:void(0)">分片数据统计</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/throwDay'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/throwDay')}}" data-title="当日投放数据统计" href="javascript:void(0)">当日投放数据统计</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/fanDaySaler'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/fanDaySaler')}}" data-title="当日数据统计(銷售)" href="javascript:void(0)">当日数据统计(銷售)</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/orderDaySaler'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderDaySaler')}}" data-title="分片数据统计(销售)" href="javascript:void(0)">分片数据统计(销售)</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/orderRateList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderRateList')}}" data-title="成单率梯形图" href="javascript:void(0)">成单率梯形图</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/orderSaleRank'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderSaleRank')}}" data-title="实时数据展榜" href="javascript:void(0)">实时数据展榜</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/orderDistrict'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderDistrict')}}" data-title="实时订单地域分布" href="javascript:void(0)">实时订单地域分布</a></li>                        
-                    </ul>
-                   
-                    <ul>                       
-                        <li @if(!isset($res['statistics/districtRoi'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/districtRoi7day')}}" data-title="滚动地域ROI" href="javascript:void(0)">滚动地域ROI</a></li> 
-                        <li @if(!isset($res['template/templateLogReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/template/templateLogReport')}}" data-title="销售模板导粉报表" href="javascript:void(0)">销售模板导粉报表</a></li>
-
-                        <li @if(!isset($res['template/templateLogReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/template/templateLogMonthReport')}}" data-title="销售模板导粉月报" href="javascript:void(0)">销售模板导粉月报</a></li> 
-
-                        <li @if(!isset($res['statistics/salerOrderFugou'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/salerOrderFugou')}}" data-title="销售粉丝复购报表" href="javascript:void(0)">销售粉丝复购报表</a></li> 
-                        <li @if(!isset($res['statistics/dayGrandTotal'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/dayGrandTotal')}}" data-title="每日数据累计汇总报表" href="javascript:void(0)">每日数据累计汇总报表</a></li> 
+                        <li @if(!isset($res['statistics/fanDay'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/fanDay')}}" data-title="当日数据统计" href="javascript:void(0)">当日数据统计</a></li>
+                        <li @if(!isset($res['statistics/orderDay'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderDay')}}" data-title="分片数据统计" href="javascript:void(0)">分片数据统计</a></li>
+                        <li @if(!isset($res['statistics/orderRateList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderRateList')}}" data-title="成单率梯形图" href="javascript:void(0)">成单率梯形图</a></li>
+                        <li @if(!isset($res['statistics/districtRoi'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/districtRoi7day')}}" data-title="滚动地域ROI" href="javascript:void(0)">滚动地域ROI</a></li>
+                        <li @if(!isset($res['statistics/dayGrandTotal'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/dayGrandTotal')}}" data-title="每日数据累计汇总报表" href="javascript:void(0)">每日数据累计汇总报表</a></li>
+                        <li @if(!isset($res['statistics/customerOrder'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/customerOrder')}}" data-title="用户订单统计" href="javascript:void(0)">用户订单统计</a></li>
+                        <li @if(!isset($res['statistics/salerOrderFugou'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/salerOrderFugou')}}" data-title="销售粉丝复购报表" href="javascript:void(0)">销售粉丝复购报表</a></li>
                         <li @if(!isset($res['statistics/volumeRank'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/volumeRank')}}" data-title="近30日商品售卖排行榜" href="javascript:void(0)">近30日商品售卖排行榜</a></li>
-
-                        <li @if(!isset($res['statistics/dayGrandTeamTotal'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/dayGrandTeamTotal')}}" data-title="团队ROI每日汇总报表" href="javascript:void(0)">团队ROI每日汇总报表</a></li>
-
                         <li @if(!isset($res['statistics/dayGrandSalerTotal'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/dayGrandSalerTotal')}}" data-title="销售ROI每日汇总报表" href="javascript:void(0)">销售ROI每日汇总报表</a></li>
-                   
-                    </ul>
-                    <ul>
-                        <li @if(!isset($res['statistics/customerOrder'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/customerOrder')}}" data-title="用户订单统计" href="javascript:void(0)">用户订单统计</a></li>
                     </ul>
-                   
                 </dd>
             </dl>
             <dl id="menu-order">
-                <dt @if(!isset($res['statistics/financemanage'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe606;</i> 财务报表<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
+                <dt @if(!isset($res['statistics/financemanage'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe623;</i> 财务数据报表<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
                 <dd>
                     <ul>                       
-                        <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/teamFinanceList')}}" data-title="团队订单财务明细" href="javascript:void(0)">团队订单财务明细</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/teamFinanceTotal'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/teamFinanceTotal')}}" data-title="团队订单财务汇总" href="javascript:void(0)">团队订单财务汇总</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/aftersaleFinanceList')}}" data-title="售后订单财务明细" href="javascript:void(0)">售后订单财务明细</a></li>                        
-                    </ul>
-                    <!--ul>                       
-                        <li @if(!isset($res['statistics/teamFinanceTotal'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/teamFinanceTotal?aftersale=1')}}" data-title="售后订单财务汇总" href="javascript:void(0)">售后订单财务汇总</a></li>                        
-                    </ul-->
-                    <ul>                       
-                        <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/refundFinanceList')}}" data-title="退补订单财务明细" href="javascript:void(0)">退补订单财务明细</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/sendFinanceList')}}" data-title="发货订单财务明细" href="javascript:void(0)">发货订单财务明细</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/warehouseFinanceList')}}" data-title="仓库每日发货报表" href="javascript:void(0)">仓库每日发货报表</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/depositDayReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/depositDayReport')}}" data-title="充值日报表" href="javascript:void(0)">充值日报表</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/depositDayReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/depositDetail')}}" data-title="充值卡充值明细" href="javascript:void(0)">充值卡充值明细</a></li>                        
-                    </ul>
-                    <ul>                       
-                        <li @if(!isset($res['statistics/depositDayReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/consumDetail')}}" data-title="充值卡消费明细" href="javascript:void(0)">充值卡消费明细</a></li>                        
-                    </ul>
-                    <ul>                       
+                        <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/teamFinanceList')}}" data-title="团队订单财务明细" href="javascript:void(0)">团队订单财务明细</a></li>
+                        <li @if(!isset($res['statistics/teamFinanceTotal'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/teamFinanceTotal')}}" data-title="团队订单财务汇总" href="javascript:void(0)">团队订单财务汇总</a></li>
+                        <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/aftersaleFinanceList')}}" data-title="售后订单财务明细" href="javascript:void(0)">售后订单财务明细</a></li>
+                        {{--<li @if(!isset($res['statistics/teamFinanceTotal'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/teamFinanceTotal?aftersale=1')}}" data-title="售后订单财务汇总" href="javascript:void(0)">售后订单财务汇总</a></li>                        --}}
+                        <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/refundFinanceList')}}" data-title="退补订单财务明细" href="javascript:void(0)">退补订单财务明细</a></li>
+                        <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/sendFinanceList')}}" data-title="发货订单财务明细" href="javascript:void(0)">发货订单财务明细</a></li>
+                        <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/warehouseFinanceList')}}" data-title="仓库每日发货报表" href="javascript:void(0)">仓库每日发货报表</a></li>
+                        <li @if(!isset($res['statistics/depositDayReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/depositDayReport')}}" data-title="充值日报表" href="javascript:void(0)">充值日报表</a></li>
+                        <li @if(!isset($res['statistics/depositDayReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/depositDetail')}}" data-title="充值卡充值明细" href="javascript:void(0)">充值卡充值明细</a></li>
+                        <li @if(!isset($res['statistics/depositDayReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/consumDetail')}}" data-title="充值卡消费明细" href="javascript:void(0)">充值卡消费明细</a></li>
                         <li @if(!isset($res['statistics/depositDayReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/customerMonthAccount')}}" data-title="客户充值消费月报" href="javascript:void(0)">客户充值消费月报</a></li>                        
                     </ul>
-                    
                 </dd>
             </dl>
             <dl id="menu-order">
-                <dt @if(!isset($res['statistics/salerBonus'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe630;</i> 业绩报表<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
+                <dt @if(!isset($res['statistics/performanceReport'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe623;</i> 业绩数据报表<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
                 <dd>
                     <ul>                       
                         <li @if(!isset($res['statistics/salerBonus'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/salerBonus')}}" data-title="銷售业绩报表" href="javascript:void(0)">銷售业绩报表</a></li>  
                         <li @if(!isset($res['statistics/salerBonus'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/salerTargetProgress')}}" data-title="銷售月销售额完成度报表" href="javascript:void(0)">銷售月销售额完成度报表</a></li>                       
-                    </ul>  
-                      
+                    </ul>
+                </dd>
+            </dl>
+
+            <dl id="menu-order">
+                <dt @if(!isset($res['statistics/releaseReport'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe623;</i> 投放数据报表<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
+                <dd>
+                    <ul>
+                        <li @if(!isset($res['statistics/orderDistrict'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderDistrict')}}" data-title="实时订单地域分布" href="javascript:void(0)">实时订单地域分布</a></li>
+                        <li @if(!isset($res['template/templateLogReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/template/templateLogReport')}}" data-title="销售模板导粉报表" href="javascript:void(0)">销售模板导粉报表</a></li>
+                        <li @if(!isset($res['template/templateLogReport'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/template/templateLogMonthReport')}}" data-title="销售模板导粉月报" href="javascript:void(0)">销售模板导粉月报</a></li>
+                        <li @if(!isset($res['statistics/throwDay'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/throwDay')}}" data-title="当日投放数据统计" href="javascript:void(0)">当日投放数据统计</a></li>
+                    </ul>
+                </dd>
+            </dl>
+
+            <dl id="menu-order">
+                <dt @if(!isset($res['statistics/teamReport'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe623;</i> 团队数据报表<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
+                <dd>
+                    <ul>
+                        <li @if(!isset($res['statistics/dayGrandTeamTotal'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/dayGrandTeamTotal')}}" data-title="团队ROI每日汇总报表" href="javascript:void(0)">团队ROI每日汇总报表</a></li>
+                    </ul>
+                </dd>
+            </dl>
+
+            <dl id="menu-order">
+                <dt @if(!isset($res['statistics/saleReport'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe623;</i> 销售数据报表<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
+                <dd>
+                    <ul>
+                        <li @if(!isset($res['statistics/orderSaleRank'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderSaleRank')}}" data-title="实时数据展榜" href="javascript:void(0)">实时数据展榜</a></li>
+                        <li @if(!isset($res['statistics/fanDaySaler'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/fanDaySaler')}}" data-title="当日数据统计(銷售)" href="javascript:void(0)">当日数据统计(銷售)</a></li>
+                        <li @if(!isset($res['statistics/orderDaySaler'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderDaySaler')}}" data-title="分片数据统计(销售)" href="javascript:void(0)">分片数据统计(销售)</a></li>
+                    </ul>
                 </dd>
             </dl>
         </div>