diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index 11b1296..3fe92f1 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -144,12 +144,21 @@ Component({ var arr = [1219, 2089, 3031]; var new_arr = new Array(); var card_name_map = new Map(); + + var user = getApp().globalData.userInfo; + for (var i = 0; i < plusCard.length; i++) { - var name = "card" + plusCard[i].CorrPrice.toLowerCase(); - card_name_map.set(name, plusCard[i].CardName); + if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) { + continue; + } + var name = "card" + plusCard[i].CorrPrice.toLowerCase(); + card_name_map.set(name, plusCard[i].CardName); + new_arr.push(plusCard[i]); + + } var ob = { - "card_list": plusCard, + "card_list": new_arr, "name_map": card_name_map }; func(ob); diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 76d79d8..275713c 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -171,13 +171,18 @@ Page({ var plusCard = res.data.data; var arr = [1219, 2089, 3031]; var new_arr = new Array(); - var card_name_map=new Map(); - for (var i = 0; i < plusCard.length; i++) { + var card_name_map=new Map(); + var user = getApp().globalData.userInfo; + for (var i = 0; i < plusCard.length; i++) { + if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) { + continue; + } var name="card"+plusCard[i].CorrPrice.toLowerCase(); - card_name_map.set(name,plusCard[i].CardName); + card_name_map.set(name,plusCard[i].CardName); + new_arr.push(plusCard[i]); } - var ob={"card_list":plusCard,"name_map":card_name_map}; + var ob={"card_list":new_arr,"name_map":card_name_map}; func(ob); }) }, diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index f062bca..fb31a6a 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -197,13 +197,20 @@ Page({ var plusCard = res.data.data; var arr = [1219, 2089, 3031]; var new_arr = new Array(); - var card_name_map=new Map(); - for (var i = 0; i < plusCard.length; i++) { - var name="card"+plusCard[i].CorrPrice.toLowerCase(); - card_name_map.set(name,plusCard[i].CardName); + var card_name_map=new Map(); + var user = getApp().globalData.userInfo; + + for (var i = 0; i < plusCard.length; i++) { + if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) { + continue; + } + var name="card"+plusCard[i].CorrPrice.toLowerCase(); + card_name_map.set(name,plusCard[i].CardName); + new_arr.push(plusCard[i]); + } - var ob={"card_list":plusCard,"name_map":card_name_map}; + var ob={"card_list":new_arr,"name_map":card_name_map}; func(ob); }) }, diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js index 9e403e0..dbb9a0f 100644 --- a/pages/user/cardinfo/cardinfo.js +++ b/pages/user/cardinfo/cardinfo.js @@ -41,7 +41,7 @@ Page({ free:null,//分佣的数据 expiryDate:"",//卡到期时间 is_guoqi:0, //卡是不是过期 - + IsStopBuy:0, //卡是否停用 yu_e_show:0,//装入余额的弹窗 }, @@ -166,6 +166,10 @@ Page({ user_card.CardImg = th.data.url + "/miniapp/images/plus/bg" + index + ".jpg?v=1"; } + if (user_card.IsStopBuy==true){ + this.setData({IsStopBuy:1}) + } + console.log(user_card,"会员的卡类"); ee.setData({user_card: user_card}); @@ -718,12 +722,20 @@ Page({ if (res.data.code == 0) { end_time=res.data.data.pageData[0].end_time; } - }) + }) + var now=ut.gettimestamp(); if(end_time - + + {{item.CardName}} @@ -35,6 +36,8 @@ + +