diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
index 14eed01..2fa9423 100644
--- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
+++ b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
@@ -331,6 +331,7 @@ Page({
var url = e.currentTarget.dataset.url;
var index=e.currentTarget.dataset.index
console.log(url);
+ wx.setStorageSync('monthgiftba_defpick', th.data.def_pick_store)
wx.setStorageSync('monthgiftbag', th.data.wareCard[index])
getApp().goto(url);
diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
index 41534e1..5d2ca7d 100644
--- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
+++ b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
@@ -50,18 +50,21 @@
{{"零售价:¥"+items.giftPosPrice}}
-
+
{{"活动开始时间:"+items.starTime}}
{{"活动结束时间:"+items.endTime}}
+
+ {{"活动结束时间:"+items.endTime}}
+
diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
index 6f912a1..b8855ef 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
@@ -97,7 +97,7 @@ Page({
is_retail_price: json_d.is_retail_price || 0
});
})
-
+ // com.get_sto(th,os)
//获取用户设备信息,屏幕宽度
wx.getSystemInfo({
success: res => {
@@ -108,6 +108,7 @@ Page({
});
let monthgiftbag=wx.getStorageSync('monthgiftbag')
+ let monthgiftba_defpick=wx.getStorageSync('monthgiftba_defpick')
var now = ut.gettimestamp();
var isStart=0;
@@ -115,10 +116,15 @@ Page({
var start = monthgiftbag.begindate;
// start = start / 1000;
if (start < now) isStart = 1;
+
+ let remark=monthgiftbag.remark.replace(/\![]()