Commit 14dc27531280f2ac89f3f07a80598e2f8b6e4332
1 parent
88a294e3
邀请函、商家详情弹框领券，不展示券信息，只展示券总额，券总额加数字动画2
Showing
11 changed files
with
11 additions
and
11 deletions
| @@ -1028,7 +1028,7 @@ Page({ | @@ -1028,7 +1028,7 @@ Page({ | ||
| 1028 | return item.is_type == '3' | 1028 | return item.is_type == '3' |
| 1029 | }) | 1029 | }) |
| 1030 | // 免费券判断是否领取，弹框领取 | 1030 | // 免费券判断是否领取，弹框领取 |
| 1031 | - if (freeCoupons.length > 0 && setcoupon!='1') { | 1031 | + if (freeCoupons.length > 0) { |
| 1032 | this.getCoupon(freeCoupons,obj,setcoupon) | 1032 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 1033 | } | 1033 | } |
| 1034 | console.log('邀请函--------------------优惠券', list); | 1034 | console.log('邀请函--------------------优惠券', list); |
| @@ -1095,7 +1095,7 @@ Page({ | @@ -1095,7 +1095,7 @@ Page({ | ||
| 1095 | } | 1095 | } |
| 1096 | } | 1096 | } |
| 1097 | // 免费券判断是否领取，弹框领取 | 1097 | // 免费券判断是否领取，弹框领取 |
| 1098 | - if (freeCoupons.length > 0 && setcoupon != '1') { | 1098 | + if (freeCoupons.length > 0) { |
| 1099 | this.getCoupon(freeCoupons,obj,setcoupon) | 1099 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 1100 | } | 1100 | } |
| 1101 | console.log('邀请函--------------------优惠券', list); | 1101 | console.log('邀请函--------------------优惠券', list); |
| @@ -1110,7 +1110,7 @@ Page({ | @@ -1110,7 +1110,7 @@ Page({ | ||
| 1110 | } | 1110 | } |
| 1111 | } | 1111 | } |
| 1112 | // 免费券判断是否领取，弹框领取 | 1112 | // 免费券判断是否领取，弹框领取 |
| 1113 | - if (freeCoupons.length > 0 && setcoupon != '1') { | 1113 | + if (freeCoupons.length > 0) { |
| 1114 | this.getCoupon(freeCoupons,obj,setcoupon) | 1114 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 1115 | } | 1115 | } |
| 1116 | console.log('邀请函--------------------优惠券', list); | 1116 | console.log('邀请函--------------------优惠券', list); |
| @@ -1000,7 +1000,7 @@ Page({ | @@ -1000,7 +1000,7 @@ Page({ | ||
| 1000 | return item.is_type == '3' | 1000 | return item.is_type == '3' |
| 1001 | }) | 1001 | }) |
| 1002 | // 免费券判断是否领取，弹框领取 | 1002 | // 免费券判断是否领取，弹框领取 |
| 1003 | - if (freeCoupons.length > 0 && setcoupon!='1') { | 1003 | + if (freeCoupons.length > 0) { |
| 1004 | this.getCoupon(freeCoupons,obj,setcoupon) | 1004 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 1005 | } | 1005 | } |
| 1006 | console.log('邀请函--------------------优惠券', list); | 1006 | console.log('邀请函--------------------优惠券', list); |
| @@ -955,7 +955,7 @@ Page({ | @@ -955,7 +955,7 @@ Page({ | ||
| 955 | return item.is_type == '3' | 955 | return item.is_type == '3' |
| 956 | }) | 956 | }) |
| 957 | // 免费券判断是否领取，弹框领取 | 957 | // 免费券判断是否领取，弹框领取 |
| 958 | - if (freeCoupons.length > 0 && setcoupon!='1') { | 958 | + if (freeCoupons.length > 0) { |
| 959 | this.getCoupon(freeCoupons,obj,setcoupon) | 959 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 960 | } | 960 | } |
| 961 | console.log('邀请函--------------------优惠券', list); | 961 | console.log('邀请函--------------------优惠券', list); |
| @@ -956,7 +956,7 @@ Page({ | @@ -956,7 +956,7 @@ Page({ | ||
| 956 | return item.is_type == '3' | 956 | return item.is_type == '3' |
| 957 | }) | 957 | }) |
| 958 | // 免费券判断是否领取，弹框领取 | 958 | // 免费券判断是否领取，弹框领取 |
| 959 | - if (freeCoupons.length > 0 && setcoupon!='1') { | 959 | + if (freeCoupons.length > 0) { |
| 960 | this.getCoupon(freeCoupons,obj,setcoupon) | 960 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 961 | } | 961 | } |
| 962 | console.log('邀请函--------------------优惠券', list); | 962 | console.log('邀请函--------------------优惠券', list); |
| @@ -954,7 +954,7 @@ Page({ | @@ -954,7 +954,7 @@ Page({ | ||
| 954 | return item.is_type == '3' | 954 | return item.is_type == '3' |
| 955 | }) | 955 | }) |
| 956 | // 免费券判断是否领取，弹框领取 | 956 | // 免费券判断是否领取，弹框领取 |
| 957 | - if (freeCoupons.length > 0 && setcoupon!='1') { | 957 | + if (freeCoupons.length > 0) { |
| 958 | this.getCoupon(freeCoupons,obj,setcoupon) | 958 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 959 | } | 959 | } |
| 960 | console.log('邀请函--------------------优惠券', list); | 960 | console.log('邀请函--------------------优惠券', list); |
| @@ -911,7 +911,7 @@ Page({ | @@ -911,7 +911,7 @@ Page({ | ||
| 911 | return item.is_type == '3' | 911 | return item.is_type == '3' |
| 912 | }) | 912 | }) |
| 913 | // 免费券判断是否领取，弹框领取 | 913 | // 免费券判断是否领取，弹框领取 |
| 914 | - if (freeCoupons.length > 0 && setcoupon!='1') { | 914 | + if (freeCoupons.length > 0) { |
| 915 | this.getCoupon(freeCoupons,obj,setcoupon) | 915 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 916 | } | 916 | } |
| 917 | console.log('邀请函--------------------优惠券', list); | 917 | console.log('邀请函--------------------优惠券', list); |
| @@ -955,7 +955,7 @@ Page({ | @@ -955,7 +955,7 @@ Page({ | ||
| 955 | return item.is_type == '3' | 955 | return item.is_type == '3' |
| 956 | }) | 956 | }) |
| 957 | // 免费券判断是否领取，弹框领取 | 957 | // 免费券判断是否领取，弹框领取 |
| 958 | - if (freeCoupons.length > 0 && setcoupon!='1') { | 958 | + if (freeCoupons.length > 0) { |
| 959 | this.getCoupon(freeCoupons,obj,setcoupon) | 959 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 960 | } | 960 | } |
| 961 | console.log('邀请函--------------------优惠券', list); | 961 | console.log('邀请函--------------------优惠券', list); |
| @@ -954,7 +954,7 @@ Page({ | @@ -954,7 +954,7 @@ Page({ | ||
| 954 | return item.is_type == '3' | 954 | return item.is_type == '3' |
| 955 | }) | 955 | }) |
| 956 | // 免费券判断是否领取，弹框领取 | 956 | // 免费券判断是否领取，弹框领取 |
| 957 | - if (freeCoupons.length > 0 && setcoupon!='1') { | 957 | + if (freeCoupons.length > 0) { |
| 958 | this.getCoupon(freeCoupons,obj,setcoupon) | 958 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 959 | } | 959 | } |
| 960 | console.log('邀请函--------------------优惠券', list); | 960 | console.log('邀请函--------------------优惠券', list); |
| @@ -310,7 +310,7 @@ Page({ | @@ -310,7 +310,7 @@ Page({ | ||
| 310 | return item.is_type == '3' | 310 | return item.is_type == '3' |
| 311 | }) | 311 | }) |
| 312 | // 免费券判断是否领取，弹框领取 | 312 | // 免费券判断是否领取，弹框领取 |
| 313 | - if (freeCoupons.length > 0 && setcoupon!='1') { | 313 | + if (freeCoupons.length > 0) { |
| 314 | this.getCoupon(freeCoupons,obj,setcoupon) | 314 | this.getCoupon(freeCoupons,obj,setcoupon) |
| 315 | } | 315 | } |
| 316 | console.log('邀请函--------------------优惠券', list); | 316 | console.log('邀请函--------------------优惠券', list); |
-
Please register or login to post a comment