From d1e92b8847470d4e1d8b1eeb5da88322fcfe454f Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 15 Apr 2020 11:33:52 +0800
Subject: [PATCH] 1.优惠券的显示方式 2.商家有开通等级卡功能，不能等级会员在商品详情页购买商品会员bug

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

diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 0849202..c8dba07 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -376,7 +376,7 @@
                       <block>{{item.Sum}}元优惠券</block>
                     </view>
                     <view class="coupon-time">
-                    {{filters.replace_time2(item.BeginDate)}}至{{filters.replace_time2(item.BillDate)}}</view>
+                    {{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}</view>
                    </view>
                </view>
                    <!-- <view wx:if="{{item.Obtain>0}}" class="code-img" bindtap="show_quan" data-ind="{{index}}"  data-now="{{filter.format_time(now)}}">
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 6093d83..9e3ca00 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -946,7 +946,7 @@ Page({
 	  //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
 	  if(o.prom_type!=1 && o.prom_type!=6){
 	  		   var conf=th.data.bconfig;
-	  		   if(conf.switch_list){
+      if (conf.switch_list && getApp().globalData.userInfo['card_field']){
 	  			   var s_list=JSON.parse(conf.switch_list);
 				   var now=ut.gettimestamp();				   
 				   var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
--
libgit2 0.21.4