Commit 1fabf2e4e26398d68ef3d875852cd53f02f00fe2
Merge branch 'test' into 'qa'
Test See merge request !522
Showing
2 changed files
with
14 additions
and
4 deletions
pages/cart/cart2/cart2.js
| ... | ... | @@ -304,7 +304,7 @@ Page({ |
| 304 | 304 | show_page:function(){ |
| 305 | 305 | var th=this,ta = this.data.param; |
| 306 | 306 | th.setData({ |
| 307 | - userinfo: to.globalData.userInfo,}); | |
| 307 | + userinfo: getApp().globalData.userInfo,}); | |
| 308 | 308 | |
| 309 | 309 | //选获取地址 |
| 310 | 310 | th.getuser_addr(function(addr){ |
| ... | ... | @@ -364,7 +364,8 @@ Page({ |
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | //-- 如果是等级会员注册返回 -- |
| 367 | - if(is_card_back){ | |
| 367 | + if(is_card_back){ | |
| 368 | + th.data.card_name=th.data.userinfo.card_field; | |
| 368 | 369 | // 拼团,搭配购不计算,赠品也不计算 |
| 369 | 370 | if( item['prom_type']!=5 && item['prom_type']!=6 && !item.is_gift && !item['is_collocation'] && item.goods_price>item[th.data.card_name] ){ |
| 370 | 371 | item.goods_price=item[th.data.card_name]; |
| ... | ... | @@ -494,7 +495,8 @@ Page({ |
| 494 | 495 | |
| 495 | 496 | //---是不是购买等级卡成功的返回---等级卡显示的判断--- |
| 496 | 497 | var is_card_back=getApp().globalData.is_card_back; |
| 497 | - if(is_card_back){ | |
| 498 | + if(is_card_back){ | |
| 499 | + th.data.card_name=th.data.userinfo.card_field; | |
| 498 | 500 | gg.goods_price=gd[th.data.card_name]; |
| 499 | 501 | getApp().globalData.is_card_back=0; |
| 500 | 502 | th.setData({card_cut_price:0}); | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -866,7 +866,15 @@ |
| 866 | 866 | <!-------拼单--------> |
| 867 | 867 | <block wx:if="{{prom_type==6}}"> |
| 868 | 868 | <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h"> |
| 869 | - <view class="fir-v">￥{{filters.toFix(data.shop_price,2)}}</view> | |
| 869 | + <view class="fir-v"> | |
| 870 | + <!-- ￥{{data.shop_price,2)}} --> | |
| 871 | + <block wx:if="{{card_field && sele_g[card_field]>0}}"> | |
| 872 | + {{filters.toFix(sele_g[card_field],2)}} | |
| 873 | + </block> | |
| 874 | + <block wx:else> | |
| 875 | + {{filters.toFix(sele_g.shop_price,2)}} | |
| 876 | + </block> | |
| 877 | + </view> | |
| 870 | 878 | <view>单独购买</view> |
| 871 | 879 | </view> |
| 872 | 880 | ... | ... |