diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js index 8b3d3e9..be1f175 100644 --- a/pages/user/cardinfo/cardinfo.js +++ b/pages/user/cardinfo/cardinfo.js @@ -15,7 +15,6 @@ Page({ */ data: { images: [o.imghost + "/miniapp/images/plus/card_one.jpg", o.imghost + "/miniapp/images/plus/card_two.jpg", o.imghost + "/miniapp/images/plus/card_three.jpg"], - url: o.imghost, screenWidth: 0, screenheight: 0, @@ -70,9 +69,7 @@ Page({ }).then(res => { var plusCard = res.data.data; - if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1"; - var big_card = null; - var big_cards = null; + var big_cards = null,big_card=null; console.log(plusCard, "数据什么的", res); for (var i = 0; i < plusCard.length; i++) { if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg" + (i + 1) + ".jpg?v=1"; @@ -709,14 +706,29 @@ Page({ //-----立即续费的功能------ xufei:async function(){ - var th = this; - var is_card = 0; + var th = this,is_card = 0,end_time=0; + await getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=1&type=3", + {1:1}).then(res => { + if (res.data.code == 0) { + end_time=res.data.data.pageData[0].end_time; + } + }) + var now=ut.gettimestamp(); + if(end_time { + { data: { storeId: os.stoid,isRenewal:1,endData: end_time,userId:getApp().globalData.user_id} }).then(res => { if (res.data.code == 0) is_card = 1; + else errmsg=res.data.msg; }) - if (is_card == 0) getApp().my_warnning("请联系商家升级plus功能", 0, th); + + if (is_card == 0){ getApp().my_warnning(errmsg?errmsg:"请联系商家升级plus功能", 0, th);} var item = th.data.user_card; var req = {};