diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index 4573cdb..51ca204 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -37,13 +37,7 @@ Page({
     th.getList();
   },
   onShow: function() {
-    // var th = this;
-    // th.setData({
-    //   pages: 1,
-    //   pageSize: 10,
-    //   loadingType: 0
-    // })
-    // th.getList();
+  
   },
 
   GetBuyPrice: function(e) {
@@ -155,6 +149,9 @@ Page({
   },
   getList: function(e) {
     var th = this;
+    wx.showLoading({
+      title: '加载中',
+    });
     getApp().request.get('/api/weshop/marketing/giftbag/page', {
       data: {
         storeId: th.data.getStorageID, //商家ID
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index f557394..a608483 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -39,7 +39,7 @@
             <text class="ellipsis-1">{{"原价:￥"+items.giftPosPrice}}</text>
           </view>
           <view class="content_ware_time">
-            <text class="ellipsis-1">{{"活动时间:"+items.endTime}}</text>
+            <text class="ellipsis-1">{{"活动结束时间:"+items.endTime}}</text>
           </view>
         </view>
       </view>
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 113c1dd..74604d0 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -4,7 +4,7 @@ var e = getApp(),
   t = e.request,
   d = e.globalData;
 var ut = require("../../../utils/util.js");
-    
+
 Page({
   data: {
     url: a.url, //接口网址
@@ -25,8 +25,9 @@ Page({
     wareCard: [],
     orderSn: "", //订单编号
     lbId: "",
-    code: "",    //核销码
-	c_state:"0",  //判断是否已经使用, 0正常  1已使用  2已过期
+    code: "", //核销码
+    c_state: "0", //判断是否已经使用, 0正常  1已使用  2已过期
+    is_lb: 0, //是否有礼包
   },
   onLoad: function(options) {
     var th = this;
@@ -179,16 +180,20 @@ Page({
               giftRemark: res.data.data.giftRemark
             })
           }
-		  
-		  //---获取日期的时间戳---
-		  var t_endtime=res.data.data.endTime;
-		  t_endtime = t_endtime.replace(/-/g,'/');
-		  var t_date = new Date(t_endtime)/1000;
-		  var t_now=ut.gettimestamp();
-		  
-		  if(res.data.data.goodsUseState) th.setData({c_state:1})
-		  else if(t_date<=t_now)
-		     th.setData({c_state:2})
+
+          //---获取日期的时间戳---
+          var t_endtime = res.data.data.endTime;
+          t_endtime = t_endtime.replace(/-/g, '/');
+          var t_date = new Date(t_endtime) / 1000;
+          var t_now = ut.gettimestamp();
+
+          if (res.data.data.goodsUseState) th.setData({
+            c_state: 1
+          })
+          else if (t_date <= t_now)
+            th.setData({
+              c_state: 2
+            })
 
           th.setData({
             giftDate: res.data.data.endTime,
@@ -201,6 +206,15 @@ Page({
             wareCard: res.data.data.wareCard,
             lbId: res.data.data.lbId
           })
+          //判断是否有礼包
+          for (var i = 0; i < res.data.data.wareCard.length; i++) {
+            if (res.data.data.wareCard[i].lbType == 1) {
+              th.setData({
+                is_lb: 1
+              })
+              break;
+            }
+          }
         } else {
           getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
           return false;
@@ -301,7 +315,7 @@ Page({
     getApp().goto(url);
   },
   //图片失败，默认图片
-  bind_bnerr2: function (e) {
+  bind_bnerr2: function(e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
     _errObj[_errImg] = "/public/images/empty.jpg";
@@ -309,7 +323,7 @@ Page({
 
   },
   //关闭导航
-  close: function () {
+  close: function() {
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 679e63a..3a4461a 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -118,17 +118,23 @@
   </block>
   <block wx:if="{{isBuy==0}}">
     <view class="foot_button data-v-3a5b7e36">
-      <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
-        <text class="data-v-3a5b7e36">立即使用</text>
-      </view>
-      <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue" >
-        <text class="data-v-3a5b7e36">商品已使用</text>
-      </view>
-	  <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue" >
-	    <text class="data-v-3a5b7e36">商品已过期</text>
-	  </view>
-	  
-	  
+      <block wx:if="{{is_lb==1}}">
+        <view wx:if="{{is_lb==1}}" class="foot_button_buy data-v-3a5b7e36 overdue">
+          <text class="data-v-3a5b7e36">无核销商品</text>
+        </view>
+      </block>
+      <block wx:else>
+        <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
+          <text class="data-v-3a5b7e36">立即使用</text>
+        </view>
+        <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue">
+          <text class="data-v-3a5b7e36">商品已核销</text>
+        </view>
+        <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue">
+          <text class="data-v-3a5b7e36">商品兑换时间已过</text>
+        </view>
+
+      </block>
     </view>
   </block>
 </view>