Showing
4 changed files
with
27 additions
and
31 deletions
@@ -17,7 +17,6 @@ module.exports = { | @@ -17,7 +17,6 @@ module.exports = { | ||
17 | domains: { | 17 | domains: { |
18 | // api: 'http://devapi.yoho.cn:58078/', | 18 | // api: 'http://devapi.yoho.cn:58078/', |
19 | // service: 'http://devservice.yoho.cn:58077/' | 19 | // service: 'http://devservice.yoho.cn:58077/' |
20 | - | ||
21 | api: 'http://testapi.yoho.cn:28078/', | 20 | api: 'http://testapi.yoho.cn:28078/', |
22 | service: 'http://testservice.yoho.cn:28077/' | 21 | service: 'http://testservice.yoho.cn:28077/' |
23 | }, | 22 | }, |
@@ -47,17 +47,17 @@ function hiddenTips($ele) { | @@ -47,17 +47,17 @@ function hiddenTips($ele) { | ||
47 | // } | 47 | // } |
48 | // } | 48 | // } |
49 | 49 | ||
50 | -function wrapElements(selector, count) { | ||
51 | - var elArr = null; | 50 | +// function wrapElements(selector, count) { |
51 | +// var elArr = null; | ||
52 | 52 | ||
53 | - $(selector).each(function(idx) { | ||
54 | - elArr = $(selector).slice(idx, idx + count); | 53 | +// $(selector).each(function(idx) { |
54 | +// elArr = $(selector).slice(idx, idx + count); | ||
55 | 55 | ||
56 | - if (elArr.length === count && idx % count === 0) { | ||
57 | - $(elArr).wrapAll($('<div class="js-wraper"></div>')); | ||
58 | - } | ||
59 | - }); | ||
60 | -} | 56 | +// if (elArr.length === count && idx % count === 0) { |
57 | +// $(elArr).wrapAll($('<div class="js-wraper"></div>')); | ||
58 | +// } | ||
59 | +// }); | ||
60 | +// } | ||
61 | 61 | ||
62 | 62 | ||
63 | 63 | ||
@@ -98,7 +98,7 @@ function search() { | @@ -98,7 +98,7 @@ function search() { | ||
98 | // if (!isFlexSupport()) { | 98 | // if (!isFlexSupport()) { |
99 | // $('.detail .column').removeClass('column').addClass('oldbox'); | 99 | // $('.detail .column').removeClass('column').addClass('oldbox'); |
100 | // } | 100 | // } |
101 | - wrapElements('.detail .column', 2); | 101 | + // wrapElements('.detail .column', 2); |
102 | searching = false; | 102 | searching = false; |
103 | end = true; | 103 | end = true; |
104 | loading.hideLoadingMask(); | 104 | loading.hideLoadingMask(); |
@@ -56,17 +56,9 @@ $basicBtnC: #eb0313; | @@ -56,17 +56,9 @@ $basicBtnC: #eb0313; | ||
56 | 56 | ||
57 | &.table { | 57 | &.table { |
58 | width: 100%; | 58 | width: 100%; |
59 | - | ||
60 | - .js-wraper { | ||
61 | - display: flex; | ||
62 | - flex-wrap: wrap; | ||
63 | - justify-content: flex-start; | ||
64 | - } | 59 | + overflow: hidden; |
65 | 60 | ||
66 | .column { | 61 | .column { |
67 | - display: flex; | ||
68 | - flex-basis: 49.9%; | ||
69 | - align-items: center; | ||
70 | box-sizing: border-box; | 62 | box-sizing: border-box; |
71 | padding: 6px 3%; | 63 | padding: 6px 3%; |
72 | width: 49.9%; | 64 | width: 49.9%; |
@@ -76,6 +68,14 @@ $basicBtnC: #eb0313; | @@ -76,6 +68,14 @@ $basicBtnC: #eb0313; | ||
76 | font-size: 24px; | 68 | font-size: 24px; |
77 | } | 69 | } |
78 | 70 | ||
71 | + .column:nth-child(2n+1) { | ||
72 | + float: left; | ||
73 | + } | ||
74 | + | ||
75 | + .column:nth-child(2n+2) { | ||
76 | + float: right; | ||
77 | + } | ||
78 | + | ||
79 | .oldbox { | 79 | .oldbox { |
80 | float: left; | 80 | float: left; |
81 | overflow: hidden; | 81 | overflow: hidden; |
@@ -384,13 +384,13 @@ $basicBtnC: #eb0313; | @@ -384,13 +384,13 @@ $basicBtnC: #eb0313; | ||
384 | text-align: left; | 384 | text-align: left; |
385 | 385 | ||
386 | .vip-img { | 386 | .vip-img { |
387 | - background: resolve('product/silver.png') no-repeat; | 387 | + background: resolve("product/silver.png") no-repeat; |
388 | } | 388 | } |
389 | } | 389 | } |
390 | 390 | ||
391 | &:nth-child(2) { | 391 | &:nth-child(2) { |
392 | .vip-img { | 392 | .vip-img { |
393 | - background: resolve('product/golden.png') no-repeat; | 393 | + background: resolve("product/golden.png") no-repeat; |
394 | } | 394 | } |
395 | } | 395 | } |
396 | 396 | ||
@@ -398,7 +398,7 @@ $basicBtnC: #eb0313; | @@ -398,7 +398,7 @@ $basicBtnC: #eb0313; | ||
398 | text-align: right; | 398 | text-align: right; |
399 | 399 | ||
400 | .vip-img { | 400 | .vip-img { |
401 | - background: resolve('product/platinum.png') no-repeat; | 401 | + background: resolve("product/platinum.png") no-repeat; |
402 | } | 402 | } |
403 | } | 403 | } |
404 | } | 404 | } |
@@ -744,15 +744,14 @@ $basicBtnC: #eb0313; | @@ -744,15 +744,14 @@ $basicBtnC: #eb0313; | ||
744 | top: 0; | 744 | top: 0; |
745 | left: 48px; | 745 | left: 48px; |
746 | display: block; | 746 | display: block; |
747 | - width: 72px; | ||
748 | - height: 72px; | 747 | + width: 30px; |
748 | + height: 30px; | ||
749 | border-radius: 50%; | 749 | border-radius: 50%; |
750 | background: $basicBtnC; | 750 | background: $basicBtnC; |
751 | color: #fff; | 751 | color: #fff; |
752 | text-align: center; | 752 | text-align: center; |
753 | - font-size: 40px; | ||
754 | - line-height: 72px; | ||
755 | - transform: scale(0.5); | 753 | + font-size: 20px; |
754 | + line-height: 30px; | ||
756 | 755 | ||
757 | &.hide { | 756 | &.hide { |
758 | display: none; | 757 | display: none; |
@@ -4,10 +4,8 @@ | @@ -4,10 +4,8 @@ | ||
4 | padding-bottom: 20px; | 4 | padding-bottom: 20px; |
5 | 5 | ||
6 | .service { | 6 | .service { |
7 | - margin-left: 50px; | ||
8 | - width: 494px; | ||
9 | height: 28px; | 7 | height: 28px; |
10 | - background: resolve('product/service.png') no-repeat; | 8 | + background: resolve("product/service.png") no-repeat; |
11 | background-size: cover; | 9 | background-size: cover; |
12 | } | 10 | } |
13 | 11 |
-
Please register or login to post a comment