Showing
3 changed files
with
17 additions
and
10 deletions
| @@ -132,7 +132,7 @@ function orderCompute() { | @@ -132,7 +132,7 @@ function orderCompute() { | ||
| 132 | if ($.type(res) !== 'object') { | 132 | if ($.type(res) !== 'object') { |
| 133 | window.location.reload(); | 133 | window.location.reload(); |
| 134 | } else { | 134 | } else { |
| 135 | - if (res.last_order_amount) { | 135 | + if (typeof res.last_order_amount !== undefined) { |
| 136 | res.last_order_amount = (+res.last_order_amount).toFixed(2); | 136 | res.last_order_amount = (+res.last_order_amount).toFixed(2); |
| 137 | } | 137 | } |
| 138 | if (res.use_yoho_coin) { | 138 | if (res.use_yoho_coin) { |
| @@ -320,6 +320,8 @@ $subBlock.on('touchstart', 'li', function() { | @@ -320,6 +320,8 @@ $subBlock.on('touchstart', 'li', function() { | ||
| 320 | $(this).parents('ul').find('i').removeClass('icon-cb-radio').addClass('icon-radio'); | 320 | $(this).parents('ul').find('i').removeClass('icon-cb-radio').addClass('icon-radio'); |
| 321 | }); | 321 | }); |
| 322 | $(this).parents('ul').hide(); | 322 | $(this).parents('ul').hide(); |
| 323 | + $('.down').removeClass('hide'); | ||
| 324 | + $('.up').addClass('hide'); | ||
| 323 | $('.dispatch h3').removeClass('border-none'); | 325 | $('.dispatch h3').removeClass('border-none'); |
| 324 | dispatchInfo = $(this).find('span').html(); | 326 | dispatchInfo = $(this).find('span').html(); |
| 325 | $(this).parents('.sub-block').find('h3 span').html(dispatchInfo); | 327 | $(this).parents('.sub-block').find('h3 span').html(dispatchInfo); |
| @@ -10,8 +10,8 @@ | @@ -10,8 +10,8 @@ | ||
| 10 | } | 10 | } |
| 11 | 11 | ||
| 12 | .title { | 12 | .title { |
| 13 | - font-size: 26rem / $pxConvertRem; | ||
| 14 | - font-weight: bold; | 13 | + font-size: 32rem / $pxConvertRem; |
| 14 | + color: #444; | ||
| 15 | } | 15 | } |
| 16 | /*xwg 2016-3-19 10:53*/ | 16 | /*xwg 2016-3-19 10:53*/ |
| 17 | .price-cost{ | 17 | .price-cost{ |
| @@ -38,16 +38,20 @@ | @@ -38,16 +38,20 @@ | ||
| 38 | position: relative; | 38 | position: relative; |
| 39 | i{ | 39 | i{ |
| 40 | position: absolute; | 40 | position: absolute; |
| 41 | - left: 20rem / $pxConvertRem; | ||
| 42 | - top: 28rem / $pxConvertRem; | ||
| 43 | - font-size: 32rem / $pxConvertRem; | 41 | + left: 16rem / $pxConvertRem; |
| 42 | + top: 50%; | ||
| 43 | + transform:translatey(-50%); | ||
| 44 | + font-size: 44rem / $pxConvertRem; | ||
| 44 | } | 45 | } |
| 45 | .choose{ | 46 | .choose{ |
| 46 | display: block; | 47 | display: block; |
| 47 | color: #000; | 48 | color: #000; |
| 49 | + height: 64rem / $pxConvertRem; | ||
| 50 | + overflow: hidden; | ||
| 48 | position: static; | 51 | position: static; |
| 49 | padding-left:40rem / $pxConvertRem; | 52 | padding-left:40rem / $pxConvertRem; |
| 50 | font-size: 32rem / $pxConvertRem; | 53 | font-size: 32rem / $pxConvertRem; |
| 54 | + line-height: 82rem / $pxConvertRem; | ||
| 51 | span{ | 55 | span{ |
| 52 | position: absolute; | 56 | position: absolute; |
| 53 | right: 20rem / $pxConvertRem; | 57 | right: 20rem / $pxConvertRem; |
| @@ -75,7 +79,8 @@ | @@ -75,7 +79,8 @@ | ||
| 75 | i{ | 79 | i{ |
| 76 | position: absolute; | 80 | position: absolute; |
| 77 | left: 0; | 81 | left: 0; |
| 78 | - top: 16rem / $pxConvertRem; | 82 | + top: 50%; |
| 83 | + transform:translatey(-50%); | ||
| 79 | font-size: 48rem / $pxConvertRem; | 84 | font-size: 48rem / $pxConvertRem; |
| 80 | } | 85 | } |
| 81 | } | 86 | } |
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | <div class="sub-block payment-type"> | 21 | <div class="sub-block payment-type"> |
| 22 | <h3> | 22 | <h3> |
| 23 | <p>支付方式</p> | 23 | <p>支付方式</p> |
| 24 | - <span>在线支付 (推荐)</span> | 24 | + <span>在线支付(推荐)</span> |
| 25 | <i class="iconfont down"></i> | 25 | <i class="iconfont down"></i> |
| 26 | <i class="iconfont hide up"></i> | 26 | <i class="iconfont hide up"></i> |
| 27 | </h3> | 27 | </h3> |
| @@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
| 38 | <h3> | 38 | <h3> |
| 39 | <p>配送方式</p> | 39 | <p>配送方式</p> |
| 40 | {{#each dispatchMode}} | 40 | {{#each dispatchMode}} |
| 41 | - {{#if isSelected}}<span>{{name}}¥{{cost}}</span>{{/if}} | 41 | + {{#if isSelected}}<span>{{name}} ¥{{cost}}</span>{{/if}} |
| 42 | {{/each}} | 42 | {{/each}} |
| 43 | <i class="iconfont down"></i> | 43 | <i class="iconfont down"></i> |
| 44 | <i class="iconfont hide up"></i> | 44 | <i class="iconfont hide up"></i> |
| @@ -46,7 +46,7 @@ | @@ -46,7 +46,7 @@ | ||
| 46 | <ul class="dispatch-mode"> | 46 | <ul class="dispatch-mode"> |
| 47 | {{#each dispatchMode}} | 47 | {{#each dispatchMode}} |
| 48 | <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}"> | 48 | <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}"> |
| 49 | - <span>{{name}}¥{{cost}}</span> | 49 | + <span>{{name}} ¥{{cost}}</span> |
| 50 | <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}"></i> | 50 | <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}"></i> |
| 51 | </li> | 51 | </li> |
| 52 | {{/each}} | 52 | {{/each}} |
-
Please register or login to post a comment