b09a75b9 by simon

Merge branch 'master' of 120.27.44.69:dev/pingan-life-index-pro

# Conflicts:
#	src/pages/privacy/privacy.vue
2 parents d34601e5 f8a6ed3a
......@@ -9,7 +9,7 @@ import InsuranceQuery from './components/insurance-query.vue'
export default {
data() {
return {
activity: "m1"
activity: "m3"
}
},
methods: {
......@@ -22,7 +22,7 @@ export default {
},
created() {
let activity = this.$route.params.p;
activity = activity ? activity : "m1";
activity = activity ? activity : "m3";
this.activity = activity;
},
components: {
......
......@@ -55,6 +55,14 @@
background: url("~@/assets/images/insurance-query/m6-unselect.png") no-repeat center center;
background-size: 100% 100%;
}
.m7 {
background: url("~@/assets/images/insurance-query/m6-unselect.png") no-repeat center center;
background-size: 100% 100%;
}
.m8 {
background: url("~@/assets/images/insurance-query/m6-unselect.png") no-repeat center center;
background-size: 100% 100%;
}
}
.menu-item.activity {
color: #f05a23 !important;
......@@ -83,6 +91,14 @@
background: url("~@/assets/images/insurance-query/m6.png") no-repeat center center;
background-size: 100% 100%;
}
.m7 {
background: url("~@/assets/images/insurance-query/m6.png") no-repeat center center;
background-size: 100% 100%;
}
.m8 {
background: url("~@/assets/images/insurance-query/m6.png") no-repeat center center;
background-size: 100% 100%;
}
}
}
......
......@@ -4,10 +4,9 @@
<div class="left-panel">
<div class="menu-item" :class="{activity : activity == 'm1'}" @click="activity = 'm1'">
<i class="m1"></i>{{$t('customService.menu1')}}
<div></div>
</div>
<div class="separator"></div>
<div class="menu-item" :class="{activity : activity == 'm2'}" @click="activity = 'm2'">
<div class="menu-item" :class="{activity : activity == 'm2'}" @click="toPath('/payment/type');/*activity = 'm2'*/">
<i class="m2"></i>{{$t('customService.menu2')}}
</div>
<div class="separator"></div>
......@@ -19,13 +18,21 @@
<i class="m4"></i>{{$t('customService.menu4')}}
</div>
<div class="separator"></div>
<div class="menu-item" :class="{activity : activity == 'm5'}" @click="toPath('/reservation')/*activity = 'm5'*/">
<div class="menu-item" :class="{activity : activity == 'm5'}" @click="activity = 'm5'">
<i class="m5"></i>{{$t('customService.menu5')}}
</div>
<div class="separator"></div>
<div class="menu-item" :class="{activity : activity == 'm6'}" @click="activity = 'm6'">
<div class="menu-item" :class="{activity : activity == 'm6'}" @click="toPath('/reservation')/*activity = 'm6'*/">
<i class="m6"></i>{{$t('customService.menu6')}}
</div>
<div class="separator"></div>
<div class="menu-item" :class="{activity : activity == 'm7'}" @click="activity = 'm7'">
<i class="m7"></i>{{$t('customService.menu7')}}
</div>
<div class="separator"></div>
<div class="menu-item" :class="{activity : activity == 'm8'}" @click="activity = 'm8'">
<i class="m8"></i>{{$t('customService.menu8')}}
</div>
</div>
<div class="min-panel">
<div class="item" :class="{activity : activity == 'm1'}">
......@@ -46,17 +53,24 @@
<div class="item" :class="{activity : activity == 'm6'}">
<div class="triangle"></div>
</div>
<div class="item" :class="{activity : activity == 'm7'}">
<div class="triangle"></div>
</div>
<div class="item" :class="{activity : activity == 'm8'}">
<div class="triangle"></div>
</div>
</div>
<div class="right-panel">
<div class="panel" :class="{activity : activity == 'm1'}">
<div class="panel" :class="{activity : activity == 'm1'}"></div>
<div class="panel" :class="{activity : activity == 'm2'}"></div>
<div class="panel" :class="{activity : activity == 'm3'}">
<insurance-query></insurance-query>
<div class="empty-line"></div>
</div>
<div class="panel" :class="{activity : activity == 'm2'}">m2</div>
<div class="panel" :class="{activity : activity == 'm3'}">m3</div>
<div class="panel" :class="{activity : activity == 'm4'}">m4</div>
<div class="panel" :class="{activity : activity == 'm5'}">m5</div>
<div class="panel" :class="{activity : activity == 'm6'}">m6</div>
<div class="empty-line"></div></div>
<div class="panel" :class="{activity : activity == 'm4'}"></div>
<div class="panel" :class="{activity : activity == 'm5'}"></div>
<div class="panel" :class="{activity : activity == 'm6'}"></div>
<div class="panel" :class="{activity : activity == 'm7'}"></div>
<div class="panel" :class="{activity : activity == 'm8'}"></div>
</div>
</div>
</template>
......
......@@ -15,5 +15,7 @@ export default {
initData() {}
},
mounted() {},
created() {}
created() {
console.log(this.$i18n.locale);
}
}
......