From e644836f2bd2af709cdac3f8f021c6723c4ed488 Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Thu, 24 Sep 2020 15:58:39 +0800
Subject: [PATCH] 截取等级卡名称

---
 components/goods_list/g_filter.wxs |  2 +-
 pages/goods/goodsInfo/g_filter.wxs |  2 +-
 pages/goods/goodsList/g_filter.wxs | 15 ++++++++-------
 pages/goods/goodsList/goodsList.js |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/components/goods_list/g_filter.wxs b/components/goods_list/g_filter.wxs
index 8a9998e..f41a711 100644
--- a/components/goods_list/g_filter.wxs
+++ b/components/goods_list/g_filter.wxs
@@ -59,7 +59,7 @@ var g_filters = {
 				 }	
 				 			   
 			     if(type==0) return min_price;	
-				 if(min_name.length>4 )	min_name=min_name.substring(0, 4);	 
+				 if(min_name.length>7 )	min_name=min_name.substring(0, 8);	 
 			     return min_name;
 		},
 }
diff --git a/pages/goods/goodsInfo/g_filter.wxs b/pages/goods/goodsInfo/g_filter.wxs
index e998151..67a0bf9 100644
--- a/pages/goods/goodsInfo/g_filter.wxs
+++ b/pages/goods/goodsInfo/g_filter.wxs
@@ -77,7 +77,7 @@ var g_filters = {
 				 //min_price=min.price;
 				 //min_name=min.name;				   
 			     if(type==0) return min_price.toFixed(2);	
-				 if(min_name.length>4 )	min_name=min_name.substring(0, 4);	 
+				 if(min_name.length>7)	min_name=min_name.substring(0, 8);	 
 			     return min_name;
 		},
 }
diff --git a/pages/goods/goodsList/g_filter.wxs b/pages/goods/goodsList/g_filter.wxs
index e998151..69fa0de 100644
--- a/pages/goods/goodsList/g_filter.wxs
+++ b/pages/goods/goodsList/g_filter.wxs
@@ -7,7 +7,7 @@ var g_filters = {
 	    },
        	
 	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
-		get_card_price:function(goods,all_card,type){		
+		get_card_price:function(goods,all_card,type){	
 			     var price1=parseFloat(goods['cardprice1']);
 			     var price2=parseFloat(goods['cardprice2']);
 			     var price3=parseFloat(goods['cardprice3']);					   
@@ -32,7 +32,7 @@ var g_filters = {
 						     min_price=price1;min_name=vl['CardName'];
 					   }
 					   else if(price1<min_price) {
-							min_price=price1;min_name=vl['CardName'];					  
+							min_price=price1;min_name=vl['CardName'];				
 					   }
 					}
 					if(vl['CorrPrice']=="Price2" && price2>0)
@@ -41,7 +41,7 @@ var g_filters = {
 							min_price=price2;min_name=vl['CardName'];
 						}
 						else if(price2<min_price) {
-							min_price=price2;min_name=vl['CardName'];					  
+							min_price=price2;min_name=vl['CardName'];				
 						}					
 					}
 											
@@ -51,7 +51,7 @@ var g_filters = {
 							min_price=price3;min_name=vl['CardName'];
 						}
 						else if(price3<min_price) {
-							min_price=price3;min_name=vl['CardName'];					  
+							min_price=price3;min_name=vl['CardName'];				
 						}
 					}
 														
@@ -74,10 +74,11 @@ var g_filters = {
 					          }
 				 })--*/			 				 
 				 //-- 获取最下价钱，和相应的卡的名称 --		  
-				 //min_price=min.price;
-				 //min_name=min.name;				   
+				 min_price=min.price;
+				 min_name=min.name;				   
 			     if(type==0) return min_price.toFixed(2);	
-				 if(min_name.length>4 )	min_name=min_name.substring(0, 4);	 
+					 
+				 if(min_name.length>7)	min_name=min_name.substring(0, 8);
 			     return min_name;
 		},
 }
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 209bd3f..5e35d81 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -105,7 +105,7 @@ Page({
 								  //--- 判断是等级会员，且在有效期范围内 ---
 								  if(user.card_field && now<end){
 									var card_name=ob.name_map.get(user.card_field);									
-									if(card_name.length>4) card_name=card_name.substring(0,4);
+									// if(card_name.length>4) card_name=card_name.substring(0,4);
 									th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list});				 
 								  }		
 								}
--
libgit2 0.21.4