Compare commits

..

No commits in common. "e782b72b74619f985976f22265ae8e6fedbf1c91" and "ba0a5384e0af09a52cd5f0e370c582245cee75a3" have entirely different histories.

4 changed files with 202 additions and 232 deletions

View File

@ -50,10 +50,7 @@ const inputSearchText = (e) => {
.search-input { .search-input {
width: 100%; width: 100%;
} }
::v-deep .noNvueBorder > .noNvueBorder > .noNvueBorder {
background: #f9f9fd !important;
border-radius: 8rpx !important;
}
.search-input::v-deep .tmicon-times-circle-fill::before { .search-input::v-deep .tmicon-times-circle-fill::before {
content: '\e82a'; content: '\e82a';
color: #d2d2d5; color: #d2d2d5;

View File

@ -2,18 +2,15 @@
<div class="choose-deps-page"> <div class="choose-deps-page">
<zPaging ref="zPaging" :show-scrollbar="false"> <zPaging ref="zPaging" :show-scrollbar="false">
<template #top> <template #top>
<div class="top_bg"> <customNavbar :title="pageTitle"></customNavbar>
<customNavbar class="index_top_navbar" :title="pageTitle"></customNavbar> </template>
<div class="pl-[32rpx] pr-[32rpx] pt-[32rpx] pb-[32rpx]"> <div class="choose-deps">
<div class="w-full pl-[32rpx] pr-[32rpx]">
<div class="pl-[16rpx] pr-[16rpx] pt-[22rpx] pb-[24rpx] bg-[#FFFFFF]">
<customInput <customInput
:searchText="searchVal" :searchText="searchVal"
@inputSearchText="inputSearchText" @inputSearchText="inputSearchText"
></customInput> ></customInput>
</div>
</div>
</template>
<div class="choose-deps">
<div class="w-full pl-[32rpx] pr-[32rpx]">
<div <div
v-if="crumbs.length" v-if="crumbs.length"
class="w-full overflow-x-auto mt-[22rpx] leading-[48rpx] text-[#2F2F2F] flex items-center no-scrollbar" class="w-full overflow-x-auto mt-[22rpx] leading-[48rpx] text-[#2F2F2F] flex items-center no-scrollbar"
@ -41,6 +38,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div <div
v-if=" v-if="
(state.chooseMode === 1 || state.chooseMode === 2) && (state.chooseMode === 1 || state.chooseMode === 2) &&
@ -1106,22 +1104,6 @@ const toUserDetail = (userItem) => {
height: 100%; height: 100%;
display: flex; display: flex;
} }
::v-deep .index_top_navbar .tmicon-angle-left{
color:#fff !important;
}
::v-deep .index_top_navbar .text-weight-b{
color:#fff !important;
}
::v-deep .index_top_navbar .statusHeightTop > .noNvueBorder:first-child {
background: transparent !important;
border: none !important;
}
.top_bg{
background: url('@/static/image/mine/page_top.png') no-repeat;
background-size: cover;
background-position: bottom center;
}
.choose-deps-page { .choose-deps-page {
.choose-deps { .choose-deps {
flex: 1; flex: 1;

View File

@ -31,24 +31,25 @@
</div> </div>
<div class="chatInfo"> <div class="chatInfo">
<div class="chatInfo_1"> <div class="chatInfo_1">
<div class="name_center"> <div>
<div class="text-[#000000] text-[32rpx] <span
font-bold opacity-90 name_text"> class="text-[#000000] text-[32rpx] font-bold opacity-90 mr-[20rpx]"
{{ formatNameText(props.data.name) }} >
<span v-if="props.data.group_type === 2" class="depTag tag"> {{ props.data.name }}
</span>
<span v-if="props.data.group_type === 2" class="depTag">
部门 部门
</span> </span>
<span v-if="props.data.group_type === 3" class="projectTag tag"> <span v-if="props.data.group_type === 3" class="projectTag">
项目 项目
</span> </span>
<span v-if="props.data.group_type === 4" class="companyTag tag"> <span v-if="props.data.group_type === 4" class="companyTag">
公司 公司
</span> </span>
</div> </div>
<div
</div> class="text-[#000000] text-[28rpx] font-medium opacity-26 ml-[24rpx]"
<div style="flex-shrink: 0;" style="flex-shrink: 0;"
class="text-[#000000] text-[28rpx] font-medium opacity-26 ml-[24rpx] time_right"
> >
{{ beautifyTime(props.data.updated_at) }} {{ beautifyTime(props.data.updated_at) }}
</div> </div>
@ -63,12 +64,12 @@
<template #right> <template #right>
<div class="flex flex-row flex-row-center-end"> <div class="flex flex-row flex-row-center-end">
<!-- 样式占位 --> <!-- 样式占位 -->
<div style="width: 1px"></div> <div style="width: 1px;"></div>
<div <div
@click="handleTop" @click="handleTop"
class="w-[156rpx] h-[154rpx] text-[#ffffff] bg-[#F09F1F] flex items-center justify-center" class="w-[156rpx] h-[154rpx] text-[#ffffff] bg-[#F09F1F] flex items-center justify-center"
> >
{{ props.data.is_top === 1 ? "取消置顶" : "置顶" }} {{ props.data.is_top === 1 ? '取消置顶' : '置顶' }}
</div> </div>
<div <div
@click="handleDelete" @click="handleDelete"
@ -86,17 +87,17 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import avatarModule from "@/components/avatar-module/index.vue"; import avatarModule from '@/components/avatar-module/index.vue'
import { ref, reactive, defineProps, computed } from "vue"; import { ref, reactive, defineProps, computed } from 'vue'
import dayjs from "dayjs"; import dayjs from 'dayjs'
import { beautifyTime } from "@/utils/datetime"; import { beautifyTime } from '@/utils/datetime'
import { ServeClearTalkUnreadNum } from "@/api/chat"; import { ServeClearTalkUnreadNum } from '@/api/chat'
import { useTalkStore, useDialogueStore } from "@/store"; import { useTalkStore, useDialogueStore } from '@/store'
import { useSessionMenu } from "@/hooks"; import { useSessionMenu } from '@/hooks'
const talkStore = useTalkStore(); const talkStore = useTalkStore()
const { onToTopTalk, onRemoveTalk } = useSessionMenu(); const { onToTopTalk, onRemoveTalk } = useSessionMenu()
const dialogueStore = useDialogueStore(); const dialogueStore = useDialogueStore()
const props = defineProps({ const props = defineProps({
data: { data: {
type: Object, type: Object,
@ -108,17 +109,12 @@ const props = defineProps({
default: -1, default: -1,
required: true, required: true,
}, },
}); })
//
const formatNameText = (text, maxLength = 19) => {
return text.length > maxLength ? `${text.slice(0, maxLength - 1)}...` : text;
};
const cellClick = () => { const cellClick = () => {
console.log(props.data); console.log(props.data)
// //
dialogueStore.setDialogue(props.data); dialogueStore.setDialogue(props.data)
// //
if (props.data.unread_num > 0) { if (props.data.unread_num > 0) {
@ -129,24 +125,24 @@ const cellClick = () => {
talkStore.updateItem({ talkStore.updateItem({
index_name: props.data.index_name, index_name: props.data.index_name,
unread_num: 0, unread_num: 0,
}); })
}); })
} }
uni.navigateTo({ uni.navigateTo({
url: "/pages/dialog/index?sessionId=" + props.data.id, url: '/pages/dialog/index?sessionId=' + props.data.id,
}); })
}; }
const handleTop = () => { const handleTop = () => {
console.log(props.data, 1); console.log(props.data, 1)
onToTopTalk(props.data); onToTopTalk(props.data)
}; }
// //
const handleDelete = () => { const handleDelete = () => {
console.log(props.data); console.log(props.data)
onRemoveTalk(props.data); onRemoveTalk(props.data)
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .swipe_action { ::v-deep .swipe_action {
@ -187,52 +183,47 @@ const handleDelete = () => {
font-size: 28rpx; font-size: 28rpx;
color: rgba($color: #000000, $alpha: 0.4); color: rgba($color: #000000, $alpha: 0.4);
} }
.tag{
display: inline-flex; .companyTag {
align-items: center; width: 76rpx;
text-align: center;
margin-left: 10rpx;
margin-top: 4rpx;
vertical-align: top;
height: 38rpx; height: 38rpx;
line-height: 38rpx; line-height: 38rpx;
padding: 0 10rpx;
font-size: 24rpx;
border-radius: 6rpx;
font-weight: bold;
}
.companyTag {
border: 1px solid #7a58de; border: 1px solid #7a58de;
font-size: 24rpx;
text-align: center;
border-radius: 6rpx;
color: #7a58de; color: #7a58de;
} font-weight: bold;
.depTag {
border: 1px solid #377ec6;
color: #377ec6;
}
.projectTag {
border: 1px solid #c1681c;
color: #c1681c;
}
.name_center{
flex: 1;
min-width: 0;
}
.name_text{
display: inline-block; display: inline-block;
max-height: 88rpx; //
line-height: 44rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
word-break: break-all;
} }
.time_right {
/* white-space: nowrap; .depTag {
max-width: 146rpx; */ width: 76rpx;
flex: 0 0 auto; /* 不伸缩,保持内容宽度 */ height: 38rpx;
white-space: nowrap; line-height: 38rpx;
border: 1px solid #377ec6;
font-size: 24rpx;
text-align: center;
border-radius: 6rpx;
color: #377ec6;
font-weight: bold;
display: inline-block;
}
.projectTag {
width: 76rpx;
height: 38rpx;
line-height: 38rpx;
border: 1px solid #c1681c;
font-size: 24rpx;
text-align: center;
border-radius: 6rpx;
color: #c1681c;
font-weight: bold;
display: inline-block;
} }
.textEllipsis { .textEllipsis {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB