diff --git a/application/admin/view/default/appmini/config.html b/application/admin/view/default/appmini/config.html index ebcfac7de261f2a428527accbc88ce97b57ebd3a..19819934b88237a0fd64f77c56c4d6b0f6a3e7c5 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 766d5bf318db9b928ddc5e0ec0ad81bcf9dd55ae..2865fb4b275523fd0e2c84850407a7ddb77c5320 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 d6f5db102bfcf779361267493e388f0f07c7f67e..1f3ed8035e6ec927fb42b30b20c693e9b6ea9960 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 ab8da62b51dea4147f9cf50ab811a71587456bb2..b641d07b400f7183e1eb7a787c0871e2909375ff 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 8a6259b1ceefd412c374620fd21598443ed1ec9e..58f416bacb70a8d0df53ab1673f6b690063e0c8d 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 @@ - + - +