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

@@ -74,7 +74,7 @@
             {{> me/order/good}}
             {{/each}}
     </section>
-    <div class="goods-num">共{{num}}件商品  合计<span>¥{{price}}</span></div>
+    <div class="goods-num">共{{num}}件商品  合计<span>{{goodsPrice}}</span></div>
 
     <section class="block">
         <ul class="sale-invoice">

@@ -504,6 +504,10 @@ class CartModel
                 $result['cartPayData'] = isset($orderCompute['promotion_formula_list']) ? $orderCompute['promotion_formula_list'] : $payReturn['shopping_cart_data']['promotion_formula_list'];
                 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
                 $result['price'] = Helpers::transPrice($price);
+                // 订单商品数
+                $result['num'] = $payReturn['shopping_cart_data']['goods_count'];
+                // 商品金额
+                $result['goodsPrice'] = $payReturn['shopping_cart_data']['str_order_amount'];
             }
 
             // 发票有关数据

@@ -6,7 +6,7 @@ define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
 define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
-define('USE_CACHE', true); // 缓存的开关
+define('USE_CACHE', false); // 缓存的开关
 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'testing');