From 8e964b860d4f76b2178fabf181a77ec12c4263f5 Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Fri, 30 Jul 2021 15:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B8=A0=E9=81=93=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E6=9F=A5=E7=9C=8B=E9=93=B6=E8=81=94=E5=88=B8=E6=A0=B8?=
 =?UTF-8?q?=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Unionpay/CouponController.php | 16 +++++-----
 .../Resources/views/common/menu.blade.php     | 29 ++++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/Merchant/Controllers/Unionpay/CouponController.php b/app/Merchant/Controllers/Unionpay/CouponController.php
index f340464..05d3ff7 100644
--- a/app/Merchant/Controllers/Unionpay/CouponController.php
+++ b/app/Merchant/Controllers/Unionpay/CouponController.php
@@ -89,14 +89,14 @@ class CouponController extends Controller
             $end       = $request->end;
 
             UnionpayCoupon::query()
-                          ->whereHas('outlet', function ($q) use ($shop_name, $user) {
-                              $q->where('parent_id', $user->id)
-                                ->when($shop_name, function ($q) use ($shop_name) {
-                                    $q->whereHas('info', function ($q) use ($shop_name) {
-                                        $q->where('nickname', 'like', "%{$shop_name}%");
-                                    });
-                                });
-                          })
+//                          ->whereHas('outlet', function ($q) use ($shop_name, $user) {
+//                              $q->where('parent_id', $user->id)
+//                                ->when($shop_name, function ($q) use ($shop_name) {
+//                                    $q->whereHas('info', function ($q) use ($shop_name) {
+//                                        $q->where('nickname', 'like', "%{$shop_name}%");
+//                                    });
+//                                });
+//                          })
                           ->when($coupon_no, function ($q) use ($coupon_no) {
                               $q->where('coupon_no', $coupon_no);
                           })
diff --git a/app/Merchant/Resources/views/common/menu.blade.php b/app/Merchant/Resources/views/common/menu.blade.php
index 166665c..d728813 100644
--- a/app/Merchant/Resources/views/common/menu.blade.php
+++ b/app/Merchant/Resources/views/common/menu.blade.php
@@ -52,20 +52,21 @@
                     </li>
                 </ul>
             </li>
-
-            <li>
-                <a href="#">
-                    <i class="fa fa-users"></i>
-                    <span class="nav-label">银联微信券管理</span>
-                    <span class="fa arrow"></span>
-                </a>
-                <ul class="nav nav-second-level">
-                    <li>
-                        <a class="J_menuItem" href="{{ route('merchant.unionpay.coupons') }}"><i class="fa fa-list"></i>核销记录</a>
-                    </li>
-                </ul>
-            </li>
-
+            @if(Auth::guard('merchant')->user()->id==313)
+                <li>
+                    <a href="#">
+                        <i class="fa fa-users"></i>
+                        <span class="nav-label">银联微信券管理</span>
+                        <span class="fa arrow"></span>
+                    </a>
+                    <ul class="nav nav-second-level">
+                        <li>
+                            <a class="J_menuItem" href="{{ route('merchant.unionpay.coupons') }}"><i
+                                        class="fa fa-list"></i>核销记录</a>
+                        </li>
+                    </ul>
+                </li>
+            @endif
         </ul>
     </div>
 </nav>