diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
index e35742f..11e118c 100644
--- a/components/goods_list/goods_list.js
+++ b/components/goods_list/goods_list.js
@@ -32,29 +32,31 @@ Component({
                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 });                           
                    //---回调卡的列表---
                    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();
+                       th.setData({ card_list: ob.card_list });
+                       var ti = setInterval(function () {
+                           var user = getApp().globalData.userInfo;
+                           if (!user) return false;
+                           clearInterval(ti);   
 
-                       //--- 判断是等级会员，且在有效期范围内 ---
-                       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);
-                         th.setData({ card_field: user.card_field, card_name: card_name, 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 && now < end) {
+                              var card_name = ob.name_map.get(user.card_field);
+                              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 });
+                            }
+                           }
+                       }, 500)  
                    })
-                 }, 500)
+               
                }
              })
            }
diff --git a/pages/getphone/getphone.js b/pages/getphone/getphone.js
index 0cebb37..c2a8042 100644
--- a/pages/getphone/getphone.js
+++ b/pages/getphone/getphone.js
@@ -15,9 +15,13 @@ Page({
     var th=this,app = getApp();
     var sessionKey = getApp().globalData.sessionKey;
     var openid = getApp().globalData.openid;
+       
+    if (openid == "" || openid == null) {
+      openid = getApp().globalData.userInfo.weapp_openid;
+    }
 
     if(openid=="" || openid==null ){
-		  getApp().globalData.user_id=null;
+		      getApp().globalData.user_id=null;
           getApp().globalData.userInfo=null;
           console.log("openid");
           wx.navigateTo({ url: '/pages/togoin/togoin', })
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 7bbdd63..cbe4ee7 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -235,6 +235,9 @@ Page({
 
   //------初始化加载----------
   onLoad: function(t) {
+
+
+
     wx.setNavigationBarTitle({
       title: "商品详情",
     })
@@ -293,30 +296,34 @@ Page({
 	  //---如果后台又开等级卡的开关---
 	  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.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 && now<end){
-	  			  		    var card_name=ob.name_map.get(user.card_field);									
-	  						if(card_name.length>5) card_name=card_name.substring(0,5);
-							
-							var is_near_date=0;
-							if(end-now<60*60*30*24) is_near_date=1; //如果小于30天
-	  			  		    th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date});				 
-	  			  	      }		
-	  			  		}
+	  			  	   th.setData({card_list:ob.card_list});			
+                 var ti = setInterval(function () {
+                    var user = getApp().globalData.userInfo;
+                    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 && now<end){
+                      var card_name=ob.name_map.get(user.card_field);									
+                      if(card_name.length>5) card_name=card_name.substring(0,5);
+                
+                      var is_near_date=0;
+                      if(end-now<60*60*30*24) is_near_date=1; //如果小于30天
+                          th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date});				 
+                      }		
+                  }
+                }, 500)			
 	  			  })	
-	  		},500)				
+	  		
 	  }
 	
     });