Merge remote-tracking branch 'origin/main'

This commit is contained in:
cun-nan 2024-10-22 10:30:12 +08:00
commit 9741831c8d

View File

@ -1933,8 +1933,11 @@ export default {
addFreeTicket() { addFreeTicket() {
getCanUseCoupon().then(res => { getCanUseCoupon().then(res => {
this.sendCouponList = res.data this.sendCouponList = res.data
this.setFreeIndex(res.data[0])
}) })
this.freeTicket = true this.freeTicket = true
}, },
addMemberRecharge() { addMemberRecharge() {
this.memberRecharge = true this.memberRecharge = true
@ -2540,7 +2543,7 @@ input {
padding: 20px; padding: 20px;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
//align-content: flex-start; align-content: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
overflow: auto; overflow: auto;
height: 68vh; height: 68vh;
@ -2548,6 +2551,7 @@ input {
} }
.zo_box{ .zo_box{
width: 33.3%; width: 33.3%;
margin-bottom: 1%;
} }
.card92 { .card92 {
width: 95%; width: 95%;