feat: 优化UI

This commit is contained in:
Blizzard
2026-03-05 17:04:40 +08:00
parent 0a61c4ddec
commit 7f51b2a0a8
28 changed files with 1773 additions and 964 deletions
+163 -47
View File
@@ -1,5 +1,5 @@
/**
* 收听历史 — 从后端获取历史列表
* 收听历史 — 历史 / 收藏 两 Tab
*/
const app = getApp()
const api = require('../../utils/api')
@@ -7,15 +7,28 @@ const util = require('../../utils/util')
Page({
data: {
filter: 'all',
cleared: false,
tab: 'history', // 'history' | 'favorite'
historyList: [],
isPlaying: false,
loading: true
},
onShow() {
this._refresh()
const self = this
const gd = app.globalData
// 未登录则先登录
if (!gd.isLoggedIn || !gd.token) {
app.login().then(function () {
self._refresh()
}).catch(function () {
self.setData({ loading: false })
wx.showToast({ title: '请先登录', icon: 'none' })
})
} else {
this._refresh()
}
this._onPlayerChange = () => this._updatePlayState()
app.on('playerStateChange', this._onPlayerChange)
},
@@ -24,35 +37,52 @@ Page({
if (this._onPlayerChange) app.off('playerStateChange', this._onPlayerChange)
},
_refresh() {
if (this.data.cleared) return
setTab(e) {
const tab = e.currentTarget.dataset.val
if (tab === this.data.tab) return
this.setData({ tab, historyList: [], loading: true })
this._refresh()
},
_refresh() {
if (this.data.tab === 'history') {
this._loadHistory()
} else {
this._loadFavorites()
}
},
_loadHistory() {
const self = this
const gd = app.globalData
api.getHistoryList({ current: 1, pageSize: 30 }).then(function (res) {
if (res.code === 200 && res.data) {
var list = res.data.list || res.data || []
// 附带格式化信息
list = list.map(function (item) {
// 节目可能包含频道信息,根据后端返回结构适配
var channel = item.channel || item.program && item.program.channel || {}
var program = item.program || item
return Object.assign({}, program, {
_domainName: channel.name || program.channelName || '',
_icon: channel.icon || '🎵',
_bgColor: channel.bgColor || '#F0F0F0',
_coverUrl: (channel.cover && channel.cover.url) || channel.coverUrl || '',
_friendlyDate: util.getFriendlyDate(
program.createdAt ? program.createdAt.substring(0, 10) : ''
),
durationText: util.formatTime(program.duration || 0),
var list = (res.data.list || []).map(function (item) {
// program 嵌套在 item.program 下
var program = item.program || {}
// channel 可能为 nullchannel cover 在 program.cover
var channel = program.channel || {}
return {
// 播放所需字段
id: program.id,
title: program.title || '未知节目',
channelId: program.channelId || '',
content: program.content || '',
audioId: program.audioId || '',
// 用历史记录的 durationprogram.duration 可能是 0
duration: item.duration || program.duration || 0,
// 显示字段
_domainName: channel.name || '',
_icon: program.cover || channel.cover || '📻',
_bgColor: '#FFE8CC',
_friendlyDate: util.getFriendlyDate(item.createdAtStr ? item.createdAtStr.substring(0, 10) : ''),
durationText: util.formatTime(item.duration || 0),
// 播放进度
_progress: item.progress || 0,
_isThisPlaying: gd.activeContent && gd.activeContent.id === program.id
})
}
})
self.setData({ historyList: list, isPlaying: gd.isPlaying, loading: false })
} else {
self.setData({ historyList: [], loading: false })
@@ -63,9 +93,40 @@ Page({
})
},
/**
* 仅更新播放状态
*/
_loadFavorites() {
const self = this
const gd = app.globalData
api.getFavoriteList({ current: 1, pageSize: 30 }).then(function (res) {
if (res.code === 200 && res.data) {
var list = (res.data.list || []).map(function (item) {
var program = item.program || item
var channel = program.channel || {}
return {
id: program.id,
title: program.title || '未知节目',
channelId: program.channelId || '',
content: program.content || '',
audioId: program.audioId || '',
duration: program.duration || 0,
_domainName: channel.name || '',
_icon: program.cover || channel.cover || '📻',
_bgColor: '#FFE8CC',
_friendlyDate: util.getFriendlyDate(item.createdAtStr ? item.createdAtStr.substring(0, 10) : ''),
durationText: util.formatTime(program.duration || 0),
_isThisPlaying: gd.activeContent && gd.activeContent.id === program.id
}
})
self.setData({ historyList: list, isPlaying: gd.isPlaying, loading: false })
} else {
self.setData({ historyList: [], loading: false })
}
}).catch(function (err) {
console.error('[History] 加载收藏失败:', err)
self.setData({ loading: false })
})
},
_updatePlayState() {
var gd = app.globalData
var list = this.data.historyList.map(function (item) {
@@ -76,41 +137,96 @@ Page({
this.setData({ historyList: list, isPlaying: gd.isPlaying })
},
setFilter(e) {
this.setData({ filter: e.currentTarget.dataset.val })
},
onPlay(e) {
const id = e.currentTarget.dataset.id
const gd = app.globalData
// 从已加载数据中查找
var content = null
if (gd.activeContent && gd.activeContent.id === id) {
app.togglePlay()
return
}
// 从列表中找到基础信息
var base = null
for (var i = 0; i < this.data.historyList.length; i++) {
if (this.data.historyList[i].id === id) {
content = this.data.historyList[i]
base = this.data.historyList[i]
break
}
}
if (!content) return
if (!base) return
if (gd.activeContent && gd.activeContent.id === id) {
app.togglePlay()
} else {
app.playContent(content)
}
// 拉取完整节目详情(含 audio.url)再播放
wx.showLoading({ title: '加载中' })
api.getProgramDetail(id).then(function (res) {
wx.hideLoading()
if (res.code === 200 && res.data) {
app.playContent(Object.assign({}, base, res.data))
} else {
wx.showToast({ title: '加载失败', icon: 'none' })
}
}).catch(function () {
wx.hideLoading()
wx.showToast({ title: '网络异常', icon: 'none' })
})
},
onDeleteItem(e) {
const id = e.currentTarget.dataset.id
const tab = this.data.tab
const self = this
const label = tab === 'history' ? '历史' : '收藏'
wx.showModal({
title: '删除' + label,
content: '确定删除这条' + label + '吗?',
success(res) {
if (!res.confirm) return
const fn = tab === 'history'
? api.deleteHistory(id)
: api.removeFavorite(id)
fn.then(function (r) {
if (r.code === 200) {
// 本地即时移除
var list = self.data.historyList.filter(function (item) { return item.id !== id })
self.setData({ historyList: list })
} else {
wx.showToast({ title: r.msg || '删除失败', icon: 'none' })
}
}).catch(function () {
wx.showToast({ title: '网络异常', icon: 'none' })
})
}
})
},
onClear() {
const self = this
const tab = this.data.tab
const label = tab === 'history' ? '收听历史' : '全部收藏'
wx.showModal({
title: '提示',
content: '确定要清空所有收听历史吗?',
title: '清空' + label,
content: '确定要清空所有' + label + '吗?',
success(res) {
if (res.confirm) {
self.setData({ cleared: true, historyList: [] })
}
if (!res.confirm) return
const fn = tab === 'history'
? api.deleteAllHistory()
: api.removeAllFavorites()
fn.then(function (r) {
if (r.code === 200) {
self.setData({ historyList: [] })
} else {
wx.showToast({ title: r.msg || '操作失败', icon: 'none' })
}
}).catch(function () {
wx.showToast({ title: '网络异常', icon: 'none' })
})
}
})
}
},
goDiscover() { wx.switchTab({ url: '/pages/discover/index' }) },
goHome() { wx.switchTab({ url: '/pages/index/index' }) },
goVip() { wx.navigateTo({ url: '/pages/vip/index' }) }
})
+104 -35
View File
@@ -1,66 +1,135 @@
<!-- 收听历史 —— 按日期倒序的已听列表 -->
<!-- 收听历史 / 收藏 -->
<view class="history-page">
<!-- 筛选Tab + 清空按钮 -->
<!-- Tab 切换 + 清空 -->
<view class="filter-header">
<view class="filter-tabs">
<text
class="tab {{filter === 'all' ? 'active' : ''}}"
bindtap="setFilter"
data-val="all"
>全部片段</text>
<text
class="tab {{filter === 'subscribed' ? 'active' : ''}}"
bindtap="setFilter"
data-val="subscribed"
>仅看已订阅</text>
<view class="tab-item {{tab === 'history' ? 'active' : ''}}" bindtap="setTab" data-val="history">
<text class="tab-text">历史</text>
<view class="tab-underline"></view>
</view>
<view class="tab-item {{tab === 'favorite' ? 'active' : ''}}" bindtap="setTab" data-val="favorite">
<text class="tab-text">收藏</text>
<view class="tab-underline"></view>
</view>
</view>
<view class="clear-btn tap-active" bindtap="onClear">
<text class="clear-icon">🗑</text>
<view class="clear-btn tap-active" bindtap="onClear" wx:if="{{historyList.length > 0}}">
<view class="icon-trash">
<view class="trash-handle"></view>
<view class="trash-lid-bar"></view>
<view class="trash-body">
<view class="trash-stripe"></view>
<view class="trash-stripe"></view>
<view class="trash-stripe"></view>
</view>
</view>
<text class="clear-text">清空</text>
</view>
</view>
<!-- 历史列表 -->
<!-- 列表 -->
<view class="list-area">
<!-- 空状态 -->
<view wx:if="{{cleared || historyList.length === 0}}" class="empty-state">
<view class="empty-icon-wrap">
<text class="empty-emoji">📭</text>
<!-- 加载骨架 -->
<view wx:if="{{loading}}" class="skeleton-wrap">
<view wx:for="{{[1,2,3]}}" wx:key="*this" class="skeleton-item">
<view class="sk-icon"></view>
<view class="sk-lines">
<view class="sk-line sk-line-short"></view>
<view class="sk-line sk-line-long"></view>
<view class="sk-line sk-line-mid"></view>
</view>
</view>
<text class="empty-text">暂无收听历史</text>
</view>
<!-- 历史条目 -->
<!-- 历史空状态 -->
<view wx:elif="{{historyList.length === 0 && tab === 'history'}}" class="empty-state">
<text class="empty-icon">🎧</text>
<text class="empty-title">还没有收听记录</text>
<text class="empty-desc">去发现频道,开始你的第一段收听</text>
<view class="empty-actions">
<view class="btn-primary tap-active" bindtap="goDiscover">
<text class="btn-text">去发现频道</text>
</view>
<view class="btn-ghost tap-active" bindtap="goHome">
<text class="btn-ghost-text">回到首页</text>
</view>
</view>
</view>
<!-- 收藏空状态 -->
<view wx:elif="{{historyList.length === 0 && tab === 'favorite'}}" class="empty-state">
<text class="empty-icon">🔖</text>
<text class="empty-title">还没有收藏内容</text>
<text class="empty-desc">听到喜欢的节目,点击 ♡ 收藏它</text>
<view class="empty-actions">
<view class="btn-primary tap-active" bindtap="goDiscover">
<text class="btn-text">订阅感兴趣的频道</text>
</view>
</view>
<!-- 推荐订阅提示 -->
<view class="upsell-card">
<text class="upsell-icon">👑</text>
<view class="upsell-body">
<text class="upsell-title">开通会员</text>
<text class="upsell-desc">解锁全部付费频道,无限收藏</text>
</view>
<view class="upsell-btn tap-active" bindtap="goVip">
<text class="upsell-btn-text">了解</text>
</view>
</view>
</view>
<!-- 条目列表 -->
<view
wx:for="{{historyList}}"
wx:key="id"
class="history-item card"
class="history-item"
bindtap="onPlay"
data-id="{{item.id}}"
>
<!-- 频道图标 -->
<!-- 频道/节目图标 -->
<view class="h-icon" style="background: {{item._bgColor}};">
<image wx:if="{{item._coverUrl}}" src="{{item._coverUrl}}" class="h-cover-img" mode="aspectFill" />
<text wx:else class="h-emoji">{{item._icon}}</text>
<text class="h-emoji">{{item._icon}}</text>
</view>
<!-- 信息 -->
<!-- 文字信息 -->
<view class="h-info">
<text class="h-channel">{{item._domainName}}</text>
<text class="h-channel" wx:if="{{item._domainName}}">{{item._domainName}}</text>
<text class="h-title {{item._isThisPlaying ? 'text-primary' : ''}}">{{item.title}}</text>
<text class="h-meta">{{item._friendlyDate}} · {{item.durationText}}</text>
<view class="h-meta-row">
<text class="h-meta">{{item._friendlyDate}}</text>
<text class="h-meta" wx:if="{{item.durationText}}"> · {{item.durationText}}</text>
</view>
<!-- 播放进度条 -->
<view class="h-progress-wrap" wx:if="{{item._progress > 0 && item.duration > 0}}">
<view class="h-progress-bar" style="width: {{item._progress / item.duration * 100}}%;"></view>
</view>
</view>
<!-- 播放指示 -->
<view wx:if="{{item._isThisPlaying && isPlaying}}" class="playing-indicator">
<view class="bar bar-1"></view>
<view class="bar bar-2"></view>
<view class="bar bar-3"></view>
<!-- 播放指示 / 播放按钮 -->
<view class="h-right">
<view wx:if="{{item._isThisPlaying && isPlaying}}" class="playing-indicator">
<view class="bar bar-1"></view>
<view class="bar bar-2"></view>
<view class="bar bar-3"></view>
</view>
<view wx:else class="play-mini">
<text class="play-mini-icon">▶</text>
</view>
</view>
<view wx:else class="play-mini">
<image src="/assets/icons/play.svg" class="play-mini-icon" />
<!-- 删除按钮 -->
<view class="h-del tap-active" catchtap="onDeleteItem" data-id="{{item.id}}">
<view class="icon-trash icon-trash-sm">
<view class="trash-handle"></view>
<view class="trash-lid-bar"></view>
<view class="trash-body">
<view class="trash-stripe"></view>
<view class="trash-stripe"></view>
<view class="trash-stripe"></view>
</view>
</view>
</view>
</view>
+296 -71
View File
@@ -1,106 +1,239 @@
/* 收听历史样式 */
/* 收听历史 / 收藏 */
.history-page {
min-height: 100vh;
background: var(--color-bg-page);
background: #F7F3EE;
}
/* 筛选头部 */
/* ── Tab 头部 ── */
.filter-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 16rpx 32rpx;
padding: 0 32rpx;
background: #FFFFFF;
border-bottom: 1rpx solid #F5F5F5;
border-bottom: 1rpx solid #F0EAE2;
}
.filter-tabs {
display: flex;
gap: 8rpx;
}
.tab-item {
display: flex;
flex-direction: column;
align-items: center;
padding: 24rpx 24rpx 0;
position: relative;
}
.tab-text {
font-size: 28rpx;
font-weight: 600;
color: #AAA;
padding-bottom: 18rpx;
font-family: 'PingFang SC', sans-serif;
transition: color 0.2s;
}
.tab-item.active .tab-text {
color: #2C1A08;
}
.tab-underline {
height: 4rpx;
width: 0;
background: #FF9D42;
border-radius: 2rpx;
transition: width 0.25s;
}
.tab-item.active .tab-underline {
width: 100%;
}
/* 清空按钮 */
.clear-btn {
display: flex;
align-items: center;
}
.clear-icon {
font-size: 22rpx;
margin-right: 6rpx;
gap: 8rpx;
padding: 12rpx 0;
}
.clear-text {
font-size: 22rpx;
color: #999;
font-size: 24rpx;
color: #BBBBBB;
font-weight: 500;
}
/* 筛选Tab */
.filter-tabs {
display: flex;
gap: 32rpx;
}
.tab {
font-size: 26rpx;
font-weight: 700;
color: #999;
padding-bottom: 12rpx;
border-bottom: 4rpx solid transparent;
transition: all 0.2s;
}
.tab.active {
color: #333;
border-bottom-color: var(--color-primary);
}
/* 列表 */
/* ── 列表区 ── */
.list-area {
padding: 20rpx 32rpx;
padding: 24rpx 28rpx;
}
/* 空状态 */
/* ── 骨架屏 ── */
.skeleton-wrap { display: flex; flex-direction: column; gap: 20rpx; }
.skeleton-item {
display: flex;
align-items: center;
gap: 24rpx;
background: #FFFFFF;
border-radius: 20rpx;
padding: 24rpx;
}
.sk-icon {
width: 88rpx;
height: 88rpx;
border-radius: 20rpx;
background: linear-gradient(90deg, #F0EAE2 0%, #E8DFD5 50%, #F0EAE2 100%);
background-size: 200% 100%;
animation: shimmer 1.4s infinite;
flex-shrink: 0;
}
.sk-lines {
flex: 1;
display: flex;
flex-direction: column;
gap: 12rpx;
}
.sk-line {
height: 18rpx;
background: linear-gradient(90deg, #F0EAE2 0%, #E8DFD5 50%, #F0EAE2 100%);
background-size: 200% 100%;
animation: shimmer 1.4s infinite;
border-radius: 9rpx;
}
.sk-line-short { width: 40%; }
.sk-line-long { width: 80%; }
.sk-line-mid { width: 55%; }
@keyframes shimmer {
0% { background-position: 200% 0; }
100% { background-position: -200% 0; }
}
/* ── 空状态 ── */
.empty-state {
display: flex;
flex-direction: column;
align-items: center;
padding: 160rpx 0;
opacity: 0.5;
padding: 80rpx 48rpx 48rpx;
}
.empty-icon-wrap {
width: 128rpx;
height: 128rpx;
border-radius: 50%;
background: #F5F5F5;
.empty-icon {
font-size: 96rpx;
margin-bottom: 32rpx;
filter: drop-shadow(0 8rpx 16rpx rgba(255,157,66,0.2));
}
.empty-title {
font-size: 36rpx;
font-weight: 700;
color: #2C1A08;
margin-bottom: 16rpx;
font-family: 'PingFang SC', sans-serif;
}
.empty-desc {
font-size: 26rpx;
color: #B0A090;
text-align: center;
line-height: 1.6;
margin-bottom: 48rpx;
}
.empty-actions {
display: flex;
flex-direction: column;
gap: 20rpx;
width: 100%;
max-width: 480rpx;
}
.btn-primary {
background: linear-gradient(135deg, #FF9D42, #E07020);
border-radius: 48rpx;
padding: 28rpx 0;
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 24rpx;
box-shadow: 0 8rpx 24rpx rgba(255,157,66,0.35);
}
.empty-emoji {
font-size: 48rpx;
.btn-text {
font-size: 30rpx;
font-weight: 700;
color: #FFFFFF;
letter-spacing: 1rpx;
}
.empty-text {
.btn-ghost {
border: 2rpx solid #E8DFD5;
border-radius: 48rpx;
padding: 26rpx 0;
display: flex;
align-items: center;
justify-content: center;
background: #FFFFFF;
}
.btn-ghost-text {
font-size: 28rpx;
color: #999;
font-weight: 500;
font-weight: 600;
color: #8C7B6A;
}
/* 历史条目 */
/* VIP upsell 卡片 */
.upsell-card {
display: flex;
align-items: center;
gap: 20rpx;
background: linear-gradient(135deg, #FFF8EE, #FFF3E0);
border: 1rpx solid #FFDFA0;
border-radius: 20rpx;
padding: 24rpx 28rpx;
margin-top: 40rpx;
width: 100%;
max-width: 480rpx;
box-sizing: border-box;
}
.upsell-icon { font-size: 48rpx; }
.upsell-body {
flex: 1;
display: flex;
flex-direction: column;
gap: 4rpx;
}
.upsell-title {
font-size: 28rpx;
font-weight: 700;
color: #C07000;
}
.upsell-desc {
font-size: 22rpx;
color: #C09040;
}
.upsell-btn {
background: #FF9D42;
border-radius: 28rpx;
padding: 12rpx 28rpx;
}
.upsell-btn-text {
font-size: 24rpx;
font-weight: 700;
color: #FFF;
}
/* ── 历史条目 ── */
.history-item {
display: flex;
align-items: center;
padding: 24rpx;
margin-bottom: 20rpx;
margin-bottom: 16rpx;
background: #FFFFFF;
border-radius: 20rpx;
box-shadow: 0 2rpx 12rpx rgba(44,26,8,0.04);
}
.history-item:active {
box-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.06);
box-shadow: 0 4rpx 20rpx rgba(44,26,8,0.08);
transform: scale(0.99);
}
.h-icon {
width: 88rpx;
height: 88rpx;
border-radius: 24rpx;
border-radius: 20rpx;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
}
.h-emoji {
font-size: 40rpx;
}
.h-emoji { font-size: 42rpx; }
.h-info {
flex: 1;
@@ -111,50 +244,73 @@
display: block;
font-size: 20rpx;
font-weight: 700;
color: #999;
letter-spacing: 2rpx;
color: #FF9D42;
letter-spacing: 1rpx;
margin-bottom: 6rpx;
text-transform: uppercase;
}
.h-title {
display: block;
font-size: 26rpx;
font-size: 28rpx;
font-weight: 700;
color: #333;
color: #2C1A08;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-family: 'PingFang SC', sans-serif;
}
.h-title.text-primary {
color: var(--color-primary);
.h-title.text-primary { color: #FF9D42; }
.h-meta-row {
display: flex;
align-items: center;
flex-wrap: wrap;
margin-top: 8rpx;
}
.h-meta {
display: block;
font-size: 20rpx;
color: #BBB;
margin-top: 6rpx;
display: inline;
font-size: 22rpx;
color: #C8BAAA;
font-weight: 500;
}
/* 播放进度条 */
.h-progress-wrap {
width: 100%;
height: 4rpx;
background: #F0EAE2;
border-radius: 2rpx;
margin-top: 12rpx;
overflow: hidden;
}
.h-progress-bar {
height: 100%;
background: linear-gradient(90deg, #FF9D42, #E07020);
border-radius: 2rpx;
max-width: 100%;
}
.h-right {
flex-shrink: 0;
}
/* 播放指示器 */
.playing-indicator {
display: flex;
align-items: flex-end;
gap: 4rpx;
width: 48rpx;
height: 48rpx;
width: 40rpx;
height: 40rpx;
justify-content: center;
flex-shrink: 0;
padding-bottom: 4rpx;
}
.bar {
width: 6rpx;
border-radius: 4rpx;
background: var(--color-primary);
background: #FF9D42;
animation: bounce 0.6s ease-in-out infinite;
}
.bar-1 { height: 24rpx; animation-delay: 0s; }
.bar-2 { height: 40rpx; animation-delay: 0.1s; }
.bar-3 { height: 16rpx; animation-delay: 0.2s; }
@keyframes bounce {
0%, 100% { transform: scaleY(0.4); }
50% { transform: scaleY(1); }
@@ -164,14 +320,83 @@
width: 56rpx;
height: 56rpx;
border-radius: 50%;
border: 2rpx solid #EEE;
background: #FFF4E8;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
}
.play-mini-icon {
width: 20rpx;
height: 20rpx;
opacity: 0.4;
font-size: 22rpx;
color: #FF9D42;
padding-left: 4rpx;
}
/* 单条删除按钮 */
.h-del {
width: 52rpx;
height: 52rpx;
display: flex;
align-items: center;
justify-content: center;
margin-left: 4rpx;
flex-shrink: 0;
}
/* ── 纯 view 垃圾桶图标 ── */
.icon-trash {
display: flex;
flex-direction: column;
align-items: center;
gap: 3rpx;
width: 28rpx;
padding-top: 6rpx;
position: relative;
}
.trash-handle {
width: 12rpx;
height: 6rpx;
border: 3rpx solid #BBBBBB;
border-bottom: none;
border-radius: 4rpx 4rpx 0 0;
box-sizing: border-box;
margin-bottom: 2rpx;
}
.trash-lid-bar {
width: 28rpx;
height: 4rpx;
background: #BBBBBB;
border-radius: 2rpx;
}
.trash-body {
width: 22rpx;
height: 24rpx;
border: 3rpx solid #BBBBBB;
border-top: none;
border-radius: 0 0 5rpx 5rpx;
box-sizing: border-box;
display: flex;
flex-direction: row;
align-items: stretch;
justify-content: center;
gap: 4rpx;
padding: 4rpx 3rpx 3rpx;
}
.trash-stripe {
flex: 1;
background: #BBBBBB;
border-radius: 2rpx;
max-width: 2rpx;
}
/* 行内小号 */
.icon-trash-sm .trash-handle,
.icon-trash-sm .trash-lid-bar,
.icon-trash-sm .trash-stripe {
border-color: #D0C8C0;
background: #D0C8C0;
}
.icon-trash-sm .trash-body {
border-color: #D0C8C0;
background: transparent;
}