diff --git a/pages/user/labels/labels.js b/pages/user/labels/labels.js
index cd1134d..bde14dd 100644
--- a/pages/user/labels/labels.js
+++ b/pages/user/labels/labels.js
@@ -117,7 +117,7 @@ Page({
         })
         th.query_checklabels();
       } else {
-        getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
+        getApp().my_warnning("系统未设置兴趣标签集合", 0, th);
         th.setData({
           isread: 1
         })
@@ -165,7 +165,7 @@ Page({
           interest_lables: interest_lables
         })
       } else {
-        getApp().my_warnning("系统繁忙，请稍后再试", 0, th);
+        //getApp().my_warnning("系统繁忙，请稍后再试", 0, th);
         return false;
       }
     })
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index d091b36..1bbba1b 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -127,8 +127,6 @@ Page({
         th.setData({
           check_label: VipLabel
         })
-      } else {
-        getApp().my_warnning("系统繁忙，请稍后再试", 0, th);
       }
     })
   },
@@ -708,9 +706,9 @@ Page({
 		  user2:a,
 		  datet:a.birthday
         });
-
       }
     })
+
     a.getUserInfo(function(a) {
       var txt = util.formatTime(a.birthday, 'yyyy-M-d'),
         arr = txt.split(' ');
@@ -718,7 +716,7 @@ Page({
       var txt2 = util.formatTime(a.reg_time, 'yyyy-M-d'),
         arr2 = txt.split(' ');
       a.reg_time = arr2[0];
-      if (a.pickup_id != null) {
+      if (a.pickup_id && a.pickup_id>0) {
         req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, {
           success: function(da) {
             if(da.data.data){
@@ -891,10 +889,8 @@ Page({
 	}
 		
 	if(this.data.confirmed) return false;
-	this.data.confirmed=1; 
-	
+	this.data.confirmed=1;
 
-   
     var datas = {
       mobile: phone, //手机号码
       store_id: r.stoid,
@@ -907,7 +903,7 @@ Page({
       address: address, //地址
       pickup_id: sto_sele_id ,//自提门店 所属门店
 	  islunar:th.data.iscalendar,
-	  birthday:th.data.datet  
+	  birthday:th.data.datet
     }
     //往上提交美导的ID
     if(th.data.fir_guide_id!=th.data.user.staffId){
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 3b0f03d..188beb2 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -150,7 +150,7 @@
               </picker>
             </block>
             <block wx:else>
-              <view>{{datet==""? user.birthday==""?"":filters.replace_time2(user.birthday):datet}}</view>
+              <view>{{datet==""? user.birthday==""?"":filters.format_time(user.birthday):datet}}</view>
             </block>		
           </view>