Commit 0b85ce16 by 陈羽

update: 添加手动结束提示文案

parent 1ec34ade
......@@ -7,7 +7,7 @@
export default {
name: 'pop',
created() {
this.$store.commit('mutations.breadcrumb', [{ name: '营销管理' }, { name: '弹窗推广', path: '/pop' },{ name: '弹窗推广', path: '/pop/list' }]);
this.$store.commit('mutations.breadcrumb', [{ name: '营销管理' }, { name: '弹窗推广', path: '/pop' }, { name: '弹窗推广', path: '/pop/list' }]);
this.$store.commit('aside_handler', false);
this.$nextTick(_ => {
this.$store.commit('aside_handler', true);
......
......@@ -62,7 +62,12 @@
</template>
</el-table-column>
<el-table-column align="left" label="状态" prop="status">
<template slot-scope="scope"> <i class="dot" :style="'background:' + (scope.row.activeStatus === 1 ? '#FAAD14' : scope.row.activeStatus === 2 ? '#1890FF' : '#c0c4cc') + ';'"></i> {{ scope.row.activeStatus | statusFilter }} </template>
<template slot-scope="scope">
<el-tooltip v-if="scope.row.manualEndFlag" slot="label" open-delay="200" :content="'手动结束时间:' + formatDateTimeByType(scope.row.manualEndTime, 'yyyy-MM-dd HH:mm')" placement="top">
<p><i class="dot" :style="'background:' + (scope.row.activeStatus === 1 ? '#FAAD14' : scope.row.activeStatus === 2 ? '#1890FF' : '#c0c4cc') + ';'"></i> {{ scope.row.activeStatus | statusFilter }}</p>
</el-tooltip>
<p v-else><i class="dot" :style="'background:' + (scope.row.activeStatus === 1 ? '#FAAD14' : scope.row.activeStatus === 2 ? '#1890FF' : '#c0c4cc') + ';'"></i> {{ scope.row.activeStatus | statusFilter }}</p>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="170">
<template slot-scope="scope">
......
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