From f5e763bde08bbb97d6eef3c9cc0683776b02cb8e Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 8 Oct 2020 17:23:56 +0800
Subject: [PATCH] 1.   提交订单的页面等级卡购买后价格正确获取

---
 pages/cart/cart2/cart2.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 45a5b8e..5a5093e 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -304,7 +304,7 @@ Page({
   show_page:function(){
     var th=this,ta = this.data.param;
     th.setData({
-      userinfo: to.globalData.userInfo,});
+      userinfo: getApp().globalData.userInfo,});
 
     //选获取地址
     th.getuser_addr(function(addr){
@@ -364,7 +364,8 @@ Page({
           }
 		  
 		  //-- 如果是等级会员注册返回 --
-		  if(is_card_back){			  
+		  if(is_card_back){	
+			  th.data.card_name=th.data.userinfo.card_field;
 			  // 拼团,搭配购不计算,赠品也不计算
 			  if( item['prom_type']!=5 &&  item['prom_type']!=6  && !item.is_gift && !item['is_collocation'] && item.goods_price>item[th.data.card_name] ){
 				  item.goods_price=item[th.data.card_name];
@@ -494,7 +495,8 @@ Page({
 		  
 		  //---是不是购买等级卡成功的返回---等级卡显示的判断---
 		  var is_card_back=getApp().globalData.is_card_back;
-		  if(is_card_back){
+		  if(is_card_back){			  
+			  th.data.card_name=th.data.userinfo.card_field;			  
 			  gg.goods_price=gd[th.data.card_name];	
 			  getApp().globalData.is_card_back=0;
 			  th.setData({card_cut_price:0});
--
libgit2 0.21.4