From aee8525ac90848df042146833e41b541be99d6b5 Mon Sep 17 00:00:00 2001 From: Devil Date: Wed, 9 Dec 2020 14:48:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/default/appmini/config.html | 2 +- application/service/AppMiniService.php | 2 +- application/service/MessageService.php | 11 ++++++++++- application/service/PayLogService.php | 4 ++-- public/static/common/lib/ueditor/dialogs/map/map.html | 2 +- .../static/common/lib/ueditor/dialogs/map/show.html | 2 +- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/application/admin/view/default/appmini/config.html b/application/admin/view/default/appmini/config.html index ebcfac7de..19819934b 100755 --- a/application/admin/view/default/appmini/config.html +++ b/application/admin/view/default/appmini/config.html @@ -77,7 +77,7 @@
-

1. 获取最新组件版本号，默认[ 1.1.4 ]

+

1. 获取最新组件版本号，默认[ 1.2.4 ]

2. 登录微信小程序平台，左侧导航[ 直播 ]，申请直播权限后等待审核通过方可使用

3. 点击左侧导航[ 小程序直播->接入说明 ]，找到[ 使用方法说明->1. 【直播组件】如何引入 ]，json 代码串[ plugins->live-player-plugin ]参数下的[ version ]的值填入

去获取组件版本号 diff --git a/application/service/AppMiniService.php b/application/service/AppMiniService.php index 766d5bf31..2865fb4b2 100755 --- 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) diff --git a/application/service/MessageService.php b/application/service/MessageService.php index d6f5db102..1f3ed8035 100755 --- 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']] : []; } } diff --git a/application/service/PayLogService.php b/application/service/PayLogService.php index ab8da62b5..b641d07b4 100755 --- 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) diff --git a/public/static/common/lib/ueditor/dialogs/map/map.html b/public/static/common/lib/ueditor/dialogs/map/map.html index 8a6259b1c..58f416bac 100755 --- a/public/static/common/lib/ueditor/dialogs/map/map.html +++ b/public/static/common/lib/ueditor/dialogs/map/map.html @@ -4,7 +4,7 @@ - + - +