Compare commits
No commits in common. "main" and "zuncle" have entirely different histories.
3
App.vue
3
App.vue
@ -11,6 +11,7 @@ export default {
|
||||
try { uni.setStorageSync('inviter_code', options.query.invite_code) } catch (e) { console.error('Save invite code failed', e) }
|
||||
}
|
||||
|
||||
// 加载公开配置 (如订阅消息模板ID)
|
||||
getPublicConfig().then(res => {
|
||||
if (res && res.subscribe_templates) {
|
||||
console.log('Loaded public config:', res)
|
||||
@ -19,6 +20,8 @@ export default {
|
||||
}).catch(err => {
|
||||
console.warn('Failed to load public config:', err)
|
||||
})
|
||||
|
||||
// 抖音平台现在也显示首页，不再需要强制跳转
|
||||
},
|
||||
onShow: function() {
|
||||
console.log('App Show')
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
{
|
||||
"prompt" : "template"
|
||||
}
|
||||
@ -154,10 +154,6 @@ export function requestShipping(user_id, ids, address_id) {
|
||||
return authRequest({ url: `/api/app/users/${user_id}/inventory/request-shipping`, method: 'POST', data })
|
||||
}
|
||||
|
||||
export function checkShippingFee(user_id, ids) {
|
||||
return authRequest({ url: `/api/app/users/${user_id}/inventory/shipping-fee/check`, method: 'POST', data: { inventory_ids: ids } })
|
||||
}
|
||||
|
||||
export function createShippingFeeOrder(user_id, ids) {
|
||||
return authRequest({ url: `/api/app/users/${user_id}/inventory/shipping-fee/preorder`, method: 'POST', data: { inventory_ids: ids } })
|
||||
}
|
||||
@ -439,10 +435,3 @@ export function purchaseGamePass(package_id, count = 1, coupon_ids = []) {
|
||||
export function bindDouyinID(douyin_id) {
|
||||
return authRequest({ url: '/api/app/users/douyin/bind', method: 'POST', data: { douyin_id } })
|
||||
}
|
||||
|
||||
/**
|
||||
* 同步当前用户绑定的抖音订单
|
||||
*/
|
||||
export function syncMyDouyinOrders() {
|
||||
return authRequest({ url: '/api/app/users/douyin/orders/sync', method: 'POST' })
|
||||
}
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
import { authRequest } from '@/utils/request'
|
||||
|
||||
export function getPendingPrizeGrantActivity() {
|
||||
return authRequest({ url: '/api/app/prize-grant-activities/pending', method: 'GET' })
|
||||
}
|
||||
|
||||
export function claimPrizeGrantActivity(id) {
|
||||
return authRequest({ url: `/api/app/prize-grant-activities/${id}/claim`, method: 'POST' })
|
||||
}
|
||||
@ -8,10 +8,6 @@ export function doSynthesis(userId, recipeId) {
|
||||
return authRequest({ url: `/api/app/users/${userId}/synthesis/do`, method: 'POST', data: { recipe_id: recipeId } })
|
||||
}
|
||||
|
||||
export function doBatchSynthesis(userId, recipeId) {
|
||||
return authRequest({ url: `/api/app/users/${userId}/synthesis/do-batch`, method: 'POST', data: { recipe_id: recipeId } })
|
||||
}
|
||||
|
||||
export function getSynthesisLogs(userId, page = 1, pageSize = 20) {
|
||||
return authRequest({ url: `/api/app/users/${userId}/synthesis/logs`, method: 'GET', data: { page, page_size: pageSize } })
|
||||
}
|
||||
|
||||
@ -1,289 +0,0 @@
|
||||
<template>
|
||||
<view v-if="visible && activity" class="prize-claim-overlay" @touchmove.stop.prevent>
|
||||
<view class="prize-claim-mask" @tap="handleClose"></view>
|
||||
<view class="prize-claim-panel" @tap.stop>
|
||||
<view class="prize-claim-hero">
|
||||
<view class="hero-glow"></view>
|
||||
<view class="hero-top">
|
||||
<view class="hero-badge">奖励发放</view>
|
||||
<text class="prize-claim-close" @tap="handleClose">×</text>
|
||||
</view>
|
||||
<view class="hero-content">
|
||||
<text class="hero-title">奖励已到账，待你领取</text>
|
||||
<text class="hero-reason">{{ activity.reason }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="prize-claim-body">
|
||||
<view class="section-title">奖品内容</view>
|
||||
<view class="reward-list">
|
||||
<view
|
||||
v-for="(item, index) in activity.rewards || []"
|
||||
:key="`${item.reward_type}-${item.reward_ref_id}-${index}`"
|
||||
class="reward-item"
|
||||
>
|
||||
<view class="reward-thumb-wrap">
|
||||
<image v-if="item.image" class="reward-thumb" :src="item.image" mode="aspectFill" />
|
||||
<view v-else class="reward-thumb-empty">{{ typeShortLabel(item.reward_type) }}</view>
|
||||
</view>
|
||||
<view class="reward-main">
|
||||
<text class="reward-name">{{ item.name || item.reward_type }}</text>
|
||||
<view class="reward-meta-row">
|
||||
<text class="reward-type">{{ typeLabel(item.reward_type) }}</text>
|
||||
<text v-if="item.value_cents > 0" class="reward-value">单价 ¥{{ (item.value_cents / 100).toFixed(2) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="reward-side">
|
||||
<text class="reward-quantity">x{{ item.quantity }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="prize-claim-footer">
|
||||
<button class="claim-button" :disabled="loading" @tap="handleClaim">
|
||||
{{ loading ? '领取中...' : '立即领取' }}
|
||||
</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
const props = defineProps({
|
||||
visible: { type: Boolean, default: false },
|
||||
activity: { type: Object, default: null },
|
||||
loading: { type: Boolean, default: false }
|
||||
})
|
||||
|
||||
const emit = defineEmits(['update:visible', 'claim', 'close'])
|
||||
|
||||
function handleClose() {
|
||||
emit('close')
|
||||
emit('update:visible', false)
|
||||
}
|
||||
|
||||
function handleClaim() {
|
||||
if (!props.loading) emit('claim')
|
||||
}
|
||||
|
||||
function typeLabel(type) {
|
||||
if (type === 'product') return '商品'
|
||||
if (type === 'coupon') return '优惠券'
|
||||
if (type === 'item_card') return '道具卡'
|
||||
return type
|
||||
}
|
||||
|
||||
function typeShortLabel(type) {
|
||||
if (type === 'product') return '商品'
|
||||
if (type === 'coupon') return '券'
|
||||
if (type === 'item_card') return '卡'
|
||||
return '奖'
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.prize-claim-overlay {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 1001;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.prize-claim-mask {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
background: rgba(0, 0, 0, 0.55);
|
||||
backdrop-filter: blur(6rpx);
|
||||
}
|
||||
|
||||
.prize-claim-panel {
|
||||
position: relative;
|
||||
width: 88%;
|
||||
max-height: 78vh;
|
||||
background: $bg-card;
|
||||
border-radius: $radius-xl;
|
||||
overflow: hidden;
|
||||
box-shadow: $shadow-lg;
|
||||
animation: slideUp 0.25s ease-out;
|
||||
}
|
||||
|
||||
.prize-claim-hero {
|
||||
position: relative;
|
||||
padding: $spacing-lg $spacing-lg $spacing-xl;
|
||||
background: linear-gradient(135deg, $brand-primary 0%, $brand-primary-light 100%);
|
||||
}
|
||||
|
||||
.hero-glow {
|
||||
position: absolute;
|
||||
right: -80rpx;
|
||||
top: -80rpx;
|
||||
width: 260rpx;
|
||||
height: 260rpx;
|
||||
border-radius: 50%;
|
||||
background: rgba(255, 255, 255, 0.16);
|
||||
}
|
||||
|
||||
.hero-top {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: $spacing-lg;
|
||||
}
|
||||
|
||||
.hero-badge {
|
||||
padding: 8rpx 18rpx;
|
||||
border-radius: 999rpx;
|
||||
background: rgba(255, 255, 255, 0.18);
|
||||
color: #fff;
|
||||
font-size: $font-xs;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.prize-claim-close {
|
||||
color: rgba(255, 255, 255, 0.9);
|
||||
font-size: 48rpx;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.hero-content {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.hero-title {
|
||||
display: block;
|
||||
font-size: 40rpx;
|
||||
font-weight: 700;
|
||||
color: #fff;
|
||||
line-height: 1.3;
|
||||
margin-bottom: 12rpx;
|
||||
}
|
||||
|
||||
.hero-reason {
|
||||
display: block;
|
||||
font-size: $font-md;
|
||||
color: rgba(255, 255, 255, 0.92);
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.prize-claim-body {
|
||||
padding: $spacing-lg;
|
||||
}
|
||||
|
||||
.section-title {
|
||||
font-size: $font-md;
|
||||
font-weight: 700;
|
||||
color: $text-main;
|
||||
margin-bottom: $spacing-md;
|
||||
}
|
||||
|
||||
.reward-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: $spacing-md;
|
||||
}
|
||||
|
||||
.reward-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: $spacing-md;
|
||||
background: $bg-page;
|
||||
border-radius: $radius-lg;
|
||||
padding: $spacing-md;
|
||||
}
|
||||
|
||||
.reward-thumb-wrap {
|
||||
width: 112rpx;
|
||||
height: 112rpx;
|
||||
border-radius: $radius-md;
|
||||
overflow: hidden;
|
||||
flex-shrink: 0;
|
||||
background: #fff;
|
||||
box-shadow: $shadow-sm;
|
||||
}
|
||||
|
||||
.reward-thumb {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.reward-thumb-empty {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: $font-sm;
|
||||
color: $text-sub;
|
||||
background: rgba($brand-primary, 0.08);
|
||||
}
|
||||
|
||||
.reward-main {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10rpx;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.reward-name {
|
||||
font-size: $font-md;
|
||||
color: $text-main;
|
||||
font-weight: 700;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.reward-meta-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 12rpx;
|
||||
}
|
||||
|
||||
.reward-type,
|
||||
.reward-value,
|
||||
.reward-quantity {
|
||||
font-size: $font-sm;
|
||||
color: $text-sub;
|
||||
}
|
||||
|
||||
.reward-value {
|
||||
color: $brand-primary-dark;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.reward-side {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-width: 64rpx;
|
||||
}
|
||||
|
||||
.reward-quantity {
|
||||
font-size: $font-md;
|
||||
font-weight: 700;
|
||||
color: $brand-primary;
|
||||
}
|
||||
|
||||
.prize-claim-footer {
|
||||
padding: 0 $spacing-lg $spacing-lg;
|
||||
}
|
||||
|
||||
.claim-button {
|
||||
width: 100%;
|
||||
border: none;
|
||||
border-radius: $radius-round;
|
||||
background: linear-gradient(135deg, $brand-primary, $brand-primary-light);
|
||||
color: #fff;
|
||||
font-size: $font-md;
|
||||
font-weight: 700;
|
||||
padding: 24rpx 0;
|
||||
box-shadow: $shadow-warm;
|
||||
}
|
||||
|
||||
.claim-button[disabled] {
|
||||
opacity: 0.65;
|
||||
}
|
||||
</style>
|
||||
@ -8,4 +8,3 @@ export { default as ActivityTabs } from './ActivityTabs.vue'
|
||||
export { default as RewardsPreview } from './RewardsPreview.vue'
|
||||
export { default as RewardsPopup } from './RewardsPopup.vue'
|
||||
export { default as RecordsList } from './RecordsList.vue'
|
||||
export { default as PrizeClaimPopup } from './PrizeClaimPopup.vue'
|
||||
|
||||
@ -1,423 +0,0 @@
|
||||
<template>
|
||||
<view class="welfare-detail-page" v-if="detail">
|
||||
<image v-if="detail.cover_image" class="detail-cover" :src="detail.cover_image" mode="aspectFill" />
|
||||
<view v-else class="detail-cover empty">暂无活动图片</view>
|
||||
|
||||
<view class="detail-panel hero-panel">
|
||||
<view class="hero-head">
|
||||
<text class="detail-title">{{ detail.title }}</text>
|
||||
<text class="detail-type" :class="typeClass(detail.type)">{{ typeLabel(detail.type) }}</text>
|
||||
</view>
|
||||
<text class="detail-status">{{ statusText(detail.status) }}</text>
|
||||
<text class="detail-time">开奖时间：{{ formatTime(detail.draw_time) }}</text>
|
||||
<text class="detail-desc" v-if="detail.description">{{ detail.description }}</text>
|
||||
</view>
|
||||
|
||||
<view class="detail-panel join-panel">
|
||||
<view class="panel-head">
|
||||
<text class="panel-title">我的参与进度</text>
|
||||
<text class="panel-side">{{ progressText }}</text>
|
||||
</view>
|
||||
<view class="progress-bar">
|
||||
<view class="progress-fill" :style="{ width: progressPercent + '%' }"></view>
|
||||
</view>
|
||||
<view class="progress-foot">
|
||||
<text class="progress-hint">{{ progressHint }}</text>
|
||||
<view
|
||||
class="join-btn"
|
||||
:class="joinButtonClass"
|
||||
@tap="handleJoin"
|
||||
>
|
||||
{{ joinButtonText }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="detail-panel">
|
||||
<view class="panel-head">
|
||||
<text class="panel-title">奖品</text>
|
||||
<text v-if="sortedPrizes.length > 1" class="panel-side">按价格从高到低</text>
|
||||
</view>
|
||||
<scroll-view v-if="sortedPrizes.length" scroll-x class="prize-scroll" show-scrollbar="false">
|
||||
<view class="prize-track">
|
||||
<view v-for="prize in sortedPrizes" :key="prize.id" class="prize-item">
|
||||
<image v-if="prize.image" class="prize-image" :src="prize.image" mode="aspectFill" />
|
||||
<view v-else class="prize-image empty">{{ prizePlaceholderText(prize) }}</view>
|
||||
<text class="prize-name">{{ prize.name }}</text>
|
||||
<text class="prize-price">参考价 ¥{{ formatAmount(prizePrice(prize)) }}</text>
|
||||
<text class="prize-count">x{{ prize.quantity }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<view v-else class="empty-text">暂无奖品</view>
|
||||
</view>
|
||||
|
||||
<view class="detail-panel">
|
||||
<view class="panel-head participant-head">
|
||||
<text class="panel-title">参与玩家</text>
|
||||
<view class="participant-head-actions">
|
||||
<view class="head-action-btn overview" @tap="openWinnerOverview">中奖概览</view>
|
||||
<view v-if="showMoreParticipants" class="head-action-btn" @tap="openParticipantsPopup">查看更多</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="participant-meta-row">
|
||||
<text class="panel-side">共 {{ participantCount }} 人</text>
|
||||
</view>
|
||||
<view class="avatar-row" v-if="previewParticipants.length">
|
||||
<view
|
||||
v-for="player in previewParticipants"
|
||||
:key="player.user_id"
|
||||
class="avatar-item"
|
||||
:class="{ mine: isSelfParticipant(player) }"
|
||||
>
|
||||
<image class="participant-avatar" :src="player.avatar || '/static/logo.png'" mode="aspectFill" />
|
||||
</view>
|
||||
</view>
|
||||
<view v-else class="empty-text">暂无参与玩家</view>
|
||||
</view>
|
||||
|
||||
<view class="detail-panel history-entry" @tap="goHistory">
|
||||
<view>
|
||||
<text class="panel-title">查看往期活动</text>
|
||||
<text class="history-subtitle">浏览已结束的福利活动与中奖信息</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="winnerPopupVisible" class="winner-popup-overlay" @touchmove.stop.prevent>
|
||||
<view class="winner-popup-mask" @tap="winnerPopupVisible = false"></view>
|
||||
<view class="winner-popup-panel" @tap.stop>
|
||||
<view class="winner-popup-head">
|
||||
<text class="winner-popup-title">当前活动中奖概览</text>
|
||||
<text class="winner-popup-close" @tap="winnerPopupVisible = false">×</text>
|
||||
</view>
|
||||
<scroll-view scroll-y class="winner-popup-list">
|
||||
<view v-if="winnerOverviewList.length">
|
||||
<view v-for="item in winnerOverviewList" :key="item.id" class="winner-popup-item">
|
||||
<image v-if="item.prize_image" class="winner-popup-image" :src="item.prize_image" mode="aspectFill" />
|
||||
<view v-else class="winner-popup-image empty">{{ rewardPlaceholderText(item) }}</view>
|
||||
<view class="winner-popup-info">
|
||||
<text class="winner-popup-name">{{ item.nickname || ('用户' + item.user_id) }} · {{ item.prize_name }}</text>
|
||||
<text class="winner-popup-price">参考价 ¥{{ formatAmount(winnerPrice(item)) }}</text>
|
||||
<text class="winner-popup-time">{{ formatTime(item.created_at) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else class="empty-text">还未开奖</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="participantsPopupVisible" class="winner-popup-overlay" @touchmove.stop.prevent>
|
||||
<view class="winner-popup-mask" @tap="participantsPopupVisible = false"></view>
|
||||
<view class="winner-popup-panel" @tap.stop>
|
||||
<view class="winner-popup-head">
|
||||
<text class="winner-popup-title">全部参与玩家</text>
|
||||
<text class="winner-popup-close" @tap="participantsPopupVisible = false">×</text>
|
||||
</view>
|
||||
<scroll-view scroll-y class="winner-popup-list">
|
||||
<view v-if="allParticipants.length">
|
||||
<view v-for="player in allParticipants" :key="player.user_id" class="winner-popup-item participant-popup-item">
|
||||
<image class="winner-popup-image participant-popup-avatar" :src="player.avatar || '/static/logo.png'" mode="aspectFill" />
|
||||
<view class="winner-popup-info">
|
||||
<text class="winner-popup-name">{{ player.nickname || ('用户' + player.user_id) }}</text>
|
||||
<text class="winner-popup-time" :class="{ 'self-tag': isSelfParticipant(player) }">
|
||||
{{ isSelfParticipant(player) ? '我已参与' : '活动参与玩家' }}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else class="empty-text">暂无参与玩家</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { request, authRequest } from '@/utils/request.js'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
detail: null,
|
||||
winners: [],
|
||||
participants: [],
|
||||
participantsPage: 1,
|
||||
participantsPageSize: 20,
|
||||
participantsLoading: false,
|
||||
winnerPopupVisible: false,
|
||||
participantsPopupVisible: false,
|
||||
currentUserId: 0
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
sortedPrizes() {
|
||||
const prizes = Array.isArray(this.detail?.prizes) ? [...this.detail.prizes] : []
|
||||
return prizes.sort((a, b) => {
|
||||
const aPrice = this.prizePrice(a)
|
||||
const bPrice = this.prizePrice(b)
|
||||
if (aPrice !== bPrice) return bPrice - aPrice
|
||||
return Number(a.sort || 0) - Number(b.sort || 0)
|
||||
})
|
||||
},
|
||||
progressPercent() {
|
||||
const current = Number(this.detail?.current_paid || 0)
|
||||
const target = Number(this.detail?.threshold_amount || 0)
|
||||
if (target <= 0) return this.detail?.joined ? 100 : 0
|
||||
return Math.max(0, Math.min(100, Math.round((current / target) * 100)))
|
||||
},
|
||||
progressText() {
|
||||
const current = this.formatAmount(this.detail?.current_paid || 0)
|
||||
const target = this.formatAmount(this.detail?.threshold_amount || 0)
|
||||
return `${this.windowLabel(this.detail?.type)}消费 ${current}/${target}`
|
||||
},
|
||||
progressHint() {
|
||||
if (this.detail?.joined) return '您已成功参加本期活动'
|
||||
if (this.detail?.can_join) return '已达参与门槛，可立即参加活动'
|
||||
const startTime = this.detail?.start_time ? new Date(this.detail.start_time).getTime() : 0
|
||||
if (startTime && startTime > Date.now()) {
|
||||
return `活动将于 ${this.formatTime(this.detail.start_time)} 开始`
|
||||
}
|
||||
const target = Number(this.detail?.threshold_amount || 0)
|
||||
const current = Number(this.detail?.current_paid || 0)
|
||||
if (target > current) {
|
||||
return `还差 ¥${this.formatAmount(target - current)} 即可参加`
|
||||
}
|
||||
return '当前未满足参加条件'
|
||||
},
|
||||
joinButtonText() {
|
||||
if (this.detail?.joined) return '已参加'
|
||||
const startTime = this.detail?.start_time ? new Date(this.detail.start_time).getTime() : 0
|
||||
if (startTime && startTime > Date.now()) return '未开始'
|
||||
if (this.detail?.can_join) return '参加活动'
|
||||
return '未达门槛'
|
||||
},
|
||||
joinButtonClass() {
|
||||
if (this.detail?.joined) return 'disabled'
|
||||
if (this.detail?.can_join) return 'primary'
|
||||
return 'muted'
|
||||
},
|
||||
participantCount() {
|
||||
return Number(this.detail?.participant_count || this.participants.length || 0)
|
||||
},
|
||||
previewParticipants() {
|
||||
return this.sortedParticipants.slice(0, 6)
|
||||
},
|
||||
sortedParticipants() {
|
||||
const list = Array.isArray(this.participants) ? [...this.participants] : []
|
||||
if (!this.currentUserId) return list
|
||||
return list.sort((a, b) => {
|
||||
const aSelf = Number(a?.user_id || 0) === this.currentUserId ? 1 : 0
|
||||
const bSelf = Number(b?.user_id || 0) === this.currentUserId ? 1 : 0
|
||||
return bSelf - aSelf
|
||||
})
|
||||
},
|
||||
showMoreParticipants() {
|
||||
return this.participantCount > this.previewParticipants.length
|
||||
},
|
||||
allParticipants() {
|
||||
return this.sortedParticipants
|
||||
},
|
||||
winnerOverviewList() {
|
||||
return Array.isArray(this.winners) ? this.winners : []
|
||||
},
|
||||
},
|
||||
onLoad(options) {
|
||||
this.id = Number(options?.id || 0)
|
||||
this.loadData()
|
||||
},
|
||||
methods: {
|
||||
async loadData() {
|
||||
if (!this.id) return
|
||||
try {
|
||||
try {
|
||||
this.detail = await authRequest({ url: `/api/app/welfare-activities/${this.id}/my`, suppressAuthModal: true })
|
||||
} catch (_) {
|
||||
this.detail = await request({ url: `/api/app/welfare-activities/${this.id}` })
|
||||
}
|
||||
if (!this.detail.cover_image && this.detail.prizes && this.detail.prizes.length) {
|
||||
this.detail.cover_image = this.detail.prizes.find((item) => item.image)?.image || ''
|
||||
}
|
||||
this.participants = Array.isArray(this.detail?.participants) ? this.detail.participants : []
|
||||
this.currentUserId = Number(uni.getStorageSync('user_id') || 0)
|
||||
this.participantsPage = 1
|
||||
const winnersRes = await request({ url: `/api/app/welfare-activities/${this.id}/winners?page=1&page_size=100` })
|
||||
this.winners = winnersRes?.list || []
|
||||
} catch (e) {
|
||||
uni.showToast({ title: e.message || '加载失败', icon: 'none' })
|
||||
}
|
||||
},
|
||||
async handleJoin() {
|
||||
if (this.detail?.joined || !this.detail?.can_join) return
|
||||
try {
|
||||
await authRequest({ url: `/api/app/welfare-activities/${this.id}/join`, method: 'POST' })
|
||||
uni.showToast({ title: '参加成功', icon: 'success' })
|
||||
await this.loadData()
|
||||
} catch (e) {
|
||||
uni.showToast({ title: e.message || '参加失败', icon: 'none' })
|
||||
}
|
||||
},
|
||||
async loadMoreParticipants() {
|
||||
if (this.participantsLoading) return
|
||||
if (this.participants.length >= this.participantCount) return
|
||||
this.participantsLoading = true
|
||||
try {
|
||||
const nextPage = this.participantsPage + 1
|
||||
const res = await request({
|
||||
url: `/api/app/welfare-activities/${this.id}/participants?page=${nextPage}&page_size=${this.participantsPageSize}`
|
||||
})
|
||||
const list = Array.isArray(res?.list) ? res.list : []
|
||||
const seen = new Set(this.participants.map(item => String(item.user_id)))
|
||||
list.forEach(item => {
|
||||
const key = String(item.user_id)
|
||||
if (!seen.has(key)) {
|
||||
seen.add(key)
|
||||
this.participants.push(item)
|
||||
}
|
||||
})
|
||||
this.participantsPage = nextPage
|
||||
} catch (e) {
|
||||
uni.showToast({ title: e.message || '加载参与玩家失败', icon: 'none' })
|
||||
} finally {
|
||||
this.participantsLoading = false
|
||||
}
|
||||
},
|
||||
async openParticipantsPopup() {
|
||||
this.participantsPopupVisible = true
|
||||
await this.loadAllParticipants()
|
||||
},
|
||||
async loadAllParticipants() {
|
||||
if (this.participantsLoading) return
|
||||
while (this.participants.length < this.participantCount) {
|
||||
const prevLength = this.participants.length
|
||||
await this.loadMoreParticipants()
|
||||
if (this.participants.length === prevLength) break
|
||||
}
|
||||
},
|
||||
openWinnerOverview() {
|
||||
this.winnerPopupVisible = true
|
||||
},
|
||||
goHistory() {
|
||||
uni.navigateTo({ url: '/pages-activity/activity/welfare/index?mode=finished' })
|
||||
},
|
||||
statusText(status) {
|
||||
return { active: '进行中', finished: '已结束' }[status] || status || '-'
|
||||
},
|
||||
typeLabel(type) {
|
||||
return { daily: '每日福利', weekly: '每周福利', monthly: '每月福利' }[type] || '福利活动'
|
||||
},
|
||||
typeClass(type) {
|
||||
return {
|
||||
daily: 'type-daily',
|
||||
weekly: 'type-weekly',
|
||||
monthly: 'type-monthly'
|
||||
}[type] || 'type-default'
|
||||
},
|
||||
windowLabel(type) {
|
||||
return { daily: '每日', weekly: '每周', monthly: '每月' }[type] || '活动'
|
||||
},
|
||||
formatTime(v) {
|
||||
if (!v) return '-'
|
||||
return String(v).replace('T', ' ').slice(0, 16)
|
||||
},
|
||||
formatAmount(cents) {
|
||||
return (Number(cents || 0) / 100).toFixed(2)
|
||||
},
|
||||
prizePrice(prize) {
|
||||
return Number(prize?.price_cents ?? prize?.price ?? prize?.product_price ?? prize?.price_snapshot_cents ?? 0)
|
||||
},
|
||||
winnerPrice(item) {
|
||||
return Number(item?.price_cents ?? item?.price ?? item?.product_price ?? item?.price_snapshot_cents ?? 0)
|
||||
},
|
||||
rewardPlaceholderText(item) {
|
||||
const type = String(item?.reward_type || '').toLowerCase()
|
||||
if (type === 'coupon') return '优惠券'
|
||||
if (type === 'item_card') return '道具卡'
|
||||
return '奖品'
|
||||
},
|
||||
prizePlaceholderText(prize) {
|
||||
return this.rewardPlaceholderText(prize)
|
||||
},
|
||||
isSelfParticipant(player) {
|
||||
return Number(player?.user_id || 0) > 0 && Number(player?.user_id || 0) === this.currentUserId
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.welfare-detail-page { min-height: 100vh; padding-bottom: 40rpx; background: #fff7ed; }
|
||||
.detail-cover { width: 100%; height: 420rpx; display: block; background: #f3f4f6; }
|
||||
.detail-cover.empty { display: flex; align-items: center; justify-content: center; color: #9ca3af; }
|
||||
.detail-panel { margin: 24rpx 28rpx 0; padding: 28rpx; border-radius: 28rpx; background: #fff; box-shadow: 0 12rpx 30rpx rgba(0,0,0,.06); }
|
||||
.hero-head { display: flex; align-items: center; justify-content: space-between; gap: 20rpx; }
|
||||
.detail-title { display: block; font-size: 38rpx; font-weight: 900; color: #1f2937; flex: 1; }
|
||||
.detail-type { display: inline-flex; align-items: center; padding: 10rpx 20rpx; border-radius: 999rpx; font-size: 22rpx; font-weight: 800; }
|
||||
.type-daily { background: rgba(249, 115, 22, .12); color: #f97316; }
|
||||
.type-weekly { background: rgba(239, 68, 68, .12); color: #ef4444; }
|
||||
.type-monthly { background: linear-gradient(135deg, #a855f7, #ec4899, #f59e0b); color: #fff; }
|
||||
.type-default { background: rgba(148, 163, 184, .12); color: #64748b; }
|
||||
.detail-status { display: inline-block; margin-top: 16rpx; padding: 8rpx 20rpx; border-radius: 999rpx; background: #fef3c7; color: #b45309; font-size: 22rpx; font-weight: 800; }
|
||||
.detail-time, .detail-desc { display: block; margin-top: 16rpx; font-size: 24rpx; color: #4b5563; }
|
||||
.panel-head { margin-bottom: 18rpx; display: flex; align-items: center; justify-content: space-between; gap: 16rpx; }
|
||||
.panel-head.compact { margin-bottom: 10rpx; }
|
||||
.panel-title { font-size: 28rpx; font-weight: 900; color: #1f2937; }
|
||||
.panel-side { font-size: 22rpx; color: #9ca3af; }
|
||||
.progress-bar { height: 18rpx; border-radius: 999rpx; background: #fed7aa; overflow: hidden; }
|
||||
.progress-fill { height: 100%; border-radius: 999rpx; background: linear-gradient(90deg, #f97316, #fb7185); }
|
||||
.progress-foot { display: flex; align-items: center; justify-content: space-between; gap: 20rpx; margin-top: 20rpx; }
|
||||
.progress-hint { flex: 1; font-size: 22rpx; color: #6b7280; }
|
||||
.join-btn { min-width: 180rpx; padding: 18rpx 28rpx; text-align: center; border-radius: 999rpx; font-size: 24rpx; font-weight: 800; }
|
||||
.join-btn.primary { background: linear-gradient(135deg, #fb923c, #f97316); color: #fff; }
|
||||
.join-btn.disabled { background: #dcfce7; color: #16a34a; }
|
||||
.join-btn.muted { background: #f3f4f6; color: #9ca3af; }
|
||||
.prize-scroll { white-space: nowrap; }
|
||||
.prize-track { display: inline-flex; gap: 20rpx; }
|
||||
.prize-item { width: 260rpx; flex-shrink: 0; }
|
||||
.prize-image { width: 260rpx; height: 180rpx; border-radius: 20rpx; background: #f3f4f6; }
|
||||
.prize-image.empty { display: flex; align-items: center; justify-content: center; color: #9ca3af; }
|
||||
.prize-name { display: -webkit-box; margin-top: 12rpx; min-height: 68rpx; font-size: 24rpx; font-weight: 700; color: #1f2937; white-space: normal; word-break: break-all; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; }
|
||||
.prize-price { display: block; margin-top: 8rpx; font-size: 22rpx; color: #f97316; line-height: 1.4; }
|
||||
.prize-count { display: block; margin-top: 6rpx; font-size: 22rpx; color: #6b7280; line-height: 1.4; }
|
||||
.participant-preview { display: flex; align-items: center; gap: 12rpx; overflow: hidden; }
|
||||
.participant-head { align-items: flex-start; }
|
||||
.participant-head-actions { display: flex; align-items: center; gap: 12rpx; flex-shrink: 0; }
|
||||
.participant-meta-row { margin-bottom: 16rpx; }
|
||||
.avatar-row { display: flex; align-items: center; gap: 12rpx; overflow-x: auto; padding-bottom: 4rpx; }
|
||||
.avatar-item { position: relative; flex-shrink: 0; }
|
||||
.avatar-item.mine .participant-avatar { border-color: #fb923c; box-shadow: 0 0 0 4rpx rgba(251, 146, 60, 0.16); }
|
||||
.participant-avatar { width: 68rpx; height: 68rpx; border-radius: 50%; background: #f3f4f6; border: 4rpx solid #fff; box-shadow: 0 8rpx 18rpx rgba(0,0,0,.08); }
|
||||
.head-action-btn { flex-shrink: 0; padding: 14rpx 20rpx; border-radius: 999rpx; background: #fff7ed; color: #f97316; font-size: 22rpx; font-weight: 800; border: 2rpx solid rgba(249,115,22,.18); }
|
||||
.head-action-btn.overview { background: linear-gradient(135deg, #fff7ed, #ffedd5); }
|
||||
.more-count { min-width: 68rpx; height: 68rpx; padding: 0 16rpx; border-radius: 34rpx; background: #fff7ed; color: #f97316; display: flex; align-items: center; justify-content: center; font-size: 22rpx; font-weight: 800; }
|
||||
.participant-list { display: none; }
|
||||
.participant-overview-card, .participant-card { display: flex; align-items: center; justify-content: space-between; gap: 16rpx; padding: 20rpx; border-radius: 22rpx; background: #fff7ed; }
|
||||
.overview-icon { width: 76rpx; height: 76rpx; border-radius: 50%; background: linear-gradient(135deg, #fde68a, #fb7185); display: flex; align-items: center; justify-content: center; font-size: 34rpx; flex-shrink: 0; }
|
||||
.participant-main { display: flex; align-items: center; gap: 14rpx; flex: 1; min-width: 0; }
|
||||
.participant-card-avatar { width: 76rpx; height: 76rpx; border-radius: 50%; background: #f3f4f6; }
|
||||
.participant-card-info { flex: 1; min-width: 0; }
|
||||
.participant-name { display: block; font-size: 26rpx; font-weight: 800; color: #1f2937; }
|
||||
.participant-sub { display: block; margin-top: 8rpx; font-size: 22rpx; color: #6b7280; }
|
||||
.winner-btn { padding: 14rpx 20rpx; border-radius: 999rpx; background: #fff; color: #f97316; font-size: 22rpx; font-weight: 800; flex-shrink: 0; }
|
||||
.overview-btn { min-width: 112rpx; text-align: center; }
|
||||
.expand-btn { display: none; }
|
||||
.empty-text { font-size: 24rpx; color: #9ca3af; }
|
||||
.history-entry { display: flex; justify-content: space-between; align-items: center; }
|
||||
.history-subtitle { display: block; margin-top: 10rpx; font-size: 22rpx; color: #9ca3af; }
|
||||
.winner-popup-overlay { position: fixed; inset: 0; z-index: 1000; display: flex; align-items: center; justify-content: center; }
|
||||
.winner-popup-mask { position: absolute; inset: 0; background: rgba(0,0,0,.48); }
|
||||
.winner-popup-panel { position: relative; width: 88%; max-height: 72vh; background: #fff; border-radius: 28rpx; overflow: hidden; box-shadow: 0 18rpx 50rpx rgba(0,0,0,.18); }
|
||||
.winner-popup-head { display: flex; align-items: center; justify-content: space-between; gap: 16rpx; padding: 26rpx 28rpx; border-bottom: 2rpx solid #f3f4f6; }
|
||||
.winner-popup-title { flex: 1; font-size: 28rpx; font-weight: 900; color: #1f2937; }
|
||||
.winner-popup-close { font-size: 42rpx; color: #9ca3af; line-height: 1; }
|
||||
.winner-popup-list { max-height: 54vh; padding: 24rpx 28rpx; }
|
||||
.winner-popup-item { display: flex; gap: 16rpx; align-items: center; padding: 18rpx 0; }
|
||||
.participant-popup-item { align-items: center; }
|
||||
.participant-popup-avatar { border-radius: 50%; }
|
||||
.self-tag { color: #f97316; font-weight: 800; }
|
||||
.winner-popup-image { width: 96rpx; height: 96rpx; border-radius: 20rpx; background: #f3f4f6; flex-shrink: 0; }
|
||||
.winner-popup-image.empty { display: flex; align-items: center; justify-content: center; color: #9ca3af; }
|
||||
.winner-popup-info { flex: 1; min-width: 0; }
|
||||
.winner-popup-name { display: block; font-size: 26rpx; font-weight: 800; color: #1f2937; }
|
||||
.winner-popup-price, .winner-popup-time { display: block; margin-top: 8rpx; font-size: 22rpx; color: #6b7280; }
|
||||
</style>
|
||||
@ -1,108 +0,0 @@
|
||||
<template>
|
||||
<view class="welfare-list-page">
|
||||
<view class="page-head">
|
||||
<text class="page-title">{{ mode === 'finished' ? '往期活动' : '福利活动' }}</text>
|
||||
<text class="page-subtitle">{{ mode === 'finished' ? '查看已结束活动' : '当前仅展示进行中的活动' }}</text>
|
||||
</view>
|
||||
|
||||
<view class="toolbar">
|
||||
<view class="toolbar-btn" :class="{ active: mode === 'active' }" @tap="switchMode('active')">进行中</view>
|
||||
<view class="toolbar-btn" :class="{ active: mode === 'finished' }" @tap="switchMode('finished')">往期活动</view>
|
||||
</view>
|
||||
|
||||
<view v-if="loading" class="state">加载中...</view>
|
||||
<view v-else-if="activities.length === 0" class="state">{{ mode === 'finished' ? '暂无往期活动' : '暂无进行中的活动' }}</view>
|
||||
|
||||
<view v-else class="activity-grid">
|
||||
<view v-for="item in activities" :key="item.id" class="activity-card" @tap="goDetail(item.id)">
|
||||
<image v-if="item.cover_image" class="activity-cover" :src="item.cover_image" mode="aspectFill" />
|
||||
<view v-else class="activity-cover empty">暂无图片</view>
|
||||
<view class="activity-meta">
|
||||
<text class="activity-name">{{ item.title }}</text>
|
||||
<view class="activity-type-row">
|
||||
<text class="activity-type" :class="typeClass(item.type)">{{ typeLabel(item.type) }}</text>
|
||||
<text class="activity-status" :class="mode === 'finished' ? 'status-finished' : 'status-active'">
|
||||
{{ mode === 'finished' ? '已结束' : '进行中' }}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { request } from '@/utils/request.js'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
mode: 'active',
|
||||
activities: []
|
||||
}
|
||||
},
|
||||
onLoad(options) {
|
||||
this.mode = options?.mode === 'finished' ? 'finished' : 'active'
|
||||
this.loadData()
|
||||
},
|
||||
methods: {
|
||||
async loadData() {
|
||||
this.loading = true
|
||||
try {
|
||||
const status = this.mode === 'finished' ? 'finished' : 'active'
|
||||
const res = await request({ url: `/api/app/welfare-activities?status=${status}&page=1&page_size=50` })
|
||||
this.activities = Array.isArray(res?.list) ? res.list : []
|
||||
} catch (e) {
|
||||
uni.showToast({ title: e.message || '加载失败', icon: 'none' })
|
||||
} finally {
|
||||
this.loading = false
|
||||
}
|
||||
},
|
||||
switchMode(mode) {
|
||||
if (this.mode === mode) return
|
||||
this.mode = mode
|
||||
this.loadData()
|
||||
},
|
||||
goDetail(id) {
|
||||
uni.navigateTo({ url: `/pages-activity/activity/welfare/detail?id=${id}` })
|
||||
},
|
||||
typeLabel(type) {
|
||||
return { daily: '每日福利', weekly: '每周福利', monthly: '每月福利' }[type] || '福利活动'
|
||||
},
|
||||
typeClass(type) {
|
||||
return {
|
||||
daily: 'type-daily',
|
||||
weekly: 'type-weekly',
|
||||
monthly: 'type-monthly'
|
||||
}[type] || 'type-default'
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.welfare-list-page { min-height: 100vh; padding: 28rpx; background: #fff7ed; }
|
||||
.page-head { margin-bottom: 28rpx; }
|
||||
.page-title { display: block; font-size: 46rpx; font-weight: 900; color: #1f2937; }
|
||||
.page-subtitle { display: block; margin-top: 10rpx; font-size: 24rpx; color: #9ca3af; }
|
||||
.toolbar { display: flex; gap: 16rpx; margin-bottom: 28rpx; }
|
||||
.toolbar-btn { flex: 1; text-align: center; padding: 20rpx 0; background: #fff; border-radius: 999rpx; color: #9a5b24; font-weight: 800; }
|
||||
.toolbar-btn.active { background: #ff8a3d; color: #fff; }
|
||||
.state { padding: 120rpx 0; text-align: center; color: #9ca3af; }
|
||||
.activity-grid { display: flex; flex-direction: column; gap: 24rpx; }
|
||||
.activity-card { display: flex; overflow: hidden; border-radius: 28rpx; background: #fff; box-shadow: 0 12rpx 30rpx rgba(0,0,0,.06); min-height: 220rpx; }
|
||||
.activity-cover { width: 240rpx; height: 220rpx; display: block; background: #f3f4f6; flex-shrink: 0; }
|
||||
.activity-cover.empty { display: flex; align-items: center; justify-content: center; color: #9ca3af; }
|
||||
.activity-meta { flex: 1; padding: 24rpx 22rpx; display: flex; flex-direction: column; justify-content: space-between; min-width: 0; }
|
||||
.activity-name { display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; font-size: 30rpx; font-weight: 800; color: #1f2937; line-height: 1.4; }
|
||||
.activity-type-row { display: flex; align-items: center; justify-content: space-between; gap: 16rpx; margin-top: 12rpx; flex-wrap: wrap; }
|
||||
.activity-type { display: inline-flex; align-items: center; padding: 8rpx 18rpx; border-radius: 999rpx; font-size: 22rpx; font-weight: 800; }
|
||||
.type-daily { background: rgba(249, 115, 22, .12); color: #f97316; }
|
||||
.type-weekly { background: rgba(239, 68, 68, .12); color: #ef4444; }
|
||||
.type-monthly { background: linear-gradient(135deg, #a855f7, #ec4899, #f59e0b); color: #fff; }
|
||||
.type-default { background: rgba(148, 163, 184, .12); color: #64748b; }
|
||||
.activity-status { font-size: 22rpx; font-weight: 700; }
|
||||
.status-active { color: #10b981; }
|
||||
.status-finished { color: #94a3b8; }
|
||||
</style>
|
||||
@ -51,8 +51,16 @@
|
||||
<text class="enter-btn-text">{{ entering ? '正在进入...' : (ticketCount > 0 ? '立即开局' : '资格不足') }}</text>
|
||||
</view>
|
||||
|
||||
<view
|
||||
class="btn-secondary"
|
||||
<view
|
||||
class="btn-free"
|
||||
:class="{ disabled: entering }"
|
||||
@tap="enterGame('minesweeper_free')"
|
||||
>
|
||||
<text class="free-btn-text">🍭 练习试玩 </text>
|
||||
</view>
|
||||
|
||||
<view
|
||||
class="btn-secondary"
|
||||
@tap="goRoomList"
|
||||
>
|
||||
<text class="secondary-btn-text">📡 对战列表 / 围观</text>
|
||||
@ -100,7 +108,7 @@ export default {
|
||||
},
|
||||
async enterGame(code) {
|
||||
const targetCode = code || this.gameCode
|
||||
if (this.ticketCount <= 0) return
|
||||
if (targetCode !== 'minesweeper_free' && this.ticketCount <= 0) return
|
||||
if (this.entering) return
|
||||
|
||||
this.entering = true
|
||||
@ -113,14 +121,9 @@ export default {
|
||||
}
|
||||
})
|
||||
|
||||
const nakamaServer = 'wss://game.1024tool.vip'
|
||||
const gameBaseUrl = 'https://game.1024tool.vip'
|
||||
const userInfo = uni.getStorageSync('user_info') || {}
|
||||
const uid = userInfo.id || userInfo.user_id || ''
|
||||
const nickname = encodeURIComponent(userInfo.nickname || userInfo.name || '')
|
||||
const gameUrl = `${gameBaseUrl}/?game_token=${encodeURIComponent(res.game_token)}&nakama_server=${encodeURIComponent(nakamaServer)}&nakama_key=${encodeURIComponent(res.nakama_key)}&game_type=${encodeURIComponent(targetCode)}&uid=${encodeURIComponent(uid)}&nickname=${nickname}`
|
||||
const nakamaServer = res.nakama_server || 'wss://kdy.1024tool.vip/ws'
|
||||
uni.navigateTo({
|
||||
url: `/pages-game/game/webview?url=${encodeURIComponent(gameUrl)}`
|
||||
url: `/pages-game/game/minesweeper/play?game_token=${encodeURIComponent(res.game_token)}&nakama_server=${encodeURIComponent(nakamaServer)}&nakama_key=${encodeURIComponent(res.nakama_key)}`
|
||||
})
|
||||
} catch (e) {
|
||||
uni.showToast({
|
||||
@ -137,15 +140,14 @@ export default {
|
||||
const res = await authRequest({
|
||||
url: '/api/app/games/enter',
|
||||
method: 'POST',
|
||||
data: { game_code: this.gameCode }
|
||||
data: {
|
||||
game_code: this.gameCode
|
||||
}
|
||||
})
|
||||
const nakamaServer = 'wss://kdy.1024tool.vip'
|
||||
const gameBaseUrl = 'http://192.168.31.185:8082'
|
||||
const userInfo = uni.getStorageSync('user_info') || {}
|
||||
const uid = userInfo.id || userInfo.user_id || ''
|
||||
const gameUrl = `${gameBaseUrl}/?game_token=${encodeURIComponent(res.game_token)}&nakama_server=${encodeURIComponent(nakamaServer)}&nakama_key=${encodeURIComponent(res.nakama_key)}&game_type=${encodeURIComponent(this.gameCode)}&uid=${encodeURIComponent(uid)}&scene=room-list`
|
||||
|
||||
const nakamaServer = res.nakama_server || 'wss://kdy.1024tool.vip/ws'
|
||||
uni.navigateTo({
|
||||
url: `/pages-game/game/webview?url=${encodeURIComponent(gameUrl)}`
|
||||
url: `/pages-game/game/minesweeper/room-list?game_token=${encodeURIComponent(res.game_token)}&nakama_server=${encodeURIComponent(nakamaServer)}&nakama_key=${encodeURIComponent(res.nakama_key)}`
|
||||
})
|
||||
} catch (e) {
|
||||
uni.showToast({ title: '无法获取对战列表', icon: 'none' })
|
||||
@ -316,6 +318,35 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
.btn-free {
|
||||
margin-top: 24rpx;
|
||||
height: 110rpx;
|
||||
width: 100%;
|
||||
border-radius: 55rpx;
|
||||
background: rgba($brand-primary, 0.15);
|
||||
border: 1px solid rgba($brand-primary, 0.3);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
transition: all 0.2s;
|
||||
|
||||
&:active {
|
||||
transform: scale(0.98);
|
||||
background: rgba($brand-primary, 0.25);
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
opacity: 0.5;
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
.free-btn-text {
|
||||
color: $brand-primary;
|
||||
font-size: 32rpx;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.btn-secondary {
|
||||
margin-top: 24rpx;
|
||||
background: rgba(255,255,255,0.05);
|
||||
|
||||
@ -1,399 +0,0 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<view class="bg-decoration"></view>
|
||||
|
||||
<!-- 对战分说明 -->
|
||||
<view class="score-tip glass-card">
|
||||
<text class="score-tip-icon">💡</text>
|
||||
<text class="score-tip-text">对战分 = 游戏内排名积分，赢局 +1000 基础分，得分/伤害/宝箱均有加成，与平台充值积分无关</text>
|
||||
</view>
|
||||
|
||||
<!-- 我的排名 -->
|
||||
<view class="my-card glass-card" v-if="myRank">
|
||||
<view class="my-left">
|
||||
<text class="my-label">我的排名</text>
|
||||
<text class="my-rank">{{ myRank.rank ? `#${myRank.rank}` : '未上榜' }}</text>
|
||||
</view>
|
||||
<view class="my-divider"></view>
|
||||
<view class="my-stats">
|
||||
<view class="stat-col">
|
||||
<text class="stat-val">{{ myRank.wins || 0 }}</text>
|
||||
<text class="stat-key">胜场</text>
|
||||
</view>
|
||||
<view class="stat-col">
|
||||
<text class="stat-val">{{ myRank.matches_played || 0 }}</text>
|
||||
<text class="stat-key">总场次</text>
|
||||
</view>
|
||||
<view class="stat-col">
|
||||
<text class="stat-val">{{ formatWinRate(myRank.win_rate) }}</text>
|
||||
<text class="stat-key">胜率</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="my-divider"></view>
|
||||
<view class="my-right">
|
||||
<text class="my-pts">{{ myRank.total_rank_points || 0 }}</text>
|
||||
<text class="my-pts-label">对战分</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 榜单 -->
|
||||
<scroll-view scroll-y class="list-wrap" @scrolltolower="loadMore">
|
||||
|
||||
<view v-if="loading && list.length === 0" class="state-box">
|
||||
<text class="state-icon">⏳</text>
|
||||
<text class="state-text">加载中...</text>
|
||||
</view>
|
||||
|
||||
<view v-else-if="!loading && list.length === 0" class="state-box">
|
||||
<text class="state-icon">🏆</text>
|
||||
<text class="state-text">暂无数据，快来挑战吧！</text>
|
||||
</view>
|
||||
|
||||
<view v-else class="list">
|
||||
<view
|
||||
v-for="item in list"
|
||||
:key="item.user_id"
|
||||
class="rank-row glass-card"
|
||||
:class="{ 'is-me': item.user_id === myUserId }"
|
||||
>
|
||||
<view class="rank-badge">
|
||||
<text v-if="item.rank === 1" class="medal">🥇</text>
|
||||
<text v-else-if="item.rank === 2" class="medal">🥈</text>
|
||||
<text v-else-if="item.rank === 3" class="medal">🥉</text>
|
||||
<text v-else class="rank-no">{{ item.rank }}</text>
|
||||
</view>
|
||||
|
||||
<image class="avatar" :src="item.avatar || fallback" mode="aspectFill" />
|
||||
|
||||
<view class="item-info">
|
||||
<view class="name-row">
|
||||
<text class="item-name">{{ item.nickname || '匿名玩家' }}</text>
|
||||
<text v-if="item.user_id === myUserId" class="me-tag">我</text>
|
||||
</view>
|
||||
<text class="item-sub">{{ item.wins }}胜 · {{ item.matches_played }}场 · {{ formatWinRate(item.win_rate) }}胜率</text>
|
||||
</view>
|
||||
|
||||
<view class="pts-box">
|
||||
<text class="pts-val">{{ item.total_rank_points }}</text>
|
||||
<text class="pts-unit">分</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="loadingMore" class="footer-tip"><text class="footer-txt">加载中...</text></view>
|
||||
<view v-if="!hasMore && list.length > 0" class="footer-tip"><text class="footer-txt">— 已显示全部 —</text></view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { authRequest } from '../../../utils/request.js'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
gameType: 'minesweeper',
|
||||
list: [],
|
||||
myRank: null,
|
||||
myUserId: null,
|
||||
total: 0,
|
||||
page: 1,
|
||||
pageSize: 20,
|
||||
loading: false,
|
||||
loadingMore: false,
|
||||
hasMore: true,
|
||||
fallback: 'https://via.placeholder.com/80/FF6B00/FFFFFF?text=U',
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
const info = uni.getStorageSync('user_info') || {}
|
||||
this.myUserId = info.id || info.user_id || null
|
||||
this.fetchList(true)
|
||||
},
|
||||
methods: {
|
||||
async fetchList(reset = false) {
|
||||
if (reset) {
|
||||
this.list = []
|
||||
this.page = 1
|
||||
this.hasMore = true
|
||||
this.myRank = null
|
||||
this.loading = true
|
||||
} else {
|
||||
if (!this.hasMore || this.loadingMore) return
|
||||
this.loadingMore = true
|
||||
}
|
||||
try {
|
||||
const res = await authRequest({
|
||||
url: '/api/app/games/leaderboard',
|
||||
method: 'GET',
|
||||
data: { game_type: this.gameType, page: this.page, page_size: this.pageSize },
|
||||
})
|
||||
const items = res.list || []
|
||||
this.list = reset ? items : [...this.list, ...items]
|
||||
this.total = res.total || 0
|
||||
this.myRank = res.me || null
|
||||
this.hasMore = this.list.length < this.total
|
||||
if (this.hasMore) this.page++
|
||||
} catch {
|
||||
uni.showToast({ title: '加载失败，请重试', icon: 'none' })
|
||||
} finally {
|
||||
this.loading = false
|
||||
this.loadingMore = false
|
||||
}
|
||||
},
|
||||
loadMore() { this.fetchList(false) },
|
||||
formatWinRate(rate) {
|
||||
if (rate == null) return '0%'
|
||||
return `${(rate * 100).toFixed(1)}%`
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import '@/uni.scss';
|
||||
|
||||
.page {
|
||||
min-height: 100vh;
|
||||
background: $bg-page;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 对战分说明 */
|
||||
.score-tip {
|
||||
position: relative;
|
||||
z-index: 5;
|
||||
margin: 0 32rpx 20rpx;
|
||||
padding: 20rpx 24rpx;
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 12rpx;
|
||||
}
|
||||
|
||||
.score-tip-icon {
|
||||
font-size: 28rpx;
|
||||
flex-shrink: 0;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.score-tip-text {
|
||||
font-size: 22rpx;
|
||||
color: $text-sub;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
/* 我的排名 */
|
||||
.my-card {
|
||||
position: relative;
|
||||
z-index: 5;
|
||||
margin: 0 32rpx 24rpx;
|
||||
padding: 28rpx 24rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0;
|
||||
}
|
||||
|
||||
.my-left {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
min-width: 100rpx;
|
||||
}
|
||||
|
||||
.my-label {
|
||||
font-size: $font-xs;
|
||||
color: $text-sub;
|
||||
margin-bottom: 8rpx;
|
||||
}
|
||||
|
||||
.my-rank {
|
||||
font-size: 38rpx;
|
||||
font-weight: 900;
|
||||
color: $brand-primary;
|
||||
}
|
||||
|
||||
.my-divider {
|
||||
width: 1px;
|
||||
height: 60rpx;
|
||||
background: $border-color-light;
|
||||
margin: 0 20rpx;
|
||||
}
|
||||
|
||||
.my-stats {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-around;
|
||||
}
|
||||
|
||||
.stat-col {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 4rpx;
|
||||
}
|
||||
|
||||
.stat-val {
|
||||
font-size: 30rpx;
|
||||
font-weight: 800;
|
||||
color: $text-main;
|
||||
}
|
||||
|
||||
.stat-key {
|
||||
font-size: $font-xs;
|
||||
color: $text-sub;
|
||||
}
|
||||
|
||||
.my-right {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
min-width: 80rpx;
|
||||
}
|
||||
|
||||
.my-pts {
|
||||
font-size: 38rpx;
|
||||
font-weight: 900;
|
||||
color: $brand-primary;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.my-pts-label {
|
||||
font-size: $font-xs;
|
||||
color: $text-sub;
|
||||
margin-top: 6rpx;
|
||||
}
|
||||
|
||||
/* 列表 */
|
||||
.list-wrap {
|
||||
flex: 1;
|
||||
height: 0;
|
||||
padding: 0 32rpx;
|
||||
}
|
||||
|
||||
.state-box {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
padding: 120rpx 0;
|
||||
gap: 20rpx;
|
||||
}
|
||||
|
||||
.state-icon { font-size: 80rpx; }
|
||||
.state-text { font-size: $font-md; color: $text-sub; }
|
||||
|
||||
.list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 16rpx;
|
||||
padding-bottom: calc(40rpx + env(safe-area-inset-bottom));
|
||||
}
|
||||
|
||||
.rank-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 20rpx 24rpx;
|
||||
gap: 20rpx;
|
||||
|
||||
&.is-me {
|
||||
border: 2rpx solid rgba($brand-primary, 0.4);
|
||||
background: linear-gradient(135deg, rgba($brand-primary, 0.06) 0%, $bg-glass 100%);
|
||||
}
|
||||
}
|
||||
|
||||
.rank-badge {
|
||||
width: 52rpx;
|
||||
height: 52rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.medal { font-size: 44rpx; }
|
||||
|
||||
.rank-no {
|
||||
font-size: $font-md;
|
||||
font-weight: 800;
|
||||
color: $text-sub;
|
||||
}
|
||||
|
||||
.avatar {
|
||||
width: 88rpx;
|
||||
height: 88rpx;
|
||||
border-radius: 50%;
|
||||
background: $bg-secondary;
|
||||
flex-shrink: 0;
|
||||
border: 2rpx solid $border-color-light;
|
||||
}
|
||||
|
||||
.item-info {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8rpx;
|
||||
}
|
||||
|
||||
.name-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12rpx;
|
||||
}
|
||||
|
||||
.item-name {
|
||||
font-size: $font-lg;
|
||||
font-weight: 700;
|
||||
color: $text-main;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
max-width: 220rpx;
|
||||
}
|
||||
|
||||
.me-tag {
|
||||
font-size: $font-xs;
|
||||
font-weight: 700;
|
||||
color: #fff;
|
||||
background: $gradient-brand;
|
||||
padding: 2rpx 14rpx;
|
||||
border-radius: $radius-round;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.item-sub {
|
||||
font-size: $font-sm;
|
||||
color: $text-sub;
|
||||
}
|
||||
|
||||
.pts-box {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
gap: 4rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.pts-val {
|
||||
font-size: 36rpx;
|
||||
font-weight: 900;
|
||||
color: $brand-primary;
|
||||
}
|
||||
|
||||
.pts-unit {
|
||||
font-size: $font-sm;
|
||||
color: $text-sub;
|
||||
}
|
||||
|
||||
.footer-tip {
|
||||
padding: 32rpx 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.footer-txt {
|
||||
font-size: $font-sm;
|
||||
color: $text-tertiary;
|
||||
}
|
||||
</style>
|
||||
@ -1,5 +1,7 @@
|
||||
<template>
|
||||
<web-view v-if="url" :src="url" @message="onMessage"></web-view>
|
||||
<view class="container">
|
||||
<web-view :src="url" @message="onMessage"></web-view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
@ -19,16 +21,33 @@ onLoad((options) => {
|
||||
})
|
||||
|
||||
function onMessage(e) {
|
||||
console.log('Message from Game:', e.detail)
|
||||
const data = e.detail.data || []
|
||||
|
||||
// Handle specific messages
|
||||
data.forEach(msg => {
|
||||
if (msg.action === 'close') {
|
||||
uni.navigateBack()
|
||||
} else if (msg.action === 'playAgain') {
|
||||
// 再来一局: 返回上一页，上一页会自动刷新重新获取token进入游戏
|
||||
console.log('PlayAgain: 返回游戏入口页面')
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
success: () => uni.$emit('refreshGame')
|
||||
success: () => {
|
||||
// 可选: 发送事件通知上一页刷新
|
||||
uni.$emit('refreshGame')
|
||||
}
|
||||
})
|
||||
} else if (msg.action === 'game_over') {
|
||||
// Optional: Refresh user balance or state
|
||||
}
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.container {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -19,8 +19,6 @@
|
||||
<view class="ol">
|
||||
<view class="li">发货时效：发货订单提交成功后，本平台将在3-15个工作日内安排发货（预售商品按页面说明执行）。</view>
|
||||
<view class="li">物流信息：您可在“我的订单”中查看物流状态。因地址错误、联系不畅导致的配送失败，责任由您承担。</view>
|
||||
<view class="li">用户收到货物后需要保留完整的开箱视频，以便售后作为依据。无视频依据，将不与售后处理。</view>
|
||||
<view class="li">在对产品质量等问题发生时，我们仅提供退换服务，如有更多诉求，我们将协助用户与供货商进行沟通处理。</view>
|
||||
</view>
|
||||
<view class="h2">四、售后服务</view>
|
||||
<view class="ol">
|
||||
|
||||
@ -93,30 +93,16 @@
|
||||
|
||||
<!-- 底部：进度 + 按钮 -->
|
||||
<view class="ticket-footer">
|
||||
<view class="ready-meta">
|
||||
<text class="ready-hint">
|
||||
{{ getReadyCount(recipe) }}/{{ recipe.materials?.length || 0 }} 材料就绪
|
||||
</text>
|
||||
<text class="batch-hint" v-if="getMaxSynthesizeCount(recipe) > 0">
|
||||
最多可合成 {{ getMaxSynthesizeCount(recipe) }} 次
|
||||
</text>
|
||||
</view>
|
||||
<view class="action-group">
|
||||
<view
|
||||
class="synth-btn synth-btn-secondary"
|
||||
:class="recipe.can_synthesize && !batchSynthesizing ? 'btn-ready' : 'btn-locked'"
|
||||
@tap="onSynthesize(recipe)"
|
||||
>
|
||||
<text class="btn-text">{{ synthesizing ? '合成中' : (recipe.can_synthesize ? '单次合成' : '不足') }}</text>
|
||||
</view>
|
||||
<view
|
||||
class="synth-btn synth-btn-primary"
|
||||
:class="getMaxSynthesizeCount(recipe) > 0 && !synthesizing ? 'btn-ready' : 'btn-locked'"
|
||||
@tap="onBatchSynthesize(recipe)"
|
||||
>
|
||||
<text class="btn-text">{{ batchSynthesizing ? '批量中' : (getMaxSynthesizeCount(recipe) > 0 ? '一键合成' : '不足') }}</text>
|
||||
<view v-if="getMaxSynthesizeCount(recipe) > 0 && !batchSynthesizing" class="btn-shine"></view>
|
||||
</view>
|
||||
<text class="ready-hint">
|
||||
{{ getReadyCount(recipe) }}/{{ recipe.materials?.length || 0 }} 材料就绪
|
||||
</text>
|
||||
<view
|
||||
class="synth-btn"
|
||||
:class="recipe.can_synthesize ? 'btn-ready' : 'btn-locked'"
|
||||
@tap="onSynthesize(recipe)"
|
||||
>
|
||||
<text class="btn-text">{{ synthesizing ? '合成中' : (recipe.can_synthesize ? '合成' : '不足') }}</text>
|
||||
<view v-if="recipe.can_synthesize" class="btn-shine"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -129,11 +115,10 @@
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { getSynthesisRecipes, doSynthesis, doBatchSynthesis } from '../../api/synthesis.js'
|
||||
import { getSynthesisRecipes, doSynthesis } from '../../api/synthesis.js'
|
||||
|
||||
const loading = ref(true)
|
||||
const synthesizing = ref(false)
|
||||
const batchSynthesizing = ref(false)
|
||||
const isRefreshing = ref(false)
|
||||
const recipes = ref([])
|
||||
|
||||
@ -157,21 +142,6 @@ function getOverallProgress(recipe) {
|
||||
return Math.round((getReadyCount(recipe) / recipe.materials.length) * 100)
|
||||
}
|
||||
|
||||
function getMaxSynthesizeCount(recipe) {
|
||||
return Number(recipe?.max_synthesize_count || 0)
|
||||
}
|
||||
|
||||
function confirmSynthesis({ title, content }) {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.showModal({
|
||||
title,
|
||||
content,
|
||||
success: (res) => res.confirm ? resolve() : reject(new Error('cancel')),
|
||||
fail: reject
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
async function loadRecipes() {
|
||||
loading.value = true
|
||||
const userId = uni.getStorageSync('user_id')
|
||||
@ -196,11 +166,15 @@ async function onRefresh() {
|
||||
}
|
||||
|
||||
async function onSynthesize(recipe) {
|
||||
if (synthesizing.value || batchSynthesizing.value || !recipe.can_synthesize) return
|
||||
if (synthesizing.value || !recipe.can_synthesize) return
|
||||
try {
|
||||
await confirmSynthesis({
|
||||
title: '确认合成',
|
||||
content: `确定要合成「${recipe.target_product?.name || '目标商品'}」吗？合成后碎片将被消耗。`
|
||||
await new Promise((resolve, reject) => {
|
||||
uni.showModal({
|
||||
title: '确认合成',
|
||||
content: `确定要合成「${recipe.target_product?.name || '目标商品'}」吗？合成后碎片将被消耗。`,
|
||||
success: (res) => res.confirm ? resolve() : reject('cancel'),
|
||||
fail: reject
|
||||
})
|
||||
})
|
||||
} catch {
|
||||
return
|
||||
@ -219,33 +193,6 @@ async function onSynthesize(recipe) {
|
||||
}
|
||||
}
|
||||
|
||||
async function onBatchSynthesize(recipe) {
|
||||
const maxCount = getMaxSynthesizeCount(recipe)
|
||||
if (batchSynthesizing.value || synthesizing.value || maxCount <= 0) return
|
||||
|
||||
try {
|
||||
await confirmSynthesis({
|
||||
title: '确认一键合成',
|
||||
content: `将消耗当前全部可用碎片，预计合成 ${maxCount} 次「${recipe.target_product?.name || '目标商品'}」，是否继续？`
|
||||
})
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
|
||||
batchSynthesizing.value = true
|
||||
const userId = uni.getStorageSync('user_id')
|
||||
try {
|
||||
const res = await doBatchSynthesis(userId, recipe.id)
|
||||
const count = Number(res?.synthesized_count || maxCount)
|
||||
uni.showToast({ title: `一键合成成功，共合成 ${count} 次`, icon: 'none' })
|
||||
await loadRecipes()
|
||||
} catch (e) {
|
||||
uni.showToast({ title: e?.message || '一键合成失败', icon: 'none' })
|
||||
} finally {
|
||||
batchSynthesizing.value = false
|
||||
}
|
||||
}
|
||||
|
||||
onLoad(() => {
|
||||
loadRecipes()
|
||||
})
|
||||
@ -588,47 +535,27 @@ defineExpose({ onShow })
|
||||
/* 底部行：进度提示 + 按钮 */
|
||||
.ticket-footer {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: 14rpx;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-top: 4rpx;
|
||||
}
|
||||
|
||||
.ready-meta {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6rpx;
|
||||
}
|
||||
|
||||
.ready-hint {
|
||||
font-size: 20rpx;
|
||||
color: $text-tertiary;
|
||||
}
|
||||
|
||||
.batch-hint {
|
||||
font-size: 20rpx;
|
||||
color: $brand-primary;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.action-group {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12rpx;
|
||||
}
|
||||
|
||||
/* 合成按钮 - 小胶囊 */
|
||||
.synth-btn {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
height: 52rpx;
|
||||
padding: 0 16rpx;
|
||||
border-radius: 26rpx;
|
||||
height: 56rpx;
|
||||
padding: 0 28rpx;
|
||||
border-radius: 28rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
flex-shrink: 0;
|
||||
transition: all 0.2s cubic-bezier(0.18, 0.89, 0.32, 1.28);
|
||||
|
||||
&.btn-ready {
|
||||
@ -636,7 +563,7 @@ defineExpose({ onShow })
|
||||
box-shadow: 0 6rpx 16rpx rgba($brand-primary, 0.3);
|
||||
|
||||
&:active {
|
||||
transform: scale(0.96);
|
||||
transform: scale(0.94);
|
||||
opacity: 0.9;
|
||||
}
|
||||
}
|
||||
@ -646,25 +573,15 @@ defineExpose({ onShow })
|
||||
}
|
||||
}
|
||||
|
||||
.synth-btn-primary {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.synth-btn-secondary {
|
||||
&.btn-ready {
|
||||
background: linear-gradient(135deg, rgba($brand-primary, 0.14), rgba($brand-primary, 0.08));
|
||||
box-shadow: none;
|
||||
border: 1.5rpx solid rgba($brand-primary, 0.25);
|
||||
}
|
||||
}
|
||||
|
||||
.btn-text {
|
||||
font-size: 22rpx;
|
||||
font-size: 24rpx;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0;
|
||||
letter-spacing: 1rpx;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
white-space: nowrap;
|
||||
|
||||
.btn-ready & { color: #fff; }
|
||||
.btn-locked & { color: $text-tertiary; }
|
||||
}
|
||||
|
||||
.btn-shine {
|
||||
|
||||
82
pages.json
82
pages.json
@ -36,50 +36,38 @@
|
||||
{
|
||||
"root": "pages-activity",
|
||||
"pages": [
|
||||
{
|
||||
"path": "activity/yifanshang/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "一番赏"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "activity/wuxianshang/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "无限赏"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "activity/duiduipeng/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "对对碰"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "activity/list/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "活动列表"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "activity/pata/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "爬塔"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "activity/welfare/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "福利活动"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "activity/welfare/detail",
|
||||
"style": {
|
||||
"navigationBarTitleText": "活动详情"
|
||||
}
|
||||
{
|
||||
"path": "activity/yifanshang/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "一番赏"
|
||||
}
|
||||
]
|
||||
},
|
||||
},
|
||||
{
|
||||
"path": "activity/wuxianshang/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "无限赏"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "activity/duiduipeng/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "对对碰"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "activity/list/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "活动列表"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "activity/pata/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "爬塔"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"root": "pages-user",
|
||||
"pages": [
|
||||
@ -235,12 +223,6 @@
|
||||
"disableScroll": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "game/minesweeper/leaderboard",
|
||||
"style": {
|
||||
"navigationBarTitleText": "扫雷战绩榜"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "game/webview",
|
||||
"style": {
|
||||
@ -301,4 +283,4 @@
|
||||
"__usePrivacyCheck__": true
|
||||
},
|
||||
"uniIdRouter": {}
|
||||
}
|
||||
}
|
||||
@ -213,30 +213,16 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="ticket-footer">
|
||||
<view class="ready-meta">
|
||||
<text class="ready-hint">
|
||||
{{ getSynthReadyCount(recipe) }}/{{ recipe.materials?.length || 0 }} 材料就绪
|
||||
</text>
|
||||
<text class="batch-hint" v-if="getSynthMaxCount(recipe) > 0">
|
||||
最多可合成 {{ getSynthMaxCount(recipe) }} 次
|
||||
</text>
|
||||
</view>
|
||||
<view class="action-group">
|
||||
<view
|
||||
class="synth-btn synth-btn-secondary"
|
||||
:class="recipe.can_synthesize && !batchSynthesizing ? 'btn-ready' : 'btn-locked'"
|
||||
@tap="onSynthesize(recipe)"
|
||||
>
|
||||
<text class="btn-text">{{ synthesizing ? '合成中' : (recipe.can_synthesize ? '单次合成' : '不足') }}</text>
|
||||
</view>
|
||||
<view
|
||||
class="synth-btn synth-btn-primary"
|
||||
:class="getSynthMaxCount(recipe) > 0 && !synthesizing ? 'btn-ready' : 'btn-locked'"
|
||||
@tap="onBatchSynthesize(recipe)"
|
||||
>
|
||||
<text class="btn-text">{{ batchSynthesizing ? '批量中' : (getSynthMaxCount(recipe) > 0 ? '一键合成' : '不足') }}</text>
|
||||
<view v-if="getSynthMaxCount(recipe) > 0 && !batchSynthesizing" class="btn-shine"></view>
|
||||
</view>
|
||||
<text class="ready-hint">
|
||||
{{ getSynthReadyCount(recipe) }}/{{ recipe.materials?.length || 0 }} 材料就绪
|
||||
</text>
|
||||
<view
|
||||
class="synth-btn"
|
||||
:class="recipe.can_synthesize ? 'btn-ready' : 'btn-locked'"
|
||||
@tap="onSynthesize(recipe)"
|
||||
>
|
||||
<text class="btn-text">{{ synthesizing ? '合成中' : (recipe.can_synthesize ? '合成' : '不足') }}</text>
|
||||
<view v-if="recipe.can_synthesize" class="btn-shine"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -308,8 +294,8 @@
|
||||
<script setup>
|
||||
import { ref, computed } from 'vue'
|
||||
import { onShow, onReachBottom, onShareAppMessage, onPullDownRefresh } from '@dcloudio/uni-app'
|
||||
import { getInventory, getProductDetail, redeemInventory, requestShipping, cancelShipping, listAddresses, getShipments, createAddressShare, checkShippingFee, createShippingFeeOrder } from '@/api/appUser'
|
||||
import { getSynthesisRecipes, doSynthesis, doBatchSynthesis } from '@/api/synthesis.js'
|
||||
import { getInventory, getProductDetail, redeemInventory, requestShipping, cancelShipping, listAddresses, getShipments, createAddressShare, createShippingFeeOrder } from '@/api/appUser'
|
||||
import { getSynthesisRecipes, doSynthesis } from '@/api/synthesis.js'
|
||||
import { vibrateShort } from '@/utils/vibrate.js'
|
||||
import { checkPhoneBoundSync } from '@/utils/checkPhone.js'
|
||||
import { executePaymentFlow } from '@/utils/payment.js'
|
||||
@ -340,7 +326,6 @@ const pendingShipIds = ref([])
|
||||
const recipes = ref([])
|
||||
const synthLoading = ref(false)
|
||||
const synthesizing = ref(false)
|
||||
const batchSynthesizing = ref(false)
|
||||
|
||||
const totalCount = computed(() => {
|
||||
return aggregatedList.value.reduce((sum, item) => sum + (item.count || 1), 0)
|
||||
@ -778,21 +763,6 @@ function getSynthReadyCount(recipe) {
|
||||
return recipe.materials.filter(m => m.owned_count >= m.required_count).length
|
||||
}
|
||||
|
||||
function getSynthMaxCount(recipe) {
|
||||
return Number(recipe?.max_synthesize_count || 0)
|
||||
}
|
||||
|
||||
function confirmSynthesisAction({ title, content }) {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.showModal({
|
||||
title,
|
||||
content,
|
||||
success: (res) => res.confirm ? resolve() : reject(new Error('cancel')),
|
||||
fail: reject
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
async function loadRecipes(uid) {
|
||||
synthLoading.value = true
|
||||
const userId = uid || uni.getStorageSync('user_id')
|
||||
@ -808,21 +778,23 @@ async function loadRecipes(uid) {
|
||||
}
|
||||
|
||||
async function onSynthesize(recipe) {
|
||||
if (synthesizing.value || batchSynthesizing.value || !recipe.can_synthesize) return
|
||||
if (synthesizing.value || !recipe.can_synthesize) return
|
||||
try {
|
||||
await confirmSynthesisAction({
|
||||
title: '确认合成',
|
||||
content: `确定要合成「${recipe.target_product?.name || '目标商品'}」吗？合成后碎片将被消耗。`
|
||||
await new Promise((resolve, reject) => {
|
||||
uni.showModal({
|
||||
title: '确认合成',
|
||||
content: `确定要合成「${recipe.target_product?.name || '目标商品'}」吗？合成后碎片将被消耗。`,
|
||||
success: (res) => res.confirm ? resolve() : reject('cancel'),
|
||||
fail: reject
|
||||
})
|
||||
})
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
} catch { return }
|
||||
synthesizing.value = true
|
||||
const userId = uni.getStorageSync('user_id')
|
||||
try {
|
||||
await doSynthesis(userId, recipe.id)
|
||||
uni.showToast({ title: '合成成功！', icon: 'success' })
|
||||
await Promise.all([loadRecipes(userId), loadInventory(userId)])
|
||||
await loadRecipes(userId)
|
||||
} catch (e) {
|
||||
uni.showToast({ title: e?.message || '合成失败', icon: 'none' })
|
||||
} finally {
|
||||
@ -830,32 +802,6 @@ async function onSynthesize(recipe) {
|
||||
}
|
||||
}
|
||||
|
||||
async function onBatchSynthesize(recipe) {
|
||||
const maxCount = getSynthMaxCount(recipe)
|
||||
if (batchSynthesizing.value || synthesizing.value || maxCount <= 0) return
|
||||
try {
|
||||
await confirmSynthesisAction({
|
||||
title: '确认一键合成',
|
||||
content: `将消耗当前全部可用碎片，预计合成 ${maxCount} 次「${recipe.target_product?.name || '目标商品'}」，是否继续？`
|
||||
})
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
|
||||
batchSynthesizing.value = true
|
||||
const userId = uni.getStorageSync('user_id')
|
||||
try {
|
||||
const res = await doBatchSynthesis(userId, recipe.id)
|
||||
const count = Number(res?.synthesized_count || maxCount)
|
||||
uni.showToast({ title: `一键合成成功，共合成 ${count} 次`, icon: 'none' })
|
||||
await Promise.all([loadRecipes(userId), loadInventory(userId)])
|
||||
} catch (e) {
|
||||
uni.showToast({ title: e?.message || '一键合成失败', icon: 'none' })
|
||||
} finally {
|
||||
batchSynthesizing.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function onRedeem() {
|
||||
vibrateShort()
|
||||
const user_id = uni.getStorageSync('user_id')
|
||||
@ -961,26 +907,13 @@ async function confirmShipWithAddress() {
|
||||
showAddressPicker.value = false
|
||||
|
||||
const FREIGHT_THRESHOLD = 5
|
||||
const FREIGHT_FEE = 10
|
||||
|
||||
let shippingCheck
|
||||
try {
|
||||
shippingCheck = await checkShippingFee(user_id, allIds)
|
||||
} catch (e) {
|
||||
uni.showToast({ title: e?.message || '运费校验失败', icon: 'none' })
|
||||
return
|
||||
}
|
||||
|
||||
if (shippingCheck?.need_fee) {
|
||||
const fee = Number(shippingCheck?.fee_cents || 0) / 100
|
||||
const reason = shippingCheck?.reason
|
||||
const content = reason === 'contains_non_free_shipping_item'
|
||||
? `所选商品包含不包邮商品，需支付 ¥${fee.toFixed(2)} 运费，确认继续？`
|
||||
: `共 ${allIds.length} 件商品，不满 ${FREIGHT_THRESHOLD} 件需支付 ¥${fee.toFixed(2)} 运费，确认继续？`
|
||||
|
||||
if (allIds.length < FREIGHT_THRESHOLD) {
|
||||
const confirmed = await new Promise((resolve) => {
|
||||
uni.showModal({
|
||||
title: '需支付运费',
|
||||
content,
|
||||
content: `共 ${allIds.length} 件商品，不满 ${FREIGHT_THRESHOLD} 件需支付 ¥${FREIGHT_FEE}.00 运费，确认继续？`,
|
||||
confirmText: '去支付',
|
||||
cancelText: '取消',
|
||||
success: (res) => resolve(res.confirm)
|
||||
@ -1001,8 +934,25 @@ async function confirmShipWithAddress() {
|
||||
return
|
||||
}
|
||||
uni.hideLoading()
|
||||
|
||||
uni.showLoading({ title: '提交中...' })
|
||||
try {
|
||||
await requestShipping(user_id, allIds, addressId)
|
||||
uni.showToast({ title: '申请成功', icon: 'success' })
|
||||
pendingShipIds.value = []
|
||||
aggregatedList.value = []
|
||||
page.value = 1
|
||||
hasMore.value = true
|
||||
loadInventory(user_id)
|
||||
} catch (e) {
|
||||
uni.showToast({ title: e.message || '申请失败', icon: 'none' })
|
||||
} finally {
|
||||
uni.hideLoading()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// 满5件包邮直接发货
|
||||
uni.showLoading({ title: '提交中...' })
|
||||
try {
|
||||
await requestShipping(user_id, allIds, addressId)
|
||||
@ -2027,54 +1977,33 @@ function onCopyShareLink() {
|
||||
|
||||
.ticket-footer {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: 14rpx;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-top: 4rpx;
|
||||
}
|
||||
|
||||
.ready-meta {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6rpx;
|
||||
}
|
||||
|
||||
.ready-hint {
|
||||
font-size: 20rpx;
|
||||
color: $text-tertiary;
|
||||
}
|
||||
|
||||
.batch-hint {
|
||||
font-size: 20rpx;
|
||||
color: $brand-primary;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.action-group {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12rpx;
|
||||
}
|
||||
|
||||
.synth-btn {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
height: 52rpx;
|
||||
padding: 0 16rpx;
|
||||
border-radius: 26rpx;
|
||||
height: 56rpx;
|
||||
padding: 0 28rpx;
|
||||
border-radius: 28rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
transition: all 0.2s cubic-bezier(0.18, 0.89, 0.32, 1.28);
|
||||
flex-shrink: 0;
|
||||
|
||||
&.btn-ready {
|
||||
background: $gradient-brand;
|
||||
box-shadow: 0 6rpx 16rpx rgba($brand-primary, 0.3);
|
||||
|
||||
&:active {
|
||||
transform: scale(0.96);
|
||||
transform: scale(0.94);
|
||||
opacity: 0.9;
|
||||
}
|
||||
}
|
||||
@ -2084,25 +2013,12 @@ function onCopyShareLink() {
|
||||
}
|
||||
}
|
||||
|
||||
.synth-btn-primary {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.synth-btn-secondary {
|
||||
&.btn-ready {
|
||||
background: linear-gradient(135deg, rgba($brand-primary, 0.14), rgba($brand-primary, 0.08));
|
||||
box-shadow: none;
|
||||
border: 1.5rpx solid rgba($brand-primary, 0.25);
|
||||
}
|
||||
}
|
||||
|
||||
.btn-text {
|
||||
font-size: 22rpx;
|
||||
font-size: 24rpx;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0;
|
||||
letter-spacing: 1rpx;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
white-space: nowrap;
|
||||
|
||||
.btn-ready & { color: #fff; }
|
||||
.btn-locked & { color: $text-tertiary; }
|
||||
|
||||
@ -61,11 +61,12 @@
|
||||
<view class="gameplay-grid-v2">
|
||||
<!-- 上排：两大核心 -->
|
||||
<view class="grid-row-top">
|
||||
<view class="game-card-large card-match" @tap="navigateTo('/pages-activity/activity/list/index?category=对对碰')">
|
||||
<view class="game-card-large card-yifan" @tap="navigateTo('/pages-activity/activity/list/index?category=一番赏')">
|
||||
<view class="card-bg-decoration"></view>
|
||||
<view class="card-content-large">
|
||||
<text class="card-title-large">对对碰</text>
|
||||
<view class="card-tag-large">碰一碰消除</view>
|
||||
<image class="card-mascot-large" src="https://via.placeholder.com/150/FFB6C1/000000?text=Match" mode="aspectFit" />
|
||||
<text class="card-title-large">一番赏</text>
|
||||
<view class="card-tag-large">欧皇擂台</view>
|
||||
<image class="card-mascot-large" src="https://via.placeholder.com/150/90EE90/000000?text=YI" mode="aspectFit" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="game-card-large card-wuxian" @tap="navigateTo('/pages-activity/activity/list/index?category=无限赏')">
|
||||
@ -79,10 +80,10 @@
|
||||
|
||||
<!-- 下排：三小功能 -->
|
||||
<view class="grid-row-bottom">
|
||||
<view class="game-card-small card-yifan-small" @tap="navigateTo('/pages-activity/activity/list/index?category=一番赏')">
|
||||
<text class="card-title-small">一番赏</text>
|
||||
<text class="card-subtitle-small">欧皇擂台</text>
|
||||
<image class="card-icon-small" src="https://via.placeholder.com/80/90EE90/000000?text=YI" mode="aspectFit" />
|
||||
<view class="game-card-small card-match" @tap="navigateTo('/pages-activity/activity/list/index?category=对对碰')">
|
||||
<text class="card-title-small">对对碰</text>
|
||||
<text class="card-subtitle-small">碰一碰消除</text>
|
||||
<image class="card-icon-small" src="https://via.placeholder.com/80/FFB6C1/000000?text=Match" mode="aspectFit" />
|
||||
</view>
|
||||
|
||||
<view class="game-card-small card-tower" @tap="navigateTo('/pages-game/game/minesweeper/index')">
|
||||
@ -91,15 +92,9 @@
|
||||
<image class="card-icon-small" src="https://via.placeholder.com/80/9370DB/000000?text=Mine" mode="aspectFit" />
|
||||
</view>
|
||||
|
||||
<view class="game-card-small card-welfare" @tap="navigateTo('/pages-activity/activity/welfare/index')">
|
||||
<text class="card-title-small">福利活动</text>
|
||||
<text class="card-subtitle-small">日周月福利</text>
|
||||
<image class="card-icon-small" src="https://via.placeholder.com/80/98FB98/000000?text=Gift" mode="aspectFit" />
|
||||
</view>
|
||||
|
||||
<view class="game-card-small card-more" @tap="openLeaderboard">
|
||||
<text class="card-title-small">排行榜</text>
|
||||
<text class="card-subtitle-small">扫雷战绩榜</text>
|
||||
<view class="game-card-small card-more" @tap="navigateTo('#')">
|
||||
<text class="card-title-small">更多</text>
|
||||
<text class="card-subtitle-small">敬请期待</text>
|
||||
<image class="card-icon-small" src="https://via.placeholder.com/80/E0E0E0/000000?text=More" mode="aspectFit" />
|
||||
</view>
|
||||
</view>
|
||||
@ -140,30 +135,19 @@
|
||||
<!-- 底部垫高 - 避开TabBar -->
|
||||
<view style="height: 140rpx"></view>
|
||||
</scroll-view>
|
||||
|
||||
<PrizeClaimPopup
|
||||
v-model:visible="prizeClaimVisible"
|
||||
:activity="prizeClaimActivity"
|
||||
:loading="prizeClaimLoading"
|
||||
@close="handlePrizeClaimClose"
|
||||
@claim="handlePrizeClaim"
|
||||
/>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { authRequest, request } from '../../utils/request.js'
|
||||
import { getPendingPrizeGrantActivity, claimPrizeGrantActivity } from '@/api/prizeClaim'
|
||||
import SplashScreen from '@/components/SplashScreen.vue'
|
||||
import PrizeClaimPopup from '@/components/activity/PrizeClaimPopup.vue'
|
||||
// #ifdef MP-TOUTIAO
|
||||
import customTabBarToutiao from '@/components/app-tab-bar-toutiao.vue'
|
||||
// #endif
|
||||
|
||||
export default {
|
||||
components: {
|
||||
SplashScreen,
|
||||
PrizeClaimPopup
|
||||
SplashScreen
|
||||
// #ifdef MP-TOUTIAO
|
||||
, customTabBarToutiao
|
||||
// #endif
|
||||
@ -177,12 +161,7 @@ export default {
|
||||
bannerIndex: 0,
|
||||
isHomeLoading: false,
|
||||
swiperAutoplay: true,
|
||||
swiperKey: 0,
|
||||
prizeClaimVisible: false,
|
||||
prizeClaimLoading: false,
|
||||
prizeClaimActivity: null,
|
||||
prizeClaimChecking: false,
|
||||
prizeClaimLastCheckAt: 0
|
||||
swiperKey: 0
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@ -240,7 +219,6 @@ export default {
|
||||
if (this.activities.length === 0 && !this.isHomeLoading) {
|
||||
this.loadHomeData()
|
||||
}
|
||||
this.checkPrizeGrantActivity()
|
||||
},
|
||||
onHide() {
|
||||
this.swiperAutoplay = false
|
||||
@ -279,55 +257,6 @@ export default {
|
||||
const fn = token ? authRequest : request
|
||||
return fn({ url })
|
||||
},
|
||||
getPrizeClaimSessionKey() {
|
||||
const userId = uni.getStorageSync('user_id')
|
||||
const sessionId = uni.getStorageSync('app_session_id')
|
||||
if (!userId || !sessionId) return ''
|
||||
return `prize_claim_closed:${userId}:${sessionId}`
|
||||
},
|
||||
async checkPrizeGrantActivity(force = false) {
|
||||
const token = uni.getStorageSync('token')
|
||||
if (!token || this.prizeClaimChecking || this.prizeClaimVisible) return
|
||||
const sessionKey = this.getPrizeClaimSessionKey()
|
||||
if (!force && sessionKey && uni.getStorageSync(sessionKey)) return
|
||||
const now = Date.now()
|
||||
if (!force && now - this.prizeClaimLastCheckAt < 10000) return
|
||||
this.prizeClaimChecking = true
|
||||
this.prizeClaimLastCheckAt = now
|
||||
try {
|
||||
const res = await getPendingPrizeGrantActivity()
|
||||
if (res && res.has_pending && res.activity) {
|
||||
this.prizeClaimActivity = res.activity
|
||||
this.prizeClaimVisible = true
|
||||
}
|
||||
} catch (err) {
|
||||
console.warn('checkPrizeGrantActivity failed', err)
|
||||
} finally {
|
||||
this.prizeClaimChecking = false
|
||||
}
|
||||
},
|
||||
handlePrizeClaimClose() {
|
||||
const sessionKey = this.getPrizeClaimSessionKey()
|
||||
if (sessionKey) {
|
||||
try { uni.setStorageSync(sessionKey, 1) } catch (_) {}
|
||||
}
|
||||
this.prizeClaimVisible = false
|
||||
},
|
||||
async handlePrizeClaim() {
|
||||
if (!this.prizeClaimActivity?.id || this.prizeClaimLoading) return
|
||||
this.prizeClaimLoading = true
|
||||
try {
|
||||
await claimPrizeGrantActivity(this.prizeClaimActivity.id)
|
||||
uni.showToast({ title: '领取成功', icon: 'success' })
|
||||
this.prizeClaimVisible = false
|
||||
this.prizeClaimActivity = null
|
||||
this.checkPrizeGrantActivity(true)
|
||||
} catch (err) {
|
||||
uni.showToast({ title: err?.message || '领取失败', icon: 'none' })
|
||||
} finally {
|
||||
this.prizeClaimLoading = false
|
||||
}
|
||||
},
|
||||
normalizeNotices(list) {
|
||||
const arr = this.unwrap(list)
|
||||
return arr.map((i, idx) => ({
|
||||
@ -451,9 +380,6 @@ export default {
|
||||
if(url === '#') return
|
||||
uni.navigateTo({ url })
|
||||
},
|
||||
async openLeaderboard() {
|
||||
uni.navigateTo({ url: '/pages-game/game/minesweeper/leaderboard' })
|
||||
},
|
||||
onNoticeTap() {
|
||||
const content = this.displayNotices.map(n => n.text).join('\n')
|
||||
uni.showModal({
|
||||
@ -845,28 +771,16 @@ export default {
|
||||
background: $gradient-gold; /* 质感金渐变 */
|
||||
}
|
||||
|
||||
.card-yifan-small {
|
||||
background: linear-gradient(135deg, $brand-primary 0%, $brand-secondary 100%);
|
||||
}
|
||||
.card-yifan-small .card-title-small { color: #fff; }
|
||||
.card-yifan-small .card-subtitle-small { color: rgba(255,255,255,.85); }
|
||||
|
||||
.card-match {
|
||||
background: linear-gradient(135deg, #FF9A9E 0%, #FECFEF 100%);
|
||||
background: linear-gradient(135deg, #FF9A9E 0%, #FECFEF 100%); /* 柔和粉 */
|
||||
}
|
||||
.card-match .card-title-large { color: #fff; }
|
||||
.card-match .card-tag-large { color: $accent-pink; }
|
||||
.card-match .card-title-small { color: $accent-pink; }
|
||||
|
||||
.card-tower {
|
||||
background: linear-gradient(135deg, #FFE0CC 0%, #FFCBA4 100%); /* 品牌橙暖色 */
|
||||
}
|
||||
.card-tower .card-title-small { color: $brand-primary; }
|
||||
|
||||
.card-welfare {
|
||||
background: linear-gradient(135deg, #D1FAE5 0%, #A7F3D0 100%);
|
||||
}
|
||||
.card-welfare .card-title-small { color: #047857; }
|
||||
|
||||
.card-more {
|
||||
background: linear-gradient(135deg, $bg-secondary 0%, #E5E7EB 100%); /* 金属灰 */
|
||||
}
|
||||
|
||||
@ -178,12 +178,6 @@
|
||||
</view>
|
||||
<text class="menu-label">{{ douyinUserId ? '已绑定' : '绑定抖音' }}</text>
|
||||
</view>
|
||||
<view class="menu-item" @click="handleSyncDouyinOrders">
|
||||
<view class="menu-icon-box">
|
||||
<image class="menu-icon-img" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0OCIgaGVpZ2h0PSI0OCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiMzMzMiIHN0cm9rZS13aWR0aD0iMS41IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjxwYXRoIGQ9Ik0yMSAxMmE5IDkgMCAxIDEtMi42NC02LjM2Ii8+PHBvbHlsaW5lIHBvaW50cz0iMjEgMyAyMSA5IDE1IDkiLz48cGF0aCBkPSJNMyAxMmE5IDkgMCAxIDAgMi42NCA2LjM2Ii8+PHBvbHlsaW5lIHBvaW50cz0iMyAyMSAzIDE1IDkgMTUiLz48L3N2Zz4=" mode="aspectFit"></image>
|
||||
</view>
|
||||
<text class="menu-label">{{ douyinSyncing ? '同步中...' : '同步订单' }}</text>
|
||||
</view>
|
||||
<!-- #ifdef MP-TOUTIAO -->
|
||||
|
||||
<button
|
||||
@ -500,7 +494,7 @@
|
||||
<script>
|
||||
import {
|
||||
getUserInfo, getUserStats, getPointsBalance, getUserPoints, getUserCoupons, getItemCards,
|
||||
getUserTasks, getTaskProgress, getInviteRecords, modifyUser, getUserProfile, bindDouyinID, syncMyDouyinOrders, getPublicConfig
|
||||
getUserTasks, getTaskProgress, getInviteRecords, modifyUser, getUserProfile, bindDouyinID, getPublicConfig
|
||||
} from '../../api/appUser.js'
|
||||
// #ifdef MP-TOUTIAO
|
||||
import customTabBarToutiao from '@/components/app-tab-bar-toutiao.vue'
|
||||
@ -525,7 +519,6 @@ export default {
|
||||
|
||||
mobile: '', // 手机号
|
||||
douyinUserId: '', // 抖音用户ID
|
||||
douyinSyncing: false,
|
||||
customerServiceQrCode: '', // 客服二维码
|
||||
customerServiceId: '0071112x', // 抖音IM客服账号
|
||||
pointsBalance: 0,
|
||||
@ -1036,40 +1029,6 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
async handleSyncDouyinOrders() {
|
||||
if (!this.checkPhoneBound()) return
|
||||
if (this.douyinSyncing) return
|
||||
|
||||
if (!this.douyinUserId) {
|
||||
uni.showToast({
|
||||
title: '请先绑定抖音号',
|
||||
icon: 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
this.douyinSyncing = true
|
||||
try {
|
||||
uni.showLoading({ title: '同步中...' })
|
||||
const data = await syncMyDouyinOrders()
|
||||
await this.loadUserInfo()
|
||||
uni.hideLoading()
|
||||
|
||||
uni.showModal({
|
||||
title: '同步完成',
|
||||
content: `抖音号：${data.douyin_user_id || this.douyinUserId}\n抓取订单：${data.total_fetched || 0} 笔\n新增订单：${data.new_orders || 0} 笔`,
|
||||
showCancel: false
|
||||
})
|
||||
} catch (err) {
|
||||
uni.hideLoading()
|
||||
uni.showToast({
|
||||
title: err.message || '同步失败',
|
||||
icon: 'none'
|
||||
})
|
||||
} finally {
|
||||
this.douyinSyncing = false
|
||||
}
|
||||
},
|
||||
toMinesweeper() {
|
||||
if (!this.checkPhoneBound()) return
|
||||
uni.navigateTo({ url: '/pages-game/game/minesweeper/index' })
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user