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

@@ -34,6 +34,7 @@ var $chosePanel = $('#chose-panel'),
     $allChoseItems,
     $allChoseItems,
     queryString,
     queryString,
     $choseArea,
     $choseArea,
+    $cartBar,
     $soonSoldOut = $('.soonSoldOut-tag'),
     $soonSoldOut = $('.soonSoldOut-tag'),
     $yohoPage = $('.yoho-page');
     $yohoPage = $('.yoho-page');
 
 
@@ -54,6 +55,7 @@ function init() {
     $sizeRowList = $('.size-list ul');
     $sizeRowList = $('.size-list ul');
     $colorRowList = $('.color-list ul');
     $colorRowList = $('.color-list ul');
     $leftNum = $('#left-num');
     $leftNum = $('#left-num');
+    $cartBar = $('.cart-bar');
     curColorIndex = 0;
     curColorIndex = 0;
     curSizeIndex = 0;
     curSizeIndex = 0;
     isEdit = 0;
     isEdit = 0;
@@ -136,6 +138,10 @@ function show(html, cb) {
 function hide() {
 function hide() {
     $('.chose-panel').hide();
     $('.chose-panel').hide();
     innerScroll.enableScroll($choseArea);
     innerScroll.enableScroll($choseArea);
+
+    if ($cartBar.length > 0) {
+        $cartBar.show();
+    }
 }
 }
 
 
 //修改加入购物车的文字和背景
 //修改加入购物车的文字和背景

@@ -64,6 +64,7 @@ $('#likeBtn').on('touchstart', function() {
 });
 });
 
 
 $('#addtoCart').on('touchstart', function() {
 $('#addtoCart').on('touchstart', function() {
+    $('.cart-bar').hide();
     chosePanel.show();
     chosePanel.show();
 
 
     //统计代码：用于统计用户加入购物车的动作
     //统计代码：用于统计用户加入购物车的动作

@@ -52,9 +52,9 @@
     			font-size: 50px;
     			font-size: 50px;
     		}
     		}
     		p{
     		p{
-    			width: 59.517241%;
+    			width: 61.517241%;
     			height: auto;
     			height: auto;
-    			margin: 0 3% 16em / $pxConvertRem;
+    			margin: 0 2% 16em / $pxConvertRem;
     			float: left;
     			float: left;
     			&:first-of-type{
     			&:first-of-type{
     				margin-top: 0.75rem;
     				margin-top: 0.75rem;