From f57d3cf02c50d8555471ec65091caef1dbdd4cc1 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 31 Aug 2023 10:17:05 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=BC=BA=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E9=93=BE=E6=8E=A5=20-=20=E9=80=82=E9=85=8D=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/UsersController.php  | 30 ++++++++++-
 resources/assets/js/App.vue                   | 52 ++++++-------------
 .../manage/components/MeetingManager.vue      | 30 ++++++++---
 3 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index f2ebb0682..c1e6d0b12 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -1215,13 +1215,41 @@ class UsersController extends AbstractController
         $data['nickname'] = $sharekey ? $username : $user?->nickname;
         $data['token'] = $token;
         $data['msgs'] = $msgs;
-        $data['sharelink'] = $meeting->getShareLink();
         // 
         Meeting::setTouristInfo($data);
         // 
         return Base::retSuccess('success', $data);
     }
 
+    /**
+     * @api {get} api/users/meeting/link          16. 【会议】获取分享链接
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName meeting__link
+     *
+     * @apiParam {String} meetingid               频道ID（不是数字）
+     * @apiParam {String} [sharekey]              分享的key
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function meeting__link()
+    {
+        $meetingid = trim(Request::input('meetingid'));
+        $sharekey = trim(Request::input('sharekey'));
+        if(empty($sharekey) || !Meeting::getShareInfo($sharekey)){
+            User::auth();
+        }
+        $meeting = Meeting::whereMeetingid($meetingid)->first();
+        if (empty($meeting)) {
+            return Base::retError('频道ID不存在');
+        }
+        return Base::retSuccess('success', $meeting->getShareLink());
+    }
+
     /**
      * @api {get} api/users/meeting/tourist          16. 【会议】游客信息
      *
diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index 1f2b45482..b63917b53 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -334,43 +334,25 @@ export default {
                 switch (act) {
                     // 获取用户信息
                     case "getInfo":
-                        if( (uuid+'').indexOf('88888') !== -1 ){
-                            this.$store.dispatch("call", {
-                                url: 'users/meeting/tourist',
-                                data: {
-                                    tourist_id: uuid
+                        const isTourist = (uuid+'').indexOf('88888') !== -1;
+                        this.$store.dispatch("call", {
+                            url: isTourist ? 'users/meeting/tourist' : 'users/basic',
+                            data: {
+                                userid: uuid,
+                                tourist_id: uuid,
+                            }
+                        }).then(({data}) => {
+                            $A.eeuiAppSendMessage({
+                                action: 'updateMeetingInfo',
+                                infos: {
+                                    uuid: uuid,
+                                    avatar: isTourist ? data?.userimg : data[0]?.userimg,
+                                    username: isTourist ? data?.nickname : data[0]?.nickname,
                                 }
-                            }).then(({data}) => {
-                                $A.eeuiAppSendMessage({
-                                    action: 'updateMeetingInfo',
-                                    infos: {
-                                        uuid: uuid,
-                                        avatar: data?.userimg,
-                                        username: data?.nickname,
-                                    }
-                                });
-                            }).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);
-                            });
-                        }
+                        }).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 49ddaba63..7701cff40 100644
--- a/resources/assets/js/pages/manage/components/MeetingManager.vue
+++ b/resources/assets/js/pages/manage/components/MeetingManager.vue
@@ -73,7 +73,7 @@
                     <i class="taskfont" v-html="localUser.videoTrack ? '&#xe7c1;' : '&#xe7c8;'"></i>
                 </Button>
                 <template v-if="windowPortrait">
-                    <Button type="primary"  @click="onInvitation('open')">
+                    <Button type="primary" :loading="linkCopyLoad" @click="onInvitation('open')">
                         <i class="taskfont">&#xe646;</i>
                     </Button>
                     <Button type="primary" v-if="!addData.sharekey" @click="meetingMini = true">
@@ -113,7 +113,7 @@
                 </FormItem>
             </Form>
             <div slot="footer" class="adaption">
-                <Button type="default" @click="linkCopy">{{$L('复制链接')}}</Button>
+                <Button type="default" :loading="linkCopyLoad" @click="linkCopy">{{$L('复制链接')}}</Button>
                 <Button type="primary" :loading="invitationLoad" @click="onInvitation('submit')">{{$L('发送邀请')}}</Button>
             </div>
         </Modal>
@@ -172,6 +172,8 @@ export default {
                 audioTrack: null,
                 videoTrack: null,
             },
+
+            linkCopyLoad: false,
         }
     },
 
@@ -279,7 +281,6 @@ export default {
                     }).then(({data}) => {
                         this.$set(this.addData, 'name', data.name);
                         this.$set(this.addData, 'meetingid', data.meetingid);
-                        this.$set(this.addData, 'sharelink', data.sharelink);
                         this.$set(this.localUser, 'nickname', data.nickname);
                         this.$set(this.localUser, 'userimg', data.userimg);
                         this.$store.dispatch("saveDialogMsg", data.msgs);
@@ -539,12 +540,25 @@ export default {
         },
 
         linkCopy() {
-            this.$copyText(this.addData.sharelink).then(_ => {
-                $A.messageSuccess('已复制会议邀请链接');
-            }).catch(_ => {
-                $A.messageError('复制失败');
+            this.linkCopyLoad = true;
+            this.$store.dispatch("call", {
+                url: 'users/meeting/link',
+                data: {
+                    meetingid: this.addData.meetingid || this.invitationData.meetingid,
+                    sharekey: this.addData.sharekey
+                },
+            }).then(({ data }) => {
+                this.$copyText(data).then(_ => {
+                    $A.messageSuccess('已复制会议邀请链接');
+                }).catch(_ => {
+                    $A.messageError('复制失败');
+                });
+                this.invitationShow = false;
+            }).catch(({ msg }) => {
+                $A.modalError(msg);
+            }).finally(_ => {
+                this.linkCopyLoad = false;
             });
-            this.invitationShow = false;
         },
     }
 }