diff --git a/app/admin/view/nk/analysis/index.html b/app/admin/view/nk/analysis/index.html
index 84ed5bb..c118667 100644
--- a/app/admin/view/nk/analysis/index.html
+++ b/app/admin/view/nk/analysis/index.html
@@ -126,7 +126,7 @@
 
 		</div>
 
-
+	{if $is_admin ==1}
 	<div class="layui-card">
 		<div id="chartView" style="width: 100%;height:300px;"></div>
 	</div>
@@ -134,7 +134,7 @@
 	<div class="layui-card">
 		<div id="chartView2" style="width: 100%;height:500px;"></div>
 	</div>
-
+	{/if}
 </div>
 
 <script type="text/html" id="status">
diff --git a/app/api/controller/Statistics.php b/app/api/controller/Statistics.php
index f5cb35e..fc36ab0 100644
--- a/app/api/controller/Statistics.php
+++ b/app/api/controller/Statistics.php
@@ -404,6 +404,7 @@ class Statistics extends BaseController
 
     //是否参保
     public function get_num9($area_id=0,$street_id=0,$village_id=0){
+        $where = [];
         if ($area_id){
             $where[] = ['area_id', '=', $area_id];
         }
@@ -430,6 +431,7 @@ class Statistics extends BaseController
 
     //农业结构
     public function get_num10($area_id=0,$street_id=0,$village_id=0){
+        $where = [];
         if ($area_id){
             $where[] = ['area_id', '=', $area_id];
         }
@@ -551,6 +553,7 @@ class Statistics extends BaseController
 
     //农业产量
     public function get_num14($area_id=0,$street_id=0,$village_id=0){
+        $where = [];
         if ($area_id){
             $where[] = ['area_id', '=', $area_id];
         }
@@ -575,6 +578,7 @@ class Statistics extends BaseController
 
     //农产品品牌
     public function get_num15($area_id=0,$street_id=0,$village_id=0){
+        $where = [];
         if ($area_id){
             $where[] = ['area_id', '=', $area_id];
         }
@@ -598,6 +602,7 @@ class Statistics extends BaseController
 
     //农产品市场行情
     public function get_num16($area_id=0,$street_id=0,$village_id=0){
+        $where = [];
         if ($area_id){
             $where[] = ['area_id', '=', $area_id];
         }
@@ -627,6 +632,7 @@ class Statistics extends BaseController
 
     //农产品需求量
     public function get_num17($area_id=0,$street_id=0,$village_id=0){
+        $where = [];
         if ($area_id){
             $where[] = ['area_id', '=', $area_id];
         }
@@ -648,5 +654,47 @@ class Statistics extends BaseController
         $this->apiSuccess('获取成功',$return);
     }
 
+    //企业直播
+    public function get_num18($area_id=0,$street_id=0,$village_id=0){
+        $where = [];
+//        if ($area_id){
+//            $where[] = ['area_id', '=', $area_id];
+//        }
+//        if ($street_id){
+//            $where[] =  ['street_id', '=', $street_id];
+//        }
+//        if ($village_id){
+//            $where[] =  ['village_id', '=', $village_id];
+//        }
+
+        $list = Db::connect('shop')->table('eb_broadcast_room')->field('name,cover_img,share_img,start_time,end_time,anchor_name,anchor_wechat,phone,live_status')->where($where)->select();
+        $this->apiSuccess('获取成功',$list);
+    }
+
+    //商户列表
+    public function get_num19($area_id=0,$street_id=0,$village_id=0){
+        $where = [];
+        if ($area_id){
+            $where[] = ['b.area_id', '=', $area_id];
+        }
+        if ($street_id){
+            $where[] =  ['b.street_id', '=', $street_id];
+        }
+        if ($village_id){
+            $where[] =  ['b.village_id', '=', $village_id];
+        }
+
+        $list = Db::connect('shop')->table('eb_merchant')
+            ->alias('a')
+            ->join('eb_merchant_address b','a.mer_id = b.mer_id')
+            ->field('mer_name,real_name,mer_phone,mer_address,mer_keyword,mer_avatar,sales,category_id')
+            ->withAttr('category',function ($value,$data){
+                return Db::connect('shop')->table('eb_merchant_category')->where('merchant_category_id',$data['category_id'])->value('category_name');
+            })
+            ->where($where)
+            ->select();
+        $this->apiSuccess('获取成功',$list);
+    }
+
 
 }