Commit 2637bf3b by liuchenxi

Merge branch 'feature/按钮权限管理'

parents 600840f4 6ac24309
...@@ -206,6 +206,8 @@ import activeSelect from '@/components/active/active-select.vue'; ...@@ -206,6 +206,8 @@ import activeSelect from '@/components/active/active-select.vue';
<div class="to-active-tip font-14 color-606266">确认完成了所有前期准备工作,即可前往活动配置。</div> <div class="to-active-tip font-14 color-606266">确认完成了所有前期准备工作,即可前往活动配置。</div>
<div class="to-active-btn"> <div class="to-active-btn">
<el-button <el-button
v-if="$getButtonLimit($buttonCode.marketingAddShare)"
:limit-code="$buttonCode.marketingAddShare"
type="primary" type="primary"
:disabled="disableCreate" :disabled="disableCreate"
@click="toCreate" @click="toCreate"
......
...@@ -25,13 +25,13 @@ import finishedActive from '@/components/active/finished-active.vue'; ...@@ -25,13 +25,13 @@ import finishedActive from '@/components/active/finished-active.vue';
<div class="active-title-date font-14 color-909399 m-t-7">{{ item.startDate | formatTimeYmdHms }} - {{ item.endDate | formatTimeYmdHms }}</div> <div class="active-title-date font-14 color-909399 m-t-7">{{ item.startDate | formatTimeYmdHms }} - {{ item.endDate | formatTimeYmdHms }}</div>
</div> </div>
<div class="active-title-right"> <div class="active-title-right">
<el-button type="primary" plain @click.stop="toEdit(index, item)">活动配置</el-button> <el-button type="primary" plain v-if="$getButtonLimit($buttonCode.marketingSetShare)" :limit-code="$buttonCode.marketingSetShare" @click.stop="toEdit(index, item)">活动配置</el-button>
<!-- <el-button <!-- <el-button
type="primary" type="primary"
plain plain
@click="handleCopy(index, item)" @click="handleCopy(index, item)"
>复制路径</el-button> --> >复制路径</el-button> -->
<el-button type="primary" plain @click.stop="toDataList(index, item)">数据明细</el-button> <el-button type="primary" plain v-if="$getButtonLimit($buttonCode.marketingShareData)" :limit-code="$buttonCode.marketingShareData" @click.stop="toDataList(index, item)">数据明细</el-button>
</div> </div>
</div> </div>
<div v-if="selectItem == item.activityId" class="finished-active-body"> <div v-if="selectItem == item.activityId" class="finished-active-body">
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
*/ */
toEdit(index, row) { toEdit(index, row) {
const that = this; const that = this;
that.$router.push(`/createActive?activityId=${row.activityId}&editFlag=show`); that.$router.push(`/checkActive?activityId=${row.activityId}&editFlag=show`);
}, },
/** /**
* 数据明细 * 数据明细
......
...@@ -50,6 +50,8 @@ import inProgressActive from '@/components/active/in-progress-active.vue'; ...@@ -50,6 +50,8 @@ import inProgressActive from '@/components/active/in-progress-active.vue';
</div> </div>
<div class="active-title-right"> <div class="active-title-right">
<el-button <el-button
v-if="$getButtonLimit($buttonCode.marketingAddShare)"
:limit-code="$buttonCode.marketingAddShare"
type="primary" type="primary"
plain plain
@click.stop="toEdit(index, item)" @click.stop="toEdit(index, item)"
...@@ -63,6 +65,8 @@ import inProgressActive from '@/components/active/in-progress-active.vue'; ...@@ -63,6 +65,8 @@ import inProgressActive from '@/components/active/in-progress-active.vue';
@click="handleCopy(index, item)" @click="handleCopy(index, item)"
>复制路径</el-button> >复制路径</el-button>
<el-button <el-button
v-if="$getButtonLimit($buttonCode.marketingShareData)"
:limit-code="$buttonCode.marketingShareData"
type="primary" type="primary"
plain plain
@click.stop="toDataList(index, item)" @click.stop="toDataList(index, item)"
...@@ -240,7 +244,7 @@ export default { ...@@ -240,7 +244,7 @@ export default {
*/ */
toEdit(index, row) { toEdit(index, row) {
const that = this; const that = this;
that.$router.push(`/createActive?activityId=${row.activityId}`); that.$router.push(`/editActive?activityId=${row.activityId}`);
}, },
/** /**
* 数据明细 * 数据明细
......
...@@ -23,13 +23,13 @@ import willStartActive from '@/components/active/will-start-active.vue'; ...@@ -23,13 +23,13 @@ import willStartActive from '@/components/active/will-start-active.vue';
<div class="active-title-date font-14 color-909399 m-t-7">{{ item.startDate | formatTimeYmdHms }} - {{ item.endDate | formatTimeYmdHms }}</div> <div class="active-title-date font-14 color-909399 m-t-7">{{ item.startDate | formatTimeYmdHms }} - {{ item.endDate | formatTimeYmdHms }}</div>
</div> </div>
<div class="active-title-right"> <div class="active-title-right">
<el-button type="primary" plain @click="toEdit(index, item)">活动配置</el-button> <el-button type="primary" v-if="$getButtonLimit($buttonCode.marketingSetShare)" :limit-code="$buttonCode.marketingSetShare" plain @click="toEdit(index, item)">活动配置</el-button>
<!-- <el-button <!-- <el-button
type="primary" type="primary"
plain plain
@click="handleCopy(index, item)" @click="handleCopy(index, item)"
>复制路径</el-button> --> >复制路径</el-button> -->
<el-button type="primary" plain @click="toDataList(index, item)">数据明细</el-button> <el-button type="primary" v-if="$getButtonLimit($buttonCode.marketingShareData)" :limit-code="$buttonCode.marketingShareData" plain @click="toDataList(index, item)">数据明细</el-button>
<el-button type="primary" plain @click="toDelList(index, item)">删除</el-button> <el-button type="primary" plain @click="toDelList(index, item)">删除</el-button>
</div> </div>
</div> </div>
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
*/ */
toEdit(index, row) { toEdit(index, row) {
const that = this; const that = this;
that.$router.push(`/createActive?activityId=${row.activityId}`); that.$router.push(`/editActive?activityId=${row.activityId}`);
}, },
/** /**
* 数据明细 * 数据明细
......
...@@ -76,13 +76,15 @@ router.beforeEach((to, from, next) => { ...@@ -76,13 +76,15 @@ router.beforeEach((to, from, next) => {
} }
}) })
/* eslint-disable no-new */ window.getLimit(router, 'share-config').then(() => {
new Vue({ /* eslint-disable no-new */
el: '#app', new Vue({
router, el: '#app',
store, router,
components: { store,
App components: {
}, App
template: '<App/>' },
}); template: '<App/>'
});
})
...@@ -58,10 +58,26 @@ export const constantRouterMap = [{ ...@@ -58,10 +58,26 @@ export const constantRouterMap = [{
}, },
{ {
path: '/createActive', path: '/createActive',
name: '创建完成', name: '创建活动',
component: _import('activeConfig', 'index'), component: _import('activeConfig', 'index'),
meta: { meta: {
title: '创建完成' title: '创建活动'
}
},
{
path: '/editActive',
name: '编辑活动',
component: _import('activeConfig', 'index'),
meta: {
title: '编辑活动'
}
},
{
path: '/checkActive',
name: '查看活动',
component: _import('activeConfig', 'index'),
meta: {
title: '查看活动'
} }
}, },
// 活动创建完成 // 活动创建完成
......
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