wxd / MShopWeApp

Commit d1e92b8847470d4e1d8b1eeb5da88322fcfe454f

Authored by yvan.ni
1 parent a7a33b66

1.优惠券的显示方式 

2.商家有开通等级卡功能，不能等级会员在商品详情页购买商品会员bug
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
pages/cart/cart2/cart2.wxml
  View file @d1e92b8
... ... @@ -376,7 +376,7 @@
376 376 <block>{{item.Sum}}元优惠券</block>
377 377 </view>
378 378 <view class="coupon-time">
379   - {{filters.replace_time2(item.BeginDate)}}至{{filters.replace_time2(item.BillDate)}}</view>
  379 + {{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}</view>
380 380 </view>
381 381 </view>
382 382 <!-- <view wx:if="{{item.Obtain>0}}" class="code-img" bindtap="show_quan" data-ind="{{index}}" data-now="{{filter.format_time(now)}}">
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @d1e92b8
... ... @@ -946,7 +946,7 @@ Page({
946 946 //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
947 947 if(o.prom_type!=1 && o.prom_type!=6){
948 948 var conf=th.data.bconfig;
949   - if(conf.switch_list){
  949 + if (conf.switch_list && getApp().globalData.userInfo['card_field']){
950 950 var s_list=JSON.parse(conf.switch_list);
951 951 var now=ut.gettimestamp();
952 952 var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
... ...