只有礼品的要有兑换时间

yvan.ni
1 parent 65dadb7b
Showing 3 changed files with 10 additions and 3 deletions
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -228,6 +228,11 @@ Page({
             giftTitle: res.data.data.giftTitle,
             default_color: res.data.data.bgcolor
           })
+
+          if(res.data.data.iswarelbtype==1)  {
+              th.setData({iswarelbtype:1})
+          }
+
           if (!res.data.data.giftRemark || res.data.data.giftRemark == '') {
             th.setData({
               giftRemark: '暂无详情......'
@@ -18,13 +18,13 @@
 		     </text>
 		  </block>
 		  <block wx:else>
-		    <text class="data-v-3a5b7e36" wx:if="{{isBuy==0}}">{{"兑换结束时间："+giftDate}}</text>
+		    <text class="data-v-3a5b7e36" wx:if="{{isBuy==0 && iswarelbtype}}">{{"兑换结束时间："+giftDate}}</text>
 		    <text class="data-v-3a5b7e36" wx:else>
 		        {{"活动结束时间："+giftDate}}
 		    </text>
 		  </block>
 		</view>
-    <view class="top_time data-v-3a5b7e36" wx:if="{{flag == 1}}">
+    <view class="top_time data-v-3a5b7e36" wx:if="{{flag == 1 && iswarelbtype}}">
 			<text class="data-v-3a5b7e36" wx:if="{{exchangeType == 1}}">
 			   {{"兑换时间：领取后"+exchangeDay+"天内兑换"}}
 			</text>
@@ -81,7 +81,8 @@
           <view class="content_ware_price">
             <text>{{"零售价:￥"+item.giftPosPrice}}</text>
           </view>
-          <view class="content_ware_time">
+
+          <view class="content_ware_time" wx:if="{{item.iswarelbtype==1}}">
             <block wx:if="{{getDate>item.endTime}}">
             <text>{{"兑换截至日期:"+item.endTime}}</text>
             </block>
@@ -89,6 +90,7 @@
               <text>{{"距兑换开始时间: "+item.starTime}}</text>
             </block>
           </view>
+
         </view>
       </view>
       <view class="content_box_button" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&orderSn={{item.orderSn}}">