Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
b09a75b9 by simon
Options

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

# Conflicts:
#	src/pages/privacy/privacy.vue
2 parents d34601e5 f8a6ed3a
Expand all
Inline Side-by-side
Showing 7 changed files with 47 additions and 15 deletions
...@@ -9,7 +9,7 @@ import InsuranceQuery from './components/insurance-query.vue' ...@@ -9,7 +9,7 @@ import InsuranceQuery from './components/insurance-query.vue'
9 export default { 9 export default {
10 data() { 10 data() {
11 return { 11 return {
12 activity: "m1" 12 activity: "m3"
13 } 13 }
14 }, 14 },
15 methods: { 15 methods: {
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
22 }, 22 },
23 created() { 23 created() {
24 let activity = this.$route.params.p; 24 let activity = this.$route.params.p;
25 activity = activity ? activity : "m1"; 25 activity = activity ? activity : "m3";
26 this.activity = activity; 26 this.activity = activity;
27 }, 27 },
28 components: { 28 components: {
......
...@@ -55,6 +55,14 @@ ...@@ -55,6 +55,14 @@
55 background: url("~@/assets/images/insurance-query/m6-unselect.png") no-repeat center center; 55 background: url("~@/assets/images/insurance-query/m6-unselect.png") no-repeat center center;
56 background-size: 100% 100%; 56 background-size: 100% 100%;
57 } 57 }
58 .m7 {
59 background: url("~@/assets/images/insurance-query/m6-unselect.png") no-repeat center center;
60 background-size: 100% 100%;
61 }
62 .m8 {
63 background: url("~@/assets/images/insurance-query/m6-unselect.png") no-repeat center center;
64 background-size: 100% 100%;
65 }
58 } 66 }
59 .menu-item.activity { 67 .menu-item.activity {
60 color: #f05a23 !important; 68 color: #f05a23 !important;
...@@ -83,6 +91,14 @@ ...@@ -83,6 +91,14 @@
83 background: url("~@/assets/images/insurance-query/m6.png") no-repeat center center; 91 background: url("~@/assets/images/insurance-query/m6.png") no-repeat center center;
84 background-size: 100% 100%; 92 background-size: 100% 100%;
85 } 93 }
94 .m7 {
95 background: url("~@/assets/images/insurance-query/m6.png") no-repeat center center;
96 background-size: 100% 100%;
97 }
98 .m8 {
99 background: url("~@/assets/images/insurance-query/m6.png") no-repeat center center;
100 background-size: 100% 100%;
101 }
86 102
87 } 103 }
88 } 104 }
......
...@@ -4,10 +4,9 @@ ...@@ -4,10 +4,9 @@
4 <div class="left-panel"> 4 <div class="left-panel">
5 <div class="menu-item" :class="{activity : activity == 'm1'}" @click="activity = 'm1'"> 5 <div class="menu-item" :class="{activity : activity == 'm1'}" @click="activity = 'm1'">
6 <i class="m1"></i>{{$t('customService.menu1')}} 6 <i class="m1"></i>{{$t('customService.menu1')}}
7 <div></div>
8 </div> 7 </div>
9 <div class="separator"></div> 8 <div class="separator"></div>
10 <div class="menu-item" :class="{activity : activity == 'm2'}" @click="activity = 'm2'"> 9 <div class="menu-item" :class="{activity : activity == 'm2'}" @click="toPath('/payment/type');/*activity = 'm2'*/">
11 <i class="m2"></i>{{$t('customService.menu2')}} 10 <i class="m2"></i>{{$t('customService.menu2')}}
12 </div> 11 </div>
13 <div class="separator"></div> 12 <div class="separator"></div>
...@@ -19,13 +18,21 @@ ...@@ -19,13 +18,21 @@
19 <i class="m4"></i>{{$t('customService.menu4')}} 18 <i class="m4"></i>{{$t('customService.menu4')}}
20 </div> 19 </div>
21 <div class="separator"></div> 20 <div class="separator"></div>
22 <div class="menu-item" :class="{activity : activity == 'm5'}" @click="toPath('/reservation')/*activity = 'm5'*/"> 21 <div class="menu-item" :class="{activity : activity == 'm5'}" @click="activity = 'm5'">
23 <i class="m5"></i>{{$t('customService.menu5')}} 22 <i class="m5"></i>{{$t('customService.menu5')}}
24 </div> 23 </div>
25 <div class="separator"></div> 24 <div class="separator"></div>
26 <div class="menu-item" :class="{activity : activity == 'm6'}" @click="activity = 'm6'"> 25 <div class="menu-item" :class="{activity : activity == 'm6'}" @click="toPath('/reservation')/*activity = 'm6'*/">
27 <i class="m6"></i>{{$t('customService.menu6')}} 26 <i class="m6"></i>{{$t('customService.menu6')}}
28 </div> 27 </div>
28 <div class="separator"></div>
29 <div class="menu-item" :class="{activity : activity == 'm7'}" @click="activity = 'm7'">
30 <i class="m7"></i>{{$t('customService.menu7')}}
31 </div>
32 <div class="separator"></div>
33 <div class="menu-item" :class="{activity : activity == 'm8'}" @click="activity = 'm8'">
34 <i class="m8"></i>{{$t('customService.menu8')}}
35 </div>
29 </div> 36 </div>
30 <div class="min-panel"> 37 <div class="min-panel">
31 <div class="item" :class="{activity : activity == 'm1'}"> 38 <div class="item" :class="{activity : activity == 'm1'}">
...@@ -46,17 +53,24 @@ ...@@ -46,17 +53,24 @@
46 <div class="item" :class="{activity : activity == 'm6'}"> 53 <div class="item" :class="{activity : activity == 'm6'}">
47 <div class="triangle"></div> 54 <div class="triangle"></div>
48 </div> 55 </div>
56 <div class="item" :class="{activity : activity == 'm7'}">
57 <div class="triangle"></div>
58 </div>
59 <div class="item" :class="{activity : activity == 'm8'}">
60 <div class="triangle"></div>
61 </div>
49 </div> 62 </div>
50 <div class="right-panel"> 63 <div class="right-panel">
51 <div class="panel" :class="{activity : activity == 'm1'}"> 64 <div class="panel" :class="{activity : activity == 'm1'}"></div>
65 <div class="panel" :class="{activity : activity == 'm2'}"></div>
66 <div class="panel" :class="{activity : activity == 'm3'}">
52 <insurance-query></insurance-query> 67 <insurance-query></insurance-query>
53 <div class="empty-line"></div> 68 <div class="empty-line"></div></div>
54 </div> 69 <div class="panel" :class="{activity : activity == 'm4'}"></div>
55 <div class="panel" :class="{activity : activity == 'm2'}">m2</div> 70 <div class="panel" :class="{activity : activity == 'm5'}"></div>
56 <div class="panel" :class="{activity : activity == 'm3'}">m3</div> 71 <div class="panel" :class="{activity : activity == 'm6'}"></div>
57 <div class="panel" :class="{activity : activity == 'm4'}">m4</div> 72 <div class="panel" :class="{activity : activity == 'm7'}"></div>
58 <div class="panel" :class="{activity : activity == 'm5'}">m5</div> 73 <div class="panel" :class="{activity : activity == 'm8'}"></div>
59 <div class="panel" :class="{activity : activity == 'm6'}">m6</div>
60 </div> 74 </div>
61 </div> 75 </div>
62 </template> 76 </template>
......
...@@ -15,5 +15,7 @@ export default { ...@@ -15,5 +15,7 @@ export default {
15 initData() {} 15 initData() {}
16 }, 16 },
17 mounted() {}, 17 mounted() {},
18 created() {} 18 created() {
19 console.log(this.$i18n.locale);
20 }
19 } 21 }
......