diff --git a/TUIKit/components/TUIGroup/create-group/index.vue b/TUIKit/components/TUIGroup/create-group/index.vue index 6dca803..a4412e3 100644 --- a/TUIKit/components/TUIGroup/create-group/index.vue +++ b/TUIKit/components/TUIGroup/create-group/index.vue @@ -165,6 +165,7 @@ import { uploadSingleFile } from '../../../../utils/uploadFile' import { validateGroupNumber } from '../../../../utils/validate' import { useUI } from '../../../../utils/use-ui' +import { getRandomGroup } from '../../../../api' const { showToast } = useUI() const TUIGroupServer = Server.getInstance() @@ -243,8 +244,7 @@ const submitDisabledStatus = computed(() => { return ( - groupInfo.profile.name === '' || - (groupInfo.profile.groupID === '' && !groupInfo.isEdit) + groupInfo.profile.name === ''&& !groupInfo.isEdit ) }) @@ -300,14 +300,17 @@ if (options.type === TUIChatEngine.TYPES.GRP_COMMUNITY) { delete options.groupID } - const isGroupID = validateGroupNumber(options.groupID) + // const isGroupID = validateGroupNumber(options.groupID) - if (!isGroupID.valid) { - return showToast(isGroupID.message) - } + // if (!isGroupID.valid) { + // return showToast(isGroupID.message) + // } + + const id = await getRandomGroup() + const res = await TUIGroupService.createGroup({ ...options, - groupID: '', + groupID: id.data, avatar: groupAvatar.value }) const { type } = res.data.group diff --git a/components/share-popup/share-popup.vue b/components/share-popup/share-popup.vue index 6cdba38..02aaac9 100644 --- a/components/share-popup/share-popup.vue +++ b/components/share-popup/share-popup.vue @@ -174,21 +174,28 @@ * @param data */ const onConfirm = async (state, item) => { - const show = await showDialog( - '提示', - `确定分享${props.type == 1 ? '直播间' : '商品'}吗？` - ) - if (!show) { - return - } - if (state) { - multiSelectShare() + if (props.type == 2) { + const show = await showDialog( + '提示', + `确定分享${props.type == 1 ? '直播间' : '商品'}吗？` + ) + if (!show) { + return + } + if (state) { + multiSelectShare() + } else { + showLoading() + await sendCustomData(item) + hideLoading() + await showToast('分享成功', 'success') + isShow.value = false + } } else { - showLoading() - await sendCustomData(item) - hideLoading() - await showToast('分享成功', 'success') - isShow.value = false + await showDialog( + '提示', + `UI需要调整` + ) } } diff --git a/pages/anchor/index.nvue b/pages/anchor/index.nvue index 2d53826..8fd8de0 100644 --- a/pages/anchor/index.nvue +++ b/pages/anchor/index.nvue @@ -1,1177 +1,1404 @@ \ No newline at end of file + .modal-btn-accept { + font-size: 32rpx; + font-weight: bold; + color: rgba(28, 102, 229, 1); + } + diff --git a/pages/discover/livelist/h5-list.vue b/pages/discover/livelist/h5-list.vue index 7feff22..41ed893 100644 --- a/pages/discover/livelist/h5-list.vue +++ b/pages/discover/livelist/h5-list.vue @@ -14,7 +14,7 @@ diff --git a/pages/discover/livelist/h5-live-player.vue b/pages/discover/livelist/h5-live-player.vue index 21d094c..d9ce367 100644 --- a/pages/discover/livelist/h5-live-player.vue +++ b/pages/discover/livelist/h5-live-player.vue @@ -34,6 +34,7 @@ getLiveActivityDetail, getLiveActivityRecord } from '../../../api/tui-kit' + import { LIVE_BUSINESS } from '@/constants/live-keys' const { t } = useUIKit() @@ -69,6 +70,7 @@ const activityData = ref({}) /** 是否显示活动按钮 */ const isShowActivity = ref(false) + const shareDialog = ref(false) const audienceListTitle = computed( () => `在线人数 (${audienceList.value.length})` @@ -80,9 +82,17 @@ showLeaveLiveDialog('您已被踢出房间') } - watch(messageList, (newVal, oldVal) => { - console.log('收到弹幕消息====:', newVal) // 实时更新的全量消息列表 - }) + watch( + () => messageList.value, + newMessages => { + if (newMessages.length > 0) { + console.log('弹幕消息列表更新:', newMessages) + if (newMessages.some(v => v.businessID === LIVE_BUSINESS.ADMIN)) { + } + } + }, + { deep: true } + ) watch( () => currentLive.value?.liveId, @@ -112,7 +122,7 @@ */ const handleLeaveLive = () => { leaveLiveDialogVisible.value = false - // navigateBack() + navigateBack() } /** @@ -195,12 +205,20 @@ } onLoad(async (e: any) => { - await setSelfInfo({ - userName: userInfo.value?.userName || userInfo.value?.mobile, - avatarUrl: userInfo.value?.avatar || '' - }) - subscribeEvent(LiveListEvent.onKickedOutOfLive, handleKickedOutOfLive) - await handleJoinLive(e.liveId) + try { + await setSelfInfo({ + userName: userInfo.value?.userName || userInfo.value?.mobile, + avatarUrl: userInfo.value?.avatar || '' + }) + subscribeEvent( + LiveListEvent.onKickedOutOfLive, + handleKickedOutOfLive + ) + await handleJoinLive(e.liveId) + } catch (err) { + console.error('Failed to join live room, error:', err) + showLeaveLiveDialog('没有直播间') + } }) @@ -273,6 +291,13 @@ src="/static/images/activity.png" mode="aspectFit" /> + @@ -309,6 +334,11 @@ + + + + diff --git a/pages/mall/detail.vue b/pages/mall/detail.vue index 7af8478..016d3d4 100644 --- a/pages/mall/detail.vue +++ b/pages/mall/detail.vue @@ -137,17 +137,23 @@ 拼单 @@ -159,7 +165,7 @@ - 拼单倒计时: + 距离结束: { useUploadPlugin: true // 使用文件上传插件 }) // #ifdef H5 + console.log('11111======') await useLoginState().login({ SDKAppID: tencentUserSig.value.sdkappID, userID: tencentUserSig.value.userId, @@ -109,18 +110,31 @@ export const useUserStore = defineStore('user', () => { // #endif // #ifdef APP-PLUS - await useLoginState().login({ - SDKAppID: tencentUserSig.value.sdkappID, - userID: tencentUserSig.value.userId, - userSig: tencentUserSig.value.userSig - }) + console.log('222222222======') + try { + await useLoginState().login({ + SDKAppID: tencentUserSig.value.sdkappID, + userID: tencentUserSig.value.userId, + userSig: tencentUserSig.value.userSig + }) + console.log('===========1111') + } catch (err) { + console.log(err, '===========1111') + } uni.$TUICallKit = uni.requireNativePlugin('TencentCloud-TUICallKit') - uni.$TUICallKit.login({ - SDKAppID: tencentUserSig.value.sdkappID, - userID: tencentUserSig.value.userId, - userSig: tencentUserSig.value.userSig - }) + + console.log(uni.$TUICallKit, "TUICallKit ｜ ok"); // 本地日志 + // try { + // await uni.$TUICallKit.login({ + // SDKAppID: tencentUserSig.value.sdkappID, + // userID: tencentUserSig.value.userId, + // userSig: tencentUserSig.value.userSig + // }) + // } catch (err) { + // console.log(err, '===========2222222222') + // } + // #endif }