|
|
@@ -26,12 +26,6 @@
|
|
|
:open="unReadMsgNum > 0 || false">
|
|
|
<template v-slot:title>
|
|
|
<uni-section title="公告" type="line" titleFontSize="1.3rem">
|
|
|
- <!-- <template v-slot:right>
|
|
|
- <uni-badge :text="unReadMsgNum"
|
|
|
- v-if="unReadMsgNum !== undefined && unReadMsgNum > 0"></uni-badge>
|
|
|
- <button @click.stop="clickReadButton" class="read_button" v-if="unReadMsgNum !== undefined"
|
|
|
- :disabled="unReadMsgNum === 0 ? true : false">一键阅读</button>
|
|
|
- </template> -->
|
|
|
</uni-section>
|
|
|
</template>
|
|
|
<message-list @clickSegment="getNoticeData" @clickItem="handleToNoticeDetail"
|
|
|
@@ -50,7 +44,7 @@
|
|
|
</template>
|
|
|
</uni-section>
|
|
|
</template>
|
|
|
- <message-list ref="msgListRef" @readMsg="setAllMsgRead" @clickSegment="getMessageData"
|
|
|
+ <message-list ref="msgListRef" @clickSegment="getMessageData"
|
|
|
@clickItem="handleToMessageDetail" @scrollToBottom="getMessagePage" :defaultCurrent="1" :pSize="5"
|
|
|
:pageNo="1" :segments="{ '全部': '', '未读': '0', '已读': '1' }">
|
|
|
</message-list>
|
|
|
@@ -64,14 +58,12 @@
|
|
|
|
|
|
<!-- 跳转打卡页按钮 -->
|
|
|
<view class="fab_button toClockInBtn">
|
|
|
- <uni-fab :pattern="{ icon: 'calendar-filled' }" :popMenu="false" horizontal="right"
|
|
|
- @fabClick="toClockInBtn"></uni-fab>
|
|
|
+ <uni-fab :pattern="{ icon: 'map-pin-ellipse' }" :popMenu="false" horizontal="right" @fabClick="toClockInBtn"></uni-fab>
|
|
|
</view>
|
|
|
<!-- AI咨询按钮 -->
|
|
|
- <!-- <view class="fab_button">
|
|
|
- <uni-fab :pattern="{ icon: 'headphones' }" :popMenu="false" horizontal="right"
|
|
|
- @fabClick="clickFabButton"></uni-fab>
|
|
|
- </view> -->
|
|
|
+ <!-- <view class="fab_button"> -->
|
|
|
+ <!-- <uni-fab :pattern="{ icon: 'headphones' }" :popMenu="false" horizontal="right" @fabClick="clickFabButton"></uni-fab> -->
|
|
|
+ <!-- </view> -->
|
|
|
|
|
|
</view>
|
|
|
</template>
|
|
|
@@ -190,7 +182,9 @@ function handleToNoticeDetail(notice) {
|
|
|
// 消息列表
|
|
|
// const messages = ref([])
|
|
|
// 获取消息列表数据
|
|
|
+const msgPoint = ref(0)
|
|
|
function getMessageData({ pSize, pageNo, type, segmentValue }, callback) {
|
|
|
+ const flag = msgPoint.value = new Date().getTime()
|
|
|
const params = {
|
|
|
currentUser: userStore.user.useId,
|
|
|
isRead: segmentValue,
|
|
|
@@ -203,11 +197,12 @@ function getMessageData({ pSize, pageNo, type, segmentValue }, callback) {
|
|
|
if ('(流程提醒)您有一个流程' == item.title.substring(0, 12)) {
|
|
|
item.title = '(流程提醒)' + item.title.slice(12)
|
|
|
}
|
|
|
- // return item
|
|
|
})
|
|
|
|
|
|
// 通知子组件加载完成
|
|
|
- callback(returnParams.list, returnParams.total, pageNo)
|
|
|
+ if (flag == msgPoint.value) {
|
|
|
+ callback(returnParams.list, returnParams.total, pageNo)
|
|
|
+ }
|
|
|
})
|
|
|
}
|
|
|
// 分页获取消息数据
|
|
|
@@ -342,13 +337,13 @@ function setAllMsgRead() {
|
|
|
margin-top: 10rpx;
|
|
|
}
|
|
|
|
|
|
-.toClockInBtn {
|
|
|
+::v-deep .toClockInBtn {
|
|
|
.uni-fab__circle--rightBottom {
|
|
|
bottom: 100px;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-.uni-badge {
|
|
|
+::v-deep .uni-badge {
|
|
|
height: 1.5rem !important;
|
|
|
line-height: 1.375rem !important;
|
|
|
font-size: 1.125rem !important;
|