Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -79,6 +79,9 @@ function orderCompute() {
         if (!res) {
         if (!res) {
             tip.show('网络出错');
             tip.show('网络出错');
         } else {
         } else {
+            if (res.last_order_amount) {
+                res.last_order_amount = (+res.last_order_amount).toFixed(2);
+            }
             priceHtml = priceTmpl({
             priceHtml = priceTmpl({
                 sumPrice: res.order_amount,
                 sumPrice: res.order_amount,
                 salePrice: res.discount_amount,
                 salePrice: res.discount_amount,

@@ -75,6 +75,20 @@
 
 
     .goods {
     .goods {
         margin-right: -20rem / $pxConvertRem;
         margin-right: -20rem / $pxConvertRem;
+
+        .price-wrap {
+            position: static;
+            text-align: left;
+
+            .price {
+                color: #444;
+            }
+
+            .count {
+                display: inline;
+                margin-left: 20rem / $pxConvertRem;
+            }
+        }
     }
     }
 
 
     .sale-invoice {
     .sale-invoice {
@@ -148,21 +162,27 @@
         }
         }
     }
     }
 
 
-    #invoice {
-        input {
+    .block input {
+        box-sizing: border-box;
+        margin: pxToRem(20px) 0;
+        padding: 0 pxToRem(12px);
         width: 100%;
         width: 100%;
-            height: pxToRem(90px);
+        height: pxToRem(60px);
+        color: #444;
+        background: #efefef;
+        font-size: pxToRem(16px);
+        line-height: 1;
         outline: 0;
         outline: 0;
         border: 0;
         border: 0;
-            border-top: 1px solid #f7f7f7;
-            border-bottom: 1px solid #f7f7f7;
+        @include border-radius(4px);
     }
     }
 
 
+    #invoice {
+        border-top: 1px solid #f7f7f7;
+
         label {
         label {
-            position: relative;
-            width: 100%;
-            height: pxToRem(90px);
-            border-bottom: 1px solid #f7f7f7;
+            display: block;
+            border-top: 1px solid #f7f7f7;
         }
         }
 
 
         select {
         select {
@@ -178,13 +198,7 @@
     #msg {
     #msg {
         padding-top: pxToRem(20px);
         padding-top: pxToRem(20px);
         input {
         input {
-            padding: pxToRem(10px);
-            width: pxToRem(580px);
-            height: pxToRem(50px);
-            outline: 0;
-            border: 0;
-            border: 1px solid #f7f7f7;
-            border-radius: pxToRem(4px);
+            margin: 0;
         }
         }
 
 
     }
     }

@@ -41,10 +41,10 @@
 
 
         <section class="block">
         <section class="block">
             <ul class="sale-invoice">
             <ul class="sale-invoice">
-                {{# coupon}}
                 <li class="coupon">
                 <li class="coupon">
                     <a href="/cart/index/selectCoupon">
                     <a href="/cart/index/selectCoupon">
                         <span class="title">优惠券</span>
                         <span class="title">优惠券</span>
+                        {{# coupon}}
                             {{#if count}}
                             {{#if count}}
                                 <span class="coupon-count">
                                 <span class="coupon-count">
                                     {{count}}张可用
                                     {{count}}张可用
@@ -62,13 +62,12 @@
                                     <i class="iconfont">&#xe614;</i>
                                     <i class="iconfont">&#xe614;</i>
                                 </span>
                                 </span>
                             {{/if}}
                             {{/if}}
+                        {{/coupon}}
                     </a>
                     </a>
                 </li>
                 </li>
-                {{/coupon}}
-
                 <li class="coin" data-yoho-coin="{{yohoCoin}}">
                 <li class="coin" data-yoho-coin="{{yohoCoin}}">
                     <span class="title">YOHO币</span>
                     <span class="title">YOHO币</span>
-                    <span class="desc">可抵用¥{{yohoCoin}}</span>
+                    <span class="desc">可抵¥{{yohoCoin}}</span>
                     <span class="coin-check">
                     <span class="coin-check">
                         <em>- ¥ {{yohoCoin}}</em>
                         <em>- ¥ {{yohoCoin}}</em>
                         <i class="iconfont checkbox icon-cb-checked"></i>
                         <i class="iconfont checkbox icon-cb-checked"></i>

@@ -356,7 +356,8 @@ class IndexController extends AbstractAction
         }
         }
 
 
         if (empty($result)) {
         if (empty($result)) {
-            echo ' ';
+            // 这儿需要返回空数组，勿改!!!
+            echo '[]';
         } else {
         } else {
             $this->echoJson($result);
             $this->echoJson($result);
         }
         }