diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 2ad3d54..bd585b5 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -18,7 +18,10 @@ var d = getApp().globalData; Page({ data: { url: o.imghost, - swiperimage: ["/miniapp/images/title.png"], //,"/miniapp/images/newpeople/newpeople.png" + swiperimage: [{ + image: "/miniapp/images/title.png", + nav_url: 0 + }], resourceUrl: o.resourceUrl, logo: o.appLogo, homeData: null, @@ -66,12 +69,11 @@ Page({ max_sw_height: 0, //banner的最大高度 is_disgraceful: 0, //是否显示新人广告 new_image: "", //新人有礼弹窗图片 - new_nav: "/pages/giftpack/newvipgift/newvipgift", //新人页面跳转地址 + new_nav: "", //新人页面跳转地址 }, onLoad: function() { var th = this; - // n.init(th, "", "recommend"); //看一下商家是否开通了权益 //--初始化是否有打勾-- @@ -88,6 +90,7 @@ Page({ } }) th.is_new(); + // th.is_festival(); }, //关闭新用户领取广告 @@ -655,9 +658,9 @@ Page({ url: lurl }); }, - new_nav: function() { + new_nav: function(e) { var th = this; - var new_nav = th.data.new_nav; + var new_nav = e.currentTarget.dataset.url; getApp().goto(new_nav); }, //跳转到权益 @@ -689,17 +692,21 @@ Page({ wx.hideLoading(); getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", { data: { - storeId: o.stoid, + storeId: os.stoid, userId: d.user_id } }).then(res => { - var actid = res.data.data.id; //活动id - var giftBagId = res.data.data.giftBagId;//礼包id - var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 +'&'+ 'giftBagId=' + giftBagId; - var new_image = res.data.data.imageurl; - var swiperimage = th.data.swiperimage; - swiperimage.push("/miniapp/images/newpeople/newpeople.png"); if (res.data.code == 0) { + var actid = res.data.data.id; //活动id + var giftBagId = res.data.data.giftBagId; //礼包id + var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId; + var new_image = res.data.data.imageurl; + var swiperimage = th.data.swiperimage; + var img = { + image: "/miniapp/images/newpeople/newpeople.png", + nav_url: new_nav + } + swiperimage.unshift(img); th.setData({ swiperimage: swiperimage, new_image: new_image, @@ -721,6 +728,32 @@ Page({ } }) + }, + is_festival: function(e) { + var th = this; + var url = "/api/weshop/marketing/holiday/act/judge"; + getApp().request.promiseGet(url, { + data: { + storeId: os.stoid, + userId: d.user_id + } + }).then(res => { + if (res.data.code == 0) { + var actid = res.data.data.id; //活动id + var giftBagId = res.data.data.gifBagId; //礼包id + var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId; + var swiperimage = th.data.swiperimage; + var actImg = res.data.data.actImg; + var img = { + image: actImg, + nav_url: nav_url + } + swiperimage.unshift(img); + th.setData({ + swiperimage: swiperimage, + new_nav: nav_url + }) + } + }) } - }); \ No newline at end of file diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 5c02126..b512855 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -110,11 +110,11 @@ - + - + diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index 8a2e497..8c7514a 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -451,6 +451,7 @@ .xc-title-img { height: 220rpx; width: 100%; + border-radius: 15rpx; } .title-img-frame { @@ -906,5 +907,5 @@ } .swiper{ height: 250rpx; - padding-bottom:10rpx; + padding-bottom:30rpx; } \ No newline at end of file