diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index 33feeae..f7460c2 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -1161,8 +1161,7 @@ Page({ // 'list.pageData': this.data.record, // // record: self.data.list.pageData, // }); - - + }, closePopup() { diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index f2d3a23..7b8e08f 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -187,7 +187,6 @@ - diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 68d8e0e..62bb0db 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -47,6 +47,9 @@ Page({ add_card_data: '', //等级卡的内容 getusercode_vailtime:10,//会员二维码时效 hiddenCS: true, + + is_show_recommend:false + }, goto_nav: function (e) { var th = this; @@ -152,24 +155,7 @@ Page({ }) var th = this; - // 判断是否开启美业 - getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => { - if (res.data.code == 0) { - th.setData({ - enableMeiye: res.data.data.EnableMeiye, - }); - }; - }); - - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => { - if (res.data.code == 0) { - var plusCard = res.data.data; - for (var i = 0; i < plusCard.length; i++) { - if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; } - } - } - }) if (typeof this.getTabBar === 'function' && this.getTabBar()) { var index = getApp().getPageIndex(this); @@ -189,6 +175,26 @@ Page({ var e = getApp().globalData.userInfo; if (e != undefined && e != null && e.mobile) { + + // 判断是否开启美业 + getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => { + if (res.data.code == 0) { + th.setData({ + enableMeiye: res.data.data.EnableMeiye, + }); + }; + }); + + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => { + if (res.data.code == 0) { + var plusCard = res.data.data; + for (var i = 0; i < plusCard.length; i++) { + if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; } + } + } + }) + + this.birthday(); this.is_assistance(); @@ -451,15 +457,22 @@ Page({ } }) //th.requestRecommend(); + + //自定义组件一定要等到页面加载完了,才来调用selectComponnent + setTimeout(function () { + + th.setData({ is_show_recommend:true }) + + if (getApp().globalData.user_id) getApp().requestCardNum(th); + var goods_list = th.selectComponent("#goods_recommend"); //组件的id + goods_list.init(); + goods_list.get_list(); + }, 800) } - //自定义组件一定要等到页面加载完了,才来调用selectComponnent - setTimeout(function () { - if (getApp().globalData.user_id) getApp().requestCardNum(th); - var goods_list = th.selectComponent("#goods_recommend"); //组件的id - goods_list.init(); - goods_list.get_list(); - }, 800) + + + }, //判断会员是后有改服务项目 @@ -498,11 +511,14 @@ Page({ */ onReachBottom: function () { //!this.nomore && this.requestRecommend(); - var goods_list = this.selectComponent("#goods_recommend"); //组件的id - goods_list.init(); - setTimeout(function () { - goods_list.get_list(); - }, 300) + var e = getApp().globalData.userInfo; + if (e != undefined && e != null && e.mobile) { + var goods_list = this.selectComponent("#goods_recommend"); //组件的id + goods_list.init(); + setTimeout(function () { + goods_list.get_list(); + }, 300) + } }, /** diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml index cb78f98..700dfda 100644 --- a/pages/user/index/index.wxml +++ b/pages/user/index/index.wxml @@ -296,7 +296,9 @@ - + + + @@ -318,7 +320,9 @@ + +