Merge branch 'master' of qk:zy_duanju/duanju_manage into test

modules/Channel/Services/Order/OrderService.php

@@ -72,7 +72,7 @@ class OrderService
             ["value" => 'MONTH',"name" => '包月'],
             ["value" => 'QUARTER' ,"name"=> '包季'],
             ["value" => 'YEAR' ,"name"=> '包年'],
-            ["value" => "FIRST_COIN" ,"name" => "首冲"]
+            ["value" => "FIRST_COIN" ,"name" => "首充"]
         ];
     }
 

modules/Manage/Http/Controllers/MiniprogramController.php

@@ -29,6 +29,7 @@ class MiniprogramController extends Controller
         $name = $request->get('name');
         $play_name = $request->get('play_name');
         $company = $request->get('company');
+        $type = $request->get('type');
         $page_size = $request->input('limit', 15);
         $where = [];
         if($name){
@@ -40,6 +41,11 @@ class MiniprogramController extends Controller
         if($company){
             $where[] = ['company','like','%'.$company.'%']; 
         }
+
+        if($type){
+            $where[] = ['type','=',$type];
+        }
+
         $result = $this->miniprogram->where($where)->paginate($page_size);
         foreach($result as $item){
             $item->type_name = MiniprogramType::from($item->type)->name();