细节优化

aee8525a · Devil · 1f05267e · aee8525a · aee8525a · aee8525a
6 changed file
--- a/application/admin/view/default/appmini/config.html
+++ b/application/admin/view/default/appmini/config.html
@@ -77,7 +77,7 @@
 				            <div class="am-form-group">
 				                <label>{{$data.common_app_weixin_liveplayer_ver.name}}</label>
 				                <div class="am-alert am-alert-warning">
-				                    <p>1. 获取最新组件版本号，默认[ 1.1.4 ]</p>
+				                    <p>1. 获取最新组件版本号，默认[ 1.2.4 ]</p>
 				                    <p>2. 登录微信小程序平台，左侧导航[ 直播 ]，申请直播权限后等待审核通过方可使用</p>
 				                    <p>3. 点击左侧导航[ 小程序直播->接入说明 ]，找到[ 使用方法说明->1. 【直播组件】如何引入 ]，json 代码串[ plugins->live-player-plugin ]参数下的[ version ]的值填入</p>
 				                    <a href="https://developers.weixin.qq.com/miniprogram/dev/framework/liveplayer/live-player-plugin.html" target="_blank">去获取组件版本号 <i class="am-icon-external-link"></i></a>

--- a/application/service/AppMiniService.php
+++ b/application/service/AppMiniService.php
@@ -576,7 +576,7 @@ class AppMiniService
            if(is_array($data) && isset($data['plugins']))
            {
                $data['plugins']['live-player-plugin'] = [
-                    'version'   => MyC('common_app_weixin_liveplayer_ver', '1.1.4', true),
+                    'version'   => MyC('common_app_weixin_liveplayer_ver', '1.2.4', true),
                    'provider'  => 'wx2b03c6e691cd7370',
                ];
                if(file_put_contents($file, JsonFormat($data)) === false)

--- a/application/service/MessageService.php
+++ b/application/service/MessageService.php
@@ -194,6 +194,15 @@ class MessageService
        $data = Db::name('Message')->where($where)->field($field)->limit($m, $n)->order($order_by)->select();
        if(!empty($data))
        {
+            // 字段列表
+            $keys = ArrayKeys($data);
+            
+            // 用户列表
+            if(in_array('user_id', $keys) && isset($params['is_public']) && $params['is_public'] == 0)
+            {
+                $user_list = UserService::GetUserViewInfo(array_column($data, 'user_id'));
+            }
+
            $common_is_read_list = lang('common_is_read_list');
            $common_message_type_list = lang('common_message_type_list');
            foreach($data as &$v)
@@ -203,7 +212,7 @@ class MessageService
                {
                    if(isset($params['is_public']) && $params['is_public'] == 0)
                    {
-                        $v['user'] = UserService::GetUserViewInfo($v['user_id']);
+                        $v['user'] = (!empty($user_list) && is_array($user_list) && array_key_exists($v['user_id'], $user_list)) ? $user_list[$v['user_id']] : [];
                    }
                }


--- a/application/service/PayLogService.php
+++ b/application/service/PayLogService.php
@@ -198,13 +198,13 @@ class PayLogService
                {
                    $log_value_list[$lv['pay_log_id']][] = $lv;
                }
+            }

-                // 用户列表
+            // 用户列表
            if(in_array('user_id', $keys) && isset($params['is_public']) && $params['is_public'] == 0)
            {
                $user_list = UserService::GetUserViewInfo(array_column($data, 'user_id'));
            }
-            }

            // 循环处理数据
            foreach($data as &$v)

--- a/public/static/common/lib/ueditor/dialogs/map/map.html
+++ b/public/static/common/lib/ueditor/dialogs/map/map.html
@@ -4,7 +4,7 @@
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title></title>
    <script type="text/javascript" src="../internal.js"></script>
-    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=XSdiGjfg3wOHiKjpYEMG6CYA"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak={{common_baidu_map_ak}}"></script>
    <style type="text/css">
        .content{width:530px; height: 350px;margin: 10px auto;}
        .content table{width: 100%}

--- a/public/static/common/lib/ueditor/dialogs/map/show.html
+++ b/public/static/common/lib/ueditor/dialogs/map/show.html
@@ -14,7 +14,7 @@
            overflow: hidden;
        }
    </style>
-    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=XSdiGjfg3wOHiKjpYEMG6CYA"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak={{common_baidu_map_ak}}"></script>
 </head>

 <body onload="initMap();">