diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
index 1cb22f3..012c6f1 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
@@ -1640,11 +1640,17 @@ Page({
if(price || giftIntegral){
if(price){
price_txt='¥' + price;
- if(giftIntegral) price_txt+='+';
+ if(giftIntegral){
+ if(this.data.sele_g.money_type>0){
+ price_txt+='+';
+ }else{
+ price_txt+='或';
+ }
+ }
}
if(giftIntegral) price_txt+=giftIntegral+'积分';
}else{
- price_txt="¥0";
+ price_txt="免费领取";
}
context.fillText(price_txt, 54 * unit, 735 * unit);
diff --git a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
index 97e4ca7..ae95d7b 100644
--- a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
+++ b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
@@ -59,6 +59,9 @@
{{"¥"+item.payMoney}}
+
+ +
+
{{item.payIntegral+"积分"}}