diff --git a/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue b/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue index e719d44..93b1542 100644 --- a/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue +++ b/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue @@ -288,6 +288,7 @@ /** 点击跳转直播间 */ const onLive = () => { // #ifdef APP-PLUS + uni.$liveID = goodsData.value.id navigateTo('/pages/audience/index', { liveID: goodsData.value.id }) diff --git a/pages/audience/index.nvue b/pages/audience/index.nvue index 5a0313a..428bbc7 100644 --- a/pages/audience/index.nvue +++ b/pages/audience/index.nvue @@ -59,11 +59,11 @@ /> - - {{ Number(topNUmber) > 100 ? '99+' : topNUmber }} + + {{ Number(topNUmber) > 100 ? '99+' : topNUmber }}1 - {{ audienceList.length }} + {{ audienceNumber }} @@ -268,6 +268,7 @@ addLiveSeatEventListener, removeLiveSeatEventListener } = useLiveSeatState(uni?.$liveID) + console.log("uniliveID",uni?.$liveID) const { audienceList } = useLiveAudienceState(uni?.$liveID) const { disconnect, connected, cancelApplication } = useCoGuestState( uni?.$liveID @@ -346,6 +347,7 @@ const coGuestSheetItems = ref(['取消连麦申请']) const coGuestSheetTitle = ref('') const topNUmber = ref('') + const audienceNumber = computed(()=>audienceList.value.length) // 监听座位变化:当自身不在 seatList 时,将本地连麦状态重置为 IDLE watch( diff --git a/pages/my-index/my-index.vue b/pages/my-index/my-index.vue index 2279086..5d38f73 100644 --- a/pages/my-index/my-index.vue +++ b/pages/my-index/my-index.vue @@ -6,6 +6,7 @@ import { formatNumberWithWan } from '../../utils' import { getUserPayPwd } from '@/api/my-index' import { useUserStore } from '../../stores/user' + import { ref } from 'vue' const bottomList = [ { @@ -51,7 +52,7 @@ } ] - const { getIntegral } = useUserStore() + const { getIntegral, refreshUserInfo } = useUserStore() const { showDialog } = useUI() const { userInfo, integralData } = useAuthUser() @@ -72,6 +73,12 @@ } } + const paging = ref(null) + const onRefresh = async () => { + await refreshUserInfo() + paging.value.complete() + } + onLoad(() => { // 获取用户信息 console.log(userInfo.value, '===获取用户信息') @@ -82,73 +89,31 @@