diff --git a/library/Plugin/Helpers.php b/library/Plugin/Helpers.php index c57acde..810a930 100644 --- a/library/Plugin/Helpers.php +++ b/library/Plugin/Helpers.php @@ -191,7 +191,7 @@ class Helpers */ public static function transPrice($price) { - return (!empty($price) && !is_float($price)) ? $price . '.00' : number_format($price, 2, '.', ''); + return number_format($price, 2, '.', ''); } /** diff --git a/static/js/me/order-detail.js b/static/js/me/order-detail.js index 7bd913e..975b5fb 100644 --- a/static/js/me/order-detail.js +++ b/static/js/me/order-detail.js @@ -41,7 +41,7 @@ optHammer.on('tap', function(e) { } }).then(function(res) { $('#dialog-wrapper').hide(); - if (!res) { + if ($.type(res) !== 'object') { return; } if (res.message) { @@ -70,7 +70,7 @@ optHammer.on('tap', function(e) { } }).then(function(res) { $('#dialog-wrapper').hide(); - if (!res) { + if ($.type(res) !== 'object') { return; } if (res.message) { diff --git a/static/sass/cart/_good.scss b/static/sass/cart/_good.scss index 0a2306e..d9729a8 100644 --- a/static/sass/cart/_good.scss +++ b/static/sass/cart/_good.scss @@ -28,9 +28,9 @@ } .few-tag{ - width: 132rem / $pxConvertRem; + width: 148rem / $pxConvertRem; position: absolute; - left: 100rem / $pxConvertRem; + left: 92rem / $pxConvertRem; text-align: center; top: 75%; color: #fff; diff --git a/static/sass/cart/_index.scss b/static/sass/cart/_index.scss index 77dfb88..96d3a52 100644 --- a/static/sass/cart/_index.scss +++ b/static/sass/cart/_index.scss @@ -5,7 +5,7 @@ .icon-cb-checked:before { content: "\e61d"; } .shopping-cart-page { - padding-bottom: 120rem / $pxConvertRem; + margin-bottom: 120rem / $pxConvertRem; overflow-x: hidden; background: #f0f0f0; diff --git a/static/sass/cart/_order-ensure.scss b/static/sass/cart/_order-ensure.scss index ae3765d..ab6f564 100644 --- a/static/sass/cart/_order-ensure.scss +++ b/static/sass/cart/_order-ensure.scss @@ -137,6 +137,13 @@ color: #999; } } + + .checkbox { + display: inline-block; + width: 80rem / $pxConvertRem; + text-align: center; + margin-right: -20rem / $pxConvertRem; + } .coin-check { float: right; diff --git a/yohobuy/m.yohobuy.com/application/models/Index/Cart.php b/yohobuy/m.yohobuy.com/application/models/Index/Cart.php index cd0a958..4b7c18d 100644 --- a/yohobuy/m.yohobuy.com/application/models/Index/Cart.php +++ b/yohobuy/m.yohobuy.com/application/models/Index/Cart.php @@ -408,7 +408,7 @@ class CartModel $oneGoods['name'] = $single['product_name']; $oneGoods['color'] = $single['color_name']; $oneGoods['size'] = $single['size_name']; - $oneGoods['price'] = Helpers::transPrice($single['sales_price']); + $oneGoods['price'] = Helpers::transPrice($single['last_price']); $oneGoods['count'] = $single['buy_number']; //gift=>是否赠品,advanceBuy=>是否加价购;