Commit 822e086d by 黑潮

fix: 修复bug

parent 35569f79
......@@ -38,7 +38,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/link-tools.2.1.21.js"></script><!-- 链接小工具 -->
<script src="//web-1251519181.file.myqcloud.com/components/export-data.1.1.2.js"></script><!-- 数据导出 -->
<script src="//web-1251519181.file.myqcloud.com/components/integral-select.1.0.26.js"></script><!-- 积分选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/rule-engine.1.0.86.js"></script><!-- 规则引擎 -->
<script src="//web-1251519181.file.myqcloud.com/components/rule-engine.1.0.93.js"></script><!-- 规则引擎 -->
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js"></script><!-- 分页器 -->
<script src="//web-1251519181.file.myqcloud.com/components/perm-button.1.0.1.js"></script><!-- 权限项按钮 -->
<script src="//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js"></script><!-- 步骤条 -->
......@@ -48,7 +48,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/preview-img.1.0.4.js"></script><!-- 图片预览 -->
<script src="//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js"></script><!-- 删除轻弹窗 -->
<script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.12.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.17.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.18.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.5.js"></script><!-- 账号分组组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js"></script><!-- 富文本编辑器 -->
</body>
......
......@@ -7,9 +7,9 @@
<el-select class="dm-select mr10 w140" clearable v-model="listParams.statusFlag" placeholder="所有使用状态" @change="refresh">
<el-option v-for="(v, i) in status" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-select class="mr10" style="width:170px" v-model="listParams.visitorFlag" @change="refresh" placeholder="所有用户领取记录" clearable>
<el-option label="会员领取记录" :value="0"></el-option>
<el-option label="非会员领取记录" :value="1"></el-option>
<el-select class="mr10" style="width:170px" v-model="listParams.memberType" @change="refresh" placeholder="所有用户领取记录" clearable>
<el-option label="会员领取记录" :value="1"></el-option>
<el-option label="非会员领取记录" :value="2"></el-option>
</el-select>
<el-input placeholder="请输入关键字" class="mr10 w400" v-model="listParams.search" clearable @change="refresh">
<el-select v-model="listParams.searchType" slot="prepend" style="width:120px;" placeholder="请选择" @change="refresh">
......@@ -79,7 +79,7 @@
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="130px" fixed="right">
<template slot-scope="scope" v-if="listParams.visitorFlag == 0">
<template slot-scope="scope" v-if="listParams.memberType == 0">
<el-button type="text" v-if="scope.row.statusFlag == 4" @click="orderData(scope.row)">手动核销</el-button>
<dm-delete @confirm="delData(scope.row)" v-if="scope.row.statusFlag === 4" width="280" tips="销毁后无法恢复,确认销毁?">
<el-button type="text">销毁</el-button>
......@@ -140,7 +140,7 @@ export default {
verifyEndTime: '',
currentPage: 1,
pageSize: 20,
visitorFlag: '', // 0会员 1非会员
memberType: '', // 0会员 1非会员
},
cardType: Object.keys(cardType).map(v => { return cardType[v]; }),
status: _statusList,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment