Merge branch 'main' into wyfMain-dev
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
This commit is contained in:
commit
aa9adb6211
@ -12,6 +12,7 @@
|
|||||||
@input="inputSearchText"
|
@input="inputSearchText"
|
||||||
:showClear="true"
|
:showClear="true"
|
||||||
@clear="clearInput"
|
@clear="clearInput"
|
||||||
|
placeholderStyle="color:#BABABA"
|
||||||
></tm-input>
|
></tm-input>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<wd-swipe-action>
|
<wd-swipe-action class="swipe_action">
|
||||||
<div
|
<div
|
||||||
@click="cellClick"
|
@click="cellClick"
|
||||||
:class="['chatItem', props.data.is_top === 1 ? 'isTop' : '']"
|
:class="['chatItem', props.data.is_top === 1 ? 'isTop' : '']"
|
||||||
@ -31,23 +31,19 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="chatInfo">
|
<div class="chatInfo">
|
||||||
<div class="chatInfo_1">
|
<div class="chatInfo_1">
|
||||||
<div class="flex items-center">
|
<div >
|
||||||
<div class="text-[#000000] text-[32rpx] font-bold opacity-90">
|
<span class="text-[#000000] text-[32rpx] font-bold opacity-90 mr-[20rpx]">{{ props.data.name }}</span>
|
||||||
{{ props.data.name }}
|
<span v-if="props.data.group_type === 2" class="depTag">
|
||||||
</div>
|
部门
|
||||||
<div>
|
</span>
|
||||||
<div v-if="props.data.group_type === 2" class="depTag">
|
<span v-if="props.data.group_type === 3" class="projectTag">
|
||||||
部门
|
项目
|
||||||
</div>
|
</span>
|
||||||
<div v-if="props.data.group_type === 3" class="projectTag">
|
<span v-if="props.data.group_type === 4" class="companyTag">
|
||||||
项目
|
公司
|
||||||
</div>
|
</span>
|
||||||
<div v-if="props.data.group_type === 4" class="companyTag">
|
|
||||||
公司
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="text-[#000000] text-[28rpx] font-medium opacity-26">
|
<div class="text-[#000000] text-[28rpx] font-medium opacity-26 ml-[24rpx]">
|
||||||
{{ beautifyTime(props.data.updated_at) }}
|
{{ beautifyTime(props.data.updated_at) }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -60,6 +56,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<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
|
<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"
|
||||||
@ -140,6 +138,10 @@ const handleDelete = () => {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
::v-deep .swipe_action {
|
||||||
|
// border: 1px solid #fff;
|
||||||
|
// transform: translate3d(1px, 0px, 0px) !important;
|
||||||
|
}
|
||||||
.chatItem {
|
.chatItem {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 154rpx;
|
height: 154rpx;
|
||||||
@ -172,8 +174,7 @@ const handleDelete = () => {
|
|||||||
|
|
||||||
.chatInfo_2_1 {
|
.chatInfo_2_1 {
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: #000000;
|
color: rgba($color: #000000, $alpha: 0.4);
|
||||||
opacity: 40%;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.companyTag {
|
.companyTag {
|
||||||
@ -186,7 +187,8 @@ const handleDelete = () => {
|
|||||||
border-radius: 6rpx;
|
border-radius: 6rpx;
|
||||||
color: #7a58de;
|
color: #7a58de;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
margin-left: 12rpx;
|
|
||||||
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.depTag {
|
.depTag {
|
||||||
@ -199,7 +201,8 @@ const handleDelete = () => {
|
|||||||
border-radius: 6rpx;
|
border-radius: 6rpx;
|
||||||
color: #377ec6;
|
color: #377ec6;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
margin-left: 12rpx;
|
|
||||||
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.projectTag {
|
.projectTag {
|
||||||
@ -212,7 +215,8 @@ const handleDelete = () => {
|
|||||||
border-radius: 6rpx;
|
border-radius: 6rpx;
|
||||||
color: #c1681c;
|
color: #c1681c;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
margin-left: 12rpx;
|
|
||||||
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.textEllipsis {
|
.textEllipsis {
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="outer-layer">
|
<div class="outer-layer">
|
||||||
<div>
|
<div>
|
||||||
<tm-navbar :hideBack="false" hideHome title="" :leftWidth="420">
|
<tm-navbar class="index_top_navbar" :hideBack="false" hideHome title="" :leftWidth="420">
|
||||||
<template v-slot:left>
|
<template v-slot:left>
|
||||||
<div class="flex items-center ml-[48rpx]">
|
<div class="flex items-center ml-[48rpx]">
|
||||||
<tm-image
|
<image
|
||||||
:width="72"
|
class="w-[72rpx] h-[72rpx]"
|
||||||
:height="72"
|
style="border-radius: 50%;"
|
||||||
:round="12"
|
|
||||||
:src="userStore.avatar"
|
:src="userStore.avatar"
|
||||||
></tm-image>
|
mode="scaleToFill"
|
||||||
|
/>
|
||||||
<div class="ml-[24rpx] text-[36rpx] font-bold">
|
<div class="ml-[24rpx] text-[36rpx] font-bold">
|
||||||
{{ userStore.nickname }}
|
{{ userStore.nickname }}
|
||||||
</div>
|
</div>
|
||||||
@ -18,24 +18,24 @@
|
|||||||
<template v-slot:right>
|
<template v-slot:right>
|
||||||
<div class="mr-[48rpx] popoverBox">
|
<div class="mr-[48rpx] popoverBox">
|
||||||
<tm-popover position="br" color="#333333" :width="260">
|
<tm-popover position="br" color="#333333" :width="260">
|
||||||
<tm-image
|
<image
|
||||||
:width="41"
|
class="w-[48rpx] h-[48rpx]"
|
||||||
:height="41"
|
style="border-radius: 50%;"
|
||||||
:round="12"
|
|
||||||
:src="addCircle"
|
:src="addCircle"
|
||||||
></tm-image>
|
mode="scaleToFill"
|
||||||
|
/>
|
||||||
<template v-slot:label>
|
<template v-slot:label>
|
||||||
<div
|
<div
|
||||||
class="w-full h-[208rpx] pt-[22rpx] pb-[22rpx] pl-[34rpx] pr-[32rpx]"
|
class="w-full h-[208rpx] pt-[22rpx] pb-[32rpx] pl-[14rpx] pr-[12rpx]"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
@click="creatGroupChat"
|
@click="creatGroupChat"
|
||||||
class="flex items-center mb-[30rpx]"
|
class="flex items-center pl-[22rpx] mb-[32rpx]"
|
||||||
>
|
>
|
||||||
<div class="mr-[26rpx] flex items-center">
|
<div class="mr-[26rpx] flex items-center">
|
||||||
<tm-image
|
<tm-image
|
||||||
:width="40"
|
:width="40"
|
||||||
:height="40"
|
:height="39"
|
||||||
:src="cahtPopover"
|
:src="cahtPopover"
|
||||||
></tm-image>
|
></tm-image>
|
||||||
</div>
|
</div>
|
||||||
@ -48,12 +48,12 @@
|
|||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
<div
|
<div
|
||||||
@click="toAddressBookPage"
|
@click="toAddressBookPage"
|
||||||
class="flex items-center mt-[28rpx]"
|
class="flex items-center pl-[22rpx] mt-[32rpx]"
|
||||||
>
|
>
|
||||||
<div class="mr-[26rpx] flex items-center">
|
<div class="mr-[26rpx] flex items-center">
|
||||||
<tm-image
|
<tm-image
|
||||||
:width="40"
|
:width="40"
|
||||||
:height="40"
|
:height="43"
|
||||||
:src="zu3289"
|
:src="zu3289"
|
||||||
></tm-image>
|
></tm-image>
|
||||||
</div>
|
</div>
|
||||||
@ -78,6 +78,8 @@
|
|||||||
:round="1"
|
:round="1"
|
||||||
prefix="tmicon-search"
|
prefix="tmicon-search"
|
||||||
prefixColor="#46299D"
|
prefixColor="#46299D"
|
||||||
|
placeholderStyle="color:#BABABA"
|
||||||
|
class="input_search"
|
||||||
></tm-input>
|
></tm-input>
|
||||||
</div>
|
</div>
|
||||||
<div class="contentRoot">
|
<div class="contentRoot">
|
||||||
@ -191,6 +193,17 @@ page {
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
::v-deep .index_top_navbar > .statusHeight:first-child{
|
||||||
|
height: 70px !important;
|
||||||
|
}
|
||||||
|
::v-deep .index_top_navbar .statusHeightTop{
|
||||||
|
height: 70px !important;
|
||||||
|
}
|
||||||
|
::v-deep .index_top_navbar .statusHeightTop > .noNvueBorder:first-child{
|
||||||
|
height: 70px !important;
|
||||||
|
}
|
||||||
|
|
||||||
.root {
|
.root {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
padding: 20rpx 0;
|
padding: 20rpx 0;
|
||||||
@ -198,6 +211,14 @@ page {
|
|||||||
.searchRoot {
|
.searchRoot {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
padding: 22rpx 18rpx;
|
padding: 22rpx 18rpx;
|
||||||
|
/* ::v-deep .input_search{
|
||||||
|
|
||||||
|
background: #F9F9FD !important;
|
||||||
|
} */
|
||||||
|
::v-deep .noNvueBorder > .noNvueBorder > .noNvueBorder{
|
||||||
|
// border: 1px solid red !important;
|
||||||
|
background: #F9F9FD !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.contentRoot {
|
.contentRoot {
|
||||||
margin-top: 20rpx;
|
margin-top: 20rpx;
|
||||||
@ -210,7 +231,7 @@ page {
|
|||||||
}
|
}
|
||||||
.popoverBox {
|
.popoverBox {
|
||||||
:deep(.popover-bcc) {
|
:deep(.popover-bcc) {
|
||||||
transform: translateX(20rpx) translateY(40rpx);
|
transform: translateX(16rpx) translateY(48rpx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
Loading…
Reference in New Issue
Block a user