Merge branch 'master' of http://120.27.44.69/dev/pingan-life-index-pro
# Conflicts: # src/common/lang/en.js # src/pages/infomation-improve/infomation-improve.js
Showing
165 changed files
with
57 additions
and
65 deletions
... | @@ -27,6 +27,7 @@ | ... | @@ -27,6 +27,7 @@ |
27 | "vue-awesome-swiper": "^3.1.3", | 27 | "vue-awesome-swiper": "^3.1.3", |
28 | "vue-i18n": "^8.15.0", | 28 | "vue-i18n": "^8.15.0", |
29 | "vue-router": "^3.0.3", | 29 | "vue-router": "^3.0.3", |
30 | "vue-video-player": "^5.0.2", | ||
30 | "vuex": "^3.0.1" | 31 | "vuex": "^3.0.1" |
31 | }, | 32 | }, |
32 | "devDependencies": { | 33 | "devDependencies": { |
... | ... |
public/images/video-poster.png
0 → 100644

559 KB
sandbox/assets/img/qrcode-focus.png
deleted
100644 → 0

10.4 KB
... | @@ -9,7 +9,7 @@ | ... | @@ -9,7 +9,7 @@ |
9 | <link rel="stylesheet" href="./css/pure-min.css"> | 9 | <link rel="stylesheet" href="./css/pure-min.css"> |
10 | <link rel="stylesheet" href="./css/grids-responsive-min.css"> | 10 | <link rel="stylesheet" href="./css/grids-responsive-min.css"> |
11 | <title>平安人寿保险官网</title> | 11 | <title>平安人寿保险官网</title> |
12 | <link href="static/js/0.1574223183500.js" rel="prefetch"><link href="static/js/1.1574223183500.js" rel="prefetch"><link href="static/js/10.1574223183500.js" rel="prefetch"><link href="static/js/11.1574223183500.js" rel="prefetch"><link href="static/js/12.1574223183500.js" rel="prefetch"><link href="static/js/13.1574223183500.js" rel="prefetch"><link href="static/js/14.1574223183500.js" rel="prefetch"><link href="static/js/15.1574223183500.js" rel="prefetch"><link href="static/js/16.1574223183500.js" rel="prefetch"><link href="static/js/2.1574223183500.js" rel="prefetch"><link href="static/js/3.1574223183500.js" rel="prefetch"><link href="static/js/4.1574223183500.js" rel="prefetch"><link href="static/js/5.1574223183500.js" rel="prefetch"><link href="static/js/6.1574223183500.js" rel="prefetch"><link href="static/js/7.1574223183500.js" rel="prefetch"><link href="static/js/8.1574223183500.js" rel="prefetch"><link href="static/js/9.1574223183500.js" rel="prefetch"><link href="static/js/app.1574223183500.js" rel="preload" as="script"></head> | 12 | <link href="static/js/0.1574431092750.js" rel="prefetch"><link href="static/js/1.1574431092750.js" rel="prefetch"><link href="static/js/10.1574431092750.js" rel="prefetch"><link href="static/js/11.1574431092750.js" rel="prefetch"><link href="static/js/12.1574431092750.js" rel="prefetch"><link href="static/js/13.1574431092750.js" rel="prefetch"><link href="static/js/14.1574431092750.js" rel="prefetch"><link href="static/js/15.1574431092750.js" rel="prefetch"><link href="static/js/16.1574431092750.js" rel="prefetch"><link href="static/js/2.1574431092750.js" rel="prefetch"><link href="static/js/3.1574431092750.js" rel="prefetch"><link href="static/js/4.1574431092750.js" rel="prefetch"><link href="static/js/5.1574431092750.js" rel="prefetch"><link href="static/js/6.1574431092750.js" rel="prefetch"><link href="static/js/7.1574431092750.js" rel="prefetch"><link href="static/js/8.1574431092750.js" rel="prefetch"><link href="static/js/9.1574431092750.js" rel="prefetch"><link href="static/js/app.1574431092750.js" rel="preload" as="script"></head> |
13 | 13 | ||
14 | <body> | 14 | <body> |
15 | <noscript> | 15 | <noscript> |
... | @@ -19,6 +19,6 @@ | ... | @@ -19,6 +19,6 @@ |
19 | <div id="app"></div> | 19 | <div id="app"></div> |
20 | <!-- built files will be auto injected --> | 20 | <!-- built files will be auto injected --> |
21 | <script src="./js/unionrsa.js"></script> | 21 | <script src="./js/unionrsa.js"></script> |
22 | <script type="text/javascript" src="static/js/app.1574223183500.js"></script></body> | 22 | <script type="text/javascript" src="static/js/app.1574431092750.js"></script></body> |
23 | 23 | ||
24 | </html> | 24 | </html> |
... | ... |
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
sandbox/static/js/2.1574431092750.js
0 → 100644
This diff could not be displayed because it is too large.
sandbox/static/js/3.1574223183500.js
deleted
100644 → 0
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
sandbox/static/js/5.1574431092750.js
0 → 100644
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
sandbox/static/js/8.1574223183500.js
deleted
100644 → 0
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
sandbox/static/js/9.1574431092750.js
0 → 100644
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... | @@ -59,7 +59,8 @@ html { | ... | @@ -59,7 +59,8 @@ html { |
59 | word-spacing: 1px; | 59 | word-spacing: 1px; |
60 | word-break: break-word; | 60 | word-break: break-word; |
61 | text-rendering: optimizeLegibility; | 61 | text-rendering: optimizeLegibility; |
62 | color: #333; | 62 | // color: #333; |
63 | color: $cFontGray; | ||
63 | background-color: #ffffff; | 64 | background-color: #ffffff; |
64 | // -ms-text-size-adjust: 100%; | 65 | // -ms-text-size-adjust: 100%; |
65 | // -webkit-text-size-adjust: 100%; | 66 | // -webkit-text-size-adjust: 100%; |
... | @@ -68,6 +69,10 @@ html { | ... | @@ -68,6 +69,10 @@ html { |
68 | box-sizing: border-box; | 69 | box-sizing: border-box; |
69 | } | 70 | } |
70 | 71 | ||
72 | body { | ||
73 | font-size: $fontSize; | ||
74 | } | ||
75 | |||
71 | html, | 76 | html, |
72 | body { | 77 | body { |
73 | -webkit-text-size-adjust: none; | 78 | -webkit-text-size-adjust: none; |
... | @@ -255,22 +260,18 @@ input::-webkit-search-cancel-button { | ... | @@ -255,22 +260,18 @@ input::-webkit-search-cancel-button { |
255 | // } | 260 | // } |
256 | 261 | ||
257 | ::-webkit-input-placeholder { | 262 | ::-webkit-input-placeholder { |
258 | /* WebKit, Blink, Edge */ | ||
259 | color: $cGray; | 263 | color: $cGray; |
260 | opacity: 1; | 264 | opacity: 1; |
261 | } | 265 | } |
262 | :-moz-placeholder { | 266 | :-moz-placeholder { |
263 | /* Mozilla Firefox 4 to 18 */ | ||
264 | color: $cGray; | 267 | color: $cGray; |
265 | opacity: 1; | 268 | opacity: 1; |
266 | } | 269 | } |
267 | ::-moz-placeholder { | 270 | ::-moz-placeholder { |
268 | /* Mozilla Firefox 19+ */ | ||
269 | color: $cGray; | 271 | color: $cGray; |
270 | opacity: 1; | 272 | opacity: 1; |
271 | } | 273 | } |
272 | :-ms-input-placeholder { | 274 | :-ms-input-placeholder { |
273 | /* Internet Explorer 10-11 */ | ||
274 | color: $cGray; | 275 | color: $cGray; |
275 | opacity: 1; | 276 | opacity: 1; |
276 | } | 277 | } |
... | @@ -326,97 +327,81 @@ textarea { | ... | @@ -326,97 +327,81 @@ textarea { |
326 | } | 327 | } |
327 | 328 | ||
328 | .content { | 329 | .content { |
329 | max-width: 1024px; | 330 | // max-width: 1024px; |
331 | max-width: 1200px; | ||
330 | width: 100%; | 332 | width: 100%; |
331 | margin: 0 auto; | 333 | margin: 0 auto; |
332 | } | 334 | } |
333 | 335 | ||
334 | .box-w { | 336 | .box-w { |
335 | // max-width: 1024px; | 337 | // max-width: 1024px; |
336 | max-width: 950px; | 338 | // max-width: 950px; |
339 | max-width: 1200px; | ||
337 | width: 100%; | 340 | width: 100%; |
338 | margin: 0 auto; | 341 | margin: 0 auto; |
339 | } | 342 | } |
340 | 343 | ||
341 | .box { | 344 | .box { |
342 | max-width: 950px; | 345 | // max-width: 950px; |
346 | max-width: 1200px; | ||
343 | width: 100%; | 347 | width: 100%; |
344 | margin: 0 auto; | 348 | margin: 0 auto; |
345 | } | 349 | } |
346 | 350 | ||
347 | .focus{ | 351 | .focus { |
348 | border: 1px solid $cOrange ; | 352 | border: 1px solid $cOrange; |
349 | } | ||
350 | |||
351 | .app__width { | ||
352 | width: 750px; | ||
353 | } | ||
354 | |||
355 | .app__width { | ||
356 | width: 750px; | ||
357 | } | 353 | } |
358 | 354 | ||
359 | .app__inner { | 355 | .swiper-pagination-bullet { |
360 | margin: 20px; | 356 | width: 1rem !important; |
357 | height: 1rem !important; | ||
361 | } | 358 | } |
362 | 359 | ||
363 | .app__title { | 360 | .swiper-pagination-bullet-active { |
364 | font-size: $fontSize; | 361 | background: $cOrange !important; |
365 | line-height: $fontSize + 4px; | ||
366 | font-weight: bold; | ||
367 | padding-bottom: 10px; | ||
368 | margin-bottom: 20px; | ||
369 | border-bottom: 0.5px solid #eeeeee; | ||
370 | } | 362 | } |
371 | 363 | ||
372 | .app__desc { | 364 | .ipt:focus { |
373 | font-size: $fontSizeSmaller; | 365 | border-color: $cOrange !important; |
374 | line-height: $fontSizeSmaller + 2px; | ||
375 | margin-bottom: 20px; | ||
376 | color: $colorGray; | ||
377 | } | 366 | } |
378 | 367 | ||
379 | .app__bgc { | 368 | .ipt.err { |
380 | position: fixed; | 369 | border-color: $cOrange !important; |
381 | background-color: #ffffff; | ||
382 | width: 100%; | ||
383 | height: 100%; | ||
384 | } | 370 | } |
385 | 371 | ||
386 | .app__bg { | 372 | .ipt-wrap { |
387 | position: absolute; | 373 | .ipt { |
374 | @extend .bb; | ||
388 | width: 100%; | 375 | width: 100%; |
389 | height: 100%; | 376 | height: 4.5rem; |
390 | } | 377 | border-radius: 4.5rem; |
391 | 378 | border: solid 1px #dcdddd !important; | |
392 | .app__top-shadow { | ||
393 | position: fixed; | ||
394 | width: 750px; | ||
395 | height: 1px; | ||
396 | box-shadow: 0px 4px 0.9px 0.1px rgba(6, 0, 1, 0.07); | ||
397 | background-color: #ffffff; | 379 | background-color: #ffffff; |
380 | padding: 0 2rem; | ||
381 | flex: 1; | ||
382 | letter-spacing: .1rem; | ||
383 | } | ||
398 | } | 384 | } |
399 | 385 | ||
400 | .app__content { | 386 | // 视频 |
401 | position: relative; | 387 | .video-js { |
402 | } | 388 | background-color: transparent !important; |
403 | |||
404 | .swiper-pagination-bullet { | ||
405 | width: 1rem !important; | ||
406 | height: 1rem !important; | ||
407 | } | 389 | } |
408 | 390 | ||
409 | .swiper-pagination-bullet-active { | 391 | .video-js .vjs-big-play-button { |
410 | background: #f05a23 !important; | 392 | top: 0 !important; |
393 | bottom: 0 !important; | ||
394 | left: 0 !important; | ||
395 | right: 0 !important; | ||
396 | margin: auto !important; | ||
397 | // display: none !important; | ||
411 | } | 398 | } |
412 | 399 | ||
413 | 400 | .video-js .vjs-slider { | |
414 | .ipt:focus { | 401 | background-color: $cOrange !important; |
415 | border-color: $cOrange !important; | ||
416 | } | 402 | } |
417 | 403 | ||
418 | .ipt.err { | 404 | .video-js .vjs-poster { |
419 | border-color: $cOrange !important; | 405 | background-color: transparent !important; |
420 | } | 406 | } |
421 | |||
422 | </style> | 407 | </style> |
... | ... |
src/assets/images/common/login-bg-bk.png
0 → 100644

192 KB

363 Bytes

335 Bytes
src/assets/images/home/footer-icon-1.png
0 → 100644

799 Bytes
src/assets/images/home/footer-icon-2.png
0 → 100644

408 Bytes
src/assets/images/home/footer-icon-3.png
0 → 100644

481 Bytes

3.36 KB

439 KB

439 KB

439 KB
src/assets/images/index/more-1.png
deleted
100644 → 0

453 KB
src/assets/images/index/recommend-4.png
0 → 100644

177 KB
src/assets/images/index/video-poster.png
0 → 100644

559 KB
src/assets/images/news-list/news-list-bg.png
0 → 100644

46.7 KB

192 KB
src/assets/images/payment-type/icon-payment-1-act.png
100644 → 100755
src/assets/images/payment-type/icon-payment-2-act.png
100644 → 100755
src/assets/images/payment-type/icon-payment-3-act.png
100644 → 100755
src/assets/images/payment-type/icon-payment-4-act.png
100644 → 100755
src/assets/images/payment-type/icon-payment-5-act.png
100644 → 100755
src/assets/images/payment-type/icon-payment-6-act.png
100644 → 100755
... | @@ -11,6 +11,11 @@ module.exports = { | ... | @@ -11,6 +11,11 @@ module.exports = { |
11 | glbalTips: { | 11 | glbalTips: { |
12 | sessionLost: "为了更好的体验,需要您登录后再进行此操作" | 12 | sessionLost: "为了更好的体验,需要您登录后再进行此操作" |
13 | }, | 13 | }, |
14 | form: { | ||
15 | datePicker: { | ||
16 | datePlaceholder: "please select date" | ||
17 | } | ||
18 | }, | ||
14 | nav: { | 19 | nav: { |
15 | loginData: { | 20 | loginData: { |
16 | name: "login", | 21 | name: "login", |
... | ... |
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/components/date-picker/date-picker.js
0 → 100644
This diff is collapsed.
Click to expand it.
src/components/date-picker/date-picker.scss
0 → 100644
This diff is collapsed.
Click to expand it.
src/components/date-picker/date-picker.vue
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
-
Please register or sign in to post a comment