月包的优化

yvan.ni
1 parent 680695c8
Showing 2 changed files with 11 additions and 2 deletions
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
packageE/pages/user/monthgiftbag/monthgiftbag.wxml
@@ -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);
@@ -59,6 +59,9 @@
             <block wx:if="{{item.payMoney>0}}">
               <text>{{"￥"+item.payMoney}}</text>
             </block>
+
+            <block wx:if="{{item.payMoney>0 && item.payIntegral>0}}">+</block>
+
             <block wx:if="{{item.payIntegral>0}}">
               <text>{{item.payIntegral+"积分"}}</text>
             </block>