liangxin/xdd-uniapp-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat：抽奖2.0（查漏补缺）

Browse Source
This commit is contained in:
LinCyJang
2026-04-30 02:04:25 +08:00
parent 6cb403c5d5
commit c3c0483625
10 changed files with 515 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages.json
+5 -5
View File
@@ -416,31 +416,31 @@
{ {
"path": "views/county-lottery-rules", "path": "views/county-lottery-rules",
"style": { "style": {
"navigationStyle": "custom" "navigationBarTitleText": "活动规则"
} }
}, },
{ {
"path": "views/county-my-tickets", "path": "views/county-my-tickets",
"style": { "style": {
"navigationStyle": "custom" "navigationBarTitleText": "我的抽奖码"
} }
}, },
{ {
"path": "views/county-winners", "path": "views/county-winners",
"style": { "style": {
"navigationStyle": "custom" "navigationBarTitleText": "中奖名单"
} }
}, },
{ {
"path": "views/county-claim-address", "path": "views/county-claim-address",
"style": { "style": {
"navigationStyle": "custom" "navigationBarTitleText": "填写收货地址"
} }
}, },
{ {
"path": "views/county-realname", "path": "views/county-realname",
"style": { "style": {
"navigationStyle": "custom" "navigationBarTitleText": "实名认证"
} }
} }
] ]
pages/order/MyOrder/index.vue
+91 -5
View File
@@ -186,6 +186,61 @@
</view> </view>
</view> </view>
</view> </view>
<view v-else-if="order.isDrawOrder === 1">
<view class="item-info acea-row row-between row-top draw-order-info">
<view class="pictrue">
<image :src="order.drawOrderInfo && order.drawOrderInfo.prizeImage" />
</view>
<view class="text" style="margin-top: 0 !important;">
<view class="acea-row name-wrap" style="flex-wrap: nowrap">
<view class="name more-t v12-font-bold">{{ (order.drawOrderInfo && order.drawOrderInfo.prizeName) || '抽奖商品' }}</view>
<view class="money draw-price">
<view class="draw-price-origin">
<text class="v12-font-22">￥</text>
<text class="v12-font-28">{{ force2Decimal((order.drawOrderInfo && order.drawOrderInfo.prizePrice) || 0) }}</text>
</view>
<view class="v12-font-22 v12-secondary-dark-text draw-qty">x1</view>
</view>
</view>
</view>
</view>
<view class="totalPrice acea-row row-between row-middle" :style="{'padding-bottom': '0'}">
<view v-if="order.createTime">
<span class="orderTime v12-font-24 v12-dark1-text">{{ order.createTime }}</span>
</view>
<view class="v12-font-24 v12-dark1-text">
共{{ order.totalNum || 0 }}件商品
<text v-if="order.isGiftCardReceiveBlind === 0">
<text class="v12-dark-text v12-font-28 v12-font-bold">
，总金额
</text>
<text class="v12-font-22 v12-primary-text v12-font-bold">
￥
</text>
<text class="money font-color-lightred v12-font-28 v12-primary-text v12-font-bold">
{{ force2Decimal(order.payPrice) }}
</text>
</text>
</view>
</view>
<view class="v12-mt-3">
<u-line></u-line>
</view>
<view class="draw-code-row acea-row row-between row-middle">
<view class="v12-font-28 v12-dark-text">
抽奖码:
<text class="v12-primary-text v12-font-bold draw-ticket-code">
{{ order.drawOrderInfo && order.drawOrderInfo.ticketCode }}
</text>
</view>
<view
v-if="order.drawOrderInfo && order.drawOrderInfo.drawStatusName"
class="font-color-white statusTag v12-primary"
>
{{ order.drawOrderInfo.drawStatusName }}
</view>
</view>
</view>
<view v-else> <view v-else>
<view <view
v-for="(cart,cartInfoIndex) in order.cartInfo" v-for="(cart,cartInfoIndex) in order.cartInfo"
@@ -237,7 +292,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="!order.experienceOrderInfo" class="totalPrice acea-row row-between row-middle" :style="{'padding-bottom': order.isTravelGroup === 1 ? '0rpx !important' : '30rpx'}"> <view v-if="!order.experienceOrderInfo && order.isDrawOrder === 0" class="totalPrice acea-row row-between row-middle" :style="{'padding-bottom': order.isTravelGroup === 1 ? '0rpx !important' : '30rpx'}">
<view v-if="order.createTime"> <view v-if="order.createTime">
<span class="orderTime v12-font-24 v12-dark1-text">{{ order.createTime }}</span> <span class="orderTime v12-font-24 v12-dark1-text">{{ order.createTime }}</span>
</view> </view>
@@ -293,8 +348,9 @@
v-if="!order.isGiftCardSend && !order.experienceOrderInfo" v-if="!order.isGiftCardSend && !order.experienceOrderInfo"
class="bottom flex jc-between ai-center" class="bottom flex jc-between ai-center"
> >
<view <view
v-if="[2, 3].includes(parseInt(order._status._type)) && order.isTickets === 0" v-if="[2, 3].includes(parseInt(order._status._type)) && order.isTickets === 0 && order.isDrawOrder === 0"
class="group-btn" class="group-btn"
> >
<text <text
@@ -316,6 +372,11 @@
</view> </view>
<template v-else> <template v-else>
<view class="v12-justify-between" style="width: 100%"> <view class="v12-justify-between" style="width: 100%">
<view
v-if="order.isDrawOrder > 0"
class="bnt service"
>联系客服
</view>
<view> <view>
<view <view
v-if="order.isGiftCardReceiveBlind === 0 && v-if="order.isGiftCardReceiveBlind === 0 &&
@@ -340,6 +401,7 @@
>删除订单</view> >删除订单</view>
</view> </view>
</view> </view>
</template> </template>
<view class="flex"> <view class="flex">
<template v-if="parseInt(order._status._type) === 0"> <template v-if="parseInt(order._status._type) === 0">
@@ -348,7 +410,7 @@
@click="cancelOrder(order)" @click="cancelOrder(order)"
>取消订单</view> >取消订单</view>
<view <view
v-if="order.isTravelGroup === 0" v-if="order.isTravelGroup === 0 && order.isDrawOrder === 0"
class="bnt cancelBnt v12-dark-text v12-dark-border" class="bnt cancelBnt v12-dark-text v12-dark-border"
@click="addressTap(order)" @click="addressTap(order)"
>修改地址</view> >修改地址</view>
@@ -369,7 +431,7 @@
@click="applyRefund(order)" @click="applyRefund(order)"
>{{ '申请退款' }}</view> >{{ '申请退款' }}</view>
<view <view
v-if="canShowModifyAddress(order)" v-if="canShowModifyAddress(order) && order.isDrawOrder === 0"
class="bnt service" class="bnt service"
@click="addressTap(order)" @click="addressTap(order)"
>修改地址</view> >修改地址</view>
@@ -404,7 +466,7 @@
</template> </template>
<template v-if="parseInt(order._status._type) === 2 && order.isTickets === 0 && order.isTravelGroup === 0"> <template v-if="parseInt(order._status._type) === 2 && order.isTickets === 0 && order.isTravelGroup === 0">
<view <view
v-if="order.isExtendedDelivery === 0" v-if="order.isExtendedDelivery === 0 && order.isDrawOrder === 0"
class="bnt default" class="bnt default"
@click="toDelay(order.orderId)" @click="toDelay(order.orderId)"
>延长收货 >延长收货
@@ -1543,4 +1605,28 @@ page {
width: 160rpx !important; width: 160rpx !important;
height: 160rpx !important; height: 160rpx !important;
} }
.draw-order-info .draw-price{
text-align: right;
}
.draw-order-info .draw-price-origin{
color: #999;
text-decoration: line-through;
}
.draw-order-info .draw-qty{
margin-top: 8rpx;
}
.draw-code-row{
margin: 0rpx 0rpx 20rpx 30rpx;
padding-top: 20rpx;
}
.draw-ticket-code{
margin-left: 8rpx;
}
.draw-status-tag{
color: #fff;
background: #c52733;
border-radius: 999rpx;
padding: 6rpx 24rpx;
line-height: 1.4;
}
</style> </style>
pages/order/OrderDetails/index.vue
+24 -10
View File
@@ -70,7 +70,7 @@
</div> </div>
<div class="v12-font-28 v12-secondary-dark-text v12-justify-between"> <div class="v12-font-28 v12-secondary-dark-text v12-justify-between">
<text class=" more-t" style="flex: 2;">{{ orderInfo.userAddress }}</text> <text class=" more-t" style="flex: 2;">{{ orderInfo.userAddress }}</text>
<view v-if="canShowModifyAddress(orderInfo)" @click="goAddress" class="v12-btn cancel v12-dark-text v12-dark-border v12-radius-40" >修改地址</view> <view v-if="canShowModifyAddress(orderInfo) && orderInfo.isDrawOrder === 0" @click="goAddress" class="v12-btn cancel v12-dark-text v12-dark-border v12-radius-40" >修改地址</view>
</div> </div>
</template> </template>
@@ -216,7 +216,7 @@
</view> </view>
</view> </view>
<view class="v12-justify-between v12-flex-column v12-dark-text v12-text-right"> <view class="v12-justify-between v12-flex-column v12-dark-text v12-text-right">
<view class=" "> <view class=" " v-if="orderInfo.isDrawOrder === 0">
<text class="v12-font-22"> <text class="v12-font-22">
￥ ￥
</text> </text>
@@ -240,7 +240,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="" v-if="orderInfo.cartInfo &&( d === orderInfo.cartInfo.length - 1)"> <view class="" v-if="orderInfo.cartInfo &&( d === orderInfo.cartInfo.length - 1) && orderInfo.isDrawOrder === 0">
<view class="v12-justify-between v12-align-center v12-mt-3 v12-dark-text" v-if="orderInfo.isGiftCardReceiveBlind === 0"> <view class="v12-justify-between v12-align-center v12-mt-3 v12-dark-text" v-if="orderInfo.isGiftCardReceiveBlind === 0">
<view class="v12-font-24 v12-dark-text"> <view class="v12-font-24 v12-dark-text">
商品总价 商品总价
@@ -312,6 +312,13 @@
</view> </view>
</view> </view>
</view> </view>
<view>
<u-divider></u-divider>
<view>
<text class="v12-font-bold">抽奖码：</text>
<text class="v12-font-bold v12-primary-text">{{ orderInfo.drawOrderInfo.ticketCode }}</text>
</view>
</view>
</view> </view>
</view> </view>
@@ -482,11 +489,12 @@
<template v-if="status.type == 1" > <template v-if="status.type == 1" >
<view class="v12-justify-between " style="width: 100%"> <view class="v12-justify-between " style="width: 100%">
<view class="v12-justify-between "> <view class="v12-justify-between ">
<view v-if="orderInfo.isGiftCardReceiveBlind === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view> <view v-if="orderInfo.isDrawOrder > 0" class="bnt v12-dark-text v12-dark-border cancel">联系客服</view>
<view class="bnt v12-dark-text v12-dark-border cancel" @click="delayOrder">催发货</view> <view v-if="orderInfo.isGiftCardReceiveBlind === 0 && orderInfo.isDrawOrder === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view>
<view v-if="canShowModifyAddress(orderInfo)" class="bnt v12-dark-text v12-dark-border cancel" @click="goAddress">修改地址</view> <view v-if="orderInfo.isDrawOrder === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="delayOrder">催发货</view>
<view v-if="canShowModifyAddress(orderInfo) && orderInfo.isDrawOrder === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="goAddress">修改地址</view>
</view> </view>
<view class="bnt v12-primary-text v12-primary-border cancel" @click="goGoodsReturn2(orderInfo)">申请退款</view> <view v-if="orderInfo.isDrawOrder === 0" class="bnt v12-primary-text v12-primary-border cancel" @click="goGoodsReturn2(orderInfo)">申请退款</view>
</view> </view>
</template> </template>
<template v-if="status.type == 2"> <template v-if="status.type == 2">
@@ -495,7 +503,7 @@
<view class="" v-else></view> <view class="" v-else></view>
<view class="v12-justify-between"> <view class="v12-justify-between">
<view class="btn-more" style="position: relative"> <view class="btn-more" style="position: relative">
<view class=" v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</view> <view v-if="orderInfo.isDrawOrder === 0" class=" v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</view>
<view class="group-float" v-show="showMore" :style="{top: orderInfo.isExtendedDelivery==0 ? '-60px' : '-32px'}"> <view class="group-float" v-show="showMore" :style="{top: orderInfo.isExtendedDelivery==0 ? '-60px' : '-32px'}">
<view v-if="orderInfo.isExtendedDelivery==0" class="btn flex jc-center ai-center v12-font-24" @click="toDelay(orderInfo.orderId)">延长收货</view> <view v-if="orderInfo.isExtendedDelivery==0" class="btn flex jc-center ai-center v12-font-24" @click="toDelay(orderInfo.orderId)">延长收货</view>
<view class="btn flex jc-center ai-center v12-font-24" @click="goGoodsReturn(orderInfo)">申请退款</view> <view class="btn flex jc-center ai-center v12-font-24" @click="goGoodsReturn(orderInfo)">申请退款</view>
@@ -514,7 +522,7 @@
<view class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view> <view class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view>
<view class="v12-justify-between"> <view class="v12-justify-between">
<view class="btn-more" style="position: relative"> <view class="btn-more" style="position: relative">
<text class=" v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</text> <text v-if="orderInfo.isDrawOrder === 0" class=" v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</text>
<view class="group-float" v-show="showMore" :style="{top: '-32px'}"> <view class="group-float" v-show="showMore" :style="{top: '-32px'}">
<view class="btn flex jc-center ai-center v12-font-24" @click="goGoodsReturn(orderInfo)">申请退款</view> <view class="btn flex jc-center ai-center v12-font-24" @click="goGoodsReturn(orderInfo)">申请退款</view>
</view> </view>
@@ -550,7 +558,10 @@
</view> </view>
</template> </template>
<template v-if="status.type == 4"> <template v-if="status.type == 4">
<view class="bnt v12-dark-text v12-dark-border cancel" @click="delOrder">删除订单</view> <view class="v12-justify-between " style="width: 100%">
<view v-if="orderInfo.isDrawOrder > 0" class="bnt v12-dark-text v12-dark-border cancel" >联系客服</view>
<view class="bnt v12-dark-text v12-dark-border cancel" @click="delOrder">删除订单</view>
</view>
<!-- <view <!-- <view
v-if="orderInfo.isTickets !== 1" v-if="orderInfo.isTickets !== 1"
class="bnt v12-dark-text v12-dark-border default" class="bnt v12-dark-text v12-dark-border default"
@@ -1216,6 +1227,9 @@ export default {
} else if (this.orderInfo.isGiftCardReceive === 1 || this.orderInfo.isGiftCardSend === 1) { } else if (this.orderInfo.isGiftCardReceive === 1 || this.orderInfo.isGiftCardSend === 1) {
this.orderTypeName = "礼包订单" this.orderTypeName = "礼包订单"
this.orderTypeNameStatus = false this.orderTypeNameStatus = false
}else if (this.orderInfo.isDrawOrder === 1) {
this.orderTypeName = "抽奖订单"
this.orderTypeNameStatus = false
} }
this.system_store = res.data.systemStore || {} this.system_store = res.data.systemStore || {}
this.mapKey = res.data.mapKay this.mapKey = res.data.mapKay
pkg-video/views/county-claim-address.vue
+92 -68
View File
@@ -1,9 +1,9 @@
<template> <template>
<view class="claim-page"> <view class="claim-page">
<view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }"> <!-- <view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }">
<view class="header-inner"> <view class="header-inner">
<view class="header-back" @click="goBack"> <view class="header-back" @click="goBack">
<text class="header-back-icon">‹</text> <u-icon name="arrow-left" size="24" color="#333" class="header-back-icon"></u-icon>
</view> </view>
<view class="header-title">填写收货地址</view> <view class="header-title">填写收货地址</view>
<view class="header-right"> <view class="header-right">
@@ -11,25 +11,27 @@
<view class="ring"></view> <view class="ring"></view>
</view> </view>
</view> </view>
</view> </view> -->
<scroll-view class="page-body" scroll-y :style="{ paddingTop: `calc(${statusBarHeight}px + 88rpx)` }"> <scroll-view class="page-body" scroll-y >
<view class="section-title">奖品信息</view>
<view class="card prize-card"> <view class="card prize-card">
<view class="prize-image-wrap"> <view class="section-title">奖品信息</view>
<image class="prize-image" :src="prizeImage" mode="aspectFill" /> <view class="prize-content">
</view> <view class="prize-image-wrap">
<view class="prize-info"> <image class="prize-image" :src="prizeImage" mode="aspectFill" />
<view class="prize-name">{{ form.prizeName || '神秘奖品' }}</view> </view>
<view class="prize-desc">颜色随机</view> <view class="prize-info">
<view class="prize-code">抽奖码：{{ form.ticketCode || '--' }}</view> <view class="prize-name">{{ form.prizeName || '神秘奖品' }}</view>
<view class="prize-desc">颜色随机</view>
<view class="prize-code">抽奖码：{{ form.ticketCode || '--' }}</view>
</view>
</view> </view>
</view> </view>
<view class="card form-card"> <view class="card form-card">
<view class="form-row"> <view class="form-row">
<text class="label">收货人</text> <text class="label">收货人</text>
<input v-model="form.realName" class="input" placeholder="张三" placeholder-style="color:#999;" /> <input v-model="form.realName" class="input" placeholder="请填写收货人" placeholder-style="color:#b2b2b2;" />
</view> </view>
<view class="form-row"> <view class="form-row">
<text class="label">手机号码</text> <text class="label">手机号码</text>
@@ -38,8 +40,8 @@
class="input" class="input"
type="number" type="number"
maxlength="11" maxlength="11"
placeholder="12345678910" placeholder="请填写收货手机号"
placeholder-style="color:#999;" placeholder-style="color:#b2b2b2;"
/> />
</view> </view>
<view class="form-row"> <view class="form-row">
@@ -53,12 +55,12 @@
@callback="onCityChange" @callback="onCityChange"
/> />
</view> </view>
<text class="iconfont icon-dizhi locate-icon" @click="getCurAddressFn"></text> <image class="locate-icon" :src="`${webUrl}/home/dingwei.png`" mode="aspectFit" @click="getCurAddressFn"></image>
</view> </view>
</view> </view>
<view class="form-row no-border"> <view class="form-row no-border">
<text class="label">详细地址</text> <text class="label">详细地址</text>
<input v-model="form.detail" class="input" placeholder="请填写具体地址" placeholder-style="color:#999;" /> <input v-model="form.detail" class="input" placeholder="请填写具体地址" placeholder-style="color:#b2b2b2;" />
</view> </view>
<view class="analysis-box"> <view class="analysis-box">
@@ -87,7 +89,7 @@
<view class="popup-panel auth-panel" @click.stop> <view class="popup-panel auth-panel" @click.stop>
<view class="popup-close" @click="closePopup">×</view> <view class="popup-close" @click="closePopup">×</view>
<view class="popup-icon-wrap"> <view class="popup-icon-wrap">
<text class="popup-icon">🪪</text> <image class="popup-realname-icon" :src="webUrl + '/home/shiming.png'" mode="aspectFit" />
</view> </view>
<view class="popup-title">实名认证</view> <view class="popup-title">实名认证</view>
<view class="popup-desc">根据平台活动规则，领取电子数码产品需要进行实名认证</view> <view class="popup-desc">根据平台活动规则，领取电子数码产品需要进行实名认证</view>
@@ -101,7 +103,7 @@
<view class="popup-panel success-panel" @click.stop> <view class="popup-panel success-panel" @click.stop>
<view class="popup-close" @click="closePopup">×</view> <view class="popup-close" @click="closePopup">×</view>
<view class="popup-icon-wrap"> <view class="popup-icon-wrap">
<text class="popup-icon">🎉</text> <image class="popup-success-icon" :src="webUrl + '/home/qingzhu.png'" mode="aspectFit" />
</view> </view>
<view class="popup-title">提交成功</view> <view class="popup-title">提交成功</view>
<view class="popup-desc">奖品将在7个工作日内寄出</view> <view class="popup-desc">奖品将在7个工作日内寄出</view>
@@ -125,6 +127,7 @@ export default {
components: { CitySelect }, components: { CitySelect },
data() { data() {
return { return {
webUrl: this.$VUE_APP_RESOURCES_URL,
statusBarHeight: 20, statusBarHeight: 20,
district: [], district: [],
addressText: '', addressText: '',
@@ -139,12 +142,13 @@ export default {
prizeName: '', prizeName: '',
prizeType: '', prizeType: '',
prizeTypeName: '', prizeTypeName: '',
prizeImage: '',
ticketCode: '', ticketCode: '',
realName: '', realName: '',
phone: '', phone: '',
detail: '' detail: ''
}, },
showRealnamePopup: true, showRealnamePopup: false,
showSubmitSuccessPopup: false, showSubmitSuccessPopup: false,
userInfo: {}, userInfo: {},
realnameStatus: 0, realnameStatus: 0,
@@ -154,7 +158,7 @@ export default {
}, },
computed: { computed: {
prizeImage() { prizeImage() {
return 'https://img2.baidu.com/it/u=1255257059,3076495012&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800' return this.form.prizeImage || ''
} }
}, },
onLoad(options) { onLoad(options) {
@@ -163,14 +167,17 @@ export default {
this.form.prizeName = decodeURIComponent(options.prizeName || '') this.form.prizeName = decodeURIComponent(options.prizeName || '')
this.form.prizeType = decodeURIComponent(options.prizeType || '') this.form.prizeType = decodeURIComponent(options.prizeType || '')
this.form.prizeTypeName = decodeURIComponent(options.prizeTypeName || '') this.form.prizeTypeName = decodeURIComponent(options.prizeTypeName || '')
this.form.prizeImage = decodeURIComponent(options.prizeImage || '')
this.form.ticketCode = decodeURIComponent(options.ticketCode || '') this.form.ticketCode = decodeURIComponent(options.ticketCode || '')
this.getCityList() this.getCityList()
this.fetchRealnameStatus() this.fetchRealnameStatus()
}, },
onShow() { onShow() {
const done = uni.getStorageSync('countyClaimAuthDone') const done = uni.getStorageSync('countyClaimAuthDone')
if (done && this.waitSubmitAfterRealname) { const needAutoSubmit = uni.getStorageSync('countyClaimNeedAutoSubmit')
if (done && (this.waitSubmitAfterRealname || needAutoSubmit)) {
uni.removeStorageSync('countyClaimAuthDone') uni.removeStorageSync('countyClaimAuthDone')
uni.removeStorageSync('countyClaimNeedAutoSubmit')
this.fetchRealnameStatus().then(() => { this.fetchRealnameStatus().then(() => {
this.submitPhysicalClaim() this.submitPhysicalClaim()
}) })
@@ -406,7 +413,7 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
.claim-page { .claim-page {
min-height: 100vh; min-height: 100vh;
background: #f5f6f8; background: #F0F0F0;
} }
.custom-header { .custom-header {
@@ -415,7 +422,6 @@ export default {
left: 0; left: 0;
width: 100%; width: 100%;
z-index: 20; z-index: 20;
background: #fff;
} }
.header-inner { .header-inner {
@@ -480,9 +486,9 @@ export default {
} }
.section-title { .section-title {
color: #999; color: #9b9b9b;
font-size: 26rpx; font-size: 28rpx;
margin: 10rpx 4rpx 16rpx; margin-bottom: 18rpx;
} }
.card { .card {
@@ -492,14 +498,17 @@ export default {
} }
.prize-card { .prize-card {
display: flex;
align-items: center;
padding: 24rpx; padding: 24rpx;
} }
.prize-content {
display: flex;
align-items: center;
}
.prize-image-wrap { .prize-image-wrap {
width: 140rpx; width: 182rpx;
height: 140rpx; height: 182rpx;
border-radius: 16rpx; border-radius: 16rpx;
border: 2rpx solid #f0f0f0; border: 2rpx solid #f0f0f0;
margin-right: 24rpx; margin-right: 24rpx;
@@ -520,28 +529,28 @@ export default {
} }
.prize-name { .prize-name {
font-size: 32rpx; font-size: 30rpx;
font-weight: 700; font-weight: 700;
color: #333; color: #2f2f2f;
margin-bottom: 12rpx; margin-bottom: 12rpx;
} }
.prize-desc, .prize-desc,
.prize-code { .prize-code {
font-size: 24rpx; font-size: 28rpx;
color: #999; color: #9c9c9c;
margin-top: 6rpx; margin-top: 8rpx;
} }
.form-card { .form-card {
padding: 10rpx 24rpx 24rpx; padding: 0 24rpx 24rpx;
} }
.form-row { .form-row {
min-height: 100rpx; min-height: 92rpx;
display: flex; display: flex;
align-items: center; align-items: center;
border-bottom: 2rpx dashed #eee; border-bottom: 2rpx dashed #e5e5e5;
} }
.form-row.no-border { .form-row.no-border {
@@ -549,9 +558,10 @@ export default {
} }
.label { .label {
width: 150rpx; width: 180rpx;
color: #333; color: #262626;
font-size: 28rpx; font-size: 28rpx;
font-weight: 600;
} }
.input { .input {
@@ -568,7 +578,7 @@ export default {
.city-select { .city-select {
flex: 1; flex: 1;
color: #999; color: #b2b2b2;
font-size: 28rpx; font-size: 28rpx;
} }
@@ -577,23 +587,24 @@ export default {
} }
.locate-icon { .locate-icon {
color: #666; width: 42rpx;
font-size: 36rpx; height: 42rpx;
margin-left: 20rpx; margin-left: 20rpx;
flex-shrink: 0;
} }
.analysis-box { .analysis-box {
background: #f8f8f8; background: #f8f8f8;
border-radius: 16rpx; border-radius: 16rpx;
padding: 20rpx; padding: 20rpx 20rpx 16rpx;
margin-top: 10rpx; margin-top: 20rpx;
} }
.analysis-textarea { .analysis-textarea {
width: 100%; width: 100%;
height: 100rpx; height: 110rpx;
color: #333; color: #333;
font-size: 26rpx; font-size: 30rpx;
} }
.analysis-actions { .analysis-actions {
@@ -612,7 +623,7 @@ export default {
.btn-clear { .btn-clear {
color: #BD3124; color: #BD3124;
border: 2rpx solid #BD3124; border: 2rpx solid #BD3124;
padding: 6rpx 28rpx; padding: 6rpx 32rpx;
margin-right: 20rpx; margin-right: 20rpx;
background: transparent; background: transparent;
} }
@@ -621,7 +632,7 @@ export default {
color: #fff; color: #fff;
background: #BD3124; background: #BD3124;
border: 2rpx solid #BD3124; border: 2rpx solid #BD3124;
padding: 6rpx 30rpx; padding: 6rpx 32rpx;
} }
.btn-recognize.disabled { .btn-recognize.disabled {
@@ -629,8 +640,8 @@ export default {
} }
.tips { .tips {
color: #666; color: #2f2f2f;
font-size: 22rpx; font-size: 24rpx;
line-height: 1.5; line-height: 1.5;
margin: 20rpx 10rpx; margin: 20rpx 10rpx;
} }
@@ -640,19 +651,19 @@ export default {
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background: #f5f6f8; padding: 24rpx 40rpx calc(30rpx + env(safe-area-inset-bottom));
padding: 20rpx 40rpx calc(20rpx + env(safe-area-inset-bottom));
} }
.submit-btn { .submit-btn {
height: 90rpx; height: 92rpx;
border-radius: 45rpx; border-radius: 46rpx;
background: #BD3124; background: #BD3124;
color: #fff; color: #fff;
text-align: center; text-align: center;
line-height: 90rpx; line-height: 92rpx;
font-size: 32rpx; font-size: 40rpx;
font-weight: 500; font-weight: 700;
letter-spacing: 18rpx;
} }
.popup-mask { .popup-mask {
@@ -667,26 +678,28 @@ export default {
} }
.popup-panel { .popup-panel {
width: 100%; width: 540rpx;
height: 550rpx;
background: #fff; background: #fff;
border-radius: 24rpx; border-radius: 24rpx;
padding: 40rpx 32rpx 32rpx; padding: 40rpx 32rpx;
position: relative; position: relative;
box-sizing: border-box;
} }
.popup-title { .popup-title {
text-align: center; text-align: center;
color: #222; color: #333;
font-size: 34rpx; font-size: 50rpx;
font-weight: 700; font-weight: 700;
} }
.popup-desc { .popup-desc {
color: #666; color: #666;
font-size: 26rpx; font-size: 28rpx;
line-height: 1.6; line-height: 1.6;
text-align: center; text-align: center;
margin-top: 14rpx; margin-top: 30rpx;
} }
.popup-close { .popup-close {
@@ -695,12 +708,13 @@ export default {
top: 16rpx; top: 16rpx;
width: 44rpx; width: 44rpx;
height: 44rpx; height: 44rpx;
border: 2rpx solid #111; border: 4rpx solid #333;
border-radius: 50%; border-radius: 50%;
font-size: 32rpx; font-size: 32rpx;
line-height: 38rpx; line-height: 38rpx;
text-align: center; text-align: center;
color: #111; color: #333;
font-weight: 700;
} }
.popup-icon-wrap { .popup-icon-wrap {
@@ -712,11 +726,21 @@ export default {
font-size: 54rpx; font-size: 54rpx;
} }
.popup-realname-icon {
width: 92rpx;
height: 92rpx;
}
.popup-success-icon {
width: 92rpx;
height: 92rpx;
}
.popup-actions { .popup-actions {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-top: 30rpx; margin-top: 120rpx;
} }
.popup-btn { .popup-btn {
pkg-video/views/county-lottery-rules.vue
+4 -6
View File
@@ -1,19 +1,17 @@
<template> <template>
<view class="county-lottery-rules-page"> <view class="county-lottery-rules-page">
<view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }"> <!-- <view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }">
<view class="header-inner"> <view class="header-inner">
<view class="header-back" @click="goBack"> <view class="header-back" @click="goBack">
<text class="header-back-icon">‹</text> <u-icon name="arrow-left" size="24" color="#333" class="header-back-icon"></u-icon>
</view> </view>
<view class="header-title">活动规则</view> <view class="header-title">活动规则</view>
<view class="header-right"> <view class="header-right">
<!-- <view class="right-dot"></view>
<view class="right-ring"></view> -->
</view> </view>
</view> </view>
</view> </view> -->
<view class="page-body" :style="{ paddingTop: `${statusBarHeight + 88}px` }"> <view class="page-body" >
<view class="rule-card"> <view class="rule-card">
<view class="rule-content"> <view class="rule-content">
<rich-text v-if="ruleContent" :nodes="ruleContent" /> <rich-text v-if="ruleContent" :nodes="ruleContent" />
pkg-video/views/county-lottery.vue
+69 -29
View File
@@ -45,24 +45,29 @@
</view> </view>
<view class="pool-wrap"> <view class="pool-wrap">
<view class="pool-header"> <view class="pool-header" style="background: linear-gradient(to bottom, #fff 50%, #CB302C 50%);">
<view class="pool-title">奖品池 <text class="sub">/ prize pool</text></view> <view class="pool-title-wrap">
<view class="pool-title">奖品池 <text class="sub">/ prize pool</text></view>
</view>
<view class="pool-desc">实付满{{ buyThresholdText }}元即可获得抽奖码，定时统一开奖</view> <view class="pool-desc">实付满{{ buyThresholdText }}元即可获得抽奖码，定时统一开奖</view>
</view> </view>
<view class="pool-body"> <view class="pool-body">
<swiper <swiper
class="pool-swiper" class="pool-swiper"
:autoplay="prizeList.length > 3" :autoplay="prizeList.length > 1"
:circular="prizeList.length > 3" :circular="prizeList.length > 1"
:interval="3000" :interval="3000"
:duration="500" :duration="500"
:display-multiple-items="prizeList.length >= 3 ? 3 : prizeList.length" previous-margin="220rpx"
next-margin="220rpx"
@change="onSwiperChange"
v-if="prizeList.length" v-if="prizeList.length"
> >
<swiper-item v-for="(prize, gIndex) in prizeList" :key="gIndex"> <swiper-item v-for="(prize, gIndex) in prizeList" :key="gIndex">
<view class="pool-list-group"> <view class="pool-list-group">
<view <view
class="pool-item" class="pool-item"
:class="{ 'is-active': currentSwiperIndex === gIndex }"
style="margin: 0 auto;" style="margin: 0 auto;"
> >
<view class="item-inner"> <view class="item-inner">
@@ -82,8 +87,9 @@
<view class="goods-section"> <view class="goods-section">
<view class="goods-header-box"> <view class="goods-header-box">
<view class="goods-title-pill"> <view class="goods-title-pill">
<text class="dot">·</text> 活动商品 <text class="dot">·</text> <view style="background: #ffb611;
<view class="triangle"></view> padding: 8rpx 40rpx;
border-radius: 40rpx;"><text class="dot">·</text> 活动商品 <text class="dot">·</text></view>
</view> </view>
<view class="goods-sub">—— 购买即得抽奖码 ——</view> <view class="goods-sub">—— 购买即得抽奖码 ——</view>
</view> </view>
@@ -147,7 +153,8 @@ export default {
day: '--', day: '--',
time: '--:--:--' time: '--:--:--'
}, },
countdownTimer: null countdownTimer: null,
currentSwiperIndex: 0
} }
}, },
computed: { computed: {
@@ -300,6 +307,9 @@ export default {
url: '/pages/home/index' url: '/pages/home/index'
}) })
}, },
onSwiperChange(e) {
this.currentSwiperIndex = e.detail.current
},
goGoodsDetail(item) { goGoodsDetail(item) {
if (!item.id) return if (!item.id) return
uni.navigateTo({ url: `/pages/shop/GoodsCon/index?id=${item.id}&from=countyLottery&activityId=${this.activityId}` }) uni.navigateTo({ url: `/pages/shop/GoodsCon/index?id=${item.id}&from=countyLottery&activityId=${this.activityId}` })
@@ -488,12 +498,24 @@ export default {
width: 44rpx; width: 44rpx;
padding: 24rpx 0; padding: 24rpx 0;
text-align: center; text-align: center;
border-radius: 24rpx 0 0 24rpx; border-radius: 24rpx 24rpx 0 24rpx;
z-index: 10; z-index: 10;
writing-mode: vertical-rl; writing-mode: vertical-rl;
letter-spacing: 6rpx; letter-spacing: 6rpx;
font-weight: bold; font-weight: bold;
box-shadow: -2rpx 2rpx 8rpx rgba(0, 0, 0, 0.1); box-shadow: -2rpx 2rpx 8rpx rgba(0, 0, 0, 0.1);
line-height: 44rpx;
&::after{
content: '';
position: absolute;
bottom: -14rpx;
right: 0; /* 修改为对齐右侧，以匹配侧边栏的布局 */
width: 0;
height: 0;
border-width: 14rpx 0 0 14rpx; /* 将三角形反转：顶部和左侧保留宽度，形成一个斜边向右下的直角三角形 */
border-style: solid;
border-color: #fff transparent transparent transparent; /* 顶部为白色 */
}
} }
.side-entry.rules { .side-entry.rules {
@@ -508,7 +530,7 @@ export default {
margin: 0 24rpx; margin: 0 24rpx;
background: #fff; background: #fff;
border-radius: 40rpx; border-radius: 40rpx;
padding: 10rpx 10rpx 10rpx 30rpx; padding: 0rpx 0rpx 0rpx 30rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@@ -538,7 +560,7 @@ export default {
background: #3b7cf6; background: #3b7cf6;
color: #fff; color: #fff;
font-size: 24rpx; font-size: 24rpx;
padding: 8rpx 20rpx; padding: 16rpx 20rpx;
border-radius: 30rpx; border-radius: 30rpx;
display: flex; display: flex;
align-items: center; align-items: center;
@@ -555,25 +577,30 @@ export default {
.pool-wrap { .pool-wrap {
margin: 24rpx; margin: 24rpx;
background: #cb302c; background: #cb302c;
border-radius: 24rpx; border-radius: 40rpx;
overflow: hidden; overflow: hidden;
box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05); box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
.pool-header { .pool-header {
display: flex; display: flex;
align-items: stretch; align-items: stretch;
.pool-title-wrap{
background: #CB302C;
border-top-right-radius: 40rpx;
position: relative;
}
.pool-title { .pool-title {
background: #ffb611; background: #ffb611;
color: #333; color: #333;
font-weight: bold; font-weight: bold;
font-size: 34rpx; font-size: 34rpx;
padding: 10rpx 24rpx; padding: 10rpx 14rpx;
border-radius: 40rpx; border-radius: 40rpx;
margin: 20rpx 30rpx 20rpx 20rpx; margin: 10rpx;
display: flex; display: flex;
align-items: baseline; align-items: baseline;
position: relative;
.sub { .sub {
font-size: 20rpx; font-size: 20rpx;
font-weight: bold; font-weight: bold;
@@ -598,20 +625,30 @@ export default {
} }
.pool-swiper { .pool-swiper {
height: 250rpx; height: 310rpx; /* 增加高度防止放大后被裁剪，并留出阴影和标签的空间 */
width: 100%; width: 100%;
} }
.pool-list-group { .pool-list-group {
display: flex; display: flex;
flex-wrap: nowrap; justify-content: center;
align-items: center;
height: 100%;
padding: 0;
} }
.pool-item { .pool-item {
width: 220rpx; width: 220rpx; /* 恢复正常大小 */
margin-right: 32rpx; margin: 0 auto;
position: relative; position: relative;
flex-shrink: 0; flex-shrink: 0;
transform: scale(0.85); /* 默认两侧缩小 */
transition: transform 0.3s ease;
&.is-active {
transform: scale(1.1); /* 当前项放大 */
z-index: 10;
}
.item-inner { .item-inner {
background: #fff; background: #fff;
@@ -684,34 +721,37 @@ export default {
.goods-title-pill { .goods-title-pill {
position: absolute; position: absolute;
top: -24rpx; top: -34rpx;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
background: #ffb611; background: #ffb611;
color: #333; color: #333;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
padding: 8rpx 40rpx;
border-radius: 40rpx; border-radius: 40rpx;
border: 6rpx solid #fff; border: 6rpx solid #fff;
display: flex; display: flex;
align-items: center; align-items: center;
white-space: nowrap; white-space: nowrap;
box-shadow: 0 -6rpx 0 #CB302C;
.dot { .dot {
margin: 0 8rpx; margin: 0 8rpx;
} }
.triangle { &::after {
content: '';
position: absolute; position: absolute;
bottom: -16rpx; bottom: -16rpx;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%) rotate(-45deg);
width: 0; width: 30rpx;
height: 0; height: 30rpx;
border-left: 12rpx solid transparent; border: 6rpx solid #fff;
border-right: 12rpx solid transparent; background: #ffb611;
border-top: 12rpx solid #ffb611; /* 为了不让这个三角形的边框跑到上方的背景前，可以设置层级或者利用边框隐藏等，目前看原来的效果是直接叠加在底下的。
由于要模拟原本的 .triangle 元素层级，我们用 z-index: -1 把它垫在 pill 下面即可 */
z-index: -1;
} }
} }
pkg-video/views/county-my-tickets.vue
+15 -8
View File
@@ -1,9 +1,9 @@
<template> <template>
<view class="county-my-tickets-page"> <view class="county-my-tickets-page">
<view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }"> <!-- <view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }">
<view class="header-inner"> <view class="header-inner">
<view class="header-back" @click="goBack"> <view class="header-back" @click="goBack">
<text class="header-back-icon">‹</text> <u-icon name="arrow-left" size="24" color="#333" class="header-back-icon"></u-icon>
</view> </view>
<view class="header-title">我的抽奖码</view> <view class="header-title">我的抽奖码</view>
<view class="header-right"> <view class="header-right">
@@ -22,9 +22,9 @@
{{ tab.label }} {{ tab.label }}
</view> </view>
</view> </view>
</view> </view> -->
<scroll-view class="page-body" scroll-y :style="{ paddingTop: `calc(${statusBarHeight}px + 168rpx)` }"> <scroll-view class="page-body" scroll-y>
<view class="tip-bar" v-if="summaryText"> <view class="tip-bar" v-if="summaryText">
<view class="tip-text one-t">{{ summaryText }}</view> <view class="tip-text one-t">{{ summaryText }}</view>
<view class="tip-btn" @click="goWinnersPage">查看全部 <text class="icon-expand">⤢</text></view> <view class="tip-btn" @click="goWinnersPage">查看全部 <text class="icon-expand">⤢</text></view>
@@ -34,7 +34,7 @@
<view class="ticket-card" v-for="item in displayList" :key="item.id"> <view class="ticket-card" v-for="item in displayList" :key="item.id">
<view class="ticket-head"> <view class="ticket-head">
<view class="ticket-code"> <view class="ticket-code">
<text class="code-icon">🎟</text> <image class="code-icon" :src="`${webUrl}/home/juan.png`" mode="aspectFit" />
<text class="code-label">抽奖码:</text> <text class="code-label">抽奖码:</text>
<text class="code-value">{{ item.ticketCode || '--' }}</text> <text class="code-value">{{ item.ticketCode || '--' }}</text>
</view> </view>
@@ -97,6 +97,7 @@ export default {
name: 'CountyMyTicketsPage', name: 'CountyMyTicketsPage',
data() { data() {
return { return {
webUrl: this.$VUE_APP_RESOURCES_URL,
statusBarHeight: 20, statusBarHeight: 20,
loading: false, loading: false,
activeTab: 'all', activeTab: 'all',
@@ -266,7 +267,8 @@ export default {
`ticketCode=${encodeURIComponent(item.ticketCode || '')}`, `ticketCode=${encodeURIComponent(item.ticketCode || '')}`,
`prizeName=${encodeURIComponent(item.prizeName || '')}`, `prizeName=${encodeURIComponent(item.prizeName || '')}`,
`prizeType=${encodeURIComponent(item.prizeType || '')}`, `prizeType=${encodeURIComponent(item.prizeType || '')}`,
`prizeTypeName=${encodeURIComponent(item.prizeTypeName || '')}` `prizeTypeName=${encodeURIComponent(item.prizeTypeName || '')}`,
`prizeImage=${encodeURIComponent(item.prizeImage || '')}`
].join('&') ].join('&')
uni.navigateTo({ uni.navigateTo({
url: `/pkg-video/views/county-claim-address?${query}` url: `/pkg-video/views/county-claim-address?${query}`
@@ -282,6 +284,10 @@ export default {
}) })
}, },
goOrder(item) { goOrder(item) {
if (this.isCouponPrize(item)) {
this.goMyCoupons()
return
}
if (!item.sourceOrderId) { if (!item.sourceOrderId) {
uni.showToast({ uni.showToast({
title: '缺少订单号', title: '缺少订单号',
@@ -470,8 +476,9 @@ export default {
.code-icon { .code-icon {
margin-right: 8rpx; margin-right: 8rpx;
color: #333; width: 44rpx;
font-size: 28rpx; height: 44rpx;
flex-shrink: 0;
} }
.code-label { .code-label {
pkg-video/views/county-realname.vue
+37 -14
View File
@@ -1,9 +1,9 @@
<template> <template>
<view class="realname-page"> <view class="realname-page">
<view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }"> <!-- <view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }">
<view class="header-inner"> <view class="header-inner">
<view class="header-back" @click="goBack"> <view class="header-back" @click="goBack">
<text class="header-back-icon">‹</text> <u-icon name="arrow-left" size="24" color="#333" class="header-back-icon"></u-icon>
</view> </view>
<view class="header-title">实名认证</view> <view class="header-title">实名认证</view>
<view class="header-right"> <view class="header-right">
@@ -11,11 +11,12 @@
<view class="ring"></view> <view class="ring"></view>
</view> </view>
</view> </view>
</view> </view> -->
<view class="page-body" :style="{ paddingTop: `calc(${statusBarHeight}px + 88rpx)` }"> <view class="page-body">
<view class="body-title">请完善以下信息</view> <view class="body-title">请完善以下信息</view>
<view class="body-desc">根据平台活动规则，领取电子数码产品需要进行实名认证</view> <view class="body-desc">根据平台活动规则，领取电子数码产品需要进行实名认。
我们会对信息进行严格保密</view>
<view class="form-wrap"> <view class="form-wrap">
<view class="form-row"> <view class="form-row">
@@ -79,11 +80,30 @@ export default {
icon: 'none' icon: 'none'
}) })
setTimeout(() => { setTimeout(() => {
uni.navigateBack() this.backToClaimPage()
}, 300) }, 300)
} }
}) })
}, },
backToClaimPage() {
const targetRoute = 'pkg-video/views/county-claim-address'
const pages = getCurrentPages()
const targetIndex = pages.findIndex(
item =>
item.route === targetRoute ||
item.route === `/${targetRoute}`
)
if (targetIndex >= 0) {
const delta = pages.length - 1 - targetIndex
uni.navigateBack({
delta: delta > 0 ? delta : 1
})
return
}
uni.redirectTo({
url: '/pkg-video/views/county-claim-address'
})
},
goBack() { goBack() {
uni.navigateBack() uni.navigateBack()
}, },
@@ -121,7 +141,7 @@ export default {
icon: 'success' icon: 'success'
}) })
setTimeout(() => { setTimeout(() => {
uni.navigateBack() this.backToClaimPage()
}, 350) }, 350)
} catch (e) { } catch (e) {
uni.showToast({ uni.showToast({
@@ -211,16 +231,20 @@ export default {
} }
.body-title { .body-title {
font-size: 44rpx; font-size: 40rpx;
color: #111; color: #333;
font-weight: 700; font-weight: 700;
padding: 20rpx;
} }
.body-desc { .body-desc {
margin-top: 12rpx; margin-top: 12rpx;
color: #666; color: #666;
font-size: 30rpx; font-size: 28rpx;
line-height: 1.45; line-height: 1.45;
padding: 20rpx;
background: rgba(244,244,244,0.39);
border-radius: 16rpx;
} }
.form-wrap { .form-wrap {
@@ -243,12 +267,12 @@ export default {
.label { .label {
width: 150rpx; width: 150rpx;
color: #333; color: #333;
font-size: 30rpx; font-size: 32rpx;
} }
.input { .input {
flex: 1; flex: 1;
font-size: 30rpx; font-size: 32rpx;
color: #333; color: #333;
} }
@@ -262,7 +286,6 @@ export default {
} }
.submit-btn { .submit-btn {
height: 88rpx;
border-radius: 44rpx; border-radius: 44rpx;
background: #bd3124; background: #bd3124;
color: #fff; color: #fff;
@@ -270,6 +293,6 @@ export default {
text-align: center; text-align: center;
font-size: 38rpx; font-size: 38rpx;
font-weight: 600; font-weight: 600;
letter-spacing: 4rpx; letter-spacing: 14rpx;
} }
</style> </style>
pkg-video/views/county-winners.vue
+170 -56
View File
@@ -1,13 +1,13 @@
<template> <template>
<view class="winners-page"> <view class="winners-page">
<view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }"> <!-- <view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }">
<view class="header-inner"> <view class="header-inner">
<view class="header-back" @click="goBack"> <view class="header-back" @click="goBack">
<text class="header-back-icon">‹</text> <u-icon name="arrow-left" size="24" color="#333" class="header-back-icon"></u-icon>
</view> </view>
<view class="header-title">中奖名单</view> <view class="header-title">中奖名单</view>
</view> </view>
</view> </view> -->
<view class="content-wrap" v-if="loaded"> <view class="content-wrap" v-if="loaded">
<view v-if="!showHistory" class="draw-info-wrap" :style="{ backgroundImage: `url(${webUrl}/zhongjiang5.png)` }"> <view v-if="!showHistory" class="draw-info-wrap" :style="{ backgroundImage: `url(${webUrl}/zhongjiang5.png)` }">
@@ -53,34 +53,53 @@
<view class="draw-time" style="margin-top: 60rpx">开奖时间：{{ drawTime }}</view> <view class="draw-time" style="margin-top: 60rpx">开奖时间：{{ drawTime }}</view>
</view> </view>
</view> </view>
<view class="win-banner" v-if="hasWon === 1 && userWinList.length > 0" :style="{ backgroundImage: `url(${webUrl}/zhongjiangn.png)` }"> <view class="win-banner" v-if="hasWon === 1 && userWinList.length > 0">
<view class="win-banner-subtitle"> <view class="win-banner-bg-top" :style="{ backgroundImage: `url(${webUrl}/zhongjiangtop.png)` }"></view>
您的抽奖码 <text class="code">{{ userWinList[0].ticketCode }}</text> 获得了 <view class="win-banner-bg-bottom" :style="{ backgroundImage: `url(${webUrl}/zhongjiangbottom.png)` }"></view>
</view> <view class="win-banner-content">
<view class="win-banner-subtitle">
<view class="prize-card" v-for="(prize, index) in userWinList" :key="index"> 您的抽奖码 <text class="code">{{ userWinList[0].ticketCode }}</text> 获得了
<view class="prize-img-wrap">
<image class="prize-img" :src="prize.prizeImage" mode="aspectFill"></image>
</view> </view>
<view class="prize-info">
<view class="prize-name-wrap"> <view class="prize-card" v-for="(prize, index) in userWinList" :key="index">
<text class="prize-level">{{ prize.levelName }}：</text> <view class="prize-img-wrap">
<text class="prize-name">{{ prize.prizeName }}</text> <image class="prize-img" :src="prize.prizeImage" mode="aspectFill"></image>
</view>
<view class="prize-info">
<view class="prize-name-wrap">
<text class="prize-level">{{ prize.levelName }}：</text>
<text class="prize-name">{{ prize.prizeName }}</text>
</view>
<view class="prize-desc">{{ prize.prizeDesc || "默认" }}</view>
</view> </view>
<view class="prize-desc">{{ prize.prizeDesc || "默认" }}</view>
</view> </view>
</view>
<button class="my-tickets-btn" @click="handleClaimNow"> <button v-if="!showHistory" class="my-tickets-btn" @click="handleClaimNow">
<text class="btn-text">立即领取</text> <text class="btn-text">立即领取</text>
</button> </button>
<view class="claim-tip">*请在7天内领取，过期失效</view> <button v-if="showHistory" class="my-tickets-btn" @click="navToMyTickets">
<text class="btn-text">我的抽奖码</text>
</button>
<view class="claim-tip">*请在7天内领取，过期失效</view>
</view>
</view>
<!-- 把半圆提出来，跟大卡片平级，并且放在大卡片前面，让大卡片的背景可以遮住它们的下半截 -->
<view class="badge-side-wrap">
<view class="badge-side left-side"></view>
<view class="badge-side right-side"></view>
</view> </view>
<view class="winners-list-wrap"> <view class="winners-list-wrap">
<view class="list-title-badge" :style="{ backgroundImage: `url(${webUrl}/zhongjiang6.png)` }"> <view class="list-title-badge">
<text class="gift-icon" style="opacity: 0;">🎁</text> <!-- 主图背景 -->
<text class="title-text" style="opacity: 0;">中奖名单</text> <view class="badge-bg" :style="{ backgroundImage: `url(${webUrl}/zhongjiang6.png)` }"></view>
<!-- 内容区 -->
<view class="badge-content">
<text class="gift-icon" style="opacity: 0;">🎁</text>
<text class="title-text" style="opacity: 0;">中奖名单</text>
</view>
</view> </view>
<view class="list-content"> <view class="list-content">
@@ -108,7 +127,7 @@
<view class="coupon-popup" @click.stop> <view class="coupon-popup" @click.stop>
<view class="popup-close" @click="closeCouponSuccessPopup">×</view> <view class="popup-close" @click="closeCouponSuccessPopup">×</view>
<view class="popup-icon-wrap"> <view class="popup-icon-wrap">
<text class="popup-icon">🎉</text> <image class="popup-success-icon" :src="webUrl + '/home/qingzhu.png'" mode="aspectFit" />
</view> </view>
<view class="popup-title">领取成功</view> <view class="popup-title">领取成功</view>
<view class="popup-desc">您的奖品已经领取成功，请前往“我的优惠券”查看详情</view> <view class="popup-desc">您的奖品已经领取成功，请前往“我的优惠券”查看详情</view>
@@ -229,9 +248,17 @@ export default {
return prizeType === 3 || prize.prizeType === "coupon" || /券/.test(prizeName) return prizeType === 3 || prize.prizeType === "coupon" || /券/.test(prizeName)
}, },
navToReceiveInfo(prize = {}) { navToReceiveInfo(prize = {}) {
const query = `?source=lottery&ticketCode=${encodeURIComponent(prize.ticketCode || "")}&prizeName=${encodeURIComponent(prize.prizeName || "")}` const query = [
`source=lottery`,
`lotteryRecordId=${encodeURIComponent(prize.lotteryRecordId || "")}`,
`ticketCode=${encodeURIComponent(prize.ticketCode || "")}`,
`prizeName=${encodeURIComponent(prize.prizeName || "")}`,
`prizeType=${encodeURIComponent(prize.prizeType || "")}`,
`prizeTypeName=${encodeURIComponent(prize.prizeTypeName || "")}`,
`prizeImage=${encodeURIComponent(prize.prizeImage || "")}`
].join("&")
uni.navigateTo({ uni.navigateTo({
url: `/pages/user/address/AddAddress/index${query}` url: `/pkg-video/views/county-claim-address?${query}`
}) })
}, },
closeCouponSuccessPopup() { closeCouponSuccessPopup() {
@@ -276,11 +303,13 @@ export default {
}, },
mapUserWinList(ticketList = []) { mapUserWinList(ticketList = []) {
return ticketList.map(item => ({ return ticketList.map(item => ({
lotteryRecordId: item.id || item.lotteryRecordId || item.ticketId || item.recordId || "",
levelName: item.levelName || item.prizeLevelName || "中奖奖品", levelName: item.levelName || item.prizeLevelName || "中奖奖品",
prizeName: item.prizeName || item.awardName || "神秘奖品", prizeName: item.prizeName || item.awardName || "神秘奖品",
prizeDesc: item.prizeDesc || item.remark || "默认", prizeDesc: item.prizeDesc || item.remark || "默认",
ticketCode: item.ticketCode || item.code || "--", ticketCode: item.ticketCode || item.code || "--",
prizeType: item.prizeType, prizeType: item.prizeType,
prizeTypeName: item.prizeTypeName || item.prizeCategoryName || "",
prizeImage: item.prizeImage || item.image || "" prizeImage: item.prizeImage || item.image || ""
})) }))
}, },
@@ -318,6 +347,10 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.popup-success-icon {
width: 92rpx;
height: 92rpx;
}
.winners-page { .winners-page {
min-height: 100vh; min-height: 100vh;
background: #f4f6f8; background: #f4f6f8;
@@ -489,10 +522,35 @@ export default {
text-align: center; text-align: center;
margin-bottom: 62rpx; margin-bottom: 62rpx;
position: relative; position: relative;
background-size: 100%;
background-repeat: no-repeat;
background-color: transparent; background-color: transparent;
.win-banner-bg-top {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 120rpx; /* 根据顶部图实际比例微调 */
background-size: 100% 100%;
background-repeat: no-repeat;
z-index: 1;
}
.win-banner-bg-bottom {
position: absolute;
top: 118rpx; /* 让上下拼接处没有缝隙，可以覆盖 2rpx */
bottom: 0;
left: 0;
width: 100%;
background-size: 100% 100%;
background-repeat: no-repeat;
z-index: 1;
}
.win-banner-content {
position: relative;
z-index: 2;
}
.win-badge { .win-badge {
position: absolute; position: absolute;
top: -34rpx; top: -34rpx;
@@ -521,7 +579,7 @@ export default {
font-size: 28rpx; font-size: 28rpx;
color: #fff; color: #fff;
margin-bottom: 20rpx; margin-bottom: 20rpx;
margin-top: 8rpx; margin-top: 50rpx;
font-weight: 700; font-weight: 700;
.code { .code {
@@ -589,8 +647,10 @@ export default {
} }
.my-tickets-btn { .my-tickets-btn {
background: linear-gradient(180deg, #ffd33d 0%, #ffb300 100%); background-size: 100% 100%;
border: 4rpx solid #1f1f1f; background-repeat: no-repeat;
background-color: transparent;
border: none;
border-radius: 48rpx; border-radius: 48rpx;
padding: 0; padding: 0;
height: 90rpx; height: 90rpx;
@@ -599,19 +659,21 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: inset 0 -8rpx 0 rgba(0, 0, 0, 0.12), 0 8rpx 0 #1f1f1f;
box-shadow: inset 0 -12rpx 0 #FAA100, inset 0 12rpx 0 #FAA100, inset -12rpx 0rpx 0rpx #FAA100, inset 12rpx 0rpx 0 #FAA100;
transition: all 0.1s; transition: all 0.1s;
background: #FDB400;
&:active { &:active {
transform: translateY(4rpx); transform: translateY(4rpx);
box-shadow: inset 0 -4rpx 0 rgba(0, 0, 0, 0.12), 0 4rpx 0 #1f1f1f; box-shadow: inset 0 -4rpx 0 #FAA100;
} }
.btn-text { .btn-text {
font-size: 50rpx; font-size: 44rpx;
font-weight: 900; font-weight: 900;
color: #fff; color: #111;
text-shadow: -2rpx -2rpx 0 #1f1f1f, 2rpx -2rpx 0 #1f1f1f, -2rpx 2rpx 0 #1f1f1f, 2rpx 2rpx 0 #1f1f1f, 0 4rpx 0 #1f1f1f; text-shadow: -2rpx -2rpx 0 #fff, 2rpx -2rpx 0 #fff, -2rpx 2rpx 0 #fff, 2rpx 2rpx 0 #fff, 0 2rpx 0 #fff;
letter-spacing: 2rpx; letter-spacing: 2rpx;
} }
} }
@@ -624,11 +686,41 @@ export default {
} }
} }
/* 新增：半圆挂在列表大卡片外部的相对容器上 */
.badge-side-wrap {
position: relative;
width: 100%;
height: 0; /* 占位 0，不影响后续流 */
z-index: 1; /* 在 winners-list-wrap 之前，所以会被它的 z-index 盖住，或自然被后面元素盖住 */
.badge-side {
position: absolute;
top: -18rpx; /* 调整此值以对齐中奖名单背景的垂直中线 */
width: 40rpx;
height: 38rpx;
background-color: #fdb400;
border: 4rpx solid #111;
}
.left-side {
left: calc(50% - 160rpx); /* 根据主图 280rpx 宽算，一半140rpx，加上突出的 20rpx */
border-radius: 40rpx 0 0 40rpx;
border-right: none;
}
.right-side {
right: calc(50% - 160rpx);
border-radius: 0 40rpx 40rpx 0;
border-left: none;
}
}
.winners-list-wrap { .winners-list-wrap {
background: #fff; background: #fff;
border-radius: 28rpx; border-radius: 28rpx;
padding: 46rpx 24rpx 10rpx; padding: 46rpx 24rpx 10rpx;
position: relative; position: relative;
z-index: 2; /* 确保盖住上面的 badge-side-wrap */
box-shadow: 0 5rpx 0 #e6e8ec; box-shadow: 0 5rpx 0 #e6e8ec;
.list-title-badge { .list-title-badge {
@@ -638,20 +730,42 @@ export default {
transform: translateX(-50%); transform: translateX(-50%);
display: flex; display: flex;
align-items: center; align-items: center;
padding: 14rpx 34rpx; justify-content: center;
background-size: 100% 100%; width: 280rpx; /* 根据实际标题框宽度设定，让它包裹住背景图 */
background-repeat: no-repeat; height: 80rpx;
background-color: transparent; z-index: 3;
.gift-icon { /* 主背景图，层级2，盖住半圆的一部分 */
font-size: 28rpx; .badge-bg {
margin-right: 8rpx; position: absolute;
top: -5rpx;
left: 0;
width: 100%;
height: 100%;
background-size: 100% 100%;
background-repeat: no-repeat;
z-index: 2;
} }
.title-text { /* 文字内容，层级3，位于最上层 */
font-size: 34rpx; .badge-content {
font-weight: 900; position: relative;
color: #222; z-index: 3;
display: flex;
align-items: center;
padding: 0 34rpx;
height: 100%;
.gift-icon {
font-size: 28rpx;
margin-right: 8rpx;
}
.title-text {
font-size: 34rpx;
font-weight: 900;
color: #222;
}
} }
} }
@@ -671,7 +785,7 @@ export default {
flex: 1; flex: 1;
.item-prize { .item-prize {
font-size: 36rpx; font-size: 28rpx;
color: #333; color: #333;
margin-bottom: 8rpx; margin-bottom: 8rpx;
line-height: 1.25; line-height: 1.25;
@@ -686,7 +800,7 @@ export default {
} }
.item-code { .item-code {
font-size: 32rpx; font-size: 28rpx;
color: #666; color: #666;
font-weight: 700; font-weight: 700;
@@ -702,14 +816,14 @@ export default {
text-align: right; text-align: right;
.user-name { .user-name {
font-size: 32rpx; font-size: 28rpx;
color: #666; color: #666;
font-weight: 700; font-weight: 700;
margin-bottom: 8rpx; margin-bottom: 8rpx;
} }
.user-phone { .user-phone {
font-size: 30rpx; font-size: 28rpx;
color: #999; color: #999;
font-weight: 600; font-weight: 600;
} }
@@ -737,8 +851,8 @@ export default {
} }
.coupon-popup { .coupon-popup {
width: 100%; width: 550rpx;
max-width: 620rpx; height: 560rpx;
background: #fff; background: #fff;
border-radius: 32rpx; border-radius: 32rpx;
padding: 26rpx 34rpx 42rpx; padding: 26rpx 34rpx 42rpx;
@@ -752,7 +866,7 @@ export default {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
border-radius: 50%; border-radius: 50%;
border: 2rpx solid #333; border: 4rpx solid #333;
font-size: 40rpx; font-size: 40rpx;
font-weight: 700; font-weight: 700;
color: #333; color: #333;
@@ -776,7 +890,7 @@ export default {
.popup-title { .popup-title {
text-align: center; text-align: center;
font-size: 60rpx; font-size: 50rpx;
font-weight: 900; font-weight: 900;
color: #222; color: #222;
margin-top: 12rpx; margin-top: 12rpx;
todo.md
+8
View File
@@ -0,0 +1,8 @@
开奖缺少 是否领取奖品状态
缺少平台客服电话
缺少 立即领取图片
送礼逻辑没做
实付多少钱数据没有
查看订单没有奖品订单号
抽奖码页缺少中奖轮播数据
奖品订单 确认收货后直接完成