建群按钮置灰逻辑修改 踢出群聊我的样式修改 投诉增加导航栏
This commit is contained in:
parent
a5d9009910
commit
651c920b7a
@ -16,9 +16,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div v-show="props?.manageType == 'removeMembers'" class="my-self">
|
<div v-show="props?.manageType == 'removeMembers'" class="my-self">
|
||||||
<div class="my-self-left">
|
<div class="my-self-left">
|
||||||
<image style="width: 72rpx;border-radius: 50%;" :src="mySelfMember.avatar" mode="widthFix"></image>
|
<image style="width: 72rpx;border-radius: 50%;height: 72rpx;" :src="mySelfMember.avatar" mode=""></image>
|
||||||
<div style="padding: 0 20rpx;">{{mySelfMember.nickname}}</div>
|
<div style="padding: 0 20rpx;">{{mySelfMember.nickname}}</div>
|
||||||
<img style="width: 66rpx;" src="@/static/image/chatSettings/is-mine.png" />
|
<img style="width: 45rpx;" src="@/static/image/chatSettings/is-mine.png" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="my-self-right">
|
<div class="my-self-right">
|
||||||
|
@ -3,9 +3,8 @@
|
|||||||
<div class="root">
|
<div class="root">
|
||||||
<ZPaging ref="zPaging" :show-scrollbar="false">
|
<ZPaging ref="zPaging" :show-scrollbar="false">
|
||||||
<template #top>
|
<template #top>
|
||||||
<customNavbar class="tmNavBar" :title="$t('complaint.title')"></customNavbar>
|
<customNavbar :title="$t('complaint.title')"></customNavbar>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- 投诉主体内容 -->
|
<!-- 投诉主体内容 -->
|
||||||
<view class="complaint-container">
|
<view class="complaint-container">
|
||||||
<!-- 投诉类型选择 -->
|
<!-- 投诉类型选择 -->
|
||||||
@ -97,6 +96,7 @@
|
|||||||
|
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
|
||||||
import {
|
import {
|
||||||
ref
|
ref
|
||||||
} from 'vue';
|
} from 'vue';
|
||||||
@ -163,6 +163,12 @@
|
|||||||
sourceType: ['album', 'camera'],
|
sourceType: ['album', 'camera'],
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
imageList.value = [...imageList.value, ...res.tempFilePaths];
|
imageList.value = [...imageList.value, ...res.tempFilePaths];
|
||||||
|
if (imageList.value.length > 9) {
|
||||||
|
uni.showToast({
|
||||||
|
title: `最多只能选择9张图片`,
|
||||||
|
icon: 'none'
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -222,7 +222,7 @@
|
|||||||
|
|
||||||
//点击发起群聊
|
//点击发起群聊
|
||||||
const handleConfirm = async () => {
|
const handleConfirm = async () => {
|
||||||
// console.log(allChooseMembers.value)
|
console.log(allChooseMembers.value)
|
||||||
let erp_ids = ''
|
let erp_ids = ''
|
||||||
if (allChooseMembers?.value?.length > 0) {
|
if (allChooseMembers?.value?.length > 0) {
|
||||||
allChooseMembers?.value?.forEach((ele) => {
|
allChooseMembers?.value?.forEach((ele) => {
|
||||||
@ -274,46 +274,7 @@
|
|||||||
}
|
}
|
||||||
//发起群聊按钮可点击状态
|
//发起群聊按钮可点击状态
|
||||||
const confirmBtnStatus = computed(() => {
|
const confirmBtnStatus = computed(() => {
|
||||||
// 基础检查:群名称为空或未选择群类型
|
return groupActiveIndex.value === -1;
|
||||||
if (
|
|
||||||
groupName.value === '' ||
|
|
||||||
(groupActiveIndex.value && groupActiveIndex.value === -1) ||
|
|
||||||
(!groupActiveIndex.value && groupActiveIndex.value !== 0)
|
|
||||||
) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 检查是否包含自己
|
|
||||||
const includesSelf = allChooseMembers.value?.some(member => member.ID === userInfo.value.ID);
|
|
||||||
const memberCount = allChooseMembers.value?.length || 0;
|
|
||||||
|
|
||||||
// 新逻辑:人数检查
|
|
||||||
if (includesSelf && memberCount < 3) {
|
|
||||||
return true; // 包含自己但总人数<3 → 禁用
|
|
||||||
}
|
|
||||||
if (!includesSelf && memberCount < 2) {
|
|
||||||
return true; // 不包含自己且人数<2 → 禁用
|
|
||||||
}
|
|
||||||
|
|
||||||
// 原有群类型特定检查
|
|
||||||
let disabledT = false;
|
|
||||||
switch (groupActiveIndex.value) {
|
|
||||||
case 0: // 第一种群类型
|
|
||||||
// 人数检查已在上方处理,这里不需要重复
|
|
||||||
break;
|
|
||||||
case 1: // 第二种群类型
|
|
||||||
if (!depCheckedKeys.value.length || !groupAdmins.value.length) {
|
|
||||||
disabledT = true;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 2: // 第三种群类型
|
|
||||||
// 人数检查已在上方处理,这里不需要重复
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return disabledT;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
onShow(() => {
|
onShow(() => {
|
||||||
|
Loading…
Reference in New Issue
Block a user