fe / YOHOBUYWAP · Commits

Go to a project

Authored by uedxwg
Commit 52aaddfcfa47c1c745c39b1c42b4b428d0ecee85 2 parents 89dd6a23 2dc38416

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

Inline Side-by-side
Showing 3 changed files with 6 additions and 2 deletions
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 {{> me/order/good}} 74 {{> me/order/good}}
75 {{/each}} 75 {{/each}}
76 </section> 76 </section>
77 - <div class="goods-num">共{{num}}件商品 合计<span>¥{{price}}</span></div> 77 + <div class="goods-num">共{{num}}件商品 合计<span>{{goodsPrice}}</span></div>
78 78
79 <section class="block"> 79 <section class="block">
80 <ul class="sale-invoice"> 80 <ul class="sale-invoice">
@@ -504,6 +504,10 @@ class CartModel @@ -504,6 +504,10 @@ class CartModel
504 $result['cartPayData'] = isset($orderCompute['promotion_formula_list']) ? $orderCompute['promotion_formula_list'] : $payReturn['shopping_cart_data']['promotion_formula_list']; 504 $result['cartPayData'] = isset($orderCompute['promotion_formula_list']) ? $orderCompute['promotion_formula_list'] : $payReturn['shopping_cart_data']['promotion_formula_list'];
505 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount']; 505 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
506 $result['price'] = Helpers::transPrice($price); 506 $result['price'] = Helpers::transPrice($price);
  507 + // 订单商品数
  508 + $result['num'] = $payReturn['shopping_cart_data']['goods_count'];
  509 + // 商品金额
  510 + $result['goodsPrice'] = $payReturn['shopping_cart_data']['str_order_amount'];
507 } 511 }
508 512
509 // 发票有关数据 513 // 发票有关数据
@@ -6,7 +6,7 @@ define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名 @@ -6,7 +6,7 @@ define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
6 define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名 6 define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
9 -define('USE_CACHE', true); // 缓存的开关 9 +define('USE_CACHE', false); // 缓存的开关
10 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录 10 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
11 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录 11 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
12 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'testing'); 12 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'testing');