aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
X1627315083
2024-08-23 10:19:02 +08:00
parent eff35d8a79
commit eb54023940
35 changed files with 1709 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
src/component/Account/message/comment.vue
View File

@@ -1,46 +1,38 @@
<template>
<div class="account_comment">
<div class="account_generalMessage_title modal_title_text">
<span>收到的评论</span>
<!-- <span>收到的评论</span> -->
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
</div>
<div class="account_generalMessage_center modal_title_text">
<div class="account_generalMessage_item">
<div class="account_generalMessage_item" v-for="item in dataList" @click="setRead(item)">
<a-badge :dot="item.isRead == 0"></a-badge>
<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 class="account_generalMessage_item_right_img" @click.stop="openOtherUsers(item)">
<img :src="item.avatar" alt="">
</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 class="account_generalMessage_item_right_title_name">{{ item.userName }} <span>回复你的作品</span></div>
<div class="account_generalMessage_item_right_title_center modal_title_text_assistant">{{ item.content }}</div>
<div class="account_generalMessage_item_right_works modal_title_text_intro" @click.stop="openOtherWork(item)">{{ item.portfolioName }}</div>
</div>
</div>
<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 class="modal_title_text_intro">{{ item.createTime }}</div>
</div>
</div>
<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_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_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 class="account_generalMessage_item" style="justify-content: center;" v-if="dataList.length == 0 && isNoData">
没有任何信息~
</div>
<div class="page_loading_box" v-show="!isNoData">
<span class="page_loading" ref="loadingDom" v-show="!isShowMark"></span>
<span v-show="isShowMark">
<a-spin size="large" />
</span>
</div>
</div>
</div>
@@ -56,56 +48,92 @@ import { useI18n } from 'vue-i18n'
export default defineComponent({
components:{
},
setup() {
props:['setReadStatus','setAllmessage','getHistory'],
setup(prop,{emit}) {
const router = useRouter()
const store = useStore();
let accountMessage = reactive({
activeKey: ref('1'),
dataList: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:[
],
page:1,
size:10,
isNoData: false,
isShowMark: false,
})
// 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 openOtherUsers = ()=>{
let loadingDom:any = ref(null)
let setmessageList = ()=>{
accountMessage.isShowMark = true
let data = {
page: accountMessage.page,
size: accountMessage.size,
}
prop.getHistory(data).then((rv:any)=>{
accountMessage.isShowMark = false
if(rv.content.length == 0) {
accountMessage.isNoData = true
return
}
accountMessage.dataList = rv.content
}).catch(() => {
accountMessage.isShowMark = false
accountMessage.isNoData = true
})
}
let setRead = (item:any)=>{
prop.setReadStatus(item).then((rv:any)=>{
item.isRead = 1
}).catch((err:any)=>{
})
}
let allRead = ()=>{
// emit('setAllmessage')
prop.setAllmessage().then(()=>{
}).catch((err:any)=>{
})
}
let openOtherUsers = (item:any)=>{
const routeUrl = router.resolve({
path:'/home/otherUsers',
query:{
id:123
userId:item.senderId
}
})
window.open(routeUrl.href,'_blank')
}
let openOtherWork = (item:any)=>{
const routeUrl = router.resolve({
path:'/home/works',
query:{
workId:item.portfolioId
}
})
window.open(routeUrl.href,'_blank')
}
onMounted (()=>{
accountMessage.isNoData = false
accountMessage.page = 0
let imgParent:any = document.querySelector('.account_systemMessage .page_loading')
new IntersectionObserver(
(entries, observer) => {
// 如果不是相交，则直接返回
// console.log(entries[0]);
if (!entries[0].intersectionRatio) return;
accountMessage.page+=1
setmessageList()
},
// { root:worksPage }
).observe(loadingDom.value);
})
return{
...toRefs(accountMessage),
setmessageList,
setRead,
allRead,
openOtherUsers,
openOtherWork,
loadingDom,
}
},
data(){

100
src/component/Account/message/likeMessage.vue
View File

@@ -1,18 +1,18 @@
<template>
<div class="account_like">
<div class="account_generalMessage_title modal_title_text">
<span>点赞</span>
<!-- <span>点赞</span> -->
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
</div>
<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 class="account_generalMessage_item_right_img" @click="openOtherUsers(item)">
<img :src="item.avatar" alt="">
</div>
<div class="account_generalMessage_item_right_title">
<div class="account_generalMessage_item_right_title_name">{{ item.senderUserName }} <span>攒了你的作品</span></div>
<div class="account_generalMessage_item_right_title_name">{{ item.userName }} <span>攒了你的作品</span></div>
<div>{{ item.portfolioName }}</div>
</div>
</div>
@@ -23,6 +23,15 @@
<div class="modal_title_text_intro">{{ item.createTime }}</div>
</div>
</div>
<div class="account_generalMessage_item" style="justify-content: center;" v-if="dataList.length == 0 && isNoData">
没有任何信息~
</div>
<div class="page_loading_box" v-show="!isNoData">
<span class="page_loading" ref="loadingDom" v-show="!isShowMark"></span>
<span v-show="isShowMark">
<a-spin size="large" />
</span>
</div>
</div>
</div>
</template>
@@ -37,50 +46,83 @@ import { useI18n } from 'vue-i18n'
export default defineComponent({
components:{
},
emits:['setReadStatus','setAllmessage'],
// emits:['setReadStatus','setAllmessage'],
props:['setReadStatus','setAllmessage','getHistory'],
setup(prop,{emit}) {
const router = useRouter()
const store = useStore();
let accountMessage = reactive({
activeKey: ref('1'),
dataList:[
]
],
page:1,
size:10,
isNoData: false,
isShowMark: false,
})
let setmessageList = (data:any)=>{
accountMessage.dataList = data.content
let loadingDom:any = ref(null)
let setmessageList = ()=>{
accountMessage.isShowMark = true
let data = {
page: accountMessage.page,
size: accountMessage.size,
}
prop.getHistory(data).then((rv:any)=>{
accountMessage.isShowMark = false
if(rv.content.length == 0) {
accountMessage.isNoData = true
return
}
accountMessage.dataList = rv.content
}).catch(() => {
accountMessage.isShowMark = false
accountMessage.isNoData = true
})
}
let setRead = (item:any)=>{
emit('setReadStatus',item)
item.isRead = 1
prop.setReadStatus(item).then((rv:any)=>{
item.isRead = 1
}).catch((err:any)=>{
})
}
let allRead = ()=>{
emit('setAllmessage')
// emit('setAllmessage')
prop.setAllmessage().then(()=>{
}).catch((err:any)=>{
})
}
let openOtherUsers = (item:any)=>{
const routeUrl = router.resolve({
path:'/home/otherUsers',
query:{
userId:item.senderId
}
})
window.open(routeUrl.href,'_blank')
}
// 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)
onMounted (()=>{
accountMessage.isNoData = false
accountMessage.page = 0
let imgParent:any = document.querySelector('.account_systemMessage .page_loading')
new IntersectionObserver(
(entries, observer) => {
// 如果不是相交，则直接返回
// console.log(entries[0]);
if (!entries[0].intersectionRatio) return;
accountMessage.page+=1
setmessageList()
},
// { root:worksPage }
).observe(loadingDom.value);
})
return{
...toRefs(accountMessage),
setmessageList,
setRead,
allRead
allRead,
openOtherUsers,
loadingDom,
}
},
data(){

101
src/component/Account/message/newFollow.vue
View File

@@ -1,25 +1,35 @@
<template>
<div class="account_newFollow">
<div class="account_generalMessage_title modal_title_text">
<span>新增粉丝</span>
<!-- <span>新增粉丝</span> -->
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
</div>
<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 class="account_generalMessage_item_right_img" @click="openOtherUsers(item)">
<img :src="item.avatar" alt="">
</div>
<div class="account_generalMessage_item_right_title">
<div class="">{{ item.senderUserName }}</div>
<div class="">{{ item.userName }}</div>
<div class="modal_title_text_intro">{{ item.createTime }} 关注了你</div>
</div>
</div>
<div class="account_generalMessage_item_left">
<div>回关</div>
<div v-if="item?.isFollow == 0" @click.stop="setFollow(item)" >{{$t('newScaleImage.Follow')}}</div>
<div v-else @click.stop="setFollow(item)" >{{$t('newScaleImage.Unfollow')}}</div>
</div>
</div>
<div class="account_generalMessage_item" style="justify-content: center;" v-if="dataList.length == 0 && isNoData">
没有任何信息~
</div>
<div class="page_loading_box" v-show="!isNoData">
<span class="page_loading" ref="loadingDom" v-show="!isShowMark"></span>
<span v-show="isShowMark">
<a-spin size="large" />
</span>
</div>
</div>
</div>
</template>
@@ -34,33 +44,96 @@ import { useI18n } from 'vue-i18n'
export default defineComponent({
components:{
},
emits:['setReadStatus','setAllmessage'],
// emits:['setReadStatus','setAllmessage'],
props:['setReadStatus','setAllmessage','getHistory'],
setup(prop,{emit}) {
const router = useRouter()
const store = useStore();
let accountMessage = reactive({
activeKey: ref('1'),
dataList:ref([
dataList:[
])
],
page:1,
size:10,
isNoData: false,
isShowMark: false,
})
let setmessageList = (data:any)=>{
accountMessage.dataList = data.content
let loadingDom:any = ref(null)
let setmessageList = ()=>{
accountMessage.isShowMark = true
let data = {
page: accountMessage.page,
size: accountMessage.size,
}
prop.getHistory(data).then((rv:any)=>{
accountMessage.isShowMark = false
if(rv.length == 0) {
accountMessage.isNoData = true
return
}
accountMessage.dataList = rv
}).catch(() => {
accountMessage.isShowMark = false
accountMessage.isNoData = true
})
}
let setRead = (item:any)=>{
emit('setReadStatus',item)
item.isRead = 1
prop.setReadStatus(item).then((rv:any)=>{
item.isRead = 1
}).catch((err:any)=>{
})
}
let allRead = ()=>{
emit('setAllmessage')
// emit('setAllmessage')
prop.setAllmessage().then(()=>{
}).catch((err:any)=>{
})
}
let setFollow = (item:any) =>{
let url = Https.httpUrls.porfolioFollow
if(item.isFollow == 1)url = Https.httpUrls.porfolioCancelFollow
Https.axiosGet(url, {params:{followeeId:item.senderId}})
.then((rv) => {
if(item.isFollow == 1){
item.isFollow = 0
}else{
item.isFollow = 1
}
})
}
let openOtherUsers = (item:any)=>{
const routeUrl = router.resolve({
path:'/home/otherUsers',
query:{
userId:item.senderId
}
})
window.open(routeUrl.href,'_blank')
}
onMounted (()=>{
accountMessage.isNoData = false
accountMessage.page = 0
let imgParent:any = document.querySelector('.account_systemMessage .page_loading')
new IntersectionObserver(
(entries, observer) => {
// 如果不是相交，则直接返回
// console.log(entries[0]);
if (!entries[0].intersectionRatio) return;
accountMessage.page+=1
setmessageList()
},
// { root:worksPage }
).observe(loadingDom.value);
})
return{
...toRefs(accountMessage),
setmessageList,
setRead,
allRead
allRead,
setFollow,
openOtherUsers,
loadingDom,
}
},
data(){

2
src/component/Account/message/privateChat.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="account_privateChatMessage">
<div class="account_generalMessage_title modal_title_text">
<span>私信</span>
<!-- <span>私信</span> -->
<div class="account_generalMessage_title_setting">全部已读</div>
</div>
<div class="account_privateChatMessage_content">

77
src/component/Account/message/system.vue
View File

@@ -1,11 +1,11 @@
<template>
<div class="account_systemMessage">
<div class="account_generalMessage_title modal_title_text">
<span>系统消息</span>
<!-- <span>系统消息</span> -->
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
</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>
<a-badge :dot="item.isRead == 0"></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>
@@ -15,6 +15,15 @@
<span v-if="item.content.link" class="account_generalMessage_item_link">{{ item.content.link }}</span>
</div>
</div>
<div class="account_generalMessage_item modal_title_text" style="display:flex;justify-content: center;" v-if="dataList.length == 0 && isNoData">
没有任何信息~
</div>
<div class="page_loading_box" v-show="!isNoData">
<span class="page_loading" ref="loadingDom" v-show="!isShowMark"></span>
<span v-show="isShowMark">
<a-spin size="large" />
</span>
</div>
</div>
</template>
<script lang="ts">
@@ -28,38 +37,74 @@ import { useI18n } from 'vue-i18n'
export default defineComponent({
components:{
},
emits:['setReadStatus','setAllmessage'],
props:{
},
// emits:['putListData'],
props:['setReadStatus','setAllmessage','getHistory'],
setup(prop,{emit}) {
const router = useRouter()
const store = useStore();
let accountMessage = reactive({
dataList: [],
page:1,
size:10,
isNoData: false,
isShowMark: false,
})
let setmessageList = (data:any)=>{
console.log(data);
data.content.forEach((item:any) => {
item.content = JSON.parse(item.content)
});
accountMessage.dataList = data.content
let loadingDom:any = ref(null)
let setmessageList = ()=>{
accountMessage.isShowMark = true
let data = {
page: accountMessage.page,
size: accountMessage.size,
}
prop.getHistory(data).then((rv:any)=>{
accountMessage.isShowMark = false
if(rv.content.length == 0) {
accountMessage.isNoData = true
return
}
rv.content.forEach((item:any) => {
item.content = JSON.parse(item.content)
});
accountMessage.dataList = rv.content
}).catch(() => {
accountMessage.isShowMark = false
accountMessage.isNoData = true
})
}
let setRead = (item:any)=>{
emit('setReadStatus',item)
prop.setReadStatus(item).then((rv:any)=>{
item.isRead = 1
}).catch((err:any)=>{
})
}
let allRead = ()=>{
emit('setAllmessage')
// emit('setAllmessage')
prop.setAllmessage().then(()=>{
}).catch((err:any)=>{
})
}
// provide('exhibitionList',exhibitionList)
onMounted (()=>{
accountMessage.isNoData = false
accountMessage.page = 0
let imgParent:any = document.querySelector('.account_systemMessage .page_loading')
new IntersectionObserver(
(entries, observer) => {
// 如果不是相交，则直接返回
// console.log(entries[0]);
if (!entries[0].intersectionRatio) return;
accountMessage.page+=1
setmessageList()
},
// { root:worksPage }
).observe(loadingDom.value);
})
return{
...toRefs(accountMessage),
setmessageList,
setRead,
allRead
allRead,
loadingDom,
}
},
data(){