From ef376fca318bc3dba6b183ad745fb5f10ef7bb66 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 7 Oct 2020 09:11:07 +0800
Subject: [PATCH] 1、  再来一单要有能够计算等级卡的价格

---
 pages/user/order_detail/order_detail.js | 6 ++++++
 pages/user/order_list/order_list.js     | 6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index cc3881d..fdb3f02 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -752,6 +752,12 @@ Page({
 			  b_item.goods_sn=good.goods_sn;
 			  b_item.sku=good.sku;
 			  b_item.is_integral_normal=g_item.is_integral_normal;
+			  
+			  //-- 如果会员是等级卡的时候,同时商品也有设置相应的卡价格 --
+			  var card_field=th.data.card_field;
+			  if(card_field && good[card_field]>0){
+			  	 b_item.price=good[card_field]; 
+			  }
 			  		  
 			  //--判断商品当前的活动情况--
 			  switch(good.prom_type){
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 5d01c08..d4f8a41 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -837,6 +837,12 @@ Page({
 		  b_item.goods_sn=good.goods_sn;
 		  b_item.sku=good.sku;		  
 		  b_item.is_integral_normal=g_item.is_integral_normal;
+		  
+		  //-- 如果会员是等级卡的时候,同时商品也有设置相应的卡价格 --
+		  var card_field=th.data.card_field;
+		  if(card_field && good[card_field]>0){
+			   b_item.price=good[card_field]; 
+		  }
 		  		  
 		  //--判断商品当前的活动情况--
 		  switch(good.prom_type){
--
libgit2 0.21.4