Authored by 梁志锋

Merge remote-tracking branch 'remotes/origin/develop/wap' into stable/wap

... ... @@ -5,6 +5,10 @@
visibility: hidden;
}
.box.bytouch {
background-color:#eee;
}
.box {
border: 1px solid #eee;
border-radius: 10rem / $pxConvertRem;
... ...
... ... @@ -708,11 +708,9 @@ class CartModel
}
// 缩略图
foreach ($val['images_list'] as $image) {
$thumbImageList[] = array(
'img' => Helpers::getImageUrl($image['image_url'], 60, 60)
);
}
$thumbImageList[] = array(
'img' => Helpers::getImageUrl($val['color_image'], 60, 60)
);
// 商品库存总数
$totalStorageNum += $colorNum;
... ...