Commit c2293ed2 by chenyu

update: update

parent fb253492
<template>
<div>
<el-tabs v-model="activeName">
<el-tab-pane label="消费类" name="1"></el-tab-pane>
<el-tab-pane label="互动类" name="2"></el-tab-pane>
</el-tabs>
<sale v-if="activeName==='1'" />
<interaction v-else />
</div>
</template>
<script>
import sale from './achievement_sale.vue';
import interaction from './achievement_interaction.vue';
export default {
components: {
sale,
interaction
},
data() {
return {
activeName: '1'
};
},
}
</script>
<style lang="less" scoped>
/deep/.el-tabs {
.el-tabs__header {
margin: 0;
.el-tabs__nav-wrap {
padding-left: 20px;
}
}
.el-tabs__item {
height: 46px;
line-height: 46px;
}
.el-tabs__nav-wrap::after {
height: 1px !important;
}
}
</style>
\ No newline at end of file
......@@ -531,16 +531,12 @@ export default {
.achievement {
display: block;
background-color: #F7F8FA;
padding:20px;
&-item {
padding: 15px 9px;
background-color: #fff;
border-radius: 6px
&+.achievement-item{
margin-top 16px
}
margin-bottom 30px;
&:last-child {
margin-bottom: 0;
}
......
......@@ -539,11 +539,10 @@ export default {
}
.achievement {
padding: 20px 20px;
padding: 20px;
&-item {
// padding: 15px 9px;
margin-bottom: 16px;
margin-bottom: 30px;
background-color: #fff;
&:last-child {
......
......@@ -152,15 +152,15 @@ var constantRouterMap = [{
}
}, {
path: '/achievement',
component: (0, _import2["default"])('achievement', 'achievement_sale'),
component: (0, _import2["default"])('achievement', 'achievement'),
meta: {
title: '会员成就-消费类'
title: '会员成就'
}
}, {
path: '/achievement_interaction',
component: (0, _import2["default"])('achievement', 'achievement_interaction'),
component: (0, _import2["default"])('achievement', 'achievement'),
meta: {
title: '会员成就-互动类'
title: '会员成就'
}
}, {
// 微信会员回收站数据页面
......
......@@ -141,16 +141,16 @@ export const constantRouterMap = [
},
{
path: '/achievement',
component: _import('achievement', 'achievement_sale'),
component: _import('achievement', 'achievement'),
meta: {
title: '会员成就-消费类',
title: '会员成就',
},
},
{
path: '/achievement_interaction',
component: _import('achievement', 'achievement_interaction'),
component: _import('achievement', 'achievement'),
meta: {
title: '会员成就-互动类',
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