diff --git a/pages/giftpack/newvipgift/newvipgift.js b/pages/giftpack/newvipgift/newvipgift.js index 9c7500e..c3ead45 100644 --- a/pages/giftpack/newvipgift/newvipgift.js +++ b/pages/giftpack/newvipgift/newvipgift.js @@ -28,10 +28,14 @@ Page({ integralTitle: "", growUpTitle: "", is_sub: 0, //是否重复领取 + }] }, GetList: function() { var th = this; var url = "/api/weshop/marketing/giftbag/bound/get"; + wx.showLoading({ + title: '加载中', + }) getApp().request.promiseGet(url, { data: { "actId": th.data.getActId, //活动id @@ -41,6 +45,7 @@ Page({ "userId": d.user_id //用户ID } }).then(res => { + wx.hideLoading(); if (res.data.code == 0) { if (res.data.data.lbCoupons != null && res.data.data.lbCoupons.length>0) { //礼包内容--礼券 @@ -100,7 +105,8 @@ Page({ if (res.data.data.actIntro != '') { th.setData({ textShow: true, - textTitle: res.data.data.actIntro.replace(/\/g, '\div>') }) } } else { @@ -119,7 +125,7 @@ Page({ th.GetList(); }, onShow: function() { - + }, GetReceive: function() { var th = this; diff --git a/pages/giftpack/newvipgift/newvipgift.wxml b/pages/giftpack/newvipgift/newvipgift.wxml index 5431acd..0681cdc 100644 --- a/pages/giftpack/newvipgift/newvipgift.wxml +++ b/pages/giftpack/newvipgift/newvipgift.wxml @@ -147,7 +147,7 @@ 活动规则: - + diff --git a/pages/giftpack/newvipgift/newvipgift.wxss b/pages/giftpack/newvipgift/newvipgift.wxss index baf031b..ed30127 100644 --- a/pages/giftpack/newvipgift/newvipgift.wxss +++ b/pages/giftpack/newvipgift/newvipgift.wxss @@ -346,6 +346,7 @@ bottom: 0; left: 0; width: 100%; + z-index: 10; } .foot_button_buy { @@ -379,15 +380,20 @@ button::after { .foot_box_text ._img { width: 100%; } +.foot_box_text .p{ + width: 100%; +} .foot_box_text .img { line-height: 0; } - .image { width: 400rpx; height: 200rpx; } +.div_class{ + width: 600rpx; +} .num { color: #fb6451; @@ -407,4 +413,4 @@ button::after { width: 20rpx; height: 90rpx; z-index: 5; -} +} \ No newline at end of file diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 864eb26..ec7ff68 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -21,7 +21,7 @@ Page({ swiperimage: [{ image: "/miniapp/images/title.png", nav_url: 0 - }], + }], resourceUrl: o.resourceUrl, logo: o.appLogo, homeData: null, @@ -70,6 +70,7 @@ Page({ is_disgraceful: 0, //是否显示新人广告 new_image: "", //新人有礼弹窗图片 new_nav: "", //新人页面跳转地址 + }, onLoad: function() { @@ -89,7 +90,7 @@ Page({ }); } }) - // th.is_festival(); + // th.is_festival(); }, //关闭新用户领取广告 @@ -101,7 +102,10 @@ Page({ }, async onShow() { var th = this; - th.is_new(); + var new_nav = th.data.new_nav; + if (new_nav == "") { + th.is_new(); + } if (getApp().globalData.user_id) getApp().requestCardNum(); await this.init_load(); //显示的时候要开启计时器