From 8cd6b877487bc0269957269645277b43fc1a3862 Mon Sep 17 00:00:00 2001
From: yyq <kingcoon@163.com>
Date: Fri, 12 May 2017 10:52:42 +0800
Subject: [PATCH] global price
---
apps/product/views/action/global/detail.hbs | 2 +-
utils/product-process.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/product/views/action/global/detail.hbs b/apps/product/views/action/global/detail.hbs
index 72c5ea3..7a40f8e 100644
--- a/apps/product/views/action/global/detail.hbs
+++ b/apps/product/views/action/global/detail.hbs
@@ -74,7 +74,7 @@
<p class="foreign-price">
{{# format_market_price}}
<span class="title">原 价：</span>
- <span class="price">{{.}}</span>
+ <span class="price has-other-price">{{.}}</span>
{{/ format_market_price}}
{{# format_sales_price}}
<span class="title">当前价：</span>
diff --git a/utils/product-process.js b/utils/product-process.js
index 9c4a18b..d271c41 100644
--- a/utils/product-process.js
+++ b/utils/product-process.js
@@ -156,7 +156,7 @@ exports.processProductList = (list, options) => {
images_url: product.default_images,
status: 1
}],
- sales_price: product.orign_price,
+ sales_price: product.final_price || product.orign_price,
market_price: null,
tbl_country_name: product.country_name,
tbl_brand_id: product.brand_id
--
libgit2 0.24.0