diff --git a/app/Models/Meeting.php b/app/Models/Meeting.php index 0b9814f7d..15e8218a2 100644 --- a/app/Models/Meeting.php +++ b/app/Models/Meeting.php @@ -84,7 +84,7 @@ class Meeting extends AbstractModel public static function getTouristInfo($touristId) { if(Cache::has(Meeting::CACHE_KEY.'_'.$touristId)){ - return Base::retSuccess('success', Cache::get(Meeting::CACHE_KEY.'_'.$touristId) ); + return Cache::get(Meeting::CACHE_KEY.'_'.$touristId); } return null; } diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index b9d75db34..1f2b45482 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -334,23 +334,43 @@ export default { switch (act) { // 获取用户信息 case "getInfo": - this.$store.dispatch("call", { - url: 'users/basic', - data: { - userid: [ (uuid+"").substring(5) ] - } - }).then(({data}) => { - $A.eeuiAppSendMessage({ - action: 'updateMeetingInfo', - infos: { - uuid: uuid, - avatar: data[0]?.userimg, - username: data[0]?.nickname, + if( (uuid+'').indexOf('88888') !== -1 ){ + this.$store.dispatch("call", { + url: 'users/meeting/tourist', + data: { + tourist_id: uuid } + }).then(({data}) => { + $A.eeuiAppSendMessage({ + action: 'updateMeetingInfo', + infos: { + uuid: uuid, + avatar: data?.userimg, + username: data?.nickname, + } + }); + }).catch(({msg}) => { + $A.modalError(msg); }); - }).catch(({msg}) => { - $A.modalError(msg); - }); + }else{ + this.$store.dispatch("call", { + url: 'users/basic', + data: { + userid: [ (uuid+"").substring(5) ] + } + }).then(({data}) => { + $A.eeuiAppSendMessage({ + action: 'updateMeetingInfo', + infos: { + uuid: uuid, + avatar: data[0]?.userimg, + username: data[0]?.nickname, + } + }); + }).catch(({msg}) => { + $A.modalError(msg); + }); + } break; //加入成功 case "success": diff --git a/resources/assets/js/pages/manage/components/MeetingManager.vue b/resources/assets/js/pages/manage/components/MeetingManager.vue index e19d56e79..49ddaba63 100644 --- a/resources/assets/js/pages/manage/components/MeetingManager.vue +++ b/resources/assets/js/pages/manage/components/MeetingManager.vue @@ -6,7 +6,7 @@ :title="$L(addData.type === 'join' ? '加入会议' : '新会议')" :mask-closable="false" :closable="!addData.sharekey"> -
+