feat(theme): 全面完善暖色系双主题动态适配,优化同城组局品类筛选与试听条防折行规范
这个提交包含在:
@@ -16,7 +16,7 @@
|
||||
@click="switchTab('AA')"
|
||||
>
|
||||
<image class="tab-svg" :src="ICONS.bolt" mode="aspectFit" />
|
||||
<text class="tab-text">AA制车队</text>
|
||||
<text class="tab-text">AA制拼桌</text>
|
||||
<view class="tab-indicator" v-if="currentTab === 'AA'"></view>
|
||||
</view>
|
||||
<view
|
||||
@@ -25,32 +25,52 @@
|
||||
@click="switchTab('PROJECT')"
|
||||
>
|
||||
<image class="tab-svg" :src="ICONS.gameTrophy" mode="aspectFit" />
|
||||
<text class="tab-text">项目制赛事</text>
|
||||
<text class="tab-text">房主请客</text>
|
||||
<view class="tab-indicator" v-if="currentTab === 'PROJECT'"></view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 核心品类快捷筛选胶囊栏 (陪吃·陪唱·陪喝) -->
|
||||
<view class="category-capsule-bar">
|
||||
<view
|
||||
class="capsule-item btn-active"
|
||||
:class="{ active: currentCategory === 'ALL' }"
|
||||
@click="switchCategory('ALL')"
|
||||
>
|
||||
<text class="capsule-text">全部品类</text>
|
||||
</view>
|
||||
<view
|
||||
class="capsule-item btn-active"
|
||||
:class="{ active: currentCategory === 'MEAL' }"
|
||||
@click="switchCategory('MEAL')"
|
||||
>
|
||||
<image class="capsule-svg" :src="ICONS.utensils" mode="aspectFit" />
|
||||
<text class="capsule-text">美食陪吃</text>
|
||||
</view>
|
||||
<view
|
||||
class="capsule-item btn-active"
|
||||
:class="{ active: currentCategory === 'SING' }"
|
||||
@click="switchCategory('SING')"
|
||||
>
|
||||
<image class="capsule-svg" :src="ICONS.micVocal" mode="aspectFit" />
|
||||
<text class="capsule-text">同城陪唱</text>
|
||||
</view>
|
||||
<view
|
||||
class="capsule-item btn-active"
|
||||
:class="{ active: currentCategory === 'DRINK' }"
|
||||
@click="switchCategory('DRINK')"
|
||||
>
|
||||
<image class="capsule-svg" :src="ICONS.coffee" mode="aspectFit" />
|
||||
<text class="capsule-text">下午茶陪喝</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 顶部状态小提示 (矢量盾牌图标) -->
|
||||
<view class="tips-bar">
|
||||
<image class="tips-svg" :src="ICONS.shield" mode="aspectFit" />
|
||||
<text class="tips-text">同城组局主打美食陪吃、同城陪唱、下午茶陪喝,凭4位核销码现场签到履约</text>
|
||||
<text class="tips-text">AA制聚会人均费用透明平摊,项目制为房主全额请客或悬赏组局,凭4位门票码现场核销</text>
|
||||
</view>
|
||||
|
||||
<!-- 品类横滑筛选胶囊 -->
|
||||
<scroll-view scroll-x class="cat-filter-scroll" :show-scrollbar="false">
|
||||
<view class="cat-filter-list">
|
||||
<view
|
||||
v-for="cat in categoryOptions"
|
||||
:key="cat.key"
|
||||
class="cat-chip btn-active"
|
||||
:class="{ active: currentCategory === cat.key }"
|
||||
@click="selectCategory(cat.key)"
|
||||
>
|
||||
<text class="chip-text">{{ cat.label }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
<!-- 活动列表 -->
|
||||
<view class="activity-list">
|
||||
<view
|
||||
@@ -61,9 +81,9 @@
|
||||
>
|
||||
<!-- 卡片头部 -->
|
||||
<view class="card-header">
|
||||
<view class="game-tag">{{ act.game }}</view>
|
||||
<view class="game-tag" :class="getCategoryTagClass(act.game)">{{ act.game }}</view>
|
||||
<view class="mode-tag" :class="act.payType === 'AA' ? 'aa-mode' : 'project-mode'">
|
||||
{{ act.payType === 'AA' ? 'AA制平摊' : '项目制悬赏' }}
|
||||
{{ act.payType === 'AA' ? 'AA制平摊' : '房主请客' }}
|
||||
</view>
|
||||
<view class="status-pill" :class="act.status">
|
||||
{{ act.status === 'RECRUITING' ? '招募中' : '进行中' }}
|
||||
@@ -73,14 +93,14 @@
|
||||
<!-- 卡片标题 -->
|
||||
<view class="activity-title">{{ act.title }}</view>
|
||||
|
||||
<!-- 详细信息条 (矢量时钟与麦克风) -->
|
||||
<!-- 详细信息条 (矢量时钟与商圈位置) -->
|
||||
<view class="meta-row">
|
||||
<view class="meta-item">
|
||||
<image class="meta-svg" :src="ICONS.clock" mode="aspectFit" />
|
||||
<text class="meta-val">{{ act.startTime }}</text>
|
||||
</view>
|
||||
<view class="meta-item">
|
||||
<image class="meta-svg" :src="ICONS.mic" mode="aspectFit" />
|
||||
<image class="meta-svg" :src="ICONS.mapPin" mode="aspectFit" />
|
||||
<text class="meta-val">{{ act.location }}</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -88,7 +108,7 @@
|
||||
<!-- 进度与头像 -->
|
||||
<view class="progress-section">
|
||||
<view class="progress-info">
|
||||
<text class="progress-label">组队进度</text>
|
||||
<text class="progress-label">组局进度</text>
|
||||
<text class="progress-count tabular-num">{{ act.currentParticipants }} / {{ act.maxParticipants }}人</text>
|
||||
</view>
|
||||
<view class="progress-track">
|
||||
@@ -103,7 +123,7 @@
|
||||
<view class="card-footer">
|
||||
<view class="creator-info">
|
||||
<image class="creator-avatar" :src="act.creatorAvatar" mode="aspectFill" />
|
||||
<text class="creator-name">房主:{{ act.creatorNickname }}</text>
|
||||
<text class="creator-name">局长:{{ act.creatorNickname }}</text>
|
||||
</view>
|
||||
|
||||
<view class="fee-info tabular-num">
|
||||
@@ -112,18 +132,21 @@
|
||||
<text class="fee-amount">¥{{ act.aaFee }}</text>
|
||||
</template>
|
||||
<template v-else>
|
||||
<text class="fee-label">奖金池</text>
|
||||
<text class="fee-label">房主请客</text>
|
||||
<text class="fee-amount project-gold">¥{{ act.totalFee }}</text>
|
||||
</template>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="filteredActivities.length === 0" class="empty-tip">
|
||||
<text>暂无符合条件的组局活动,快来发起吧!</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 悬浮发起活动按钮 (脉冲微流光) -->
|
||||
<view class="fab-btn btn-active" @click="createActivity">
|
||||
<text class="fab-icon">+</text>
|
||||
<text class="fab-text">发起组队</text>
|
||||
<text class="fab-text">发起组局</text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -152,42 +175,38 @@ onUnmounted(() => {
|
||||
uni.$off('theme-change', onThemeChanged);
|
||||
});
|
||||
|
||||
const categoryOptions = [
|
||||
{ key: 'ALL', label: '全部品类' },
|
||||
{ key: 'MEAL', label: '美食陪吃' },
|
||||
{ key: 'SING', label: '同城陪唱' },
|
||||
{ key: 'DRINK', label: '下午茶陪喝' },
|
||||
{ key: 'GAME', label: '电竞开黑' },
|
||||
];
|
||||
|
||||
const selectCategory = (key) => {
|
||||
currentCategory.value = key;
|
||||
const getCategoryTagClass = (game) => {
|
||||
if (game === '美食陪吃') return 'tag-meal';
|
||||
if (game === '同城陪唱') return 'tag-sing';
|
||||
if (game === '下午茶陪喝' || game === '同城微醺') return 'tag-drink';
|
||||
return '';
|
||||
};
|
||||
|
||||
const filteredActivities = computed(() => {
|
||||
let list = activities.value;
|
||||
if (currentTab.value !== 'ALL') {
|
||||
list = list.filter(a => a.payType === currentTab.value);
|
||||
}
|
||||
if (currentCategory.value !== 'ALL') {
|
||||
const map = {
|
||||
MEAL: '美食陪吃',
|
||||
SING: '同城陪唱',
|
||||
DRINK: '下午茶陪喝',
|
||||
GAME: '王者荣耀',
|
||||
};
|
||||
const target = map[currentCategory.value];
|
||||
if (target) {
|
||||
list = list.filter(a => a.game === target);
|
||||
return activities.value.filter(a => {
|
||||
// 支付模式筛选
|
||||
const matchTab = currentTab.value === 'ALL' || a.payType === currentTab.value;
|
||||
// 品类筛选 (美食陪吃 / 同城陪唱 / 下午茶陪喝/微醺)
|
||||
let matchCat = true;
|
||||
if (currentCategory.value === 'MEAL') {
|
||||
matchCat = a.game === '美食陪吃';
|
||||
} else if (currentCategory.value === 'SING') {
|
||||
matchCat = a.game === '同城陪唱';
|
||||
} else if (currentCategory.value === 'DRINK') {
|
||||
matchCat = a.game === '下午茶陪喝' || a.game === '同城微醺';
|
||||
}
|
||||
}
|
||||
return list;
|
||||
return matchTab && matchCat;
|
||||
});
|
||||
});
|
||||
|
||||
const switchTab = (tab) => {
|
||||
currentTab.value = tab;
|
||||
};
|
||||
|
||||
const switchCategory = (cat) => {
|
||||
currentCategory.value = cat;
|
||||
};
|
||||
|
||||
const goToDetail = (id) => {
|
||||
uni.navigateTo({
|
||||
url: `/pages/activity/detail?id=${id}`
|
||||
@@ -261,6 +280,47 @@ const createActivity = () => {
|
||||
}
|
||||
}
|
||||
|
||||
.category-capsule-bar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16rpx;
|
||||
margin-bottom: 24rpx;
|
||||
overflow-x: auto;
|
||||
white-space: nowrap;
|
||||
|
||||
.capsule-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8rpx;
|
||||
padding: 12rpx 24rpx;
|
||||
background: #151D30;
|
||||
border-radius: 30rpx;
|
||||
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||
transition: all 0.2s ease;
|
||||
|
||||
.capsule-svg {
|
||||
width: 26rpx;
|
||||
height: 26rpx;
|
||||
}
|
||||
|
||||
.capsule-text {
|
||||
font-size: 24rpx;
|
||||
color: #94A3B8;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
&.active {
|
||||
background: rgba(99, 102, 241, 0.2);
|
||||
border-color: #6366F1;
|
||||
|
||||
.capsule-text {
|
||||
color: #FFFFFF;
|
||||
font-weight: 700;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.tips-bar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -283,45 +343,18 @@ const createActivity = () => {
|
||||
}
|
||||
}
|
||||
|
||||
.cat-filter-scroll {
|
||||
white-space: nowrap;
|
||||
margin-bottom: 24rpx;
|
||||
|
||||
.cat-filter-list {
|
||||
display: flex;
|
||||
gap: 16rpx;
|
||||
|
||||
.cat-chip {
|
||||
padding: 10rpx 24rpx;
|
||||
border-radius: 28rpx;
|
||||
background: rgba(255, 255, 255, 0.04);
|
||||
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||
transition: all 0.2s ease;
|
||||
|
||||
.chip-text {
|
||||
font-size: 24rpx;
|
||||
color: #94A3B8;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
&.active {
|
||||
background: rgba(99, 102, 241, 0.2);
|
||||
border-color: #6366F1;
|
||||
|
||||
.chip-text {
|
||||
color: #FFF;
|
||||
font-weight: 700;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.activity-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 24rpx;
|
||||
|
||||
.empty-tip {
|
||||
text-align: center;
|
||||
padding: 60rpx 0;
|
||||
font-size: 26rpx;
|
||||
color: #64748B;
|
||||
}
|
||||
|
||||
.activity-card {
|
||||
background-color: #151D30;
|
||||
border-radius: 24rpx;
|
||||
@@ -341,6 +374,22 @@ const createActivity = () => {
|
||||
font-size: 22rpx;
|
||||
padding: 4rpx 14rpx;
|
||||
border-radius: 8rpx;
|
||||
|
||||
&.tag-meal {
|
||||
background: rgba(245, 158, 11, 0.15);
|
||||
color: #FBBF24;
|
||||
border: 1px solid rgba(245, 158, 11, 0.3);
|
||||
}
|
||||
&.tag-sing {
|
||||
background: rgba(244, 63, 94, 0.15);
|
||||
color: #FB7185;
|
||||
border: 1px solid rgba(244, 63, 94, 0.3);
|
||||
}
|
||||
&.tag-drink {
|
||||
background: rgba(16, 185, 129, 0.15);
|
||||
color: #34D399;
|
||||
border: 1px solid rgba(16, 185, 129, 0.3);
|
||||
}
|
||||
}
|
||||
|
||||
.mode-tag {
|
||||
@@ -537,6 +586,14 @@ const createActivity = () => {
|
||||
}
|
||||
}
|
||||
|
||||
.category-capsule-bar .capsule-item.active {
|
||||
background: linear-gradient(135deg, #F97316, #F59E0B);
|
||||
box-shadow: 0 4rpx 14rpx rgba(249, 115, 22, 0.4);
|
||||
.capsule-text {
|
||||
color: #FFF7ED;
|
||||
}
|
||||
}
|
||||
|
||||
.tips-bar {
|
||||
background: rgba(249, 115, 22, 0.1);
|
||||
border-color: rgba(249, 115, 22, 0.25);
|
||||
@@ -545,14 +602,6 @@ const createActivity = () => {
|
||||
}
|
||||
}
|
||||
|
||||
.cat-filter-list .cat-chip.active {
|
||||
background: linear-gradient(135deg, #F97316, #F59E0B);
|
||||
box-shadow: 0 4rpx 14rpx rgba(249, 115, 22, 0.4);
|
||||
.chip-text {
|
||||
color: #FFF7ED;
|
||||
}
|
||||
}
|
||||
|
||||
.activity-list .activity-card {
|
||||
background-color: #221711;
|
||||
border-color: rgba(249, 115, 22, 0.12);
|
||||
|
||||
在新工单中引用
屏蔽一个用户