diff --git a/pages/giftpack/newvipgift/newvipgift.js b/pages/giftpack/newvipgift/newvipgift.js index e452000..135692a 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 + textTitle: res.data.data.actIntro.replace(/\/g, '\div>') }) } } else { @@ -119,11 +125,7 @@ Page({ th.GetList(); }, onShow: function() { - var th = this; - var textTitle = th.data.textTitle.replace(/活动规则: - + 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 bd585b5..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,6 @@ Page({ }); } }) - th.is_new(); // th.is_festival(); }, @@ -102,6 +102,10 @@ Page({ }, async onShow() { var th = this; + var new_nav = th.data.new_nav; + if (new_nav == "") { + th.is_new(); + } if (getApp().globalData.user_id) getApp().requestCardNum(); await this.init_load(); //显示的时候要开启计时器 @@ -660,7 +664,7 @@ Page({ }, new_nav: function(e) { var th = this; - var new_nav = e.currentTarget.dataset.url; + var new_nav = th.data.new_nav; getApp().goto(new_nav); }, //跳转到权益 diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js index 4db0560..8d8d194 100644 --- a/pages/user/assistance/friend_assistance.js +++ b/pages/user/assistance/friend_assistance.js @@ -20,12 +20,12 @@ Page({ */ onLoad: function (options) { var th=this; - this.data.task_id=options.options; - this.data.userId=options.userId; + if(options.task_id) this.data.task_id=options.task_id; + if(options.userId) this.data.userId=options.userId; //任务是不是为空 if(this.data.task_id==0 || this.data.task_id==undefined){ this.data.task_id= decodeURIComponent(options.scene); - if(this.data.task_id){ + if(this.data.task_id!=null && this.data.task_id!='undefined' && this.data.task_id!="" && this.data.task_id!=0){ getApp().request.get("http://172.20.3.102:8022/api/weshop/zl_act_user",{ data:{}, success:function(res){ @@ -57,7 +57,8 @@ Page({ cklie_button:function(){ var th=this; var t_user_id=app_d.user_id; - var data={id:this.data.task_id,storeId:os.store_id,userId:this.data.user_id, zlUserId:t_user_id}; + var data={id:this.data.task_id,storeId:os.stoid,userId:this.data.user_id, zlUserId:t_user_id}; + console.log(data); getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert", data, //入参 function(res){ //成功 diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 87f15de..8568ec1 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -491,17 +491,17 @@ Page({ }, // 判断助力活动是不是存在 is_assistance:function(){ - // var th = this; - // rq.get("/api/weshop/marketing/help/act/judge", { - // data: { storeId: os.stoid, userId: app_d.user_id }, - // success: function (res) { - // var code = res.data.code; - // if (code == 0) { - // th.setData({ is_assistance:1}); - // } + var th = this; + rq.get("/api/weshop/marketing/help/act/judge", { + data: { storeId: os.stoid, userId: app_d.user_id }, + success: function (res) { + var code = res.data.code; + if (code == 0) { + th.setData({ is_assistance:1}); + } - // } - // }) + } + }) }