Merge branch 'dev_wy' into dev2.0

@@ -16,8 +16,8 @@ Page({
       "house_fund": "住房"
       "house_fund": "住房"
     },
     },
     singlechildtype:{
     singlechildtype:{
-      "D": "独生子女",
-      "S": "非独生子女"
+      "y": "是",
+      "n": "否"
     },
     },
     reducetype: {
     reducetype: {
       "":"月",
       "":"月",
@@ -58,6 +58,10 @@ Page({
       this.verifyDate(newdata.rent_start)
       this.verifyDate(newdata.rent_start)
       this.verifyDate(newdata.rent_end)
       this.verifyDate(newdata.rent_end)
 
 
+      newdata.children_id_card_no = this.formatIdNum(newdata.children_id_card_no)
+      newdata.spouse_id_card_no = this.formatIdNum(newdata.spouse_id_card_no)
+      newdata.id_card_no = this.formatIdNum(newdata.id_card_no)
+
       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
@@ -84,6 +88,18 @@ Page({
     }
     }
   },
   },
 
 
+  formatIdNum: function (idnum) {
+    if (idnum && idnum.length >= 6 && idnum.length < 10) {
+      idnum = idnum.substring(0, 2) + '****' + idnum.substring(idnum.length - 2, idnum.length);
+    } 
+     if (idnum && idnum.length >= 10) {
+       idnum = idnum.substring(0, 4) + '****' + idnum.substring(idnum.length - 4, idnum.length);
+    } 
+    
+    console.log("formatIdNum", idnum)
+    return idnum
+  },
+
   /**
   /**
    * Lifecycle function--Called when page is initially rendered
    * Lifecycle function--Called when page is initially rendered
    */
    */

@@ -479,6 +479,16 @@ Page({
     }
     }
   },
   },
 
 
+  formatIdNum: function (idnum) {
+    if (idnum && idnum.length >= 6 && idnum.length < 10) {
+      return idnum.substring(0, 2) + '****' + idnum.substring(idnum.length - 2, idnum.length);
+    } else if (idnum.length >= 10) {
+      return idnum.substring(0, 4) + '****' + idnum.substring(idnum.length - 4, idnum.length);
+    } else {
+      return idnum
+    }
+  },
+
   bindinput: function(e) {
   bindinput: function(e) {
     console.log("bindinput", e)
     console.log("bindinput", e)
     this.setData({
     this.setData({

@@ -220,7 +220,7 @@
                 </view>
                 </view>
                 <view style='height:70rpx'>
                 <view style='height:70rpx'>
                   <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照号码：</text>
                   <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人证照号码：</text>
-                  <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.id_card_no}}</text>
+                  <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{formatIdNum(itemdetail.id_card_no)}}</text>
                 </view>
                 </view>
                 <view style='height:70rpx'>
                 <view style='height:70rpx'>
                   <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人出生日期：</text>
                   <text class='text_999_28 ' style='line-height:70rpx'>共同赡养人出生日期：</text>
@@ -283,7 +283,7 @@
               </view>
               </view>
               <view style='height:70rpx'>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>病人证照号码：</text>
                 <text class='text_999_28 ' style='line-height:70rpx'>病人证照号码：</text>
-                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.id_card_no}}</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{formatIdNum(item.id_card_no)}}</text>
               </view>
               </view>
               <view style='height:70rpx'>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>病人出生日期：</text>
                 <text class='text_999_28 ' style='line-height:70rpx'>病人出生日期：</text>