From 4e0e36178d82ed486d8cec2c8f52ca96d715cc12 Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Thu, 30 Oct 2025 19:16:05 +0800
Subject: [PATCH] 1、活动增加促销商品(完成后端) 2、修复小程序端活动相册下载不了的问题; 3、修复小程序端活动详情定位问题; 4、修复小程序端报名时免费的也弹出支付弹窗的问题; 5、修复分会后台活动核销码下载问题。

---
 admin/app/shop/controller/auth/User.php |   22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/admin/app/shop/controller/auth/User.php b/admin/app/shop/controller/auth/User.php
index 7269f7c..6cf4767 100644
--- a/admin/app/shop/controller/auth/User.php
+++ b/admin/app/shop/controller/auth/User.php
@@ -8,9 +8,6 @@
 use app\shop\model\auth\User as UserModel;
 use app\shop\model\auth\Role;
 use app\shop\model\auth\User as AuthUserModel;
-use app\shop\model\app\App as AppModel;
-use app\admin\model\RoleAccess as RoleAccessModel;
-use app\shop\model\shop\AccessUp as RoleAccessUpModel;
 
 /**
  * 管理员
@@ -150,26 +147,12 @@
 
         $user_info = (new AuthUserModel())->find($user['shop_user_id']);
 
-        //获取总后台给的权限
-        $store = AppModel::detail($user_info["app_id"]);
-        $access_ids = [];
-        if(!empty($store["application_id"])){
-            $access_ids = RoleAccessModel::getAccessIds($store["application_id"]);
-        }
-
-        //获取升级的功能
-        $up_access_ids = (new RoleAccessUpModel())->getAccessIds($user_info["app_id"]);
-        if(!empty($up_access_ids)){
-            $access_ids=array_merge($access_ids,$up_access_ids);
-        }
-
         if ($user_info['is_super'] == 1) {
             $model = new AccessModel();
-           // $menus = $model->getList();
-            $menus = $model->getListBySuper($access_ids);
+            $menus = $model->getList();
         } else {
             $model = new AccessModel();
-            $menus = $model->getListByUser($user['shop_user_id'],$access_ids);
+            $menus = $model->getListByUser($user['shop_user_id']);
 
             foreach ($menus as $key => $val) {
                 if ($val['redirect_name'] != $val['children'][0]['path']) {
@@ -177,7 +160,6 @@
                 }
             }
         }
-
         return $this->renderSuccess('', compact('menus'));
     }
 

--
Gitblit v1.9.2