Commit e644836f2bd2af709cdac3f8f021c6723c4ed488
1 parent
de4dad92
截取等级卡名称
Showing
4 changed files
with
11 additions
and
10 deletions
components/goods_list/g_filter.wxs
| @@ -59,7 +59,7 @@ var g_filters = { | @@ -59,7 +59,7 @@ var g_filters = { | ||
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | if(type==0) return min_price; | 61 | if(type==0) return min_price; |
| 62 | - if(min_name.length>4 ) min_name=min_name.substring(0, 4); | 62 | + if(min_name.length>7 ) min_name=min_name.substring(0, 8); |
| 63 | return min_name; | 63 | return min_name; |
| 64 | }, | 64 | }, |
| 65 | } | 65 | } |
pages/goods/goodsInfo/g_filter.wxs
| @@ -77,7 +77,7 @@ var g_filters = { | @@ -77,7 +77,7 @@ var g_filters = { | ||
| 77 | //min_price=min.price; | 77 | //min_price=min.price; |
| 78 | //min_name=min.name; | 78 | //min_name=min.name; |
| 79 | if(type==0) return min_price.toFixed(2); | 79 | if(type==0) return min_price.toFixed(2); |
| 80 | - if(min_name.length>4 ) min_name=min_name.substring(0, 4); | 80 | + if(min_name.length>7) min_name=min_name.substring(0, 8); |
| 81 | return min_name; | 81 | return min_name; |
| 82 | }, | 82 | }, |
| 83 | } | 83 | } |
pages/goods/goodsList/g_filter.wxs
| @@ -7,7 +7,7 @@ var g_filters = { | @@ -7,7 +7,7 @@ var g_filters = { | ||
| 7 | }, | 7 | }, |
| 8 | 8 | ||
| 9 | //-- 判断,不是等级会员时候，要显示的最低等级价和名称 -- | 9 | //-- 判断,不是等级会员时候，要显示的最低等级价和名称 -- |
| 10 | - get_card_price:function(goods,all_card,type){ | 10 | + get_card_price:function(goods,all_card,type){ |
| 11 | var price1=parseFloat(goods['cardprice1']); | 11 | var price1=parseFloat(goods['cardprice1']); |
| 12 | var price2=parseFloat(goods['cardprice2']); | 12 | var price2=parseFloat(goods['cardprice2']); |
| 13 | var price3=parseFloat(goods['cardprice3']); | 13 | var price3=parseFloat(goods['cardprice3']); |
| @@ -32,7 +32,7 @@ var g_filters = { | @@ -32,7 +32,7 @@ var g_filters = { | ||
| 32 | min_price=price1;min_name=vl['CardName']; | 32 | min_price=price1;min_name=vl['CardName']; |
| 33 | } | 33 | } |
| 34 | else if(price1<min_price) { | 34 | else if(price1<min_price) { |
| 35 | - min_price=price1;min_name=vl['CardName']; | 35 | + min_price=price1;min_name=vl['CardName']; |
| 36 | } | 36 | } |
| 37 | } | 37 | } |
| 38 | if(vl['CorrPrice']=="Price2" && price2>0) | 38 | if(vl['CorrPrice']=="Price2" && price2>0) |
| @@ -41,7 +41,7 @@ var g_filters = { | @@ -41,7 +41,7 @@ var g_filters = { | ||
| 41 | min_price=price2;min_name=vl['CardName']; | 41 | min_price=price2;min_name=vl['CardName']; |
| 42 | } | 42 | } |
| 43 | else if(price2<min_price) { | 43 | else if(price2<min_price) { |
| 44 | - min_price=price2;min_name=vl['CardName']; | 44 | + min_price=price2;min_name=vl['CardName']; |
| 45 | } | 45 | } |
| 46 | } | 46 | } |
| 47 | 47 | ||
| @@ -51,7 +51,7 @@ var g_filters = { | @@ -51,7 +51,7 @@ var g_filters = { | ||
| 51 | min_price=price3;min_name=vl['CardName']; | 51 | min_price=price3;min_name=vl['CardName']; |
| 52 | } | 52 | } |
| 53 | else if(price3<min_price) { | 53 | else if(price3<min_price) { |
| 54 | - min_price=price3;min_name=vl['CardName']; | 54 | + min_price=price3;min_name=vl['CardName']; |
| 55 | } | 55 | } |
| 56 | } | 56 | } |
| 57 | 57 | ||
| @@ -74,10 +74,11 @@ var g_filters = { | @@ -74,10 +74,11 @@ var g_filters = { | ||
| 74 | } | 74 | } |
| 75 | })--*/ | 75 | })--*/ |
| 76 | //-- 获取最下价钱，和相应的卡的名称 -- | 76 | //-- 获取最下价钱，和相应的卡的名称 -- |
| 77 | - //min_price=min.price; | ||
| 78 | - //min_name=min.name; | 77 | + min_price=min.price; |
| 78 | + min_name=min.name; | ||
| 79 | if(type==0) return min_price.toFixed(2); | 79 | if(type==0) return min_price.toFixed(2); |
| 80 | - if(min_name.length>4 ) min_name=min_name.substring(0, 4); | 80 | + |
| 81 | + if(min_name.length>7) min_name=min_name.substring(0, 8); | ||
| 81 | return min_name; | 82 | return min_name; |
| 82 | }, | 83 | }, |
| 83 | } | 84 | } |
pages/goods/goodsList/goodsList.js
| @@ -105,7 +105,7 @@ Page({ | @@ -105,7 +105,7 @@ Page({ | ||
| 105 | //--- 判断是等级会员，且在有效期范围内 --- | 105 | //--- 判断是等级会员，且在有效期范围内 --- |
| 106 | if(user.card_field && now<end){ | 106 | if(user.card_field && now<end){ |
| 107 | var card_name=ob.name_map.get(user.card_field); | 107 | var card_name=ob.name_map.get(user.card_field); |
| 108 | - if(card_name.length>4) card_name=card_name.substring(0,4); | 108 | + // if(card_name.length>4) card_name=card_name.substring(0,4); |
| 109 | th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list}); | 109 | th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list}); |
| 110 | } | 110 | } |
| 111 | } | 111 | } |