From a7be2b7c7e159fd50084806c3ba9864be4d8fd5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Mon, 24 Aug 2020 10:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=B8=A0=E9=81=93=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/Coupon/IndexController.php | 3 +++
 app/Admin/Controllers/User/IndexController.php   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Controllers/Coupon/IndexController.php b/app/Admin/Controllers/Coupon/IndexController.php
index bef4e56..00a4e38 100644
--- a/app/Admin/Controllers/Coupon/IndexController.php
+++ b/app/Admin/Controllers/Coupon/IndexController.php
@@ -126,6 +126,9 @@ class IndexController extends AdminController
                    . '<label class="label label-success">打款金额:' . $pass->where('is_profit', 1)
                                                                        ->sum('profit') . '元</label>&nbsp;&nbsp;';
         });
+
+
+
         $grid->disableExport(false);
 
         $grid->export(function ($export) {
diff --git a/app/Admin/Controllers/User/IndexController.php b/app/Admin/Controllers/User/IndexController.php
index 1945126..008798b 100644
--- a/app/Admin/Controllers/User/IndexController.php
+++ b/app/Admin/Controllers/User/IndexController.php
@@ -278,7 +278,7 @@ class IndexController extends AdminController
 
         $users = User::whereHas('identity', function ($query) {
             $query->where('identity_id', 1);
-        })->where('type', $type)->get();
+        })->get();
 
         $userRet = $users->map(function ($code) {
             return [