Merge branch 'dev_wy' into dev2.0

@@ -46,27 +46,14 @@ Page({
   handleData: function (data){
   handleData: function (data){
     var newdata = JSON.parse(data);
     var newdata = JSON.parse(data);
     if (newdata ){
     if (newdata ){
-      if (newdata.children_birthday && newdata.children_birthday > 0) {
-        newdata.children_birthday = format.formatTime_date(newdata.children_birthday)
-      }
-      if (newdata.spouse_birthday && newdata.spouse_birthday > 0) {
-        newdata.spouse_birthday = format.formatTime_date(newdata.spouse_birthday)
-      }
-      if (newdata.education_start && newdata.education_start > 0) {
-        newdata.education_start = format.formatTime_date(newdata.education_start)
-      }
-      if (newdata.education_end && newdata.education_end > 0) {
-        newdata.education_end = format.formatTime_date(newdata.education_end)
-      }
-      if (newdata.birthday && newdata.birthday > 0) {
-        newdata.birthday = format.formatTime_date(newdata.birthday)
-      }
-      if (newdata.rent_start && newdata.rent_start > 0) {
-        newdata.rent_start = format.formatTime_date(newdata.rent_start)
-      }
-      if (newdata.rent_end && newdata.rent_end > 0) {
-        newdata.rent_end = format.formatTime_date(newdata.rent_end)
-      }
+      this.verifyDate(newdata.children_birthday)
+      this.verifyDate(newdata.spouse_birthday)
+      this.verifyDate(newdata.education_start)
+      this.verifyDate(newdata.education_end)
+      this.verifyDate(newdata.birthday)
+      this.verifyDate(newdata.rent_start)
+      this.verifyDate(newdata.rent_end)
+
       if (newdata.house_address) {
       if (newdata.house_address) {
         if (newdata.house_address.province == newdata.house_address.city) {
         if (newdata.house_address.province == newdata.house_address.city) {
           newdata.house_address_new = newdata.house_address.city + newdata.house_address.district
           newdata.house_address_new = newdata.house_address.city + newdata.house_address.district
@@ -85,6 +72,14 @@ Page({
     }
     }
   },
   },
 
 
+  verifyDate(date){
+    if (date && date > 0) {
+      date = format.formatTime_date(date)
+    } else {
+      date = ""
+    }
+  },
+
   /**
   /**
    * Lifecycle function--Called when page is initially rendered
    * Lifecycle function--Called when page is initially rendered
    */
    */

@@ -79,7 +79,7 @@
     </view>
     </view>
     <view style='height:90rpx;width:100%;clear:both;'>
     <view style='height:90rpx;width:100%;clear:both;'>
       <text class='text_left'>出生日期</text>
       <text class='text_left'>出生日期</text>
-      <text class='text_right_333'>{{datas.spouse_birthday}}</text>
+      <text class='text_right_333'>{{datas.spouse_birthday>0?"datas.spouse_birthday":""}}</text>
     </view>
     </view>
     <view style='height:90rpx;width:100%;clear:both;'>
     <view style='height:90rpx;width:100%;clear:both;'>
       <text class='text_left'>国籍</text>
       <text class='text_left'>国籍</text>