Commit ead10665372f9b5284fc61694d683f5be054469a
Merge branch 'test' into 'qa'
Test See merge request !526
Showing
4 changed files
with
14 additions
and
4 deletions
pages/cart/cart2/cart2.js
| ... | ... | @@ -365,11 +365,17 @@ Page({ |
| 365 | 365 | |
| 366 | 366 | //-- 如果是等级会员注册返回 -- |
| 367 | 367 | if(is_card_back){ |
| 368 | - th.data.card_name=th.data.userinfo.card_field; | |
| 368 | + th.data.card_name=th.data.userinfo.card_field; | |
| 369 | + //如果是秒杀的返回，就要把活动弄回0 | |
| 370 | + if(item['prom_type']==1){ | |
| 371 | + item['prom_type']=0; | |
| 372 | + item['prom_id']=0; | |
| 373 | + } | |
| 369 | 374 | // 拼团,搭配购不计算,赠品也不计算 |
| 370 | 375 | if( item['prom_type']!=5 && item['prom_type']!=6 && !item.is_gift && !item['is_collocation'] && item.goods_price>item[th.data.card_name] ){ |
| 371 | 376 | item.goods_price=item[th.data.card_name]; |
| 372 | 377 | carr[i].goods_price=item[th.data.card_name]; |
| 378 | + | |
| 373 | 379 | } |
| 374 | 380 | }else{ |
| 375 | 381 | // 拼团,搭配购不计算,赠品也不计算,同时会员还未购买等级会员 |
| ... | ... | @@ -500,6 +506,8 @@ Page({ |
| 500 | 506 | gg.goods_price=gd[th.data.card_name]; |
| 501 | 507 | getApp().globalData.is_card_back=0; |
| 502 | 508 | th.setData({card_cut_price:0}); |
| 509 | + //如果是秒杀的返回 | |
| 510 | + if(gd.prom_type==1) gd.prom_type=0; | |
| 503 | 511 | }else{ |
| 504 | 512 | //--- 商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 |
| 505 | 513 | //-- 搭配购的商品也可以单独购买，所以此时搭配购的商品要进行计算优惠 -- | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -298,7 +298,7 @@ |
| 298 | 298 | </view> |
| 299 | 299 | </view> |
| 300 | 300 | <!-- 立即续费的显示 --> |
| 301 | - <view wx:elif="{{is_near_date && data[card_field]>0}}"> | |
| 301 | + <view wx:elif="{{is_near_date && data[card_field]>0 && prom_type!=1}}"> | |
| 302 | 302 | <view class="beauty-makeup-frame flex ai-center"> |
| 303 | 303 | <view class="left flex ai-center"> |
| 304 | 304 | <view class="flex ai-center grade-card-frame card-frame advert-card"> |
| ... | ... | @@ -306,7 +306,7 @@ |
| 306 | 306 | <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view> |
| 307 | 307 | </view> |
| 308 | 308 | <view class="card-effect"> |
| 309 | - <view class="fs24 xc-black3">成为{{card_name}}立<text class="co-red">省{{filters.toFix(data.market_price-data[card_field],2)}}</text>元</view> | |
| 309 | + <view class="fs24 xc-black3">成为{{card_name}}立<text class="co-red">省{{filters.toFix(data.shop_price[card_field],2)}}</text>元</view> | |
| 310 | 310 | <view class="fs22 xc-ash"> 开通会员 尽享更多优惠 </view> |
| 311 | 311 | </view> |
| 312 | 312 | </view> | ... | ... |
pages/team/team_success/team_success.js