diff --git a/TUIKit/components/TUIContact/contact-list/index.vue b/TUIKit/components/TUIContact/contact-list/index.vue index 2d3ba9e..e45a2f8 100644 --- a/TUIKit/components/TUIContact/contact-list/index.vue +++ b/TUIKit/components/TUIContact/contact-list/index.vue @@ -246,7 +246,6 @@ currentContactListKey.value = key TUIStore.update(StoreName.CUSTOM, 'currentContactListKey', key) - console.log(111) if (key === 'friendApplicationList') { TUIFriendService.setFriendApplicationRead() } @@ -456,3 +455,14 @@ + + diff --git a/TUIKit/components/TUIGroup/create-group/group-introduction/config.ts b/TUIKit/components/TUIGroup/create-group/group-introduction/config.ts index 9c6ea77..5a33570 100644 --- a/TUIKit/components/TUIGroup/create-group/group-introduction/config.ts +++ b/TUIKit/components/TUIGroup/create-group/group-introduction/config.ts @@ -1,50 +1,59 @@ -import TUIChatEngine from '@tencentcloud/chat-uikit-engine-lite'; +import TUIChatEngine from '@tencentcloud/chat-uikit-engine-lite' const groupIntroConfig = [ { icon: 'https://web.sdk.qcloud.com/im/assets/images/Public.svg', - label: '陌生人社交群(Public)', + label: '陌生人社交群', type: TUIChatEngine.TYPES.GRP_PUBLIC, - detail: '类似 QQ 群,创建后群主可以指定群管理员,用户搜索群 ID 发起加群申请后,需要群主或管理员审批通过才能入群。详见', - src: '产品文档', + detail: + '(Public)类似 QQ 群,创建后群主可以指定群管理员,用户搜索群 ID 发起加群申请后,需要群主或管理员审批通过才能入群。', + src: '产品文档' }, { icon: 'https://web.sdk.qcloud.com/im/assets/images/Meeting.svg', - label: '临时会议群(Meeting)', + label: '临时会议群', type: TUIChatEngine.TYPES.GRP_MEETING, - detail: '创建后可以随意进出,且支持查看入群前消息;适合用于音视频会议场景、在线教育场景等与实时音视频产品结合的场景。详见', - src: '产品文档', + detail: + '(Meeting)创建后可以随意进出,且支持查看入群前消息;适合用于音视频会议场景、在线教育场景等与实时音视频产品结合的场景。', + src: '产品文档' }, { icon: 'https://web.sdk.qcloud.com/im/assets/images/Work.svg', - label: '好友工作群(Work)', + label: '好友工作群', type: TUIChatEngine.TYPES.GRP_WORK, - detail: '类似普通微信群,创建后仅支持已在群内的好友邀请加群,且无需被邀请方同意或群主审批。详见', - src: '产品文档', + detail: + '(Work)类似普通微信群,创建后仅支持已在群内的好友邀请加群,且无需被邀请方同意或群主审批。', + src: '产品文档' }, { icon: 'https://web.sdk.qcloud.com/im/assets/images/AVChatroom.svg', - label: '直播群(AVChatroom)', + label: '直播群', type: TUIChatEngine.TYPES.GRP_AVCHATROOM, - detail: '创建后可以随意进出,没有群成员数量上限,但不支持历史消息存储;适合与直播产品结合,用于弹幕聊天场景。详见', - src: '产品文档', + detail: + '(AVChatroom)创建后可以随意进出,没有群成员数量上限,但不支持历史消息存储;适合与直播产品结合,用于弹幕聊天场景。', + src: '产品文档' }, { icon: 'https://web.sdk.qcloud.com/im/assets/images/Community.png', - label: '社群(Community)', + label: '社群', type: TUIChatEngine.TYPES.GRP_COMMUNITY, - detail: '创建后可以随意进出,最多支持100000人,支持历史消息存储,用户搜索群 ID 发起加群申请后,无需管理员审批即可进群。详见', - src: '产品文档', - }, -]; + detail: + '(Community)创建后可以随意进出,最多支持100000人,支持历史消息存储,用户搜索群 ID 发起加群申请后,无需管理员审批即可进群。', + src: '产品文档' + } +] const findGroupIntroConfig = (type: string) => { return groupIntroConfig.filter((item: any) => { - return item.type === type; - })[0]; -}; + return item.type === type + })[0] +} -export { - groupIntroConfig, - findGroupIntroConfig, -}; +/** 入群方式 */ +const groupJoinTypeConfig = [ + { label: '自由加入', value: 'FreeAccess' }, + { label: '需要验证', value: 'NeedPermission' }, + { label: '禁止加群', value: 'DisableApply' } +] + +export { groupIntroConfig, groupJoinTypeConfig, findGroupIntroConfig } diff --git a/TUIKit/components/TUIGroup/create-group/group-introduction/index.vue b/TUIKit/components/TUIGroup/create-group/group-introduction/index.vue index 3b43b45..19165b0 100644 --- a/TUIKit/components/TUIGroup/create-group/group-introduction/index.vue +++ b/TUIKit/components/TUIGroup/create-group/group-introduction/index.vue @@ -10,66 +10,64 @@
- +
- {{ TUITranslateService.t(`TUIGroup.${item.detail}`) }} +
diff --git a/TUIKit/components/TUIGroup/create-group/index.vue b/TUIKit/components/TUIGroup/create-group/index.vue index 96a0e28..ed88992 100644 --- a/TUIKit/components/TUIGroup/create-group/index.vue +++ b/TUIKit/components/TUIGroup/create-group/index.vue @@ -1,15 +1,11 @@ + diff --git a/TUIKit/components/TUIGroup/create-group/style/h5.scss b/TUIKit/components/TUIGroup/create-group/style/h5.scss index b404643..a8175bb 100644 --- a/TUIKit/components/TUIGroup/create-group/style/h5.scss +++ b/TUIKit/components/TUIGroup/create-group/style/h5.scss @@ -33,18 +33,20 @@ margin-top: 12px; overflow: hidden; - .group-introduction-list{ + .group-introduction-list { flex: 1; display: flex; flex-direction: column; overflow: auto; - padding: 12px 18px; + padding: 12rpx 24rpx; + width: calc(100% - 48rpx); + } + .select-item { + border-radius: 26rpx; } - &-item { padding: 14px 18px; - border-bottom: 1px solid #E5E5E5; - + border-bottom: 2rpx solid #e5e5e5; &-label { font-size: 14px; } diff --git a/TUIKit/components/TUIGroup/index.vue b/TUIKit/components/TUIGroup/index.vue index 866e186..0f5f32e 100644 --- a/TUIKit/components/TUIGroup/index.vue +++ b/TUIKit/components/TUIGroup/index.vue @@ -1,23 +1,21 @@