diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 639900d..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index cecaf72..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1770205618468 - - - 1770218264881 - - - - - - - - \ No newline at end of file diff --git a/TUIKit/components/TUIChat/message-input-toolbar/call-view/index.vue b/TUIKit/components/TUIChat/message-input-toolbar/call-view/index.vue index c2eb822..59af354 100644 --- a/TUIKit/components/TUIChat/message-input-toolbar/call-view/index.vue +++ b/TUIKit/components/TUIChat/message-input-toolbar/call-view/index.vue @@ -1,125 +1,138 @@ - \ No newline at end of file + diff --git a/components/share-popup/share-popup.vue b/components/share-popup/share-popup.vue index fe0e1f7..2ee4ce9 100644 --- a/components/share-popup/share-popup.vue +++ b/components/share-popup/share-popup.vue @@ -214,6 +214,9 @@ * @param data */ const onConfirm = async (state, item) => { + if (state == 1 && selectedList.value.length == 0) { + return + } const show = await showDialog( '提示', `确定分享${props.type == 1 ? '直播间' : '商品'}吗?` diff --git a/pages/audience/index.nvue b/pages/audience/index.nvue index 0dd0add..41f6787 100644 --- a/pages/audience/index.nvue +++ b/pages/audience/index.nvue @@ -73,7 +73,14 @@ class="action-btn" src="/static/images/fengxiang.png" style="width: 72rpx; height: 72rpx;" - @click="shareDialog = true" + @click="navigateTo('/pages/shop-together/user', { + type: 1, + id: currentLive.liveID, + text: currentLive.liveName, + cover: currentLive.coverUrl, + avatarUrl: currentLive.liveOwner.avatarUrl + title: currentLive.liveOwner.title + })" /> @@ -102,17 +109,10 @@ -