合并代码

This commit is contained in:
X1627315083
2024-08-19 10:36:46 +08:00
parent a8ab30f30c
commit e4b3ebe88b
30 changed files with 857 additions and 472 deletions

View File

@@ -1,40 +1,42 @@
<template>
<div class="account_comment">
<div class="account_comment_title modal_title_text">
收到的评论
<div class="account_generalMessage_title modal_title_text">
<span>收到的评论</span>
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
</div>
<div class="account_comment_center modal_title_text">
<div class="account_comment_item">
<div class="account_comment_item_right">
<div class="account_comment_item_right_img" @click="openOtherUsers">
<div class="account_generalMessage_center modal_title_text">
<div class="account_generalMessage_item">
<div class="account_generalMessage_item_right">
<div class="account_generalMessage_item_right_img" @click="openOtherUsers">
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
</div>
<div class="account_comment_item_right_title">
<div class="account_comment_item_right_title_name">名字 <span>回复你的作品</span></div>
<div class="account_comment_item_right_title_center modal_title_text_assistant">回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容</div>
<div class="account_comment_item_right_works modal_title_text_intro">回复作品名</div>
<div class="account_generalMessage_item_right_title">
<div class="account_generalMessage_item_right_title_name">名字 <span>回复你的作品</span></div>
<div class="account_generalMessage_item_right_title_center modal_title_text_assistant">回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容</div>
<div class="account_generalMessage_item_right_works modal_title_text_intro">回复作品名</div>
</div>
</div>
<div class="account_comment_item_left">
<div class="account_comment_item_left_delete modal_title_text_intro">
<div class="account_generalMessage_item_left">
<div class="account_generalMessage_item_left_delete modal_title_text_intro">
<span class="icon iconfont icon-shanchu operate_icon"></span>
</div>
<div class="modal_title_text_intro">2024-06-05</div>
</div>
</div>
<div class="account_comment_item">
<div class="account_comment_item_right">
<div class="account_comment_item_right_img">
<div class="account_generalMessage_item">
<div class="account_generalMessage_item_right">
<div class="account_generalMessage_item_right_img">
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
</div>
<div class="account_comment_item_right_title">
<div class="account_comment_item_right_title_name">名字 <span>回复你的作品</span></div>
<div class="account_comment_item_right_title_center modal_title_text_assistant">回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容</div>
<div class="account_comment_item_right_works modal_title_text_intro">回复作品名</div>
<div class="account_generalMessage_item_right_title">
<div class="account_generalMessage_item_right_title_name">名字 <span>回复你的作品</span></div>
<div class="account_generalMessage_item_right_title_center modal_title_text_assistant">回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容</div>
<div class="account_generalMessage_item_right_works modal_title_text_intro">回复作品名</div>
</div>
</div>
<div class="account_comment_item_left">
<div class="account_comment_item_left_delete modal_title_text_intro">
<div class="account_generalMessage_item_left">
<div class="account_generalMessage_item_left_delete modal_title_text_intro">
<span class="icon iconfont icon-shanchu operate_icon"></span>
</div>
<div class="modal_title_text_intro">2024-06-05</div>
@@ -59,7 +61,7 @@ export default defineComponent({
const store = useStore();
let accountMessage = reactive({
activeKey: ref('1'),
followList:ref([
dataList:ref([
{
name:'张三',
avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
@@ -116,92 +118,67 @@ export default defineComponent({
<style lang="less" scoped>
.account_comment{
width: 100%;
.account_comment_title{
display: flex;
align-items: center;
justify-content: space-between;
padding: 2rem 5rem;
border-bottom: 1px solid #e9eaec;
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
border: 1px solid #e9eaec;
border-radius: 5px;
.account_comment_title_setting{
cursor: pointer;
.account_generalMessage_item{
.account_generalMessage_item_right{
display: flex;
align-items: center;
margin-right: 1rem;
.account_generalMessage_item_right_works{
cursor: pointer;
}
.account_generalMessage_item_right_works:hover{
text-decoration: underline;
}
.account_generalMessage_item_right_img{
width: 8rem;
height: 8rem;
margin-right: 2rem;
flex-shrink: 0;
cursor: pointer;
img{
width: 100%;
height: 100%;
border-radius: 50%;
}
}
.account_generalMessage_item_right_title{
display: flex;
flex-direction: column;
align-items: flex-start;
.account_generalMessage_item_right_title_center{
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.account_generalMessage_item_right_title_name{
font-weight: 600;
font-weight: 500;
color: #000;
span{
font-weight: 500;
color: #9999aa;
}
}
}
}
.account_generalMessage_item_left{
text-align: right;
flex-shrink: 0;
.account_generalMessage_item_left_delete{
span{
cursor: pointer;
}
}
div{
padding: .5rem 2rem;
border-radius: 4rem;
}
}
}
.account_comment_center{
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
border: 1px solid #e9eaec;
border-radius: 5px;
padding: 2rem 5rem;
.account_comment_item{
display: flex;
display: flex;
justify-content: space-between;
align-items: center;
padding: 2rem 0;
border-bottom: 1px solid #e9eaec;
.account_comment_item_right{
display: flex;
align-items: center;
margin-right: 1rem;
.account_comment_item_right_works{
cursor: pointer;
}
.account_comment_item_right_works:hover{
text-decoration: underline;
}
.account_comment_item_right_img{
width: 8rem;
height: 8rem;
margin-right: 2rem;
flex-shrink: 0;
cursor: pointer;
img{
width: 100%;
height: 100%;
border-radius: 50%;
}
}
.account_comment_item_right_title{
display: flex;
flex-direction: column;
align-items: flex-start;
.account_comment_item_right_title_center{
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.account_comment_item_right_title_name{
font-weight: 600;
font-weight: 500;
color: #000;
span{
font-weight: 500;
color: #9999aa;
}
}
}
}
.account_comment_item_left{
text-align: right;
flex-shrink: 0;
.account_comment_item_left_delete{
span{
cursor: pointer;
}
}
div{
padding: .5rem 2rem;
border-radius: 4rem;
}
}
}
.account_comment_item:last-child{
margin-bottom: 0;
border-bottom: none;
}
.account_generalMessage_item:last-child{
margin-bottom: 0;
border-bottom: none;
}
}
</style>

View File

@@ -1,41 +1,26 @@
<template>
<div class="account_like">
<div class="account_like_title modal_title_text">
点赞
<div class="account_generalMessage_title modal_title_text">
<span>点赞</span>
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
</div>
<div class="account_like_center modal_title_text">
<div class="account_like_item">
<div class="account_like_item_right">
<div class="account_like_item_right_img">
<div class="account_generalMessage_center modal_title_text">
<div class="account_generalMessage_item" v-for="item in dataList" :key="item.id" @click="setRead(item)">
<a-badge :dot="item.isRead == 0"></a-badge>
<div class="account_generalMessage_item_right">
<div class="account_generalMessage_item_right_img">
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
</div>
<div class="account_like_item_right_title">
<div class="account_like_item_right_title_name">名字 <span>等人攒了你的作品</span></div>
<div>作品名字</div>
<div class="account_generalMessage_item_right_title">
<div class="account_generalMessage_item_right_title_name">{{ item.senderUserName }} <span>攒了你的作品</span></div>
<div>{{ item.portfolioName }}</div>
</div>
</div>
<div class="account_like_item_left">
<div class="account_like_item_left_delete modal_title_text_intro">
<div class="account_generalMessage_item_left">
<div class="account_generalMessage_item_left_delete modal_title_text_intro">
<span class="icon iconfont icon-shanchu operate_icon"></span>
</div>
<div class="modal_title_text_intro">2024-06-05</div>
</div>
</div>
<div class="account_like_item">
<div class="account_like_item_right">
<div class="account_like_item_right_img">
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
</div>
<div class="account_like_item_right_title">
<div class="account_like_item_right_title_name">名字 <span>等人攒了你的作品</span></div>
<div>作品名字</div>
</div>
</div>
<div class="account_like_item_left">
<div class="account_like_item_left_delete modal_title_text_intro">
<span class="icon iconfont icon-shanchu operate_icon"></span>
</div>
<div class="modal_title_text_intro">2024-06-05</div>
<div class="modal_title_text_intro">{{ item.createTime }}</div>
</div>
</div>
</div>
@@ -52,25 +37,25 @@ import { useI18n } from 'vue-i18n'
export default defineComponent({
components:{
},
setup() {
emits:['setReadStatus','setAllmessage'],
setup(prop,{emit}) {
const router = useRouter()
const store = useStore();
let accountMessage = reactive({
activeKey: ref('1'),
followList:ref([
{
name:'张三',
avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
time:'2024-01-01 12:00:00',
content:'关注了你',
isRead:false
},
{
name:'李四',
avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
}
])
dataList:[
]
})
let setmessageList = (data:any)=>{
accountMessage.dataList = data.content
}
let setRead = (item:any)=>{
emit('setReadStatus',item)
item.isRead = 1
}
let allRead = ()=>{
emit('setAllmessage')
}
// let ws = new WebSocket('ws://127.0.0.1:3000')
// console.log(ws);
@@ -93,6 +78,9 @@ export default defineComponent({
})
return{
...toRefs(accountMessage),
setmessageList,
setRead,
allRead
}
},
data(){
@@ -105,36 +93,15 @@ export default defineComponent({
<style lang="less" scoped>
.account_like{
width: 100%;
.account_like_title{
display: flex;
align-items: center;
justify-content: space-between;
padding: 2rem 5rem;
border-bottom: 1px solid #e9eaec;
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
border: 1px solid #e9eaec;
border-radius: 5px;
.account_like_title_setting{
cursor: pointer;
}
.account_generalMessage_title{
}
.account_like_center{
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
border: 1px solid #e9eaec;
border-radius: 5px;
padding: 2rem 5rem;
.account_like_item{
display: flex;
display: flex;
justify-content: space-between;
align-items: center;
padding: 2rem 0;
border-bottom: 1px solid #e9eaec;
.account_like_item_right{
.account_generalMessage_center{
.account_generalMessage_item{
.account_generalMessage_item_right{
display: flex;
align-items: center;
margin-right: 1rem;
.account_like_item_right_img{
.account_generalMessage_item_right_img{
width: 8rem;
height: 8rem;
margin-right: 2rem;
@@ -146,8 +113,8 @@ export default defineComponent({
border-radius: 50%;
}
}
.account_like_item_right_title{
.account_like_item_right_title_name{
.account_generalMessage_item_right_title{
.account_generalMessage_item_right_title_name{
font-weight: 600;
font-weight: 500;
color: #000;
@@ -158,10 +125,10 @@ export default defineComponent({
}
}
}
.account_like_item_left{
.account_generalMessage_item_left{
text-align: right;
flex-shrink: 0;
.account_like_item_left_delete{
.account_generalMessage_item_left_delete{
span{
cursor: pointer;
}
@@ -172,7 +139,7 @@ export default defineComponent({
}
}
}
.account_like_item:last-child{
.account_generalMessage_item:last-child{
margin-bottom: 0;
border-bottom: none;
}

View File

@@ -1,34 +1,22 @@
<template>
<div class="account_newFollow">
<div class="account_newFollow_title modal_title_text">
新增粉丝
<div class="account_generalMessage_title modal_title_text">
<span>新增粉丝</span>
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
</div>
<div class="account_newFollow_center modal_title_text">
<div class="account_newFollow_item">
<div class="account_newFollow_item_right">
<div class="account_newFollow_item_right_img">
<div class="account_generalMessage_center modal_title_text">
<div class="account_generalMessage_item" v-for="item in dataList" :key="item.id" @click="setRead(item)">
<a-badge :dot="item.isRead == 0"></a-badge>
<div class="account_generalMessage_item_right">
<div class="account_generalMessage_item_right_img">
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
</div>
<div class="account_newFollow_item_right_title">
<div class="">名字</div>
<div class="modal_title_text_intro">2024-01-01 12:00:00 关注了你</div>
<div class="account_generalMessage_item_right_title">
<div class="">{{ item.senderUserName }}</div>
<div class="modal_title_text_intro">{{ item.createTime }} 关注了你</div>
</div>
</div>
<div class="account_newFollow_item_left">
<div>回关</div>
</div>
</div>
<div class="account_newFollow_item">
<div class="account_newFollow_item_right">
<div class="account_newFollow_item_right_img">
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
</div>
<div class="account_newFollow_item_right_title">
<div class="">名字</div>
<div class="modal_title_text_intro">2024-01-01 12:00:00 关注了你</div>
</div>
</div>
<div class="account_newFollow_item_left">
<div class="account_generalMessage_item_left">
<div>回关</div>
</div>
</div>
@@ -46,47 +34,33 @@ import { useI18n } from 'vue-i18n'
export default defineComponent({
components:{
},
setup() {
emits:['setReadStatus','setAllmessage'],
setup(prop,{emit}) {
const router = useRouter()
const store = useStore();
let accountMessage = reactive({
activeKey: ref('1'),
followList:ref([
{
name:'张三',
avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
time:'2024-01-01 12:00:00',
content:'关注了你',
isRead:false
},
{
name:'李四',
avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
}
dataList:ref([
])
})
// let ws = new WebSocket('ws://127.0.0.1:3000')
// console.log(ws);
// ws.onopen = ()=>{
// console.log(222);
// let data = {
// cmd:4,
// data:{
// msg:'222'
// }
// }
// ws.send(JSON.stringify(data))
// // ws.onmessage = (data)=>{
// // console.log(data);
// // }
// }
// provide('exhibitionList',exhibitionList)
let setmessageList = (data:any)=>{
accountMessage.dataList = data.content
}
let setRead = (item:any)=>{
emit('setReadStatus',item)
item.isRead = 1
}
let allRead = ()=>{
emit('setAllmessage')
}
onMounted (()=>{
})
return{
...toRefs(accountMessage),
setmessageList,
setRead,
allRead
}
},
data(){
@@ -99,35 +73,12 @@ export default defineComponent({
<style lang="less" scoped>
.account_newFollow{
width: 100%;
.account_newFollow_title{
display: flex;
align-items: center;
justify-content: space-between;
padding: 2rem 5rem;
border-bottom: 1px solid #e9eaec;
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
border: 1px solid #e9eaec;
border-radius: 5px;
.account_newFollow_title_setting{
cursor: pointer;
}
}
.account_newFollow_center{
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
border: 1px solid #e9eaec;
border-radius: 5px;
padding: 2rem 5rem;
.account_newFollow_item{
display: flex;
display: flex;
justify-content: space-between;
align-items: center;
padding: 2rem 0;
border-bottom: 1px solid #e9eaec;
.account_newFollow_item_right{
.account_generalMessage_center{
.account_generalMessage_item{
.account_generalMessage_item_right{
display: flex;
align-items: center;
.account_newFollow_item_right_img{
.account_generalMessage_item_right_img{
width: 8rem;
height: 8rem;
margin-right: 2rem;
@@ -139,7 +90,7 @@ export default defineComponent({
}
}
}
.account_newFollow_item_left{
.account_generalMessage_item_left{
div{
padding: .5rem 2rem;
border-radius: 4rem;
@@ -148,7 +99,7 @@ export default defineComponent({
}
}
}
.account_newFollow_item:last-child{
.account_generalMessage_item:last-child{
margin-bottom: 0;
border-bottom: none;
}

View File

@@ -1,7 +1,8 @@
<template>
<div class="account_privateChatMessage">
<div class="account_privateChatMessage_title modal_title_text">
私信
<div class="account_generalMessage_title modal_title_text">
<span>私信</span>
<div class="account_generalMessage_title_setting">全部已读</div>
</div>
<div class="account_privateChatMessage_content">
<div class="content_left">
@@ -243,25 +244,14 @@ export default defineComponent({
height: 100%;
display: flex;
flex-direction: column;
.account_privateChatMessage_title{
display: flex;
align-items: center;
justify-content: space-between;
padding: 2rem 5rem;
border-bottom: 1px solid #e9eaec;
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
border: 1px solid #e9eaec;
border-radius: 5px;
.account_privateChatMessage_title_setting{
cursor: pointer;
}
}
.account_privateChatMessage_content{
flex: 1;
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
border: 1px solid #e9eaec;
border-radius: 5px;
display: flex;
margin-right: 5rem;
margin-left: 5rem;
.content_left{
width: 20%;
border-right: 1px solid #e9eaec;
@@ -277,7 +267,6 @@ export default defineComponent({
&.active{
background: #e4e5e6;
}
img{
width: 6rem;
height: 6rem;

View File

@@ -1,20 +1,20 @@
<template>
<div class="account_systemMessage">
<div class="account_systemMessage_title modal_title_text">
系统消息
<div class="account_generalMessage_title modal_title_text">
<span>系统消息</span>
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
</div>
<div class="account_systemMessage_item modal_title_text">
<div class="account_systemMessage_item_title">
<div>Open Call for International Young Fashion Talent</div>
<div class="modal_title_text_intro">31 Aug 2024</div>
<div class="account_generalMessage_item modal_title_text" v-for="item in dataList" :key="item.id" @click="setRead(item)">
<a-badge dot></a-badge>
<div class="account_generalMessage_item_title">
<div class="account_generalMessage_item_title_text" :title="item.content">{{ item.content.title }}</div>
<div class="modal_title_text_intro">{{ item.createTime }}</div>
</div>
<div class="modal_title_text_intro">
10 selected young fashion talent will be mentored by the AiDA development team to learn and explore the possibilities of AiDA. Each selected young fashion talent will create a 4-outfit collection themed Culture with AiDA. They will receive full technical support and subsidies for the associated production fee. Selected International/ Mainland young talent will also be able to attend the Culture X AI Internation Fashion Show in Hong Kong that is scheduled on 11 March 2025.
<span class="account_systemMessage_item_link">网页链接</span>
{{ item.content.content }}
<span v-if="item.content.link" class="account_generalMessage_item_link">{{ item.content.link }}</span>
</div>
</div>
<div></div>
<div></div>
</div>
</template>
<script lang="ts">
@@ -28,34 +28,38 @@ import { useI18n } from 'vue-i18n'
export default defineComponent({
components:{
},
setup() {
emits:['setReadStatus','setAllmessage'],
props:{
},
setup(prop,{emit}) {
const router = useRouter()
const store = useStore();
let accountMessage = reactive({
activeKey: ref('1'),
dataList: [],
})
// let ws = new WebSocket('ws://127.0.0.1:3000')
// console.log(ws);
// ws.onopen = ()=>{
// console.log(222);
// let data = {
// cmd:4,
// data:{
// msg:'222'
// }
// }
// ws.send(JSON.stringify(data))
// // ws.onmessage = (data)=>{
// // console.log(data);
// // }
// }
let setmessageList = (data:any)=>{
console.log(data);
data.content.forEach((item:any) => {
item.content = JSON.parse(item.content)
});
accountMessage.dataList = data.content
}
let setRead = (item:any)=>{
emit('setReadStatus',item)
}
let allRead = ()=>{
emit('setAllmessage')
}
// provide('exhibitionList',exhibitionList)
onMounted (()=>{
})
return{
...toRefs(accountMessage),
setmessageList,
setRead,
allRead
}
},
data(){
@@ -68,37 +72,21 @@ export default defineComponent({
<style lang="less" scoped>
.account_systemMessage{
width: 100%;
.account_systemMessage_title{
display: flex;
align-items: center;
justify-content: space-between;
padding: 2rem 5rem;
border-bottom: 1px solid #e9eaec;
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
border: 1px solid #e9eaec;
border-radius: 5px;
.account_systemMessage_title_setting{
cursor: pointer;
}
}
.account_systemMessage_item{
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
border: 1px solid #e9eaec;
border-radius: 5px;
padding: 5rem 5rem;
.account_systemMessage_item_title{
.account_generalMessage_item{
.account_generalMessage_item_title{
display: flex;
align-items: center;
margin-bottom: 2rem;
.account_generalMessage_item_title_text{
max-width: 80%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.modal_title_text_intro{
margin-left: 4rem;
}
}
.account_systemMessage_item_link{
color: #39215b;
cursor: pointer;
font-weight: 600;
}
}
}
</style>