|
@@ -3,14 +3,14 @@
|
|
|
<div class="join-shop-list-container">
|
|
|
<!-- 查询结果 -->
|
|
|
<el-table v-loading="listLoading" element-loading-text="正在查询中..." :data="list" v-bind="{ stripe: true, size: 'small', border: true, highlightCurrentRow: true }">
|
|
|
- <el-table-column prop="allianceCardId" label="联盟卡ID" align="center" />
|
|
|
+ <el-table-column prop="allianceCardId" label="联盟卡ID" align="center" />
|
|
|
<el-table-column prop="buyerUserId" label="购买者会员ID" align="center" />
|
|
|
- <el-table-column prop="shopId" label="商家ID" align="center" />
|
|
|
- <el-table-column prop="shopName" label="商家名称" align="center" />
|
|
|
- <el-table-column prop="amount" label="消费金额" align="center">
|
|
|
+ <el-table-column prop="shopId" label="商家ID" align="center" />
|
|
|
+ <el-table-column prop="shopName" label="商家名称" align="center" />
|
|
|
+ <el-table-column prop="amount" label="消费金额" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag size="mini" type="danger">¥{{ scope.row.amount }}</el-tag>
|
|
|
- </template>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="createTime" label="消费时间" align="center" />
|
|
|
</el-table>
|
|
@@ -66,20 +66,7 @@ export default {
|
|
|
try {
|
|
|
this.listLoading = true
|
|
|
const res = await getConsumptionRecordByUserIdAndAllianceCardIdApi(this.listQuery)
|
|
|
- this.list =
|
|
|
- [
|
|
|
- {
|
|
|
- id: 1,
|
|
|
- allianceCardId: 1,
|
|
|
- buyerUserId: 1,
|
|
|
- shopId: 1,
|
|
|
- shopName: '牛鼎膳',
|
|
|
- amount: 100,
|
|
|
- createTime: '2024-11-09 01:44:05',
|
|
|
- updateTime: '2024-11-09 01:44:05',
|
|
|
- deleted: 0
|
|
|
- }
|
|
|
- ] || res.data.list
|
|
|
+ this.list = res.data.list
|
|
|
this.total = res.data.total
|
|
|
this.listLoading = false
|
|
|
} catch (error) {
|