diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index e9a84ed..6e0c207 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -316,13 +316,24 @@ Component({ 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 user = getApp().globalData.userInfo; + + if(plusCard) { + + for (var i = 0; i < plusCard.length; i++) { + if ((!user || 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/components/diy_goodsGroup/g_filter.wxs b/components/diy_goodsGroup/g_filter.wxs index 6b5e379..fc32f2c 100644 --- a/components/diy_goodsGroup/g_filter.wxs +++ b/components/diy_goodsGroup/g_filter.wxs @@ -47,6 +47,7 @@ var g_filters = { //---设置对应的价格名字---- for(var i=0;i<3;i++) { var vl=all_card[i]; + if(!vl) continue; if(vl['CorrPrice']=="Price1" && price1>0) { if(min_price==null) { diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index 460fbe6..98c3fbf 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -159,7 +159,7 @@ Component({ var user = getApp().globalData.userInfo; if(plusCard) { for (var i = 0; i < plusCard.length; i++) { - if (user && (user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) { + if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) { continue; } var name = "card" + plusCard[i].CorrPrice.toLowerCase(); diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js index 76941ed..9d2d193 100644 --- a/packageA/pages/activity_share/activity_share.js +++ b/packageA/pages/activity_share/activity_share.js @@ -225,7 +225,7 @@ Page({ clickTab2(e) { if(this.data.currentIndex2!=e.target.dataset.index){ this.setData({ - currentIndex2: e.target.dataset.index,is_no_data:0,is_no_more:0,list:[], + currentIndex2: e.target.dataset.index,is_no_data:0,is_no_more:0,list:[],list2:[] }); this.data.is_load=0; this.data.currentPage=1; diff --git a/packageA/pages/activity_share/activity_share.wxml b/packageA/pages/activity_share/activity_share.wxml index 3d3183c..2dbb217 100644 --- a/packageA/pages/activity_share/activity_share.wxml +++ b/packageA/pages/activity_share/activity_share.wxml @@ -53,7 +53,7 @@ 已拼{{item.buy_num}}份 - 1人团 + {{item.ct_num}}人团 剩余: @@ -153,9 +153,9 @@ 必买商品 - 商品编号：{{hui_active.goods_sn}} - {{hui_active.main_goods_name}} - 手店价：￥{{g_filter.toFix(hui_active.ginfo.shop_price,2)}} + 商品编号：{{hui_active.ginfo.goods_sn}} + 商品名称：{{hui_active.main_goods_name}} + 手店价：￥{{g_filter.toFix(hui_active.ginfo.shop_price,2)}} 搭配商品 diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js index 35948dc..40ae229 100644 --- a/packageA/pages/goods_share/goods_share.js +++ b/packageA/pages/goods_share/goods_share.js @@ -96,28 +96,32 @@ Page({ var sw_arr=JSON.parse(swithc_list); //---如果后台又开等级卡的开关--- if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){ - th.setData({rank_switch:true}); - var user=getApp().globalData.userInfo; - var ti=setInterval(function(){ - if(!user) return false; - clearInterval(ti); + th.setData({rank_switch:true}); + var user=getApp().globalData.userInfo; + //---回调卡的列表--- th.getPlusCardType(function(ob){ - th.setData({card_list:ob.card_list}); - if(user.card_field ){ - var str = user['card_expiredate'].replace(/-/g, '/'); - var end = new Date(str); - end = Date.parse(end) / 1000; - var now = ut.gettimestamp(); - //--- 判断是等级会员，且在有效期范围内 --- - if(user.card_field && now4) card_name=card_name.substring(0,4); - th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list}); - } - } - }) - },500) + th.setData({card_list:ob.card_list}); + + var ti=setInterval(function(){ + if(!user) return false; + clearInterval(ti); + + if(user.card_field ){ + var str = user['card_expiredate'].replace(/-/g, '/'); + var end = new Date(str); + end = Date.parse(end) / 1000; + var now = ut.gettimestamp(); + //--- 判断是等级会员，且在有效期范围内 --- + if(user.card_field && now4) card_name=card_name.substring(0,4); + th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list}); + } + } + },1000) + }) + } }); }, @@ -277,7 +281,7 @@ Page({ 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)) { + if ((!user || user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) { continue; } var name="card"+plusCard[i].CorrPrice.toLowerCase(); diff --git a/packageA/pages/goods_share/goods_share.wxml b/packageA/pages/goods_share/goods_share.wxml index ec817b0..57dee07 100644 --- a/packageA/pages/goods_share/goods_share.wxml +++ b/packageA/pages/goods_share/goods_share.wxml @@ -42,20 +42,37 @@ data-errorimg="list[{{index}}].original_img"> - {{item.goods_name}} - ￥{{item.shop_price}} - - - - - PLUS￥{{item[card_field]}} - - - - PLUS￥{{g_filter.get_card_price(item,card_list,0)}} - - - + {{item.goods_name}} + + + ￥{{item.shop_price}} + ￥{{item.market_price}} + + + + + + + + + + + {{card_name}} + + ￥{{filter.toFix(item[card_field],2)}} + + + + + + + {{g_filter.get_card_price(item,card_list,1)}} + + ￥{{g_filter.get_card_price(item,card_list,0)}} + + + + 已售：{{item.sales_sum}} diff --git a/packageA/pages/goods_share/goods_share.wxss b/packageA/pages/goods_share/goods_share.wxss index d88b837..969bd02 100644 --- a/packageA/pages/goods_share/goods_share.wxss +++ b/packageA/pages/goods_share/goods_share.wxss @@ -116,3 +116,28 @@ page { margin-left: 10rpx; margin-right: 5rpx; } + +.card_bg { + box-sizing: border-box; + padding: 2rpx 10rpx; + height: 28rpx; + border-radius: 26rpx; + font-size: 18rpx; + line-height: 28rpx; + max-width: 210rpx; + background: #333; + color: #fff; + margin-left: 8rpx; +} + +.card_bg image { + width: 19rpx; + height: 19rpx; + margin-right: 8rpx; +} + +.txt_line{ + text-decoration: line-through; position: relative; + top: 23rpx;color: #adadad; + font-size: 24rpx; margin-left: 10rpx; + } diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml index 163c5fc..4a87b11 100644 --- a/pages/goods/categoryList/categoryList.wxml +++ b/pages/goods/categoryList/categoryList.wxml @@ -411,9 +411,13 @@ {{item.goods_name}} - + - ￥{{item.prom_price}} + + {{item.prom_integral}}积分 + + + ￥{{item.prom_price}} + ￥{{item.market_price}} 评论{{item.comment_count}} 已售{{item.sales_sum}} diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 5e35d81..ad859fe 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -16,8 +16,8 @@ Page({ openFilterModal: !1, baseUrl: "/api/weshop/goods/page?1=1", requestUrl: "", - tabname:"goods_id", //排序的字段 - adname:"desc", //升降的字段 + tabname:"sort", //排序的字段 + adname:"asc", //升降的字段 is_new:0, is_hot:0, prom_goods_list:null, @@ -257,7 +257,7 @@ Page({ 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)) { + if ((!user || user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) { continue; } var name="card"+plusCard[i].CorrPrice.toLowerCase(); diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index 0107cbc..27a77af 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -19,8 +19,8 @@ Page({ //hotWords: [ [ "手机", "小米", "iphone" ], [ "三星", "华为", "冰箱" ] ] hotWords: null, - tabname: "goods_id", //排序的字段 - adname: "desc", //升降的字段 + tabname: "sort", //排序的字段 + adname: "asc", //升降的字段 rq_data:null, }, onLoad: function(t) { @@ -240,7 +240,7 @@ Page({ 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)) { + if ((!user || user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) { continue; } var name="card"+plusCard[i].CorrPrice.toLowerCase();