feat(companion): 全面扩展同城生活陪伴体系(陪吃·陪喝·陪玩),完成TDD测试与安全核销闭环
这个提交包含在:
@@ -26,9 +26,9 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 游戏品类选择 -->
|
||||
<!-- 品类选择 -->
|
||||
<view class="form-card">
|
||||
<view class="card-label">选择开黑游戏</view>
|
||||
<view class="card-label">选择活动品类</view>
|
||||
<view class="game-pills">
|
||||
<view
|
||||
v-for="g in games"
|
||||
@@ -49,27 +49,27 @@
|
||||
<input
|
||||
class="row-input"
|
||||
v-model="form.title"
|
||||
placeholder="如:今晚百星王者五排极速冲分"
|
||||
placeholder="如:三里屯火锅探店 / 百星五排极速冲分"
|
||||
placeholder-class="ph"
|
||||
/>
|
||||
</view>
|
||||
|
||||
<view class="input-row">
|
||||
<text class="row-label">开黑时段</text>
|
||||
<text class="row-label">活动时段</text>
|
||||
<input
|
||||
class="row-input"
|
||||
v-model="form.startTime"
|
||||
placeholder="如:今晚 20:30"
|
||||
placeholder="如:今晚 20:30 / 周六 18:30"
|
||||
placeholder-class="ph"
|
||||
/>
|
||||
</view>
|
||||
|
||||
<view class="input-row">
|
||||
<text class="row-label">语音频道</text>
|
||||
<text class="row-label">地点/频道</text>
|
||||
<input
|
||||
class="row-input"
|
||||
v-model="form.location"
|
||||
placeholder="如:开黑语音 1 号房间 / YY 668899"
|
||||
placeholder="如:朝阳区聚宝源 / 开黑语音 1 号房间"
|
||||
placeholder-class="ph"
|
||||
/>
|
||||
</view>
|
||||
@@ -133,7 +133,7 @@ import { ref, computed } from 'vue';
|
||||
import { ICONS } from '@/common/icons.js';
|
||||
import { ACTIVITIES_LIST } from '@/common/mock.js';
|
||||
|
||||
const games = ['王者荣耀', '和平精英', '英雄联盟', '无畏契约'];
|
||||
const games = ['王者荣耀', '和平精英', '美食陪吃', '同城陪玩', '下午茶陪喝', '英雄联盟'];
|
||||
|
||||
const form = ref({
|
||||
payType: 'AA',
|
||||
|
||||
@@ -25,6 +25,11 @@
|
||||
<text class="rank-tag">{{ expert.rankTag }}</text>
|
||||
</view>
|
||||
|
||||
<view class="city-row" v-if="expert.city">
|
||||
<image class="city-pin-svg" :src="ICONS.mapPin" mode="aspectFit" />
|
||||
<text class="city-text">{{ expert.city }}</text>
|
||||
</view>
|
||||
|
||||
<view class="data-row">
|
||||
<view class="rating-box">
|
||||
<image class="star-svg" :src="ICONS.star" mode="aspectFit" />
|
||||
@@ -82,6 +87,15 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 线下安全守则提示卡 -->
|
||||
<view class="offline-safety-card" v-if="expert.city">
|
||||
<image class="safety-icon-svg" :src="ICONS.shield" mode="aspectFit" />
|
||||
<view class="safety-content">
|
||||
<text class="safety-title">绿色合规陪伴服务承诺</text>
|
||||
<text class="safety-desc">该大神已完成公安实名联网比对与健康认证。同城陪玩/陪吃/陪喝仅限在公开正规商业场所履约,到场出示4位核销码现场签到。</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 战绩与生活照片 -->
|
||||
@@ -322,6 +336,23 @@ const goToOrder = () => {
|
||||
}
|
||||
}
|
||||
|
||||
.city-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6rpx;
|
||||
margin-bottom: 8rpx;
|
||||
|
||||
.city-pin-svg {
|
||||
width: 22rpx;
|
||||
height: 22rpx;
|
||||
}
|
||||
.city-text {
|
||||
font-size: 20rpx;
|
||||
color: #38BDF8;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
|
||||
.data-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -494,6 +525,41 @@ const goToOrder = () => {
|
||||
}
|
||||
}
|
||||
|
||||
.offline-safety-card {
|
||||
margin-top: 20rpx;
|
||||
background: rgba(16, 185, 129, 0.08);
|
||||
border: 1px solid rgba(16, 185, 129, 0.2);
|
||||
border-radius: 16rpx;
|
||||
padding: 16rpx 20rpx;
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 12rpx;
|
||||
|
||||
.safety-icon-svg {
|
||||
width: 32rpx;
|
||||
height: 32rpx;
|
||||
flex-shrink: 0;
|
||||
margin-top: 4rpx;
|
||||
}
|
||||
.safety-content {
|
||||
flex: 1;
|
||||
|
||||
.safety-title {
|
||||
font-size: 22rpx;
|
||||
font-weight: 600;
|
||||
color: #10B981;
|
||||
display: block;
|
||||
margin-bottom: 4rpx;
|
||||
}
|
||||
.safety-desc {
|
||||
font-size: 20rpx;
|
||||
color: #94A3B8;
|
||||
line-height: 1.4;
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.gallery-scroll {
|
||||
white-space: nowrap;
|
||||
|
||||
|
||||
@@ -235,6 +235,13 @@ const poolOrders = ref([
|
||||
price: 45,
|
||||
desc: '微信区/四排海岛/刚枪上分/kd保4以上',
|
||||
countdown: 32
|
||||
},
|
||||
{
|
||||
id: 'pool_103',
|
||||
game: '美食陪吃',
|
||||
price: 68,
|
||||
desc: '朝阳大悦城海底捞/周末饭搭子/消费现场AA/需守时礼貌',
|
||||
countdown: 56
|
||||
}
|
||||
]);
|
||||
|
||||
@@ -247,6 +254,15 @@ const activeOrders = ref([
|
||||
hours: 2,
|
||||
totalAmount: 70,
|
||||
statusText: '正在开黑连麦对局中'
|
||||
},
|
||||
{
|
||||
id: 'ord_active_2',
|
||||
buyerName: '北京吃货小张',
|
||||
buyerAvatar: 'https://images.unsplash.com/photo-1507003211169-0a1dd7228f2d?w=150&h=150&fit=crop',
|
||||
serviceTitle: '火锅探店饭搭子',
|
||||
hours: 2,
|
||||
totalAmount: 136,
|
||||
statusText: '已核销4位码入座,服务中'
|
||||
}
|
||||
]);
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<view class="header-search">
|
||||
<view class="search-box">
|
||||
<image class="search-icon-img" :src="ICONS.search" mode="aspectFit" />
|
||||
<input class="search-input" placeholder="搜索陪玩大神、游戏昵称或项目" placeholder-class="placeholder-text" />
|
||||
<input class="search-input" placeholder="搜索电竞陪玩、同城陪吃陪喝或大神" placeholder-class="placeholder-text" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -110,7 +110,11 @@
|
||||
<image class="gender-svg" :src="expert.gender === 'female' ? ICONS.female : ICONS.male" mode="aspectFit" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="rank-badge">{{ expert.rankTag }}</view>
|
||||
<view class="city-badge" v-if="expert.city">
|
||||
<image class="city-pin-svg" :src="ICONS.mapPin" mode="aspectFit" />
|
||||
<text class="city-text">{{ expert.city }}</text>
|
||||
</view>
|
||||
<view class="rank-badge" v-else>{{ expert.rankTag }}</view>
|
||||
|
||||
<!-- 语音试听条 (矢量SVG播放图标,带播放高亮光晕) -->
|
||||
<view class="voice-bar btn-active" :class="{ playing: playingId === expert.id }" @click.stop="toggleVoice(expert.id)">
|
||||
@@ -151,6 +155,9 @@ const playingId = ref(null);
|
||||
const filteredExperts = computed(() => {
|
||||
if (currentCategory.value === 'all') return experts.value;
|
||||
const gameMap = {
|
||||
offline_meal: '美食陪吃',
|
||||
offline_drink: '下午茶陪喝',
|
||||
offline_play: '同城陪玩',
|
||||
wzry: '王者荣耀',
|
||||
hpjy: '和平精英',
|
||||
lol: '英雄联盟',
|
||||
@@ -563,6 +570,24 @@ const navTo = (url) => {
|
||||
}
|
||||
}
|
||||
|
||||
.city-badge {
|
||||
font-size: 20rpx;
|
||||
color: #38BDF8;
|
||||
background: rgba(56, 189, 248, 0.12);
|
||||
padding: 4rpx 10rpx;
|
||||
border-radius: 6rpx;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
margin-bottom: 12rpx;
|
||||
border: 1px solid rgba(56, 189, 248, 0.2);
|
||||
|
||||
.city-pin-svg {
|
||||
width: 20rpx;
|
||||
height: 20rpx;
|
||||
margin-right: 6rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.rank-badge {
|
||||
font-size: 20rpx;
|
||||
color: #F59E0B;
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 优惠抵扣与备注 -->
|
||||
<!-- 优惠抵扣与履约约定 -->
|
||||
<view class="order-card">
|
||||
<view class="coupon-row btn-active" @click="selectCoupon">
|
||||
<text class="cell-label">优惠券</text>
|
||||
@@ -70,9 +70,49 @@
|
||||
<text class="arrow">></text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="remark-row">
|
||||
|
||||
<!-- 线下同城专属:商圈场所与消费约定 -->
|
||||
<block v-if="isOffline">
|
||||
<view class="remark-row">
|
||||
<text class="cell-label">碰面场所</text>
|
||||
<input class="remark-input" v-model="meetVenue" placeholder="必须为公开正规场所,如:朝阳大悦城海底捞" placeholder-class="ph" />
|
||||
</view>
|
||||
<view class="expense-row">
|
||||
<text class="cell-label">现场消费</text>
|
||||
<view class="expense-pills">
|
||||
<view
|
||||
class="expense-pill btn-active"
|
||||
:class="{ active: expenseBurden === 'AA' }"
|
||||
@click="expenseBurden = 'AA'"
|
||||
>
|
||||
AA制各自付
|
||||
</view>
|
||||
<view
|
||||
class="expense-pill btn-active"
|
||||
:class="{ active: expenseBurden === 'TREAT' }"
|
||||
@click="expenseBurden = 'TREAT'"
|
||||
>
|
||||
老板请客
|
||||
</view>
|
||||
<view
|
||||
class="expense-pill btn-active"
|
||||
:class="{ active: expenseBurden === 'SELF' }"
|
||||
@click="expenseBurden = 'SELF'"
|
||||
>
|
||||
大神自理
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="safety-tip-card">
|
||||
<image class="safety-icon-svg" :src="ICONS.shield" mode="aspectFit" />
|
||||
<text class="safety-text">绿色阳光陪伴声明:服务仅限在正规公开商业场所进行。双方碰面后将出示 4 位数字核销码进行现场签到,保障双方人身与财产安全。</text>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- 线上游戏专属:开黑区服与要求 -->
|
||||
<view class="remark-row" v-else>
|
||||
<text class="cell-label">开黑要求/游戏ID</text>
|
||||
<input class="remark-input" v-model="remark" placeholder="如:QQ区/王者段位/包赢" placeholder-class="ph" />
|
||||
<input class="remark-input" v-model="remark" placeholder="如:微信区/王者星耀段位/包赢" placeholder-class="ph" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -115,6 +155,19 @@ const hours = ref(2);
|
||||
const timeType = ref('NOW');
|
||||
const discount = ref(10);
|
||||
const remark = ref('');
|
||||
const meetVenue = ref('朝阳大悦城海底捞');
|
||||
const expenseBurden = ref('AA');
|
||||
|
||||
const isOffline = computed(() => {
|
||||
return expert.value && (
|
||||
expert.value.track === 'OFFLINE_MEAL' ||
|
||||
expert.value.track === 'OFFLINE_DRINK' ||
|
||||
expert.value.track === 'OFFLINE_PLAY' ||
|
||||
expert.value.game === '美食陪吃' ||
|
||||
expert.value.game === '下午茶陪喝' ||
|
||||
expert.value.game === '同城陪玩'
|
||||
);
|
||||
});
|
||||
|
||||
onLoad((query) => {
|
||||
if (query && query.expertId) {
|
||||
@@ -389,6 +442,63 @@ const handlePay = () => {
|
||||
}
|
||||
}
|
||||
|
||||
.expense-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 20rpx 0;
|
||||
border-top: 1px solid rgba(255, 255, 255, 0.05);
|
||||
|
||||
.cell-label {
|
||||
font-size: 24rpx;
|
||||
color: #64748B;
|
||||
width: 220rpx;
|
||||
}
|
||||
|
||||
.expense-pills {
|
||||
display: flex;
|
||||
gap: 12rpx;
|
||||
|
||||
.expense-pill {
|
||||
font-size: 22rpx;
|
||||
color: #94A3B8;
|
||||
background: rgba(255, 255, 255, 0.05);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
padding: 6rpx 16rpx;
|
||||
border-radius: 12rpx;
|
||||
|
||||
&.active {
|
||||
color: #F59E0B;
|
||||
background: rgba(245, 158, 11, 0.15);
|
||||
border-color: #F59E0B;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.safety-tip-card {
|
||||
margin-top: 20rpx;
|
||||
background: rgba(16, 185, 129, 0.08);
|
||||
border: 1px solid rgba(16, 185, 129, 0.2);
|
||||
border-radius: 16rpx;
|
||||
padding: 16rpx 20rpx;
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 12rpx;
|
||||
|
||||
.safety-icon-svg {
|
||||
width: 28rpx;
|
||||
height: 28rpx;
|
||||
flex-shrink: 0;
|
||||
margin-top: 4rpx;
|
||||
}
|
||||
.safety-text {
|
||||
font-size: 20rpx;
|
||||
color: #10B981;
|
||||
line-height: 1.5;
|
||||
}
|
||||
}
|
||||
|
||||
.fee-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
在新工单中引用
屏蔽一个用户