Commit 7f0c9840 by levlin

Merge branch 'test' into dev

parents a1606ef0 a10ca320
......@@ -2,6 +2,14 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [1.3.30](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.29...v1.3.30) (2025-07-01)
### Features
* 新增下一场活动奖品显示逻辑判断 ([6656aaa](https://gitlab.aodianyun.com/activities/web-lottery/commit/6656aaa2fdb97d2041ca77b0a23eb6d15d2808a8))
* 修复已知样式问题 ([fc9c65c](https://gitlab.aodianyun.com/activities/web-lottery/commit/fc9c65c092cda540711c79fce40a97acb4782751))
### [1.3.29](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.28...v1.3.29) (2025-05-29)
......
{
"name": "web-lottery",
"version": "1.3.29",
"version": "1.3.30",
"private": true,
"license": "UNLICENSED",
"scripts": {
......
......@@ -41,7 +41,11 @@
<div class="lottery-message__win-sub">
<!-- 实物 线下核销 -->
<template v-if="winInfo.exchangeType === LOTTERY_EXCHANGE_TYPE.offline">
前往<span @click="openRecordHandler">抽奖记录</span>使用兑换码进行兑换
前往<span @click="openRecordHandler">抽奖记录</span>使用兑换码进行兑换<span
v-if="lotteryInfo.showResult"
@click="openWinnersHandler"
>查看中奖名单</span
>
</template>
<!-- 虚拟物品 -->
<!-- <template v-if="lotteryInfo.prizeType === LOTTERY_MESSAGE_PRIZE_TYPE.online"
......@@ -150,8 +154,11 @@ export default {
contactPhone: addressInfo?.mobile || '',
name: addressInfo?.name || ''
}
this.winInfo = { ...this.winInfo,
address: `${addressInfo?.province || ''}-${addressInfo?.city || ''}-${addressInfo?.area || ''}-${addressInfo?.detail}`,
this.winInfo = {
...this.winInfo,
address: `${addressInfo?.province || ''}-${addressInfo?.city || ''}-${addressInfo?.area || ''}-${
addressInfo?.detail
}`,
contactPhone: addressInfo?.mobile || '',
name: addressInfo?.name || ''
}
......@@ -420,6 +427,10 @@ export default {
color: #0091ff;
font-size: 12px;
font-weight: 500;
&:nth-child(2) {
margin-left: 10px;
margin-right: 0;
}
}
}
&__lost {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment