Commit 382b99fb authored by 胡占生's avatar 胡占生 🇨🇳

消息中心更改

parent 3652fe22
This diff is collapsed.
...@@ -28,14 +28,20 @@ ...@@ -28,14 +28,20 @@
name="消息信息" name="消息信息"
:badge="messageNewsNum.消息信息 > 0 ? messageNewsNum.消息信息 : ''" :badge="messageNewsNum.消息信息 > 0 ? messageNewsNum.消息信息 : ''"
> >
<message-news :actives="activeName"></message-news> <message-news
:actives="activeName"
:messageNewsNum="messageNewsNum"
></message-news>
</van-tab> </van-tab>
<van-tab <van-tab
title="通知公告" title="通知公告"
name="通知公告" name="通知公告"
:badge="messageNewsNum.通知公告 > 0 ? messageNewsNum.通知公告 : ''" :badge="messageNewsNum.通知公告 > 0 ? messageNewsNum.通知公告 : ''"
> >
<notice-info :actives="activeName"></notice-info> <notice-info
:actives="activeName"
:messageNewsNum="messageNewsNum"
></notice-info>
</van-tab> </van-tab>
</van-tabs> </van-tabs>
</div> </div>
......
...@@ -17,7 +17,12 @@ ...@@ -17,7 +17,12 @@
>{{ item.category }}</span >{{ item.category }}</span
> >
<span class="my-tag-style" @click="clearNo()">清除未读</span> <span
class="my-tag-style"
v-if="messageNewsNum.消息信息 > 0"
@click="clearNo()"
>清除未读</span
>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
...@@ -63,6 +68,11 @@ ...@@ -63,6 +68,11 @@
</div> </div>
</van-badge> </van-badge>
</van-cell-group> </van-cell-group>
<van-image
v-if="messageList.length <= 0"
fit="contain"
:src="require('../../../assets/noMessage.png')"
/>
</div> </div>
</div> </div>
</van-pull-refresh> </van-pull-refresh>
...@@ -78,9 +88,15 @@ import { ...@@ -78,9 +88,15 @@ import {
} from "@/service/message"; } from "@/service/message";
export default { export default {
props: { props: {
actives: String, actives: {
type: String,
default: () => "", default: () => "",
}, },
messageNewsNum: {
type: Object,
default: () => {},
},
},
data() { data() {
return { return {
isLoading: false, isLoading: false,
...@@ -198,10 +214,8 @@ export default { ...@@ -198,10 +214,8 @@ export default {
touchstart(index, item) { touchstart(index, item) {
this.read(item); this.read(item);
this.$router.push({ this.$router.push({
name: "message-details", path: item.appUrl,
params: { query: {},
id: JSON.stringify(item),
},
}); });
}, },
......
...@@ -19,12 +19,17 @@ ...@@ -19,12 +19,17 @@
@click="selectCategory(index, item.category)" @click="selectCategory(index, item.category)"
>{{ item.category }}</span >{{ item.category }}</span
> >
<span class="my-tag-style" @click="clearNo()">清除未读</span> <span
class="my-tag-style"
v-if="messageNewsNum.通知公告 > 0"
@click="clearNo()"
>清除未读</span
>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div class="search-wrap"> <div class="search-wrap">
<!-- <van-search <van-search
v-model="searchVal" v-model="searchVal"
show-action show-action
placeholder="请输入检查名称" placeholder="请输入检查名称"
...@@ -33,7 +38,7 @@ ...@@ -33,7 +38,7 @@
<template #action> <template #action>
<div @click="onSearch">搜索</div> <div @click="onSearch">搜索</div>
</template> </template>
</van-search> --> </van-search>
<!-- <van-search <!-- <van-search
v-model="searchVal" v-model="searchVal"
placeholder="搜索" placeholder="搜索"
...@@ -65,6 +70,11 @@ ...@@ -65,6 +70,11 @@
</div> </div>
</van-badge> </van-badge>
</van-cell-group> </van-cell-group>
<van-image
v-if="notificationList.length <= 0"
fit="contain"
:src="require('../../../assets/noMessage.png')"
/>
</div> </div>
</div> </div>
</van-pull-refresh> </van-pull-refresh>
...@@ -81,9 +91,15 @@ import { ...@@ -81,9 +91,15 @@ import {
} from "@/service/message"; } from "@/service/message";
export default { export default {
props: { props: {
actives: String, actives: {
type: String,
default: () => "", default: () => "",
}, },
messageNewsNum: {
type: Object,
default: () => {},
},
},
data() { data() {
return { return {
isLoading: false, isLoading: false,
......
...@@ -49,13 +49,20 @@ ...@@ -49,13 +49,20 @@
<span>{{ item.title }}</span> <span>{{ item.title }}</span>
<span>{{ item.createTime }}</span> <span>{{ item.createTime }}</span>
</div> </div>
<div class="message-content">{{ item.content }}</div> <div class="message-content">
{{ item.content }},{{ item.createBy }}
</div>
<div class="bot_but"> <div class="bot_but">
<van-button color="#33CCFF" size="mini">立即处理</van-button> <van-button color="#33CCFF" size="mini">立即处理</van-button>
</div> </div>
</div> </div>
</van-badge> </van-badge>
</van-cell-group> </van-cell-group>
<van-image
v-if="waitList.length <= 0"
fit="contain"
:src="require('../../../assets/noMessage.png')"
/>
</div> </div>
</div> </div>
</van-pull-refresh> </van-pull-refresh>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment