Merge branch 'master' into xw-v2

This commit is contained in:
zhangds 2024-04-17 10:14:01 +08:00
commit e239a9a896
2 changed files with 2 additions and 4 deletions

View File

@ -92,8 +92,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="receiveBtn" @click="receiveFn" :class="goodInfo.available!=1?'readOnly':''">{{ <div class="receiveBtn" @click="receiveFn" :class="goodInfo.available!=1?'readOnly':''">立即领取</div>
globalFormatStatus(goodInfo.available) }}</div>
<div class="coupon_explain"> <div class="coupon_explain">
<h1>- 兑换说明 -</h1> <h1>- 兑换说明 -</h1>
<div class="content"> <div class="content">

View File

@ -98,8 +98,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="receiveBtn" @click="receiveFn" :class="goodInfo.available!=1?'readOnly':''">{{ <div class="receiveBtn" @click="receiveFn" :class="goodInfo.available!=1?'readOnly':''">立即领取</div>
globalFormatStatus(goodInfo.available) }}</div>
<div class="coupon_explain"> <div class="coupon_explain">