code review by hf: do format php codes

@@ -26,6 +26,8 @@ var navHammer,
 
 
 var isRefreshByDelete = window.cookie('_yoho-cart-refreshByDelete') === 'true' ? true : false;
 var isRefreshByDelete = window.cookie('_yoho-cart-refreshByDelete') === 'true' ? true : false;
 
 
+var lowStockCount = 0;
+
 
 
 loading.showLoadingMask();
 loading.showLoadingMask();
 
 
@@ -93,8 +95,8 @@ function shouldLowStocks() {
 
 
     $lowStocks.each(function(idx, item) {
     $lowStocks.each(function(idx, item) {
         if ($(item).parent().parent().parent().siblings('.checkbox').hasClass('icon-cb-checked')) {
         if ($(item).parent().parent().parent().siblings('.checkbox').hasClass('icon-cb-checked')) {
+            lowStockCount += 1;
             result = true;
             result = true;
-            return false;
         }
         }
     });
     });
 
 
@@ -185,8 +187,9 @@ if ($('.freebie').length > 0) {
 }
 }
 
 
 $('.btn-balance').on('touchend', function() {
 $('.btn-balance').on('touchend', function() {
+    lowStockCount = 0;
     if (shouldLowStocks()) {
     if (shouldLowStocks()) {
-        tip.show('所选商品中含有库存不足的商品');
+        tip.show('所选商品中有' + lowStockCount + '种库存不足的商品');
         return false;
         return false;
     }
     }
 
 

@@ -57,6 +57,7 @@
 
 
         .price{
         .price{
             font-size: pxToRem(24px);
             font-size: pxToRem(24px);
+            display: inline;
         }
         }
         .sale-price {
         .sale-price {
             color: #e10;
             color: #e10;

@@ -141,7 +141,7 @@
     }
     }
 
 
     .freebie-and-advance-buy {
     .freebie-and-advance-buy {
-        padding: 20rem / $pxConvertRem;
+        padding: 20rem / $pxConvertRem 0;
         font-size: 24rem / $pxConvertRem;
         font-size: 24rem / $pxConvertRem;
         border-top: 1px solid #e0e0e0;
         border-top: 1px solid #e0e0e0;
         margin-bottom: 30rem / $pxConvertRem;
         margin-bottom: 30rem / $pxConvertRem;
@@ -152,7 +152,6 @@
             line-height: 80rem / $pxConvertRem;
             line-height: 80rem / $pxConvertRem;
             margin-bottom: 10rem / $pxConvertRem;
             margin-bottom: 10rem / $pxConvertRem;
             padding: 0 20rem / $pxConvertRem;
             padding: 0 20rem / $pxConvertRem;
-            background: #f1f1f1;
 
 
             &:last-child {
             &:last-child {
                 margin-bottom: 0;
                 margin-bottom: 0;
@@ -162,6 +161,22 @@
                 float: right;
                 float: right;
                 width: 100%;
                 width: 100%;
             }
             }
+
+            .under-line {
+                display: inline-block;
+                height: 1px;
+                width: 91%;
+                position: absolute;
+                left: 9%;
+                background-color: #f1f1f1;
+            }
+
+        }
+
+        > li:first-child {
+            .under-line {
+                display: none;
+            }
         }
         }
 
 
         .count {
         .count {
@@ -191,7 +206,9 @@
             height: 4px;
             height: 4px;
             background-color: #000;
             background-color: #000;
             border-radius: 50%;
             border-radius: 50%;
-            margin-right: 8rem / $pxConvertRem;
+            position: relative;
+            left: 0;
+            top: -.12rem;
         }
         }
     }
     }
     .price-compute {
     .price-compute {

@@ -20,6 +20,9 @@
 			&:last-of-type{
 			&:last-of-type{
 				border-bottom:none;
 				border-bottom:none;
 			}
 			}
+			a:visited {
+    			color: #444444;
+			}
 			span{
 			span{
 				width: 85%;
 				width: 85%;
 				height: 100%;
 				height: 100%;
@@ -36,6 +39,6 @@
 .deal_main{
 .deal_main{
 	margin: .5rem 3%;
 	margin: .5rem 3%;
 	font-size:1.2em;
 	font-size:1.2em;
-	widows: 94%;
+	width: 94%;
 	overflow: hidden;
 	overflow: hidden;
 }
 }

@@ -276,7 +276,7 @@ $basicBtnC:#eb0313;
         }
         }
     }
     }
     .price-date {
     .price-date {
-        // width: 100%;
+        width: 100%;
         color: $subFontC;
         color: $subFontC;
         height: pxToRem(88px);
         height: pxToRem(88px);
         padding-left: pxToRem(28px);
         padding-left: pxToRem(28px);
@@ -365,6 +365,9 @@ $basicBtnC:#eb0313;
         }
         }
     }
     }
     .goodsDiscount {
     .goodsDiscount {
+        display: block;
+        width: 100%; 
+        height:auto;
         font-size: pxToRem(28px);
         font-size: pxToRem(28px);
         color: $mainFontC;
         color: $mainFontC;
         background-color: #fff;
         background-color: #fff;
@@ -373,7 +376,6 @@ $basicBtnC:#eb0313;
             position: relative;
             position: relative;
             padding: pxToRem(30px) pxToRem(60px) pxToRem(30px) pxToRem(28px);
             padding: pxToRem(30px) pxToRem(60px) pxToRem(30px) pxToRem(28px);
             line-height: pxToRem(36px);
             line-height: pxToRem(36px);
-            // line-height: pxToRem(88px);
         }
         }
 
 
         .short-text {
         .short-text {

 {{> layout/header}}
 {{> layout/header}}
 <div class="my-address-page select-address-page yoho-page">
 <div class="my-address-page select-address-page yoho-page">
-    <div class="page-wrap">
+    <div class="page-wrap clearfix">
         {{# address}}
         {{# address}}
         <a class="address-item" data-address-id="{{address_id}}" data-is-support="{{is_support}}" href="/cart/index/orderEnsure">
         <a class="address-item" data-address-id="{{address_id}}" data-is-support="{{is_support}}" href="/cart/index/orderEnsure">
             <span class="name">{{consignee}}</span>
             <span class="name">{{consignee}}</span>

@@ -22,6 +22,7 @@
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="count">{{giftCount}}</span>
                     <span class="count">{{giftCount}}</span>
                 </a>
                 </a>
+                <span class="under-line"></span>
             </li>
             </li>
         {{/if}}
         {{/if}}
         {{#if advanceBuy}}
         {{#if advanceBuy}}
@@ -32,6 +33,7 @@
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="count">{{advanceBuyCount}}</span>
                     <span class="count">{{advanceBuyCount}}</span>
                 </a>
                 </a>
+                <span class="under-line"></span>
             </li>
             </li>
         {{/if}}
         {{/if}}
     </ul>
     </ul>

@@ -873,8 +873,8 @@ class HomeController extends AbstractAction
             $input->SetOpenid($openId);
             $input->SetOpenid($openId);
             $order = WxPayApi::unifiedOrder($input);
             $order = WxPayApi::unifiedOrder($input);
             $jsApiParameters = $tools->GetJsApiParameters($order);
             $jsApiParameters = $tools->GetJsApiParameters($order);
-
-            $this->echoJson(array('code' => 200, 'data' => array('jsApiParameters' => json_decode($jsApiParameters))));
+            $this->echoJson(array('code' => 200, 'data' => array('jsApiParameters' => json_decode($jsApiParameters) )) );
+            
         } while (false);
         } while (false);
     }
     }
 
 
@@ -912,7 +912,7 @@ class HomeController extends AbstractAction
         }
         }
 
 
         $this->setTitle('订单详情');
         $this->setTitle('订单详情');
-        $this->setNavHeader('订单详情', true, false);
+        $this->setNavHeader('订单详情', Helpers::url('/home/orders'), false);
 
 
         $this->_view->display('order-detail', array(
         $this->_view->display('order-detail', array(
             'orderDetailPage' => true,
             'orderDetailPage' => true,