diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
index 811704c..f55bc0a 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
@@ -7,6 +7,7 @@ var ut = require("../../../../../utils/util.js");
 var com = require("../public/buy_com.js");
 const i = require("../../../../../utils/util.js");
 
+
 Page({
     data: {
         url: a.url, //接口网址
@@ -110,23 +111,26 @@ Page({
 
         let monthgiftbag=wx.getStorageSync('monthgiftbag')
         let monthgiftba_defpick=wx.getStorageSync('monthgiftba_defpick')
-
         var now = ut.gettimestamp();
         var isStart=0;
         // var str = res.data.data.starTime;
-        var start = monthgiftbag.begindate;
+        // if (start < now) isStart = 1;
         // start = start / 1000;
-        if (start < now) isStart = 1;
-
-        let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
-        monthgiftbag.remark=remark
+        // if (options && options.id) {
+        //   this.getList()
+        // }
+        // if (monthgiftbag) {       
+        //   var start = monthgiftbag.begindate;
+        //   let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+        //   monthgiftbag.remark=remark
+        // }
 
-        this.setData({
-          isStart,
-          monthgiftbag,
-          sele_g:monthgiftbag,
+        // this.setData({
+          // isStart,
+          // monthgiftbag,
+          // sele_g:monthgiftbag,
           // def_pick_store:monthgiftba_defpick
-        })
+        // })
 
     },
     init() {
@@ -198,6 +202,67 @@ Page({
 
     },
 
+    getList: function (e) {
+      var th = this;
+      getApp().request.get('/api/weshop/marketing/marketingMonthgiftbagForm/page', {
+        isShowLoading: true,
+        data: {
+          store_id: a.stoid, //商家ID
+          user_id: d.user_id, //用户ID
+          page: 1,
+          pageSize: 10,
+          is_end:0,
+          timetype:1,
+          id:th.data.params.id
+        },
+        success: function (res) {
+          if (res.data.code == 0) {
+            th.data.curpage++;
+            // var arr1 = th.data.wareCard;
+            var arr2 = res.data.data.pageData;
+            for (let j = 0; j < arr2.length; j++) {
+                // arr2[j].starTime1=Date.parse(new Date(arr2[j].begindate.replace(/-/g, "/")))/1000
+                arr2[j].starTime1=arr2[j].begindate
+                arr2[j].starTime=i.formatTime(arr2[j].begindate, "yyyy-MM-dd hh:mm:ss");
+                arr2[j].endTime=i.formatTime(arr2[j].enddate, "yyyy-MM-dd hh:mm:ss");
+                arr2[j].giftPosPrice=arr2[j].oldPrice
+                arr2[j].payMoney=arr2[j].lbPrice
+                arr2[j].payIntegral=arr2[j].exchangeIntegral
+                arr2[j].giftQty=arr2[j].buynum
+                arr2[j].cover_img=arr2[j].imageurl
+                arr2[j].giftTitle=arr2[j].act_name
+                arr2[j].virtualsales=arr2[j].virtualSales
+                arr2[j].lbnum=arr2[j].lbNum
+            }
+            if(arr2.length>0){
+              var monthgiftbag =arr2[0];
+              var ismore = 0;
+              // if (arr3.length == res.data.data.total) ismore = 1
+              var isStart=0;
+              if (monthgiftbag) {       
+                var start = monthgiftbag.begindate;
+                let remark=monthgiftbag.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+                monthgiftbag.remark=remark
+                var now = ut.gettimestamp();
+                if (start < now) isStart = 1;
+              }
+
+
+              th.setData({
+                isStart,
+                monthgiftbag: monthgiftbag,
+                sele_g: monthgiftbag,
+              })
+              th.init()
+            }
+          } else {
+            getApp().my_warnning("获取活动失败", 0, th);
+          }
+        }
+      })
+  
+    },
+
     onShow: function () {
         var th=this;
         this.setData({submit:0})
@@ -210,7 +275,7 @@ Page({
                 getApp().goto('/packageE/pages/togoin/togoin');
                 return false;
             }
-            this.init();
+            this.getList();
         })
 
         setTimeout(()=>{