Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

MrShi

64 分钟以前 eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1

 admin/src/components/business/OperaCouponUsageDetail.vue

@@ -38,18 +38,21 @@
          stripe
        >
          <el-table-column label="序号" type="index" width="60px"></el-table-column>
          <el-table-column prop="userName" label="领用人" min-width="100px"></el-table-column>
          <el-table-column prop="phone" label="领用手机号" min-width="120px"></el-table-column>
          <el-table-column prop="quantity" label="领用数量" min-width="80px"></el-table-column>
          <el-table-column prop="publishTime" label="发放时间" min-width="160px"></el-table-column>
          <el-table-column prop="receiveTime" label="领用时间" min-width="160px"></el-table-column>
          <el-table-column label="限用时段" min-width="160px">
          <el-table-column prop="memberName" label="领用人" min-width="100px"></el-table-column>
          <el-table-column prop="memberTelephone" label="领用手机号" min-width="120px"></el-table-column>
          <el-table-column label="领用数量" min-width="80px">
            <template slot-scope="{row}">
              <span v-if="row.validStartTime && row.validEndTime">{{ row.validStartTime }} - {{ row.validEndTime }}</span>
              <span v-else>-</span>
              <span>1</span>
            </template>
          </el-table-column>
          <el-table-column prop="useTime" label="使用时间" min-width="160px"></el-table-column>
          <el-table-column prop="createDate" label="发放时间" min-width="160px"></el-table-column>
          <el-table-column prop="validDate" label="领用时间" min-width="160px"></el-table-column>
          <el-table-column label="限用时段" min-width="160px">
            <template slot-scope="{row}">
              <span>{{ row.startDate }} - {{ row.endDate }}</span>
            </template>
          </el-table-column>
          <el-table-column prop="useDate" label="使用时间" min-width="160px"></el-table-column>
          <el-table-column label="状态" min-width="100px">
            <template slot-scope="{row}">
              <el-tag v-if="row.status === 1" type="primary">待使用</el-tag>
@@ -105,7 +108,7 @@
      this.couponInfo = {
        name: row.name,
        type: row.type,
        receivedCount: row.receivedCount,
        receivedCount: row.claimCount,
        usedCount: row.usedCount
      }
      this.visible = true
@@ -120,10 +123,9 @@
          couponId: this.couponId,
        }
      }).then(data => {
        this.tableData.list = data.list || []
        console.log(data)
        this.tableData.list = data.records || []
        this.tableData.pagination.total = data.total || 0
      }).catch(e => {
        this.$tip.apiFailed(e)
      }).finally(() => {
        this.isWorking.search = false
      })
@@ -153,6 +155,7 @@
}
.info-item {
  display: flex;
  align-items: center;
  font-size: 14px;
}
.info-item .label {