From 3f2e4f6474c1a22bde29e3fde8f5316f6d530713 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 13 Nov 2019 11:06:28 +0800
Subject: [PATCH] 过滤器，不使用数组排序，手机不兼容

---
 components/goods_list/g_filter.wxs | 56 +++++++++++++++++++++++++++++++++-----------------------
 pages/goods/goodsInfo/g_filter.wxs | 49 +++++++++++++++++++++++++++++++++++++++----------
 pages/goods/goodsList/g_filter.wxs | 59 +++++++++++++++++++++++++++++++++++------------------------
 pages/goods/search/g_filter.wxs    | 60 ++++++++++++++++++++++++++++++++++++------------------------
 4 files changed, 143 insertions(+), 81 deletions(-)

diff --git a/components/goods_list/g_filter.wxs b/components/goods_list/g_filter.wxs
index 297810c..b7c11cf 100644
--- a/components/goods_list/g_filter.wxs
+++ b/components/goods_list/g_filter.wxs
@@ -14,38 +14,48 @@ var g_filters = {
 			     if(!all_card){
 			         if(type==0) return 0;
 			         return "";
-			     }	
-																	 												 
-				 var arr=[]; 
-				 var min_price= 0;
-				 var min_name="";				 
+			     }	  
+				 
+			     var min_price=null;
+				 var min_name=null;	   
 			     //---设置对应的价格名字----	   
 				 for(var i=0;i<3;i++) {						
-					var vl=all_card[i];
+					var vl=all_card[i];					
 					if(vl['CorrPrice']=="Price1" && price1>0)
-						  arr.push({'price':price1, 'name':vl['CardName']});								
+					{	 	 		  
+					   if(min_price==null) {
+						     min_price=price1;min_name=vl['CardName'];
+					   }
+					   else if(price1<min_price) {
+							min_price=price1;min_name=vl['CardName'];					  
+					   }
+					}
 					if(vl['CorrPrice']=="Price2" && price2>0)
-						arr.push({'price':price2, 'name':vl['CardName']});						
+					{
+						if(min_price==null) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+						else if(price2<min_price) {
+							min_price=price2;min_name=vl['CardName'];					  
+						}					
+					}
+											
 					if(vl['CorrPrice']=="Price3" && price3>0)
-						arr.push({'price':price3, 'name':vl['CardName']});									
+					{						
+						if(min_price==null) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+						else if(price3<min_price) {
+							min_price=price3;min_name=vl['CardName'];					  
+						}
+					}
+														
 				 } 
-				 if(arr.length==0){
+				 if(min_price==null){
 					 if(type==0) return 0;
 					 return "";
 				 }	
-			     //--进行排序,升序---
-				 arr.sort(function(a,b){
-					          if (a.price < b.price) {
-					            return -1;
-					          } else if (a.fee == b.fee) {
-					            return 0;
-					          } else {
-					            return 1;
-					          }
-				 })
-				 //-- 获取最下价钱，和相应的卡的名称 --		  
-				 min_price=arr[0].price;
-				 min_name=arr[0].name;				   
+				 			   
 			     if(type==0) return min_price;	
 				 if(min_name.length>4 )	min_name=min_name.substring(0, 4);	 
 			     return min_name;
diff --git a/pages/goods/goodsInfo/g_filter.wxs b/pages/goods/goodsInfo/g_filter.wxs
index 2b77cdb..0357f6e 100644
--- a/pages/goods/goodsInfo/g_filter.wxs
+++ b/pages/goods/goodsInfo/g_filter.wxs
@@ -18,22 +18,51 @@ var g_filters = {
 																	 												 
 				 var arr=[]; 
 				 var min_price= 0;
-				 var min_name="";				 
+				 var min_name="";		
+						  
+				 var min_price=null;
+				 var min_name=null;	   
 			     //---设置对应的价格名字----	   
 				 for(var i=0;i<3;i++) {						
-					var vl=all_card[i];
+					var vl=all_card[i];					
 					if(vl['CorrPrice']=="Price1" && price1>0)
-						  arr.push({'price':price1, 'name':vl['CardName']});								
+					{	 	 		  
+					   if(min_price==null) {
+						     min_price=price1;min_name=vl['CardName'];
+					   }
+					   else if(price1<min_price) {
+							min_price=price1;min_name=vl['CardName'];					  
+					   }
+					}
 					if(vl['CorrPrice']=="Price2" && price2>0)
-						arr.push({'price':price2, 'name':vl['CardName']});						
+					{
+						if(min_price==null) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+						else if(price2<min_price) {
+							min_price=price2;min_name=vl['CardName'];					  
+						}					
+					}
+											
 					if(vl['CorrPrice']=="Price3" && price3>0)
-						arr.push({'price':price3, 'name':vl['CardName']});									
+					{						
+						if(min_price==null) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+						else if(price3<min_price) {
+							min_price=price3;min_name=vl['CardName'];					  
+						}
+					}
+														
 				 } 
-				 if(arr.length==0){
+				 if(min_price==null){
 					 if(type==0) return 0;
 					 return "";
 				 }	
+				 
+				 //if(type==0) return arr.length;
 			     //--进行排序,升序---
+				 /*---
 				 arr.sort(function(a,b){
 					          if (a.price < b.price) {
 					            return -1;
@@ -42,12 +71,12 @@ var g_filters = {
 					          } else {
 					            return 1;
 					          }
-				 })
+				 })--*/			 				 
 				 //-- 获取最下价钱，和相应的卡的名称 --		  
-				 min_price=arr[0].price;
-				 min_name=arr[0].name;				   
+				 //min_price=min.price;
+				 //min_name=min.name;				   
 			     if(type==0) return min_price;	
-				 if(min_name.length>5 )	min_name=min_name.substring(0, 5);	 
+				 if(min_name.length>4 )	min_name=min_name.substring(0, 4);	 
 			     return min_name;
 		},
 }
diff --git a/pages/goods/goodsList/g_filter.wxs b/pages/goods/goodsList/g_filter.wxs
index 297810c..3ba36f2 100644
--- a/pages/goods/goodsList/g_filter.wxs
+++ b/pages/goods/goodsList/g_filter.wxs
@@ -11,41 +11,52 @@ var g_filters = {
 			     var price1=parseInt(goods['cardprice1']);
 			     var price2=parseInt(goods['cardprice2']);
 			     var price3=parseInt(goods['cardprice3']);					   
-			     if(!all_card){
+			     
+				 if(!all_card){
 			         if(type==0) return 0;
 			         return "";
-			     }	
-																	 												 
-				 var arr=[]; 
-				 var min_price= 0;
-				 var min_name="";				 
+			     }														 												 
+					  
+				 var min_price=null;
+				 var min_name=null;	   
 			     //---设置对应的价格名字----	   
 				 for(var i=0;i<3;i++) {						
-					var vl=all_card[i];
+					var vl=all_card[i];					
 					if(vl['CorrPrice']=="Price1" && price1>0)
-						  arr.push({'price':price1, 'name':vl['CardName']});								
+					{	 	 		  
+					   if(min_price==null) {
+						     min_price=price1;min_name=vl['CardName'];
+					   }
+					   else if(price1<min_price) {
+							min_price=price1;min_name=vl['CardName'];					  
+					   }
+					}
 					if(vl['CorrPrice']=="Price2" && price2>0)
-						arr.push({'price':price2, 'name':vl['CardName']});						
+					{
+						if(min_price==null) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+						else if(price2<min_price) {
+							min_price=price2;min_name=vl['CardName'];					  
+						}					
+					}
+											
 					if(vl['CorrPrice']=="Price3" && price3>0)
-						arr.push({'price':price3, 'name':vl['CardName']});									
+					{						
+						if(min_price==null) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+						else if(price3<min_price) {
+							min_price=price3;min_name=vl['CardName'];					  
+						}
+					}
+														
 				 } 
-				 if(arr.length==0){
+				 if(min_price==null){
 					 if(type==0) return 0;
 					 return "";
 				 }	
-			     //--进行排序,升序---
-				 arr.sort(function(a,b){
-					          if (a.price < b.price) {
-					            return -1;
-					          } else if (a.fee == b.fee) {
-					            return 0;
-					          } else {
-					            return 1;
-					          }
-				 })
-				 //-- 获取最下价钱，和相应的卡的名称 --		  
-				 min_price=arr[0].price;
-				 min_name=arr[0].name;				   
+							   
 			     if(type==0) return min_price;	
 				 if(min_name.length>4 )	min_name=min_name.substring(0, 4);	 
 			     return min_name;
diff --git a/pages/goods/search/g_filter.wxs b/pages/goods/search/g_filter.wxs
index 297810c..1033fa9 100644
--- a/pages/goods/search/g_filter.wxs
+++ b/pages/goods/search/g_filter.wxs
@@ -11,46 +11,58 @@ var g_filters = {
 			     var price1=parseInt(goods['cardprice1']);
 			     var price2=parseInt(goods['cardprice2']);
 			     var price3=parseInt(goods['cardprice3']);					   
-			     if(!all_card){
+			     
+				 if(!all_card){
 			         if(type==0) return 0;
 			         return "";
-			     }	
-																	 												 
-				 var arr=[]; 
-				 var min_price= 0;
-				 var min_name="";				 
+			     }														 												 
+					  
+				 var min_price=null;
+				 var min_name=null;	   
 			     //---设置对应的价格名字----	   
 				 for(var i=0;i<3;i++) {						
-					var vl=all_card[i];
+					var vl=all_card[i];					
 					if(vl['CorrPrice']=="Price1" && price1>0)
-						  arr.push({'price':price1, 'name':vl['CardName']});								
+					{	 	 		  
+					   if(min_price==null) {
+						     min_price=price1;min_name=vl['CardName'];
+					   }
+					   else if(price1<min_price) {
+							min_price=price1;min_name=vl['CardName'];					  
+					   }
+					}
 					if(vl['CorrPrice']=="Price2" && price2>0)
-						arr.push({'price':price2, 'name':vl['CardName']});						
+					{
+						if(min_price==null) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+						else if(price2<min_price) {
+							min_price=price2;min_name=vl['CardName'];					  
+						}					
+					}
+											
 					if(vl['CorrPrice']=="Price3" && price3>0)
-						arr.push({'price':price3, 'name':vl['CardName']});									
+					{						
+						if(min_price==null) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+						else if(price3<min_price) {
+							min_price=price3;min_name=vl['CardName'];					  
+						}
+					}
+														
 				 } 
-				 if(arr.length==0){
+				 if(min_price==null){
 					 if(type==0) return 0;
 					 return "";
 				 }	
-			     //--进行排序,升序---
-				 arr.sort(function(a,b){
-					          if (a.price < b.price) {
-					            return -1;
-					          } else if (a.fee == b.fee) {
-					            return 0;
-					          } else {
-					            return 1;
-					          }
-				 })
-				 //-- 获取最下价钱，和相应的卡的名称 --		  
-				 min_price=arr[0].price;
-				 min_name=arr[0].name;				   
+							   
 			     if(type==0) return min_price;	
 				 if(min_name.length>4 )	min_name=min_name.substring(0, 4);	 
 			     return min_name;
 		},
 }
+
 module.exports = {
 	  is_has_rank:g_filters.is_has_rank,
 	  get_card_price:g_filters.get_card_price,   
--
libgit2 0.21.4