Skip to content

dev / pingan-life-index-pro

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

默认提交

1 parent 91e08089
Inline Side-by-side
Showing 14 changed files with 61 additions and 18 deletions
...@@ -107,3 +107,8 @@ ...@@ -107,3 +107,8 @@
107 .hide { 107 .hide {
108 display: none; 108 display: none;
109 } 109 }
110
111
112 .panel::-webkit-scrollbar {
113 display: none;
114 }
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
120 @media (max-width: 1200px) { 120 @media (max-width: 1200px) {
121 .container { 121 .container {
122 display: -webkit-box; 122 display: -webkit-box;
123 overflow-x: scroll; 123 overflow-x: auto;
124 -webkit-overflow-scrolling: touch; 124 -webkit-overflow-scrolling: touch;
125 width: 92vw; 125 width: 92vw;
126 } 126 }
......
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
175 .container { 175 .container {
176 width: 1200px; 176 width: 1200px;
177 display: -webkit-box; 177 display: -webkit-box;
178 overflow-x: scroll; 178 overflow-x: auto;
179 -webkit-overflow-scrolling: touch; 179 -webkit-overflow-scrolling: touch;
180 width: 92vw; 180 width: 92vw;
181 } 181 }
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 .payment { 83 .payment {
84 &-nav { 84 &-nav {
85 display: -webkit-box; 85 display: -webkit-box;
86 overflow-x: scroll; 86 overflow-x: auto;
87 -webkit-overflow-scrolling: touch; 87 -webkit-overflow-scrolling: touch;
88 width: 92vw; 88 width: 92vw;
89 } 89 }
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
113 .submit-btn { 113 .submit-btn {
114 width: 13.583333rem; 114 width: 13.583333rem;
115 height: 4.083333rem; 115 height: 4.083333rem;
116 margin: 2.5rem auto 0; 116 margin: 0 auto 0;
117 line-height: 4.083333rem; 117 line-height: 4.083333rem;
118 box-shadow: 0px 10px 13px 0 rgba(236, 100, 41, 0.2); 118 box-shadow: 0px 10px 13px 0 rgba(236, 100, 41, 0.2);
119 background-blend-mode: soft-light, ; 119 background-blend-mode: soft-light, ;
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
135 @media (max-width: 1200px) { 135 @media (max-width: 1200px) {
136 .container { 136 .container {
137 display: -webkit-box; 137 display: -webkit-box;
138 overflow-x: scroll; 138 overflow-x: auto;
139 -webkit-overflow-scrolling: touch; 139 -webkit-overflow-scrolling: touch;
140 width: 92vw; 140 width: 92vw;
141 141
......
...@@ -57,12 +57,13 @@ ...@@ -57,12 +57,13 @@
57 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.e3}} 57 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.e3}}
58 </div> 58 </div>
59 </div> 59 </div>
60 </div>
61 <div class="submit-btn flex-center" @click="updateContactsHandler" :class="{disabled: submitBtnDisabled}"> 60 <div class="submit-btn flex-center" @click="updateContactsHandler" :class="{disabled: submitBtnDisabled}">
62 <van-loading v-if="loading" /> 61 <van-loading v-if="loading" />
63 <span>{{$t('policyChangeContact.submit')}}</span> 62 <span>{{$t('policyChangeContact.submit')}}</span>
64 </div> 63 </div>
65 </div> 64 </div>
65
66 </div>
66 <!-- <div v-else style="height:400px"></div> --> 67 <!-- <div v-else style="height:400px"></div> -->
67 </template> 68 </template>
68 </div> 69 </div>
......
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
155 @media (max-width: 1200px) { 155 @media (max-width: 1200px) {
156 .container { 156 .container {
157 display: -webkit-box; 157 display: -webkit-box;
158 overflow-x: scroll; 158 overflow-x: auto;
159 -webkit-overflow-scrolling: touch; 159 -webkit-overflow-scrolling: touch;
160 width: 92vw; 160 width: 92vw;
161 161
......
...@@ -171,10 +171,9 @@ ...@@ -171,10 +171,9 @@
171 @media (max-width: 1200px) { 171 @media (max-width: 1200px) {
172 .container { 172 .container {
173 display: -webkit-box; 173 display: -webkit-box;
174 overflow-x: scroll; 174 overflow-x: auto;
175 -webkit-overflow-scrolling: touch; 175 -webkit-overflow-scrolling: touch;
176 width: 92vw; 176 width: 92vw;
177
178 } 177 }
179 } 178 }
180 179
......
1 @import '@/styles/_support'; 1 @import '@/styles/_support';
2 .list-container { 2 .list-container {
3 overflow-x: auto; 3 overflow-x: auto;
4 padding-bottom: 2rem; 4 margin-bottom: 2rem;
5 } 5 }
6 6
7 .hide { 7 .hide {
...@@ -215,3 +215,17 @@ ...@@ -215,3 +215,17 @@
215 } 215 }
216 } 216 }
217 } 217 }
218
219 @media (max-width: 1200px) {
220 .list-container {
221 display: -webkit-box;
222 overflow-x: auto;
223 -webkit-overflow-scrolling: touch;
224 width: 92vw;
225
226 }
227 }
228
229 .list-container::-webkit-scrollbar {
230 display: none;
231 }
...\ No newline at end of file ...\ No newline at end of file
......
1 import { mapState } from "vuex"; 1 import {
2 mapState
3 } from "vuex";
2 import api from '@/api/api' 4 import api from '@/api/api'
3 import { httpPost } from '@/api/fetch-api.js' 5 import {
6 httpPost
7 } from '@/api/fetch-api.js'
4 8
5 import Auth from '@components/auth/auth.vue'; 9 import Auth from '@components/auth/auth.vue';
6 import JsEncrypt from "jsencrypt"; 10 import JsEncrypt from "jsencrypt";
...@@ -35,7 +39,10 @@ export default { ...@@ -35,7 +39,10 @@ export default {
35 methods: { 39 methods: {
36 init() { 40 init() {
37 if (this.isLogin()) { 41 if (this.isLogin()) {
38 httpPost({ url: api.profile, sid: true }).then(content => { 42 httpPost({
43 url: api.profile,
44 sid: true
45 }).then(content => {
39 if (content) { 46 if (content) {
40 this.information = content; 47 this.information = content;
41 this.gotoVhis(); 48 this.gotoVhis();
...@@ -45,7 +52,7 @@ export default { ...@@ -45,7 +52,7 @@ export default {
45 this.gotoVhis(); 52 this.gotoVhis();
46 } 53 }
47 }, 54 },
48 userLogout(){ 55 userLogout() {
49 this.gotoVhis(); 56 this.gotoVhis();
50 }, 57 },
51 isLogin() { 58 isLogin() {
...@@ -81,8 +88,7 @@ export default { ...@@ -81,8 +88,7 @@ export default {
81 this.outsideUrl = url; 88 this.outsideUrl = url;
82 } 89 }
83 }, 90 },
84 watch: { 91 watch: {},
85 },
86 mounted() { 92 mounted() {
87 this.init(); 93 this.init();
88 // let url = this.$route.query.p; 94 // let url = this.$route.query.p;
...@@ -99,7 +105,18 @@ export default { ...@@ -99,7 +105,18 @@ export default {
99 // } 105 // }
100 // }, 500); 106 // }, 500);
101 // } 107 // }
102 }, 108
103 created() { 109 window.removeEventListener("message");
110 window.addEventListener('message', function (e) {
111 let height = e.data ? e.data.height : null;
112 if (height) {
113 var iframe = document.getElementById("myiframe");
114 try {
115 iframe.height = height;
116 iframe.style.height = height + "px";
117 } catch (ex) {}
104 } 118 }
119 });
120 },
121 created() {}
105 } 122 }
......
...@@ -3,4 +3,10 @@ ...@@ -3,4 +3,10 @@
3 .content iframe{ 3 .content iframe{
4 height: 100%; 4 height: 100%;
5 min-height: 800px; 5 min-height: 800px;
6 overflow-x: hidden;
7 overflow-y: auto;
6 } 8 }
9
10 // .content::-webkit-scrollbar {
11 // display: none;
12 // }
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 <div class="content"> 3 <div class="content">
4 4
5 <auth @onLogout="userLogout" v-show="false"></auth> 5 <auth @onLogout="userLogout" v-show="false"></auth>
6
6 <iframe v-if="outsideUrl" id="myiframe" width="100%" height="100%" scrolling="yes" frameborder="0" :src="outsideUrl"></iframe> 7 <iframe v-if="outsideUrl" id="myiframe" width="100%" height="100%" scrolling="yes" frameborder="0" :src="outsideUrl"></iframe>
7 </div> 8 </div>
8 </template> 9 </template>
......