Merge branch 'develop/wap' into beta/wap

@@ -10,6 +10,7 @@
     </section>
     <footer class="footer">
         共{{count}}件商品  实付<span class="sum-cost">¥{{sumCost}}</span>
+        {{#shippingCost}}(含运费¥{{.}}){{/shippingCost}}
     </footer>
 
     {{!-- 对应订单状态的操作逻辑 --}}

@@ -82,6 +82,10 @@ class OrderModel
                 $result[$key]['orderNum'] = $vo['order_code'];
                 $result[$key]['orderStatus'] = $vo['status_str'];
                 $result[$key]['sumCost'] = $vo['amount'];
+                // 如果运费大于0，会显示运费
+                if (floatval($vo['shipping_cost']) > 0) {
+                    $result[$key]['shippingCost'] = $vo['shipping_cost'];
+                }
                 //类内调用格式化订单商品数据方法
                 $result[$key]['goods'] = Helpers::formatOrderGoods($vo['order_goods'], $count);
                 $result[$key]['detailUrl'] = Helpers::url('/home/orderdetail', array('order_code' => $vo['order_code']));

@@ -511,6 +511,8 @@ class CartModel
 
         $compute = CartData::orderCompute($uid, $cartType, $deliveryWay, $paymentType, $couponCode, $yohoCoin);
         if ($compute && isset($compute['code']) && $compute['code'] === 200) {
+            // 有货币添加.00后缀
+            $compute['data']['use_yoho_coin'] = Helpers::transPrice($compute['data']['use_yoho_coin']);
             $result = $compute['data'];
         }