From 40a10548760c2f8a4295d9a8a072245e592fb546 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 20 Mar 2021 11:02:38 +0800
Subject: [PATCH] 线下取价的功能bug优化

---
 pages/cart/cart/cart.js            | 2 +-
 pages/goods/goodsInfo/goodsInfo.js | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index c2d8a73..57707e7 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -83,7 +83,7 @@ Page({
 					  if(item.end_time<ut.gettimestamp()){
 					  		is_open_offline=0;
 					  }
-					  th.data.is_open_offline=0;
+					  th.data.is_open_offline=is_open_offline;
         	          th.getCardList();
                   });
 
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 3ea9c06..41f7704 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1689,6 +1689,11 @@ Page({
 		  }
 		  	  
 		  var cur_goods=this.data.sele_g;
+		  var cur_price=cur_goods.shop_price;
+		  if(th.data.card_field && cur_goods[th.data.card_field]>0){
+			  cur_price=cur_goods[th.data.card_field];
+		  }
+		  
 		  var user_info = getApp().globalData.userInfo;
 		  //获取一下接口，判断是不是有线下接口,必须是普通商品，全局优惠活动也是不行
 		  if(cur_goods.prom_type==0 && !this.data.prom_goods){
@@ -1704,7 +1709,7 @@ Page({
 		  		  success:function(res){
 		  			  if(res.data.code==0 && res.data.data && res.data.data.length>0){
 		  				  var datalist=res.data.data;
-		  				  if(datalist[0].WarePrice<cur_goods.shop_price){
+		  				  if(datalist[0].WarePrice<cur_price){
 		  					   cur_goods.offline_price=datalist[0].WarePrice;  //存储线下活动的价格
 		  					   cur_goods.pricing_type=datalist[0].PriceType;   //存储线下活动的类型
 		  					  }
--
libgit2 0.21.4