Commit b73a9132 by levlin

Merge branch 'dev'

parents 5cfd1329 7f0c9840
......@@ -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