Commit 0fc3b501 by liuchenxi

Merge branch 'feature/12月迭代' into dev

parents ff892d52 cf46f34f
......@@ -18,7 +18,7 @@
</div>
<div class="game-ptyx-header pb10 clearfix">
<span class="pr10" style="line-height:32px;margin-left:10px">卡券共{{ total }}</span>
<el-button class="fr" type="primary" @click="addCard">新增卡券</el-button>
<el-button class="fr" v-if="$getButtonLimit($buttonCode.marketingAddCard)" :limit-code="$buttonCode.marketingAddCard" type="primary" @click="addCard">新增卡券</el-button>
</div>
<ul class="clearfix" element-loading-text="拼命加载中">
<card-item @adjust-stock="preAdjustStock" :item="v" v-for="(v, i) in tableList" :key="i" @delete-card="delData"></card-item>
......
......@@ -7,7 +7,7 @@
计费部门筛选框规则:开启多账户计费模式时显示计费部门筛选框; && 超管和部门权限为可见所有的子账号显示计费部门筛选框;
-->
<section class="recharge">
<div class="dm-wrap" style="margin: 12px 24px">
<div class="dm-wrap" style="margin-bottom: 12px">
<div class="flex_between">
<h3 class="title">账户概览</h3>
<el-button v-if="$getButtonLimit($buttonCode.marketingAccountRule)" :limit-code="$buttonCode.marketingAccountRule" class="h32 ghost-btn" type="primary" @click="setRuleVisible = true">计费规则配置</el-button>
......@@ -101,7 +101,7 @@
</el-col>
</el-row>
</div>
<div class="dm-wrap" style="margin: 12px 24px">
<div class="dm-wrap" style="margin-top: 12px">
<div class="pb22">
<div slot="header" class="clearfix">
<el-date-picker :pickerOptions="pickerOptions" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="consumeRecord('two')"></el-date-picker>
......
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