diff --git a/app.js b/app.js
index 0d3c294..0bf56d7 100644
--- a/app.js
+++ b/app.js
@@ -13,7 +13,7 @@ App({
         config2: null,  //门店配置
         code: null,
         heigth:0,
-        user_id: null,// 4379287,//  null,// 5682068,
+        user_id: 9274245,// 4379287,//  null,// 5682068,
         buy_now:null,
         picklist:null,    //门店列表
         wuliuprice: null, //物流价格表
@@ -383,16 +383,16 @@ App({
     },
 	
 	//------定时等待某个值,有值才进行运算--------
-	waitfor:function(time,pop_value,func){
+	waitfor:function(page,key,pop_value,func){
 		var n=0;
-		if(!time){
-			time=setInterval(function(){
-				console.log(time);n++;
+		if(!page.data[key]){
+			page.data[key]=setInterval(function(){
+				console.log(page.data[key]);n++;
 				if(pop_value) {
-					clearInterval(time);
+					clearInterval(page.data[key]);
 					func();
 				}				
-				if(n>60) clearInterval(time);
+				if(n>15) clearInterval(page.data[key]);
 			},1000);
 		}
 	}
diff --git a/components/goods_list/g_filter.wxs b/components/goods_list/g_filter.wxs
index 10a90ce..8a9998e 100644
--- a/components/goods_list/g_filter.wxs
+++ b/components/goods_list/g_filter.wxs
@@ -20,7 +20,9 @@ var g_filters = {
 				 var min_name=null;	   
 			     //---设置对应的价格名字----	   
 				 for(var i=0;i<3;i++) {						
-					var vl=all_card[i];					
+					var vl=all_card[i];			
+				   if(!vl) continue;			
+							
 					if(vl['CorrPrice']=="Price1" && price1>0)
 					{	 	 		  
 					   if(min_price==null) {
diff --git a/pages/goods/goodsInfo/g_filter.wxs b/pages/goods/goodsInfo/g_filter.wxs
index 65a4f4b..e998151 100644
--- a/pages/goods/goodsInfo/g_filter.wxs
+++ b/pages/goods/goodsInfo/g_filter.wxs
@@ -24,7 +24,8 @@ var g_filters = {
 				 var min_name=null;	   
 			     //---设置对应的价格名字----	   
 				 for(var i=0;i<3;i++) {						
-					var vl=all_card[i];					
+					var vl=all_card[i];		
+					if(!vl) continue;			
 					if(vl['CorrPrice']=="Price1" && price1>0)
 					{	 	 		  
 					   if(min_price==null) {
diff --git a/pages/goods/goodsList/g_filter.wxs b/pages/goods/goodsList/g_filter.wxs
index eea87b8..e998151 100644
--- a/pages/goods/goodsList/g_filter.wxs
+++ b/pages/goods/goodsList/g_filter.wxs
@@ -11,17 +11,21 @@ var g_filters = {
 			     var price1=parseFloat(goods['cardprice1']);
 			     var price2=parseFloat(goods['cardprice2']);
 			     var price3=parseFloat(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) continue;			
 					if(vl['CorrPrice']=="Price1" && price1>0)
 					{	 	 		  
 					   if(min_price==null) {
@@ -56,8 +60,23 @@ var g_filters = {
 					 if(type==0) return 0;
 					 return "";
 				 }	
-							   
-			     if(type==0) return min_price;	
+				 
+				 //if(type==0) return arr.length;
+			     //--进行排序,升序---
+				 /*---
+				 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=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);	 
 			     return min_name;
 		},
diff --git a/pages/goods/search/g_filter.wxs b/pages/goods/search/g_filter.wxs
index e28ecb8..e998151 100644
--- a/pages/goods/search/g_filter.wxs
+++ b/pages/goods/search/g_filter.wxs
@@ -8,20 +8,24 @@ var g_filters = {
        	
 	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
 		get_card_price:function(goods,all_card,type){		
-      var price1 = parseFloat(goods['cardprice1']);
-      var price2 = parseFloat(goods['cardprice2']);
-      var price3 = parseFloat(goods['cardprice3']);					   
-			     
-				 if(!all_card){
+			     var price1=parseFloat(goods['cardprice1']);
+			     var price2=parseFloat(goods['cardprice2']);
+			     var price3=parseFloat(goods['cardprice3']);					   
+			     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) continue;			
 					if(vl['CorrPrice']=="Price1" && price1>0)
 					{	 	 		  
 					   if(min_price==null) {
@@ -56,13 +60,27 @@ var g_filters = {
 					 if(type==0) return 0;
 					 return "";
 				 }	
-							   
-			     if(type==0) return min_price;	
+				 
+				 //if(type==0) return arr.length;
+			     //--进行排序,升序---
+				 /*---
+				 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=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);	 
 			     return min_name;
 		},
 }
-
 module.exports = {
 	  is_has_rank:g_filters.is_has_rank,
 	  get_card_price:g_filters.get_card_price,   
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index dc76955..59a8d7a 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -167,6 +167,7 @@ Page({
     this.data.is_timer = 0;
     clearInterval(this.data.pt_timer);
 	clearInterval(this.data.w_holiday_pop);
+	this.data.w_holiday_pop=0;
   },
 
   //同步初始加载
@@ -787,7 +788,7 @@ Page({
   //弹出节日有礼
   check_holiday_pop:function(){
 	  var th=this;
-	  getApp().waitfor(th.data.w_holiday_pop,th.data.holiday_image,function(){
+	  getApp().waitfor(th,'w_holiday_pop',th.data.holiday_image,function(){
 		    console.log(th.data.holiday_image);
 			th.setData({			
 			  new_image: th.data.holiday_image,