Merge branch 'feat/v20241110-同城联盟卡'

src/api/business.js

@@ -146,13 +146,12 @@ export function wordDelete(data) {
   })
 }
 
-
 // **********************商家分类**********************
 // 添加商家分类
 export function businessClassList(data) {
   return request({
     url: '/shopCategory/getAll',
-    method: "post",
+    method: 'post',
     data
   })
 }
@@ -160,8 +159,8 @@ export function businessClassList(data) {
 // 根据一级获取
 export function businessClassListById(data) {
   return request({
-    url: "/shopCategory/getById",
-    method: "post",
+    url: '/shopCategory/getById',
+    method: 'post',
     data
   })
 }
@@ -169,8 +168,8 @@ export function businessClassListById(data) {
 // 删除标签分类
 export function deleteBusinessClass(data) {
   return request({
-    url: "/shopCategory/deleteCategory",
-    method: "post",
+    url: '/shopCategory/deleteCategory',
+    method: 'post',
     data
   })
 }
@@ -178,8 +177,8 @@ export function deleteBusinessClass(data) {
 // 更新标签
 export function updateBusinessClass(data) {
   return request({
-    url: "/shopCategory/updateCategory",
-    method: "post",
+    url: '/shopCategory/updateCategory',
+    method: 'post',
     data
   })
 }
@@ -189,26 +188,25 @@ export function addBusinessClass(data) {
   return request({
     url: '/shopCategory/addCategory',
     data,
-    method: "post"
+    method: 'post'
   })
 }
 
-
 // **********品牌工厂***********
 // 获取所有分类
 
 export function factoryClassList(data) {
   return request({
     url: '/shopCategoryMall/getAll',
-    method: "post",
+    method: 'post',
     data
   })
 }
 
 export function factoryClassListById(data) {
   return request({
-    url: "/shopCategoryMall/getById",
-    method: "post",
+    url: '/shopCategoryMall/getById',
+    method: 'post',
     data
   })
 }
@@ -216,8 +214,8 @@ export function factoryClassListById(data) {
 // 删除标签分类
 export function deleteFactoryClass(data) {
   return request({
-    url: "/shopCategoryMall/deleteCategory",
-    method: "post",
+    url: '/shopCategoryMall/deleteCategory',
+    method: 'post',
     data
   })
 }
@@ -225,8 +223,8 @@ export function deleteFactoryClass(data) {
 // 更新标签
 export function updateFactoryClass(data) {
   return request({
-    url: "/shopCategoryMall/updateCategory",
-    method: "post",
+    url: '/shopCategoryMall/updateCategory',
+    method: 'post',
     data
   })
 }
@@ -236,35 +234,34 @@ export function addFactoryClass(data) {
   return request({
     url: '/shopCategoryMall/addCategory',
     data,
-    method: "post"
+    method: 'post'
   })
 }
 
 // 获取所有分类树
 export function getAllCategoryClassTree(data) {
   return request({
-    url: "shopCategory/getAllTree",
+    url: 'shopCategory/getAllTree',
     data,
-    method: "get"
+    method: 'get'
   })
 }
 
-
 //  分页查询商家的收款码
 export function getAllPaymentCode(data) {
   return request({
-    url: "/paymentCode/getAll",
+    url: '/paymentCode/getAll',
     data,
-    method: "post"
+    method: 'post'
   })
 }
 
 //  禁用该收款码
 export function disablePaymentCode(data) {
   return request({
-    url: "/paymentCode/handle",
+    url: '/paymentCode/handle',
     data,
-    method: "post"
+    method: 'post'
   })
 }
 
@@ -273,27 +270,73 @@ export function disablePaymentCode(data) {
 //  查询申请列表
 export function getWithdrawalApplicationList(data) {
   return request({
-    url: "/shop-vouchers-withdrawal-qualification/getWithdrawalQualificationAll",
+    url: '/shop-vouchers-withdrawal-qualification/getWithdrawalQualificationAll',
     data,
-    method: "post"
+    method: 'post'
   })
 }
 
 // 审核
 export function examineWithdrawalApplication(data) {
   return request({
-    url: "/shop-vouchers-withdrawal-qualification/auditWithdrawalQualification",
+    url: '/shop-vouchers-withdrawal-qualification/auditWithdrawalQualification',
     data,
-    method: "post"
+    method: 'post'
   })
 }
 
-
 // 代金券提现记录
 export function getWithdrawalRecortAllApi(data) {
   return request({
-    url: "/shop-vouchers-withdrawal-qualification/getWithdrawalRecortAll",
+    url: '/shop-vouchers-withdrawal-qualification/getWithdrawalRecortAll',
+    data,
+    method: 'post'
+  })
+}
+
+// **********同城联盟卡1***********
+
+// 获取联盟卡列表
+export function getAllianceCardListApi(params) {
+  return request({
+    url: '/alliance-card/getAll',
+    params,
+    method: 'get'
+  })
+}
+
+// 获取联盟卡列表
+export function auditAllianceCardApi(data) {
+  return request({
+    url: '/alliance-card/auditAllianceCard',
     data,
-    method: "post"
+    method: 'POST'
+  })
+}
+
+// 获取联盟卡加盟商家列表
+export function getRegistrationShopsByIdApi(params) {
+  return request({
+    url: '/alliance-card/getRegistrationShopsById',
+    params,
+    method: 'GET'
+  })
+}
+
+// 查询购买联盟卡的用户列表
+export function getBuyerPurchaseByByIdApi(params) {
+  return request({
+    url: '/alliance-card/getBuyerPurchaseByById',
+    params,
+    method: 'GET'
+  })
+}
+
+// 查询用户联盟卡消费记录
+export function getConsumptionRecordByUserIdAndAllianceCardIdApi(params) {
+  return request({
+    url: '/alliance-card/getConsumptionRecordByUserIdAndAllianceCardId',
+    params,
+    method: 'GET'
   })
 }

src/views/business/alliance/components/BaseInfo.vue

@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="基础信息" :column="1" :size="size" border>
+      <el-descriptions-item>
+        <template slot="label">联盟卡名称</template>
+        {{ card.name }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">联盟卡封面</template>
+        <el-image :preview-src-list="[card.coverUrl]" v-if="card.coverUrl" :src="card.coverUrl" fit="fill" style="width: 127px; height: 73px"></el-image>
+        <span v-else>--</span>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions class="margin-top" title="联盟卡信息" :column="2" :size="size" border>
+      <el-descriptions-item>
+        <template slot="label">联盟卡ID</template>
+        {{ card.id }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">到期时间</template>
+        {{ card.expirationTime }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">发售价格</template>
+        <span style="color: #f40">￥{{ card.purchasePrice }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">抵扣价格</template>
+        <span style="color: #f40">￥{{ card.deductionPrice }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">团长佣金</template>
+        <span style="color: #f40">￥{{ card.headOfCommission || '--' }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">合伙人佣金</template>
+        <span style="color: #f40">￥{{ card.partnerCommission || '--' }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">发行张数</template>
+        <el-tag>{{ card.receiptCount }}张</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">状态</template>
+        <el-tag type="info" v-if="card.state === 1" size="mini">审核中</el-tag>
+        <el-tag type="success" v-if="card.state === 2" size="mini">通过</el-tag>
+        <el-tag type="danger" v-if="card.state === 3" size="mini">不通过</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">是否发行</template>
+        <el-tag type="success" v-if="card.isIssuance === 1" size="mini">发行</el-tag>
+        <el-tag type="danger" v-if="card.isIssuance === 0" size="mini">停售</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">创建时间</template>
+        {{ card.createTime }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions class="margin-top" title="权益信息" :column="1" :size="size" border>
+      <el-descriptions-item>
+        <template slot="label">权益信息</template>
+        {{ card.statement }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">使用说明</template>
+        {{ card.useInstructions }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    card: { type: Object, required: true }
+  },
+  data() {
+    return {
+      size: "mini"
+      
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-descriptions-item__label {
+  width: 168px;
+}
+
+.margin-top {
+  margin-top: 24px;
+}
+</style>

src/views/business/alliance/components/Buyers.vue

@@ -0,0 +1,94 @@
+<template>
+  <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" width="90" align="center" />
+      <el-table-column prop="buyerUserId" label="购买者会员ID" width="100" align="center" />
+      <el-table-column prop="buyerUserIdPromoters" label="推广者会员ID" width="120" align="center" />
+      <el-table-column prop="buyerUserName" label="会员名称" width="120" align="center" />
+      <el-table-column prop="buyerUserLogo" label="会员头像" width="120" align="center">
+        <template slot-scope="scope">
+          <el-image :preview-src-list="[scope.row.buyerUserLogo]" v-if="scope.row.buyerUserLogo" :src="scope.row.buyerUserLogo" fit="fill" style="width: 40px; height: 40px"></el-image>
+          <span v-else>--</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="state" label="支付状态" width="120" align="center">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.state === 1" size="mini" type="info">未支付</el-tag>
+          <el-tag v-if="scope.row.state === 2" size="mini" type="success">已支付</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="购买时间" align="center" />
+      <el-table-column align="center" label="操作" width="120" fixed="right" class-name="small-padding fixed-width">
+        <template slot-scope="{ row }">
+          <el-button size="mini" @click="$refs.consumptionDialogRef && $refs.consumptionDialogRef.handleOpen(row.allianceCardId, row.buyerUserId)">查看消费记录</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div style="margin-top: 10px">
+      <el-pagination
+        :current-page="listQuery.page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="listQuery.pageSize"
+        layout="total, sizes, prev, pager, next, -> ,jumper"
+        :total="total"
+        @size-change="(val) => (listQuery.pageSize = val) && getList()"
+        @current-change="(val) => (listQuery.page = val) && getList()"
+      />
+    </div>
+
+    <!-- 查看消费记录 -->
+    <ConsumptionDialog ref="consumptionDialogRef"></ConsumptionDialog>
+  </div>
+</template>
+
+<script>
+import { getBuyerPurchaseByByIdApi } from '@/api/business'
+import ConsumptionDialog from './ConsumptionDialog.vue'
+
+export default {
+  components: { ConsumptionDialog },
+  props: {
+    cardId: { type: [Number, String], required: true }
+  },
+
+  data() {
+    return {
+      list: [],
+      total: 0,
+      listLoading: false,
+      listQuery: {
+        allianceCardId: undefined,
+        page: 1,
+        pageSize: 20
+      }
+    }
+  },
+
+  watch: {
+    cardId: {
+      handler(value) {
+        this.listQuery.allianceCardId = value
+        value && this.getList()
+      },
+      immediate: true
+    }
+  },
+
+  methods: {
+    // 获取商家列表
+    async getList() {
+      try {
+        this.listLoading = true
+        const res = await getBuyerPurchaseByByIdApi(this.listQuery)
+        this.list = res.data.list
+        this.total = res.data.total
+        this.listLoading = false
+      } catch (error) {
+        this.listLoading = false
+      }
+    }
+  }
+}
+</script>

src/views/business/alliance/components/CheckDialog.vue

@@ -0,0 +1,69 @@
+<template>
+  <el-dialog :close-on-click-modal="false" title="联盟卡审核" :visible.sync="checkVisible" width="890px">
+    <BaseInfo :card="cardInfo"></BaseInfo>
+    <span slot="footer" class="dialog-footer">
+      <el-button  type="primary"  size="mini" :loading="checkLoading === 2" @click="handleCheck(2)">通过</el-button>
+      <el-button size="mini" :loading="checkLoading === 3" type="danger" @click="handleCheck(3)">拒绝</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import BaseInfo from './BaseInfo'
+import { auditAllianceCardApi } from '@/api/business'
+
+export default {
+  components: { BaseInfo },
+  data() {
+    return {
+      checkVisible: false
+      ,
+      checkLoading: -1,
+      cardInfo: {}
+    }
+  },
+
+  watch: {
+    checkVisible(value) {
+      if (!value) {
+        this.cardInfo = {}
+        this.checkLoading = -1
+      }
+    }
+  },
+
+  methods: {
+    handleOpen(row) {
+      this.checkVisible = true
+      this.cardInfo = row
+    },
+    //  审核
+    async handleCheck(state) {
+      this.checkLoading = state
+
+      try {
+        await auditAllianceCardApi({ allianceCardId: this.cardInfo.id, state })
+        this.$message.success('联盟卡审核成功')
+        this.checkLoading = false
+        this.$emit('success')
+        this.checkVisible = false
+      } catch (error) {
+        this.checkLoading = -1
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-descriptions__header {
+  margin-bottom: 10px;
+}
+
+.dialog-footer{
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>

src/views/business/alliance/components/ConsumptionDialog.vue

@@ -0,0 +1,78 @@
+<template>
+  <el-dialog :close-on-click-modal="false" title="消费记录" :visible.sync="consumptionDialogVisible" width="60%" append-to-body>
+    <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="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">
+          <template slot-scope="scope">
+            <el-tag size="mini" type="danger">￥{{ scope.row.amount }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="消费时间" align="center" />
+      </el-table>
+
+      <div style="margin-top: 10px">
+        <el-pagination
+          :current-page="listQuery.page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="listQuery.pageSize"
+          layout="total, sizes, prev, pager, next, -> ,jumper"
+          :total="total"
+          @size-change="(val) => (listQuery.pageSize = val) && getList()"
+          @current-change="(val) => (listQuery.page = val) && getList()"
+        />
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getConsumptionRecordByUserIdAndAllianceCardIdApi } from '@/api/business'
+
+export default {
+  data() {
+    return {
+      list: [],
+      total: 0,
+      listLoading: false,
+      listQuery: {
+        allianceCardId: undefined,
+        buyerUserId: undefined,
+        page: 1,
+        pageSize: 20
+      },
+      consumptionDialogVisible: false
+    }
+  },
+
+  methods: {
+    // 打开
+    handleOpen(allianceCardId, buyerUserId) {
+      if (!allianceCardId || !buyerUserId) {
+        return this.$message.error('数据错误')
+      }
+      this.listQuery.allianceCardId = allianceCardId
+      this.listQuery.buyerUserId = buyerUserId
+      this.consumptionDialogVisible = true
+      this.getList()
+    },
+
+    // 获取商家列表
+    async getList() {
+      try {
+        this.listLoading = true
+        const res = await getConsumptionRecordByUserIdAndAllianceCardIdApi(this.listQuery)
+        this.list = res.data.list
+        this.total = res.data.total
+        this.listLoading = false
+      } catch (error) {
+        this.listLoading = false
+      }
+    }
+  }
+}
+</script>

src/views/business/alliance/components/DetailDialog.vue

@@ -0,0 +1,54 @@
+<template>
+  <el-dialog :close-on-click-modal="false" title="提示" :visible.sync="allianceVisible" width="890px">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="基本信息" name="base">
+        <BaseInfo :card="baseInfo"></BaseInfo>
+      </el-tab-pane>
+      <el-tab-pane label="参与商家" name="second">
+        <JoinShop :card-id="baseInfo.id"></JoinShop>
+      </el-tab-pane>
+      <el-tab-pane label="购买用户" name="third">
+        <Buyers :card-id="baseInfo.id"></Buyers>
+      </el-tab-pane>
+    </el-tabs>
+  </el-dialog>
+</template>
+
+<script>
+import BaseInfo from './BaseInfo'
+import JoinShop from './JoinShop'
+import Buyers from './Buyers.vue'
+
+export default {
+  components: { BaseInfo, JoinShop, Buyers },
+  data() {
+    return {
+      activeName: 'base',
+      allianceVisible: false,
+      baseInfo: {}
+    }
+  },
+
+  watch: {
+    allianceVisible(value) {
+      if (!value) {
+        this.baseInfo = {}
+        this.activeName = 'base'
+      }
+    }
+  },
+
+  methods: {
+    handleOpen(row) {
+      this.allianceVisible = true
+      this.baseInfo = row
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-descriptions__header {
+  margin-bottom: 10px;
+}
+</style>

src/views/business/alliance/components/JoinShop.vue

@@ -0,0 +1,109 @@
+<template>
+  <div class="join-shop-list-container">
+    <div class="search-container" style="display: flex; align-items: center; margin-bottom: 10px">
+      <!-- <el-radio-group v-model="listQuery.state" size="mini" @change="handleSearch">
+        <el-radio-button label="-1">全部</el-radio-button>
+        <el-radio-button label="1">已报名</el-radio-button>
+        <el-radio-button label="2">已通过</el-radio-button>
+        <el-radio-button label="3">未通过</el-radio-button>
+      </el-radio-group> -->
+    </div>
+    <!-- 查询结果 -->
+    <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" width="90" align="center" />
+      <el-table-column prop="shopId" label="参与商家ID" width="90" align="center" />
+      <el-table-column prop="shopName" label="商家名称" width="120" align="center" />
+      <el-table-column prop="shopLogo" label="商家Logo" width="120" align="center">
+        <template slot-scope="scope">
+          <el-image :preview-src-list="[scope.row.shopLogo]" v-if="scope.row.shopLogo" :src="scope.row.shopLogo" fit="fill" style="width: 127px; height: 73px"></el-image>
+          <span v-else>--</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="state" label="参与状态" width="120" align="center">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.state === 1" size="mini" type="info">已报名</el-tag>
+          <el-tag v-if="scope.row.state === 2" size="mini" type="success">已通过</el-tag>
+          <el-tag v-if="scope.row.state === 3" size="mini" type="danger">不通过</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="settlementRatio" label="结算比例" width="120" align="center">
+        <template slot-scope="scope">
+          <el-tag>{{ scope.row.settlementRatio * 100 }}%</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="报名时间" align="center" />
+    </el-table>
+
+    <div style="margin-top: 10px">
+      <el-pagination
+        :current-page="listQuery.page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="listQuery.pageSize"
+        layout="total, sizes, prev, pager, next, -> ,jumper"
+        :total="total"
+        @size-change="(val) => (listQuery.pageSize = val) && getList()"
+        @current-change="(val) => (listQuery.page = val) && getList()"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRegistrationShopsByIdApi } from '@/api/business'
+
+export default {
+  props: {
+    cardId: { type: [Number, String], required: true }
+  },
+
+  data() {
+    return {
+      list: [],
+      total: 0,
+      listLoading: false,
+      listQuery: {
+        allianceCardId: undefined,
+        page: 1,
+        pageSize: 20,
+      }
+    }
+  },
+
+  watch: {
+    cardId: {
+      handler(value) {
+        this.listQuery.allianceCardId = value
+        value && this.getList()
+      },
+      immediate: true
+    }
+  },
+
+  methods: {
+    // 获取商家列表
+    async getList() {
+      try {
+        this.listLoading = true
+        const res = await getRegistrationShopsByIdApi({ ...this.listQuery, state: this.listQuery.state == '-1' ? undefined : this.listQuery.state * 1 })
+        this.list = res.data.list
+        this.total = res.data.total
+        this.listLoading = false
+      } catch (error) {
+        this.listLoading = false
+      }
+    },
+
+    handleSearch() {
+      this.listQuery.page = 1
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.join-shop-list-container {
+}
+</style>

src/views/business/alliance/index.vue

@@ -0,0 +1,196 @@
+<template>
+  <div class="app-container">
+    <!-- 查询和其他操作 -->
+    <div class="filter-container">
+      <el-input v-model="listQuery.search" clearable size="mini" class="filter-item" style="width: 200px" placeholder="联盟卡名称/商家名称" />
+      <el-select closeable v-model="listQuery.state" clearable size="mini" class="filter-item" style="width: 200px; margin-left: 10px" placeholder="请选择审核状态">
+        <el-option label="审核中" :value="1" />
+        <el-option label="已通过" :value="2" />
+        <el-option label="未通过" :value="3" />
+      </el-select>
+      <el-button size="mini" class="filter-item" type="primary" icon="el-icon-search" style="margin-left: 10px" @click="handleSearch">查找</el-button>
+      <el-button size="mini" class="filter-item" type="info" icon="el-icon-s-tools" style="margin-left: 10px" @click="handleReset">重置</el-button>
+      <br />
+    </div>
+
+    <!-- 查询结果 -->
+    <div v-tableHeight>
+      <el-table v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list" v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }">
+        <el-table-column  label="#" type="index" width="80" align="center" />
+        <el-table-column prop="shopId" label="商家Id" width="120" align="center" />
+        <el-table-column prop="shopName" label="商家名称" width="150" align="center" />
+        <el-table-column prop="name" label="联盟卡名称" width="150" align="center" />
+        <el-table-column prop="state" label="状态" width="120" align="center">
+          <template slot-scope="scope">
+            <el-tag :type="getStateTagType(scope.row.state)" size="small">
+              {{ scope.row.state | stateText }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isIssuance" label="是否发行" width="120" align="center">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.isIssuance == '1' ? 'success' : 'info'" size="small">
+              {{ scope.row.isIssuance == '1' ? '发行' : '停售' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="coverUrl" label="联盟卡封面" width="180" align="center">
+          <template slot-scope="scope">
+            <el-image :src="scope.row.coverUrl" style="width: 50px"></el-image>
+          </template>
+        </el-table-column>
+        <el-table-column prop="purchasePrice" label="联盟卡购买价格" width="150" align="center">
+          <template slot-scope="scope">
+            <span style="color: #f40">￥{{ scope.row.purchasePrice }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deductionPrice" label="联盟卡抵扣价格" width="150" align="center">
+          <template slot-scope="scope">
+            <span style="color: #f40">￥{{ scope.row.deductionPrice }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="receiptCount" label="发行张数" width="120" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.receiptCount }}张</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="expirationTime" label="到期时间" width="180" align="center" />
+        <el-table-column prop="headOfCommission" label="团长佣金" width="120" align="center">
+          <template slot-scope="scope">
+            <span style="color: #f40">￥{{ scope.row.headOfCommission || '--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="partnerCommission" label="合伙人佣金" width="120" align="center">
+          <template slot-scope="scope">
+            <span style="color: #f40">￥{{ scope.row.partnerCommission || '--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip prop="statement" label="权益信息" width="150" align="center" />
+        <el-table-column show-overflow-tooltip prop="useInstructions" label="使用说明" width="150" align="center" />
+        <el-table-column prop="createTime" label="创建时间" width="180" align="center" />
+
+        <el-table-column align="center" label="操作" width="280" fixed="right" class-name="small-padding fixed-width">
+          <template slot-scope="{ row }">
+            <el-button @click="$refs.checkDialogRef && $refs.checkDialogRef.handleOpen(row)" :disabled="row.state !== 1" type="warning" size="mini">审核</el-button>
+            <el-button type="primary" size="mini" @click="$refs.detailDialogRef && $refs.detailDialogRef.handleOpen(row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div>
+      <el-pagination
+        :current-page="listQuery.page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="listQuery.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="(val) => (listQuery.pageSize = val) && getList()"
+        @current-change="(val) => (listQuery.page = val) && getList()"
+      />
+    </div>
+
+    <!-- 查看详情 -->
+    <DetailDialog ref="detailDialogRef"></DetailDialog>
+    <!-- 审核 -->
+    <CheckDialog @success="getList" ref="checkDialogRef"></CheckDialog>
+  </div>
+</template>
+
+<script>
+import { getAllianceCardListApi } from '@/api/business'
+import DetailDialog from './components/DetailDialog'
+import CheckDialog from './components/CheckDialog'
+
+export default {
+  name: 'allianceCardList',
+  components: { DetailDialog, CheckDialog },
+  data() {
+    // 这里存放数据
+    return {
+      list: [],
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        pageSize: 20,
+        search: '',
+        state: ''
+      },
+      checkLoading: false
+    }
+  },
+  filters: {
+    stateText(value) {
+      return { 1: '审核中', 2: '通过', 3: '不通过' }[value] || '未知状态'
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      this.listLoading = true
+      try {
+        const res = await getAllianceCardListApi(this.listQuery)
+        this.list = res.data.list
+        this.total = res.data.total
+      } finally {
+        this.listLoading = false
+      }
+    },
+    handleSearch() {
+      this.listQuery.page = 1
+      this.getList()
+    },
+    getStateTagType(state) {
+      switch (state + '') {
+        case '1':
+          return 'warning'
+        case '2':
+          return 'success'
+        case '3':
+          return 'danger'
+        default:
+          return ''
+      }
+    },
+
+    handleReset(){
+      this.listQuery.search = ''
+      this.listQuery.state = ''
+      this.handleSearch()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
+
+  .filter-container {
+    .filter-item {
+      display: inline-block;
+      vertical-align: middle;
+      margin-bottom: 10px;
+    }
+  }
+
+  .small-padding {
+    .cell {
+      padding-left: 5px;
+      padding-right: 5px;
+    }
+  }
+
+  .fixed-width {
+    .el-button--mini {
+      padding: 7px 10px;
+    }
+  }
+}
+</style>

src/views/finance/withdrawal/components/DetailModal.vue

@@ -60,11 +60,20 @@
         <el-descriptions-item label="非惠市宝订单的相关提现金额：">
           {{ formData.summaryNotHsbAmount }}
         </el-descriptions-item>
+        <el-descriptions-item label="已认证身份姓名">
+          {{ cardData.name || '未认证' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="已认证身份证">
+          {{ cardData.idCard || '未认证' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="已认证电话号码">
+          {{ cardData.phone || '未认证' }}
+        </el-descriptions-item>
       </el-descriptions>
     </div>
 
     <el-tabs v-model="tabsValue">
-      <el-tab-pane label="结算列表" name="relatedSettlement" v-if="![3, 4].includes(formData.withdrawalType)">
+      <el-tab-pane label="结算列表" name="relatedSettlement" v-if="![3, 4, 50].includes(formData.withdrawalType)">
         <div v-if="formData.relatedSettlement && formData.relatedSettlement.length" style="margin-top: 32px">
           <el-table
             v-loading="!formData.relatedSettlement.length"
@@ -134,6 +143,33 @@
           <el-table-column align="center" prop="createTime" label="出账时间"></el-table-column>
         </el-table>
       </el-tab-pane>
+
+      <el-tab-pane v-if="[50].includes(formData.withdrawalType)" label="入账列表" name="entry">
+        <el-table :data="formData.allianceCardBuyerConsumptionRecords" border stripe>
+          <el-table-column align="center" type="index" label="#" width="50"></el-table-column>
+          <el-table-column align="center" prop="allianceCardId" width="100" label="联盟卡ID"></el-table-column>
+          <el-table-column align="center" prop="buyerUserId" width="100" label="会员ID"></el-table-column>
+          <el-table-column align="center" prop="shopId" label="商家ID"></el-table-column>
+          <el-table-column align="center" prop="shopName" label="商家名称"></el-table-column>
+          <el-table-column align="center" prop="amount" label="消费金额">
+            <template slot-scope="{ row }">
+              <el-tag type="success" size="mini">￥{{ row.amount || 0 }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="actualAmountReceived" label="实际到账金额">
+            <template slot-scope="{ row }">
+              <el-tag type="success" size="mini">￥{{ row.actualAmountReceived || 0 }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="settlementRatio" label="结算比例">
+            <template slot-scope="{ row }">
+              <el-tag type="primary" size="mini">{{ row.settlementRatio ? row.settlementRatio * 100 + '%' : 0 }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="withdrawalNo" label="提现单号" width="200"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="消费时间"  width="200"></el-table-column>
+        </el-table>
+      </el-tab-pane>
     </el-tabs>
   </el-dialog>
 </template>
@@ -141,7 +177,7 @@
 <script>
 import RelatedOrders from './RelatedOrders'
 import LedgerInformation from './LedgerInformation'
-import { withdrawalGetById, withdrawalGetById2 } from '@/api/withdrawal'
+import { withdrawalGetById, withdrawalGetById2, getWithdrawalAccount } from '@/api/withdrawal'
 
 export default {
   name: 'DetailModal',
@@ -180,7 +216,9 @@ export default {
         summaryHsbSplitedAmount: '',
         summaryHsbSplitRemainAmount: '',
         summaryNotHsbAmount: ''
-      }
+      },
+      //  身份证信息
+      cardData: {}
     }
   },
   methods: {
@@ -198,7 +236,7 @@ export default {
       const loading = this.$loading({ text: '加载中' })
       try {
         let api = null
-        if (![3, 4].includes(this.formData.withdrawalType)) {
+        if (![3, 4, 50].includes(this.formData.withdrawalType)) {
           api = withdrawalGetById
           this.tabsValue = 'relatedSettlement'
         } else {
@@ -229,11 +267,17 @@ export default {
           summaryHsbSplitedAmount: res.data.summaryHsbSplitedAmount,
           summaryHsbSplitRemainAmount: res.data.summaryHsbSplitRemainAmount,
           summaryNotHsbAmount: res.data.summaryNotHsbAmount,
-          withdrawalType: this.formData.withdrawalType
+          withdrawalType: this.formData.withdrawalType,
+          allianceCardBuyerConsumptionRecords: res.data.allianceCardBuyerConsumptionRecords
         })
       } finally {
         loading.close()
       }
+    },
+    // 单独用来请求提现的身份证以及手机号姓名等
+    async getWithdrawalInfo(id) {
+      let { data } = await getWithdrawalAccount({ shopIds: id })
+      this.cardData = data[0]
     }
   }
 }

src/views/finance/withdrawal/index.vue

@@ -28,9 +28,10 @@
             <el-tag v-else-if="row.withdrawalType === 2" effect="plain" type="success">交易金</el-tag>
             <el-tag v-else-if="row.withdrawalType === 3" effect="plain" type="success">代金券</el-tag>
             <el-tag v-else-if="row.withdrawalType === 4" effect="plain" type="success">余额支付</el-tag>
-            <el-tag v-else-if="row.withdrawalType === 5" effect="plain" type="success">佣金支付</el-tag>
+            <el-tag v-else-if="row.withdrawalType === 5" effect="plain" type="success"></el-tag>
             <el-tag v-else-if="row.withdrawalType === 31" effect="plain" type="warning">充值代金券</el-tag>
             <el-tag v-else-if="row.withdrawalType === 32" effect="plain" type="danger">兑换代金券(非兑换专区)</el-tag>
+            <el-tag v-else-if="row.withdrawalType === 50" effect="plain" type="danger">联盟卡支付</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" width="120" label="提现金额" prop="withdrawalMoney" show-overflow-tooltip />