发货方式优化及消息功能优化

This commit is contained in:
Dev
2026-10-08 20:34:08 +08:00
parent f21b010ced
commit 7e3e999b74
23 changed files with 371 additions and 455 deletions
+1 -16
View File
@@ -25,12 +25,10 @@ App({
});
},
});
//启动未读消息轮询(tabbar红点)
this.startUnreadPolling();
},
onShow: function () {
updateManager();
//从后台切回前台,立即刷新未读红点
//从后台切回前台时刷新一次未读红点(不使用定时轮询,避免请求堆积导致页面卡死)
this.refreshUnread();
},
onHide: function () {},
@@ -38,19 +36,6 @@ App({
unread: 0, //未读消息数(tabbar红点共享缓存)
},
/**
* 未读消息轮询:小程序前台每10s刷新一次底部tabbar红点
* (切后台后JS执行会被系统挂起,定时器自然暂停,回前台由onShow立即补一次)
*/
startUnreadPolling: function () {
if (this.unreadTimer) {
return;
}
this.unreadTimer = setInterval(() => {
this.refreshUnread();
}, 10000);
},
/**
* 刷新当前 tab 页 tabbar 实例的红点(非tab页无tabbar实例,自动跳过)
*/
+9 -1
View File
@@ -62,7 +62,15 @@ Component({
if (!force && now - (this._lastFetchAt || 0) < 5000) {
return;
}
//上一次请求尚未结束时不再发起,避免请求堆积占满并发导致页面假死
if (this._fetching) {
return;
}
this._lastFetchAt = now;
this._fetching = true;
const done = () => {
this._fetching = false;
};
fetchMessageUnreadCount().then((res) => {
if (res.code == 1) {
const unread = Number(res.data?.unread_count) || 0;
@@ -70,7 +78,7 @@ Component({
const app = getApp();
if (app) app.globalData.unread = unread;
}
}).catch(() => {});
}).catch(() => {}).then(done, done);
},
/**
+27 -3
View File
@@ -8,6 +8,8 @@ Page({
data: {
demandId: 0,
remark: '',
// 交付链接(Git仓库/网盘等持久获取方式),选填
deliverLinks: '',
// 开发完成凭证截图(软件成品展示图等)
imageFiles: [],
imageMax: 9,
@@ -43,6 +45,19 @@ Page({
this.setData({ remark: e.detail.value });
},
// 交付链接变更
onDeliverLinksChange(e) {
this.setData({ deliverLinks: e.detail.value });
},
// 交付链接(单个):只取第一行,避免粘贴时带入多余内容
getDeliverLinks() {
const link = String(this.data.deliverLinks || '')
.split(/[\r\n]+/)[0]
.trim();
return link ? [link] : [];
},
// 凭证截图选择成功
// 注意:t-upload 绑定了 files,success 事件返回的是完整文件列表(含已选的旧文件),
// 必须整体覆盖,不能往 imageFiles 里追加,否则已选图片会重复
@@ -209,7 +224,7 @@ Page({
}
},
// 表单验证
// 表单验证:源码一般在沟通群交付,平台仅凭证截图必填,附件与链接选填
validateForm() {
const { imageFiles, attachFiles } = this.data;
if (!imageFiles.length) {
@@ -219,9 +234,17 @@ Page({
});
return false;
}
if (!attachFiles.length) {
const links = this.getDeliverLinks();
if (links.length > 1) {
wx.showToast({
title: '请上传源码或软件附件',
title: '只能填写1个交付链接',
icon: 'none'
});
return false;
}
if (links.some(item => !/^https?:\/\//i.test(item))) {
wx.showToast({
title: '交付链接需以 http:// 或 https:// 开头',
icon: 'none'
});
return false;
@@ -251,6 +274,7 @@ Page({
opType: 'deliverGoods',
images: imageFiles.map(file => file.fullUrl || file.url),
files: attachFiles.map(file => file.fullUrl || file.url),
links: this.getDeliverLinks(),
remark
};
demandOperate(params).then(
@@ -3,6 +3,7 @@
"usingComponents": {
"t-upload": "tdesign-miniprogram/upload/upload",
"t-tag": "tdesign-miniprogram/tag/tag",
"t-textarea": "tdesign-miniprogram/textarea/textarea"
"t-textarea": "tdesign-miniprogram/textarea/textarea",
"t-input": "tdesign-miniprogram/input/input"
}
}
@@ -20,14 +20,23 @@
/>
</view>
<!-- 沟通群交付引导 -->
<view class="form-card form-card--tip">
<view class="form-card__head">
<text class="form-card__title">源码交付方式</text>
</view>
<view class="form-card__desc">
建议在<text class="tip-strong">企业微信沟通群</text>中直接发送源码文件,或使用网盘地址。下方的附件与链接为选填补充。
</view>
</view>
<!-- 交付附件 -->
<view class="form-card">
<view class="form-card__head">
<text class="form-card__title">交付附件(源码或软件成品)</text>
<text class="form-card__require">*</text>
<text class="form-card__extra">{{attachFiles.length}}/{{attachMax}}</text>
<text class="form-card__extra">选填 {{attachFiles.length}}/{{attachMax}}</text>
</view>
<view class="form-card__desc">上传源码或软件成品文件,客户确认收货后可下载,从聊天记录选择文件</view>
<view class="form-card__desc">小体积源码或软件成品可直接上传,大文件请在沟通群交付;从聊天记录选择文件</view>
<view class="attach-list" wx:if="{{attachFiles.length}}">
<t-tag
wx:for="{{attachFiles}}"
@@ -53,6 +62,21 @@
/>
</view>
<!-- 交付链接 -->
<view class="form-card">
<view class="form-card__head">
<text class="form-card__title">交付链接</text>
<text class="form-card__extra">选填</text>
</view>
<view class="form-card__desc">填写一个网盘下载地址</view>
<t-input
placeholder="https://pan.xxx.com/s/xxx"
value="{{deliverLinks}}"
bindchange="onDeliverLinksChange"
maxlength="300"
/>
</view>
<!-- 发货备注 -->
<view class="form-card">
<view class="form-card__head">
@@ -74,7 +98,7 @@
<!-- 底部提交栏 -->
<view class="wx-pay-cover">
<view class="wx-pay">
<view class="submit-btn {{(imageFiles.length && attachFiles.length) ? '' : 'btn-gray'}}" bindtap="onSubmit">
<view class="submit-btn {{imageFiles.length ? '' : 'btn-gray'}}" bindtap="onSubmit">
确认发货
</view>
</view>
@@ -47,6 +47,20 @@
color: var(--text-tertiary);
}
/* 交付方式提示卡片 */
.form-card--tip {
background: var(--brand-color-light, #fff3e8);
}
.form-card--tip .form-card__desc {
margin-bottom: 0;
}
.tip-strong {
color: var(--brand-color, #ff5f15);
font-weight: 500;
}
/* ================= 附件标签 ================= */
.attach-list {
display: flex;
@@ -73,6 +73,13 @@
</view>
</view>
</view>
<block wx:if="{{_calc.getDelivery(demandInfo).links && _calc.getDelivery(demandInfo).links.length}}">
<view class="delivery-title">交付链接</view>
<view class="delivery-link" wx:for="{{_calc.getDelivery(demandInfo).links}}" wx:key="index">
<text class="delivery-link__url" selectable="{{true}}">{{item.url}}</text>
<button class="mini-btn mini-btn--primary" size="mini" data-url="{{item.url}}" bindtap="fileUrlCopy">复制</button>
</view>
</block>
<block wx:if="{{_calc.getDelivery(demandInfo).remark}}">
<view class="delivery-title">发货备注</view>
<view class="delivery-remark">{{_calc.getDelivery(demandInfo).remark}}</view>
@@ -94,6 +94,24 @@ page {
background: var(--bg-grey);
}
/* 交付链接:长链接换行展示 + 复制按钮 */
.delivery-link {
display: flex;
align-items: center;
justify-content: space-between;
padding: 12rpx 0;
}
.delivery-link__url {
flex: 1;
min-width: 0;
margin-right: 16rpx;
font-size: 26rpx;
line-height: 38rpx;
color: var(--brand-color, #ff5f15);
word-break: break-all;
}
.delivery-remark {
font-size: 26rpx;
line-height: 40rpx;
+66 -160
View File
@@ -1,176 +1,82 @@
// pages/message/detail/index.js
import { fetchMessageDetail, messageSetRead } from '../../../services/message/fetchMessage';
// tabBar 页面(与 app.json 的 tabBar.list 保持一致):
// navigateTo 无法跳转 tab 页,必须用 switchTab;而 switchTab 不支持带参数
const TAB_PAGES = [
'pages/home/home',
'pages/goods/list/index',
'pages/message/list/index',
'pages/usercenter/index',
];
Page({
/**
* 页面的初始数据
*/
data: {
// 客服信息
serviceAvatar: '/assets/images/contact.png',
serviceNickname: '在线客服',
inputContent: '',
// 消息列表
messageList: [{
id: 1,
type: 'text',
content: '您好,请问有什么可以帮您?',
time: '12:30',
avatar: '/assets/image/contact.png',
isSelf: false
},
{
id: 2,
type: 'text',
content: '我想咨询一下订单问题',
time: '12:31',
avatar: '/assets/image/default_avatar_big.png',
isSelf: true
},
{
id: 3,
type: 'text',
content: '好的,请问是哪个订单呢?',
time: '12:31',
avatar: '/assets/image/contact.png',
isSelf: false
}
],
scrollToMessage: '', // 用于消息定位
// 输入相关
inputContent: '',
showEmoji: false,
id: 0,
detail: null,
jumpPage: '',
loading: true,
},
// 监听输入框内容变化
onInput(e) {
this.setData({
inputContent: e.detail.value
onLoad(options) {
const id = options?.id || 0;
this.setData({ id });
// 页面标题用消息标题,onLoad 阶段先给默认值
wx.setNavigationBarTitle({
title: '消息详情'
});
this.loadDetail();
},
// 发送消息
sendMessage() {
if (!this.data.inputContent.trim()) return;
const newMessage = {
id: Date.now(), // 使用时间戳作为临时ID
type: 'text',
content: this.data.inputContent,
isSelf: true,
avatar: '你的默认头像URL',
time: this.formatTime(new Date())
};
this.setData({
messageList: [...this.data.messageList, newMessage],
inputContent: '', // 清空输入框
scrollToMessage: `msg-${newMessage.id}` // 滚动到最新消息
});
},
// 选择图片
chooseImage() {
wx.chooseMedia({
count: 1,
mediaType: ['image'],
sourceType: ['album', 'camera'],
success: (res) => {
const tempFilePath = res.tempFiles[0].tempFilePath;
const newMessage = {
id: Date.now(),
type: 'image',
content: tempFilePath,
isSelf: true,
avatar: '你的默认头像URL',
time: this.formatTime(new Date())
};
this.setData({
messageList: [...this.data.messageList, newMessage],
scrollToMessage: `msg-${newMessage.id}`
loadDetail() {
fetchMessageDetail(this.data.id).then((res) => {
const detail = res.data || null;
const jumpPage = String(detail?.extra_json?.page || '');
this.setData({
detail,
jumpPage,
loading: false
});
if (detail?.title) {
wx.setNavigationBarTitle({
title: detail.title
});
}
// 进入即标记已读
if (detail && !detail.is_read) {
messageSetRead({ id: this.data.id }).then(() => {
this.setData({ 'detail.is_read': 1 });
}).catch(() => {});
}
}).catch(() => {
this.setData({ loading: false });
});
},
// 预览图片
previewImage(e) {
const current = e.currentTarget.dataset.src;
const urls = this.data.messageList
.filter(msg => msg.type === 'image')
.map(msg => msg.content);
wx.previewImage({
current,
urls
// 前往消息关联的业务页面
onJumpTap() {
const jumpPage = String(this.data.jumpPage || '').replace(/^\//, '');
if (!jumpPage) {
return;
}
const pathname = jumpPage.split('?')[0];
//tabBar 页只能 switchTab(不支持带参数),其余走 navigateTo
if (TAB_PAGES.indexOf(pathname) !== -1) {
wx.switchTab({
url: '/' + pathname,
fail: () => {
wx.showToast({ title: '页面跳转失败', icon: 'none' });
}
});
return;
}
wx.navigateTo({
url: '/' + jumpPage,
fail: () => {
wx.showToast({ title: '页面跳转失败', icon: 'none' });
}
});
},
// 格式化时间
formatTime(date) {
const hour = date.getHours().toString().padStart(2, '0');
const minute = date.getMinutes().toString().padStart(2, '0');
return `${hour}:${minute}`;
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
// 设置页面标题为客服名称
wx.setNavigationBarTitle({
title: this.serviceNickname
});
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})
onShareAppMessage() { }
});
@@ -1,5 +1,9 @@
{
"navigationBarTitleText": "消息详情",
"usingComponents": {
"t-icon": "tdesign-miniprogram/icon/icon"
"t-tag": "tdesign-miniprogram/tag/tag",
"t-button": "tdesign-miniprogram/button/button",
"t-empty": "tdesign-miniprogram/empty/empty",
"t-loading": "tdesign-miniprogram/loading/loading"
}
}
}
@@ -1,29 +1,29 @@
<!--pages/message/detail/index.wxml-->
<wxs src="./index.wxs" module="_index" />
<view class="message-detail">
<!-- 聊天记录区域 -->
<scroll-view class="message-list" scroll-y scroll-into-view="{{scrollToMessage}}" enable-flex scroll-anchoring="{{true}}">
<view wx:for="{{messageList}}" wx:key="id" class="message-item {{item.isSelf ? 'self' : 'other'}}" id="msg-{{item.id}}">
<image class="avatar" src="{{item.avatar}}" />
<view class="content">
<view class="bubble">
<text wx:if="{{item.type === 'text'}}">{{item.content}}</text>
<image wx:if="{{item.type === 'image'}}" class="msg-image" src="{{item.content}}" mode="widthFix" bindtap="previewImage" data-src="{{item.content}}" />
</view>
<text class="time">{{item.time}}</text>
</view>
</view>
</scroll-view>
<!-- 底部输入区域 -->
<view class="input-area">
<view class="input-box">
<view class="tool-item" bindtap="chooseImage">
<t-icon name="image" size="48rpx" />
</view>
<textarea class="input" value="{{inputContent}}" placeholder="请输入消息" auto-height cursor-spacing="20" maxlength="500" bindinput="onInput" adjust-position="{{false}}" />
<view class="send-btn {{inputContent ? 'active' : ''}}" bindtap="sendMessage">
发送
</view>
</view>
<view wx:if="{{loading}}" class="detail-loading">
<t-loading theme="circular" size="40rpx" text="加载中..." />
</view>
</view>
<block wx:elif="{{detail}}">
<view class="detail-card">
<view class="detail-header">
<text class="detail-title">{{detail.title}}</text>
<t-tag size="small" variant="light" theme="{{_index.tagTheme(detail.message_type)}}">{{detail.message_type_text}}</t-tag>
</view>
<view class="detail-time">{{detail.createtime_text}}</view>
<view class="detail-content">{{detail.content}}</view>
</view>
<!-- 有跳转页面时才展示入口:不想前往可直接返回,不会被强制跳转 -->
<view class="detail-actions" wx:if="{{jumpPage}}">
<t-button theme="primary" size="large" block bind:tap="onJumpTap">前往查看</t-button>
</view>
</block>
<view wx:else class="detail-empty">
<t-empty icon="chat-bubble-error" description="消息不存在或已被删除" />
</view>
</view>
@@ -0,0 +1,12 @@
// 消息类型对应的标签主题色:0=系统消息(蓝),1=公告消息(橙),2=需求消息(绿)
function tagTheme(type) {
var map = {
'0': 'primary',
'1': 'warning',
'2': 'success'
};
return map[String(type)] || 'default';
}
module.exports = {
tagTheme: tagTheme
}
+45 -126
View File
@@ -1,145 +1,64 @@
/* pages/message/detail/index.wxss */
.message-detail {
display: flex;
flex-direction: column;
height: 100vh;
min-height: 100vh;
padding: 24rpx;
box-sizing: border-box;
background: var(--bg-page);
}
.service-info {
padding: 20rpx;
.detail-loading {
display: flex;
justify-content: center;
padding-top: 120rpx;
}
.detail-card {
background: var(--bg-card);
border-radius: var(--radius-lg);
padding: 32rpx;
box-shadow: var(--shadow-card);
}
.detail-header {
display: flex;
align-items: center;
background: #fff;
border-bottom: 1rpx solid #eee;
justify-content: space-between;
}
.service-info .avatar {
width: 80rpx;
height: 80rpx;
border-radius: 50%;
margin-right: 20rpx;
}
.service-info .nickname {
font-size: 32rpx;
.detail-title {
flex: 1;
min-width: 0;
margin-right: 16rpx;
font-size: 34rpx;
font-weight: 600;
line-height: 48rpx;
color: var(--text-primary);
}
.message-list {
flex: 1;
padding: 20rpx;
background: var(--bg-page);
.detail-time {
margin-top: 12rpx;
font-size: 24rpx;
line-height: 36rpx;
color: var(--text-tertiary);
}
.message-item {
display: flex;
margin-bottom: 30rpx;
}
.message-item.self {
flex-direction: row-reverse;
padding-right: 20rpx;
}
.message-item .avatar {
width: 80rpx;
height: 80rpx;
border-radius: 50%;
}
.message-item .content {
max-width: 60%;
margin: 0 20rpx;
}
.message-item .bubble {
padding: 20rpx;
border-radius: 10rpx;
background: #fff;
/* 正文:保留换行,长内容自然撑开页面滚动 */
.detail-content {
margin-top: 24rpx;
padding-top: 24rpx;
border-top: 1rpx solid var(--component-stroke, #eee);
font-size: 28rpx;
line-height: 44rpx;
color: var(--text-secondary);
white-space: pre-wrap;
word-break: break-all;
}
.message-item.self .bubble {
background: #07c160;
color: #fff;
/* 底部操作区:仅在需要跳转时出现 */
.detail-actions {
margin-top: 40rpx;
}
.message-item .msg-image {
max-width: 100%;
border-radius: 10rpx;
.detail-empty {
padding-top: 200rpx;
}
.message-item .time {
font-size: 24rpx;
color: var(--text-tertiary);
margin-top: 10rpx;
display: block;
}
.input-area {
background: #fff;
border-top: 1rpx solid #eee;
padding-bottom: env(safe-area-inset-bottom);
position: fixed; bottom: 0; left: 0; right: 0;
}
.toolbar {
display: flex;
padding: 20rpx;
border-bottom: 1rpx solid #eee;
}
.tool-item {
margin-right: 15rpx;
}
.input-box {
display: flex;
padding: 20rpx;
align-items: flex-end;
justify-content: center; align-items: center;
}
.input {
flex: 1;
background: var(--bg-page);
border-radius: 8rpx;
padding: 20rpx;
min-height: 40rpx;
max-height: 120rpx;
margin-right: 20rpx;
}
.send-btn {
width: 120rpx;
height: 64rpx;
line-height: 64rpx;
text-align: center;
background: #ddd;
color: #fff;
border-radius: 8rpx;
}
.send-btn.active {
background: #07c160;
}
.emoji-panel {
height: 400rpx;
background: #fff;
padding: 20rpx;
}
.emoji-list {
display: flex;
flex-wrap: wrap;
}
.emoji-item {
width: 64rpx;
height: 64rpx;
font-size: 40rpx;
display: flex;
align-items: center;
justify-content: center;
}
+4 -73
View File
@@ -9,15 +9,6 @@ const TYPE_TABS = [
{ key: '2', label: '需求消息' },
];
// tabBar 页面(与 app.json 的 tabBar.list 保持一致):
// navigateTo 无法跳转 tab 页,必须用 switchTab;而 switchTab 不支持带参数
const TAB_PAGES = [
'pages/home/home',
'pages/goods/list/index',
'pages/message/list/index',
'pages/usercenter/index',
];
Page({
data: {
tabs: TYPE_TABS,
@@ -30,10 +21,7 @@ Page({
pageSize: 10,
unreadCount: 0,
hasMore: true,
loading: false,
showTextAndTitle: false,
currentMessage: {},
confirmBtn: '关闭'
loading: false
},
onLoad() {
@@ -94,61 +82,11 @@ Page({
this.loadList(true);
},
showDialog(e) {
// 点击消息进入详情页(关闭交给小程序的返回:左上角/右滑手势/物理返回键)
onMessageTap(e) {
const id = e.currentTarget.dataset.id;
const item = this.data.list.find(msg => msg.id == id);
const jumpPage = item?.extra_json?.page || '';
this.setData({
showTextAndTitle: true,
currentMessage: item || {},
//携带跳转页面时提供「前往查看」
confirmBtn: jumpPage ? '前往查看' : '关闭'
});
messageSetRead({ id: id }).then(() => {
if (!item) {
return;
}
const idx = this.data.list.findIndex(msg => msg.id == id);
if (idx === -1) {
return;
}
//原来未读的消息:本地未读数-1并同步tabbar红点
if (!this.data.list[idx].is_read) {
const typeKey = String(item.message_type);
const unreadMap = { ...this.data.unreadMap };
unreadMap[typeKey] = Math.max(Number(unreadMap[typeKey] || 0) - 1, 0);
const totalUnread = Math.max(this.data.totalUnread - 1, 0);
this.setData({ unreadMap, totalUnread });
this.syncTabBarUnread(totalUnread);
}
this.setData({ [`list[${idx}].is_read`]: 1 });
});
},
//弹窗确认:有跳转页面则前往,否则仅关闭
onDialogConfirm() {
const jumpPage = String(this.data.currentMessage?.extra_json?.page || '').replace(/^\//, '');
this.setData({ showTextAndTitle: false });
if (!jumpPage) {
return;
}
const pathname = jumpPage.split('?')[0];
//tabBar 页只能 switchTab(不支持带参数),其余走 navigateTo
if (TAB_PAGES.indexOf(pathname) !== -1) {
wx.switchTab({
url: '/' + pathname,
fail: () => {
wx.showToast({ title: '页面跳转失败', icon: 'none' });
}
});
return;
}
wx.navigateTo({
url: '/' + jumpPage,
fail: () => {
//页面路径不存在或超出页面栈时降级提示
wx.showToast({ title: '页面跳转失败', icon: 'none' });
}
url: `/pages/message/detail/index?id=${id}`
});
},
@@ -169,13 +107,6 @@ Page({
});
},
onMessageTap(e) {
const { type, id } = e.currentTarget.dataset;
wx.navigateTo({
url: `/pages/message/detail/index?type=${type}&id=${id}`
});
},
onShow() {
this.loadList(true);
},
@@ -4,14 +4,9 @@
"t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
"t-cell": "tdesign-miniprogram/cell/cell",
"t-icon": "tdesign-miniprogram/icon/icon",
"t-row": "tdesign-miniprogram/row/row",
"t-col": "tdesign-miniprogram/col/col",
"t-avatar": "tdesign-miniprogram/avatar/avatar",
"t-badge": "tdesign-miniprogram/badge/badge",
"t-dialog": "tdesign-miniprogram/dialog/dialog",
"t-empty": "tdesign-miniprogram/empty/empty",
"t-tag": "tdesign-miniprogram/tag/tag",
"t-divider": "tdesign-miniprogram/divider/divider"
"t-tag": "tdesign-miniprogram/tag/tag"
},
"navigationBarTitleText": "消息列表"
}
+8 -20
View File
@@ -1,15 +1,12 @@
<!--pages/message/index.wxml-->
<wxs src="./index.wxs" module="_index" />
<view class="message-page">
<t-row>
<t-col span="4" offset="1" t-class="dark">
<!-- <text class="site-message-title">站内消息</text> -->
<t-badge count="{{unreadCount}}" content="站内消息" offset="{{ [4] }}" class="wrapper" />
</t-col>
<t-col span="3" offset="16" t-class="light">
<t-icon bindtap="onClearUnreadTap" name="clear" size="40rpx" />
</t-col>
</t-row>
<!-- 顶部标题行:用 flex 保证标题与清除按钮垂直居中对齐 -->
<view class="message-header">
<!-- 未读数已在下方「全部」tab 的角标展示,此处不再重复显示 -->
<text class="site-message-title">站内消息</text>
<t-icon class="message-clear" name="clear" size="40rpx" bindtap="onClearUnreadTap" />
</view>
<!-- 消息类型分类 -->
<t-tabs value="{{currentTabIndex}}" bind:change="onTabsChange" swipeable="{{false}}" t-class="message-tabs">
@@ -24,11 +21,11 @@
<view class="message-list">
<view class="message-item" wx:for="{{list}}" wx:for-item="item" wx:key="id">
<t-cell hover bordered data-key="showTextAndTitle" bind:tap="showDialog" data-id="{{item.id}}">
<t-cell hover bordered bind:tap="onMessageTap" data-id="{{item.id}}">
<t-avatar class="avatar-example" slot="image" image="{{item.image}}" badge-props="{{ {dot: !item.is_read, offset: [0, 4] } }}" />
<view slot="title" class="msg-title">
<text class="msg-title-text">{{item.title}}</text>
<t-tag size="small" variant="light" class="msg-type-tag">{{item.message_type_text}}</t-tag>
<t-tag size="small" variant="light" theme="{{_index.tagTheme(item.message_type)}}" class="msg-type-tag">{{item.message_type_text}}</t-tag>
</view>
<view slot="description">{{_index.ellipsis(item.content, 22)}}</view>
<text slot="note">{{item.createtime_text}}</text>
@@ -40,12 +37,3 @@
</view>
<view class="safe-bottom" />
</view>
<t-dialog visible="{{showTextAndTitle}}" title="{{currentMessage.title}}" confirm-btn="{{ confirmBtn }}" bind:confirm="onDialogConfirm">
<!-- 适配skyline,增加type="list" -->
<scroll-view slot="content" type="list" scroll-y class="long-content">
<view class="content-container">
<view class="content-type">{{currentMessage.message_type_text}}</view>
{{currentMessage.content}}
</view>
</scroll-view>
</t-dialog>
+13 -2
View File
@@ -1,6 +1,17 @@
function ellipsis(str, len) {
return str.length > len ? str.slice(0, len) + '...' : str;
}
// 消息类型对应的标签主题色:0=系统消息(蓝),1=公告消息(橙),2=需求消息(绿)
function tagTheme(type) {
var map = {
'0': 'primary',
'1': 'warning',
'2': 'success'
};
return map[String(type)] || 'default';
}
module.exports = {
ellipsis: ellipsis
}
ellipsis: ellipsis,
tagTheme: tagTheme
}
+22 -4
View File
@@ -3,6 +3,28 @@
padding: 20rpx 0rpx;
}
/* 顶部标题行:标题与清除按钮同一水平线,整体与下方分类 tabs 留出间距 */
.message-header {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 0 32rpx 12rpx;
}
.site-message-title {
font-size: 32rpx;
font-weight: bold;
line-height: 48rpx;
color: var(--text-primary);
}
/* 清除按钮:与文字垂直居中对齐 */
.message-clear {
display: flex;
align-items: center;
}
.clear-icon {
width: 40rpx;
height: 40rpx;
@@ -36,10 +58,6 @@
max-width: 420rpx;
}
.site-message-title {
font-weight: bold;
}
.empty-container {
min-height: 100vh;
padding-top: 50%;