From 09f630d2d4b360698cf86ebda6fb63041a5662ca Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Tue, 10 Sep 2019 17:11:13 +0800
Subject: [PATCH] 立即购买不能使用优惠券， 会员首页修改等级卡名称

---
 pages/cart/cart2/cart2.js   |  9 ++++++---
 pages/user/index/index.wxml |  2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index f8b89a1..4bfc7fa 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -404,13 +404,16 @@ Page({
                      th.data.check_quan_price_list=t.data.data.shop_price*gg.goods_num+"";
                      th.data.check_quan_ware_list=t.data.data.erpwareid+"";
 
-                      var url="/api/weshop/couponList/getUseCouponList";
-                      await app.request.promiseGet(url,{
+                    if (th.data.is_close_quan != 1) {
+
+                       var url="/api/weshop/couponList/getUseCouponList";
+                       await app.request.promiseGet(url,{
                         data:{storeId:oo.stoid,userId:app.globalData.user_id,BuySum:th.data.ckeck_quan_price,WareIds:th.data.check_quan_ware_list,pageSize:100}
-                      }).then(res=>{
+                       }).then(res=>{
                         if(res.data.code==0)
                           quanlist=res.data.data.pageData;
                       })
+                    } 
                   }
                   th.setData({
                     bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index ad2a469..88f83b7 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -8,7 +8,7 @@
 						   bindtap="go_info"
 						   src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
 					<view class="xc-uesr-name">
-						{{userInfo.nickname}} <view class="hvip" wx:if='{{GradeName}}'><image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}</view>
+						{{userInfo.nickname}} <view class="hvip" wx:if='{{GradeName && is_init}}'><image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}</view>
 						<view class="flex" style="font-size: 24rpx; margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
 							<block wx:if="{{cz_val<full_cz_val}}">
 						   {{"   "}}<text class="grow-up-val">成长值</text> <view style='margin-left:5rpx; margin-top:-4rpx;'>{{cz_val}} / {{need_money}}</view> 
--
libgit2 0.21.4