Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 2fd00563 8e251997
Showing 2 changed files with 2 additions and 2 deletions
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -228,7 +228,7 @@ Page({
             giftTitle: res.data.data.giftTitle,
             default_color: res.data.data.bgcolor
           })
-
+       
           if(res.data.data.iswarelbtype==1)  {
               th.setData({iswarelbtype:1})
           }
@@ -19,7 +19,7 @@
 		  </block>
 		  <block wx:else>
 		    <text class="data-v-3a5b7e36" wx:if="{{isBuy==0 && iswarelbtype}}">{{"兑换结束时间："+giftDate}}</text>
-		    <text class="data-v-3a5b7e36" wx:else>
+		    <text class="data-v-3a5b7e36" wx:if="{{flag == 1}}">
 		        {{"活动结束时间："+giftDate}}
 		    </text>
 		  </block>