merge feature/goodSize
Showing
3 changed files
with
25 additions
and
15 deletions
@@ -60,7 +60,8 @@ var limitProductCode, | @@ -60,7 +60,8 @@ var limitProductCode, | ||
60 | // 限购商品的skn。只有限购商品时才会设置。 | 60 | // 限购商品的skn。只有限购商品时才会设置。 |
61 | skn; | 61 | skn; |
62 | 62 | ||
63 | -var $sizeInfo; | 63 | +var $sizeInfo, |
64 | + $thumbImg; | ||
64 | 65 | ||
65 | //禁用数字编辑 | 66 | //禁用数字编辑 |
66 | function disableNumEdit() { | 67 | function disableNumEdit() { |
@@ -91,7 +92,8 @@ function init() { | @@ -91,7 +92,8 @@ function init() { | ||
91 | isEdit = 0; | 92 | isEdit = 0; |
92 | $mnum = $('#mnum'); | 93 | $mnum = $('#mnum'); |
93 | discountNum = $mnum.val() - 0; | 94 | discountNum = $mnum.val() - 0; |
94 | - $sizeInfo = $('.size-info'); | 95 | + $sizeInfo = $('.size-info'); |
96 | + $thumbImg = $('.thumb-img'); | ||
95 | } | 97 | } |
96 | 98 | ||
97 | /* | 99 | /* |
@@ -361,7 +363,7 @@ function chosedLength() { | @@ -361,7 +363,7 @@ function chosedLength() { | ||
361 | 363 | ||
362 | for (var i = 0; i < chosedStr.length; i++) { | 364 | for (var i = 0; i < chosedStr.length; i++) { |
363 | if (chosedStr.charCodeAt(i) > 255) { | 365 | if (chosedStr.charCodeAt(i) > 255) { |
364 | - strlen += 2; | 366 | + strlen += 2; |
365 | } else { | 367 | } else { |
366 | strlen ++; | 368 | strlen ++; |
367 | } | 369 | } |
@@ -751,11 +753,11 @@ $yohoPage.on('click', '.close', function() { | @@ -751,11 +753,11 @@ $yohoPage.on('click', '.close', function() { | ||
751 | }); | 753 | }); |
752 | 754 | ||
753 | $yohoPage.on('touchstart', '.thumb', function() { | 755 | $yohoPage.on('touchstart', '.thumb', function() { |
754 | - if ($(this).hasClass('hover')) { | ||
755 | - $(this).removeClass('hover'); | 756 | + if ($thumbImg.hasClass('hover')) { |
757 | + $thumbImg.removeClass('hover'); | ||
756 | } else { | 758 | } else { |
757 | - $(this).addClass('hover'); | ||
758 | - } | 759 | + $thumbImg.addClass('hover'); |
760 | + } | ||
759 | }) | 761 | }) |
760 | 762 | ||
761 | exports.init = init; | 763 | exports.init = init; |
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | right: 0; | 14 | right: 0; |
15 | bottom: 0; | 15 | bottom: 0; |
16 | left: 0; | 16 | left: 0; |
17 | - height: 838px; | 17 | + height: 70%; |
18 | background: #fff; | 18 | background: #fff; |
19 | } | 19 | } |
20 | 20 | ||
@@ -43,9 +43,9 @@ | @@ -43,9 +43,9 @@ | ||
43 | border-bottom: 1px solid #e6e6e6; | 43 | border-bottom: 1px solid #e6e6e6; |
44 | } | 44 | } |
45 | 45 | ||
46 | - .thumb { | 46 | + .thumb-img { |
47 | width: 164px; | 47 | width: 164px; |
48 | - min-height: 220px; | 48 | + min-height: 200px; |
49 | position: absolute; | 49 | position: absolute; |
50 | top: -60px; | 50 | top: -60px; |
51 | border: 1px solid #e6e6e6; | 51 | border: 1px solid #e6e6e6; |
@@ -241,11 +241,17 @@ | @@ -241,11 +241,17 @@ | ||
241 | width: 100%; | 241 | width: 100%; |
242 | background-color: black; | 242 | background-color: black; |
243 | height: 100%; | 243 | height: 100%; |
244 | - top: 0px; | ||
245 | - left: 0px; | ||
246 | - right: 0px; | ||
247 | - border: 0px; | 244 | + top: 0; |
245 | + left: 0; | ||
246 | + right: 0; | ||
247 | + border: 0; | ||
248 | z-index: 999; | 248 | z-index: 999; |
249 | + align-items: center; | ||
250 | + display: flex; | ||
251 | + | ||
252 | + img { | ||
253 | + width: 100%; | ||
254 | + } | ||
249 | } | 255 | } |
250 | } | 256 | } |
251 | 257 |
@@ -4,9 +4,11 @@ | @@ -4,9 +4,11 @@ | ||
4 | <div class="close iconfont"></div> | 4 | <div class="close iconfont"></div> |
5 | <div class="infos {{#if ../tickets}}tickets-info{{/if}}"> | 5 | <div class="infos {{#if ../tickets}}tickets-info{{/if}}"> |
6 | <div class="basic-info" > | 6 | <div class="basic-info" > |
7 | + <div class="thumb-img"> | ||
7 | {{#thumbs}} | 8 | {{#thumbs}} |
8 | - <img class="thumb {{#unless @first}}hide{{/if}}" src={{img}}> | 9 | + <img class="thumb {{#unless @first}}hide{{/if}}" src={{img}}> |
9 | {{/thumbs}} | 10 | {{/thumbs}} |
11 | + </div> | ||
10 | <div class="text-info"> | 12 | <div class="text-info"> |
11 | <!-- <p class="name">{{name}}</p> --> | 13 | <!-- <p class="name">{{name}}</p> --> |
12 | <p class="price"> | 14 | <p class="price"> |
-
Please register or login to post a comment