Commit 09f630d2d4b360698cf86ebda6fb63041a5662ca
1 parent
959bf6f4
立即购买不能使用优惠券， 会员首页修改等级卡名称
Showing
2 changed files
with
7 additions
and
4 deletions
pages/cart/cart2/cart2.js
| @@ -404,13 +404,16 @@ Page({ | @@ -404,13 +404,16 @@ Page({ | ||
| 404 | th.data.check_quan_price_list=t.data.data.shop_price*gg.goods_num+""; | 404 | th.data.check_quan_price_list=t.data.data.shop_price*gg.goods_num+""; |
| 405 | th.data.check_quan_ware_list=t.data.data.erpwareid+""; | 405 | th.data.check_quan_ware_list=t.data.data.erpwareid+""; |
| 406 | 406 | ||
| 407 | - var url="/api/weshop/couponList/getUseCouponList"; | ||
| 408 | - await app.request.promiseGet(url,{ | 407 | + if (th.data.is_close_quan != 1) { |
| 408 | + | ||
| 409 | + var url="/api/weshop/couponList/getUseCouponList"; | ||
| 410 | + await app.request.promiseGet(url,{ | ||
| 409 | data:{storeId:oo.stoid,userId:app.globalData.user_id,BuySum:th.data.ckeck_quan_price,WareIds:th.data.check_quan_ware_list,pageSize:100} | 411 | data:{storeId:oo.stoid,userId:app.globalData.user_id,BuySum:th.data.ckeck_quan_price,WareIds:th.data.check_quan_ware_list,pageSize:100} |
| 410 | - }).then(res=>{ | 412 | + }).then(res=>{ |
| 411 | if(res.data.code==0) | 413 | if(res.data.code==0) |
| 412 | quanlist=res.data.data.pageData; | 414 | quanlist=res.data.data.pageData; |
| 413 | }) | 415 | }) |
| 416 | + } | ||
| 414 | } | 417 | } |
| 415 | th.setData({ | 418 | th.setData({ |
| 416 | bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, | 419 | bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, |
pages/user/index/index.wxml
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | bindtap="go_info" | 8 | bindtap="go_info" |
| 9 | src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image> | 9 | src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image> |
| 10 | <view class="xc-uesr-name"> | 10 | <view class="xc-uesr-name"> |
| 11 | - {{userInfo.nickname}} <view class="hvip" wx:if='{{GradeName}}'><image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}</view> | 11 | + {{userInfo.nickname}} <view class="hvip" wx:if='{{GradeName && is_init}}'><image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}</view> |
| 12 | <view class="flex" style="font-size: 24rpx; margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'> | 12 | <view class="flex" style="font-size: 24rpx; margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'> |
| 13 | <block wx:if="{{cz_val<full_cz_val}}"> | 13 | <block wx:if="{{cz_val<full_cz_val}}"> |
| 14 | {{" "}}<text class="grow-up-val">成长值</text> <view style='margin-left:5rpx; margin-top:-4rpx;'>{{cz_val}} / {{need_money}}</view> | 14 | {{" "}}<text class="grow-up-val">成长值</text> <view style='margin-left:5rpx; margin-top:-4rpx;'>{{cz_val}} / {{need_money}}</view> |