From aa03c00dd574e97a7d7f6d6cd0fd3f30453d9425 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 31 Aug 2023 09:47:49 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BC=9A=E8=AE=AE=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E6=B7=BB=E5=8A=A0=E5=A7=93=E5=90=8D=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Meeting.php                        |  2 +-
 resources/assets/js/App.vue                   | 50 +++++++++++++------
 .../manage/components/MeetingManager.vue      |  7 ++-
 .../pages/manage/components/MeetingPlayer.vue |  2 +-
 4 files changed, 43 insertions(+), 18 deletions(-)

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">
-            <Form ref="addForm" :model="addData" label-width="auto" @submit.native.prevent>
+            <Form ref="addForm" :model="addData" :rules="addRule" label-width="auto" @submit.native.prevent>
                 <template v-if="addData.type === 'join'">
                     <!-- 加入会议 -->
                     <FormItem v-if="addData.name" prop="userids" :label="$L('会议主题')">
@@ -148,6 +148,11 @@ export default {
                 userids: [],
                 tracks: ['audio']
             },
+            addRule: {
+                username: [
+                    { required: true, message: this.$L('请输入你的姓名！'), trigger: 'change' },
+                ]
+            },
 
             invitationShow: false,
             invitationLoad: false,
diff --git a/resources/assets/js/pages/manage/components/MeetingPlayer.vue b/resources/assets/js/pages/manage/components/MeetingPlayer.vue
index b11f49b5c..bafe17200 100644
--- a/resources/assets/js/pages/manage/components/MeetingPlayer.vue
+++ b/resources/assets/js/pages/manage/components/MeetingPlayer.vue
@@ -126,7 +126,7 @@ export default {
                     tourist_id: this.player.uid
                 }
             }).then(({data}) => {
-                this.tourist = data.data;
+                this.tourist = data;
             }).catch(({msg}) => {
                 $A.modalError(msg);
             });