From 2694ddda2b22abc177cf680cdcb30d5c31e21976 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 23 Oct 2022 23:07:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83=E8=81=9A?=
 =?UTF-8?q?=E5=90=88=E8=AE=A2=E5=8D=95=E5=9C=B0=E5=9D=80=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=81=E5=90=8E=E5=8F=B0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common.php                         |  4 ++--
 app/index/controller/Order.php         |  3 ++-
 app/index/view/default/user/index.html |  2 +-
 app/service/AdminPowerService.php      | 32 ++------------------------
 4 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/app/common.php b/app/common.php
index 0a0983ed5..f327ab79c 100755
--- a/app/common.php
+++ b/app/common.php
@@ -936,8 +936,8 @@ function AdminIsPower($controller = null, $action = null, $unwanted_power = [])
 
         // 权限
         // 角色组权限列表校验
-        $power = \app\service\AdminPowerService::PowerData();
-        if(!empty($power) && is_array($power) && in_array($controller.'_'.$action, $power))
+        $res = \app\service\AdminPowerService::PowerMenuInit();
+        if(!empty($res) && !empty($res['admin_power']) && is_array($res['admin_power']) && in_array($controller.'_'.$action, $res['admin_power']))
         {
             return true;
         }
diff --git a/app/index/controller/Order.php b/app/index/controller/Order.php
index f002dcf94..e939295a4 100755
--- a/app/index/controller/Order.php
+++ b/app/index/controller/Order.php
@@ -88,6 +88,7 @@ class Order extends Common
         }
 
         // 模板数据
+        $site_fictitious = ConfigService::SiteFictitiousConfig();
         $assign = [
             'data'                  => $this->data_detail,
             // 支付参数
@@ -95,7 +96,7 @@ class Order extends Common
             // 支付方式
             'buy_payment_list'      => PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1]),
             // 虚拟销售配置
-            'site_fictitious'       => ConfigService::SiteFictitiousConfig(),
+            'site_fictitious'       => $site_fictitious['data'],
             // 浏览器名称
             'home_seo_site_title'   => SeoService::BrowserSeoTitle('订单详情', 1),
         ];
diff --git a/app/index/view/default/user/index.html b/app/index/view/default/user/index.html
index 91ea6a71a..a3bd4b153 100755
--- a/app/index/view/default/user/index.html
+++ b/app/index/view/default/user/index.html
@@ -216,7 +216,7 @@
                                                     <button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-fr order-submit submit-ajax submit-confirm" data-url="{{:MyUrl('index/order/Collect')}}" data-id="{{$order.id}}" data-view="reload" data-msg="请仔细确认已收到货物、确认继续吗？">收货</button>
                                                 {{/if}}
                                                 {{if in_array($order['status'], [4]) and $order['user_is_comments'] eq 0}}
-                                                    <a href="{{:MyUrl('index/order/Comments', ['id'=>$order['id']])}}" target="_blank" class="am-btn am-btn-warning am-btn-xs am-radius am-fr order-submit">评价</a>
+                                                    <a href="{{:MyUrl('index/order/comments', ['id'=>$order['id']])}}" target="_blank" class="am-btn am-btn-warning am-btn-xs am-radius am-fr order-submit">评价</a>
                                                 {{/if}}
                                             </div>
                                         {{/if}}
diff --git a/app/service/AdminPowerService.php b/app/service/AdminPowerService.php
index 66a187600..4aaf35b22 100755
--- a/app/service/AdminPowerService.php
+++ b/app/service/AdminPowerService.php
@@ -201,7 +201,7 @@ class AdminPowerService
      * @param   [array]         $admin      [管理员信息]
      * @param   [boolean]       $is_refresh [是否强制刷新]
      */
-    public static function PowerMenuInit($admin, $is_refresh = false)
+    public static function PowerMenuInit($admin = [], $is_refresh = false)
     {
         // 不存在管理员信息则读取登录信息
         if(empty($admin))
@@ -219,7 +219,7 @@ class AdminPowerService
         $admin_plugins = MyCache(SystemService::CacheKey('shopxo.cache_admin_power_plugins_key').$admin_id);
 
         // 缓存没数据则从数据库重新读取
-        if((($role_id > 0 || $admin_id == 1) && empty($admin_left_menu)) || $is_refresh || MyEnv('app_debug'))
+        if((($role_id > 0 || $admin_id == 1) && (empty($admin_left_menu) || empty($admin_power))) || $is_refresh || MyEnv('app_debug'))
         {
             // 获取一级数据
             if($admin_id == 1 || $role_id == 1)
@@ -333,33 +333,5 @@ class AdminPowerService
             'admin_plugins'     => $admin_plugins,
         ];
     }
-
-    /**
-     * 获取权限数据
-     * @author  Devil
-     * @blog    http://gong.gg/
-     * @version 1.0.0
-     * @date    2020-09-24
-     * @desc    description
-     */
-    public static function PowerData()
-    {
-        $admin = AdminService::LoginInfo();
-        if(!empty($admin['id']))
-        {
-            $data = MyCache(SystemService::CacheKey('shopxo.cache_admin_power_key').$admin['id']);
-        }
-
-        // 后台左侧菜单权限钩子
-        $hook_name = 'plugins_service_admin_menu_power_data';
-        MyEventTrigger($hook_name, [
-            'hook_name'     => $hook_name,
-            'is_backend'    => true,
-            'admin'         => $admin,
-            'data'          => &$data,
-        ]);
-
-        return empty($data) ? [] : $data;
-    }
 }
 ?>
\ No newline at end of file