Merge remote-tracking branch 'origin/main'

This commit is contained in:
13405411873 2024-09-24 11:27:14 +08:00
commit 7d0ccaef14

View File

@ -5,24 +5,24 @@
<!-- 顶部区域 --> <!-- 顶部区域 -->
<view class="ail"> <view class="ail">
<view class="box-order"> <view class="box-order" v-for="(item,index) in list" :key="index">
<view class="or-box-top"> <view class="or-box-top">
<view class="chengg" style="font-weight: bold;">礼品卡</view> <view class="chengg">国庆节礼品卡</view>
</view> </view>
<view class="but-box">
<view class="huis">兑换卡号</view>
<view class="">{{item.number || "暂无"}}</view>
</view>
<view class="but-box">
<view class="huis">兑换金额</view>
<view class="reds">{{item.cardAmount || 0}}</view>
</view>
<view class="but-box">
<view class="huis">订单时间</view>
<view class="">{{item.updateTime || "暂无"}}</view>
<view class="but-box">
<view class="bais">面值{{item.cardAmount || 0}}</view>
<view class="xbai">卡号{{item.number || "暂无"}}</view>
</view>
<view class="but-box">
<view class="xbai">有效期{{item.updateTime || "暂无"}}</view>
<view class="xbai">密码{{item.number || "暂无"}}</view>
</view>
<view class="potions_">
<image src="../../static/imgs/ydh.png" style="width: 45px; height: 45px; "></image>
</view> </view>
</view> </view>
@ -50,7 +50,9 @@
totalDetail: '', totalDetail: '',
show: false, show: false,
list: [], list: [{
name: '2'
}],
query: { query: {
mtUserId: '', mtUserId: '',
storeId: '', storeId: '',
@ -110,17 +112,17 @@
} }
}) })
}, },
/*getGiftRecords() { /*getGiftRecords() {
request({ request({
url: '/business/marketingActivity/cardGift/selectAllRecords', url: '/business/marketingActivity/cardGift/selectAllRecords',
method: 'get', method: 'get',
}).then(res => { }).then(res => {
console.log(res) console.log(res)
if (res.code == 200) { if (res.code == 200) {
this.list = res.data.records this.list = res.data.records
} }
}) })
},*/ },*/
} }
} }
@ -194,11 +196,14 @@
.box-order { .box-order {
width: 95%; width: 95%;
border-radius: 8px; height: 122px;
background: #ffffff; background: #ffffff;
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
margin: 10px auto; margin: 10px auto;
background: url('../../static/imgs/lpk.png') no-repeat;
background-size: 100% 100%;
position: relative;
} }
.or-box-top { .or-box-top {
@ -208,12 +213,12 @@
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
padding: 5px 0px; padding: 5px 0px;
border-bottom: 1px solid #e5e5e5;
} }
.chengg { .chengg {
color: #1678ff; color: #fff;
} }
.but-box { .but-box {
@ -265,4 +270,23 @@
bottom: 40px; bottom: 40px;
left: 11%; left: 11%;
} }
.bais {
font-size: 16px;
color: #fff;
font-weight: bold;
margin: 10px 0px;
}
.xbai {
color: #fff;
font-size: 12px;
}
.potions_ {
position: absolute;
right: 0px;
top: 0px;
}
</style> </style>