1、预扣预缴明细，

2、工资明细
3、自然人信息：添加家属

@@ -65,6 +65,12 @@
   font-size: 30rpx;
   color: #999;
 }
+.text_777_30 {
+  font-family: PingFangSC-Regular;
+  font-size: 30rpx;
+  line-height: 90rpx;
+  color: #777;
+}
 
 .text_333_30 {
   font-family: PingFangSC-Regular;

@@ -9,11 +9,46 @@ Page({
     // tab切换  
     isshow: false,
     currentTab: 0,
-    datas: {},
+    taxDatas: {
+      "id": "154024896031100928",
+      "created_at": 1511525284,
+      "updated_at": 1511525284,
+      "tenant_id": "122371433052508160",
+      "taxation_method": "salary",   // 个税申报类型："0101"-工资薪金  "0401"-劳务报酬
+      "sub_taxation_method": "salary",   // 正常工资薪金子类型："0101"-正常工资薪金  "0107"-内退一次性补偿 "0108"-解除劳动合同一次性补偿 "0109"-个人股票期权行权收入 "0110"-企业年金 "0111"-提前退休一次性补贴 "0103"-全年一次性奖金收入
+      "province": "北京市",
+      "province_code": "110000",
+      "city": "市辖区",
+      "city_code": "110100",
+      "district": "东城",
+      "district_code": "110101",
+      "name": "徐恒堂",  //姓名
+      "credential_type": "居民身份证",
+      "credential_number": "110221198301270632", //证件号码 
+      "option_date": 152135596800,
+      "personal_income": 475.6,  //当期收入额
+      "tax_free_income": 475.6,  //当期免税收入
+      "special_deduction": 475.6,  //累计专项扣除（专项扣除合计）
+      "reduction_cost": 475.6,  //累计基本减除（减除费用）
+      "special_additional_deduction": 475.6,  //累计专项附加扣除（专项附加扣除合计）
+      "other_deduction": 475.6,  //累计法定扣除（其他扣除合计）
+      "accumulated_taxable_income": 475.6,  //累计应纳税所得额
+      "tax_rate": 0.6,  //税率
+      "deduction_number": 475.6,  //速算扣除数
+      "accumulated_withholding_tax": 475.6,  //累计应扣缴税额
+      "prepay_tax": 475.6,  //已预交税额
+      "refund_tax": 475.6,  //本期应缴税额（应补退税额）
+    },
     choosed_date: '',
     long_date: 0
   },
   onLoad: function (options) {
+    if (options.date){
+      var mydate = new Date();
+      this.setData({
+        choosed_date: options.date,
+      })
+    }
     if (!options.id) return
 
     const self = this
@@ -26,9 +61,12 @@ Page({
       },
       success: function (result) {
         console.log('成功', result)
-        self.setData({
-          datas:result
-        })
+        if (result.personal_income){
+          self.setData({
+            taxDatas: result
+          })
+        }
+        
       },
       fail: function (res) {
         console.log('失败', res)
@@ -38,11 +76,6 @@ Page({
       }
 
     })
-
-    // this.setData({
-    //   choosed_date: mydate.getFullYear() + "年" + (mydate.getMonth() + 1) + "月",
-    //   long_date: mydate.getTime() / 1000
-    // })
   },
 
 

 <!--pages/main/advancepayment/adPayDetails/adPayDetails.wxml-->
 <view>
   <scroll-view style='margin-bottom:40rpx'>
-    <view style='padding:30rpx;background:#ffffff'>
-      <picker  mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
-        <view>
-          <text class='text_gray_32'>当前选择月份</text>
-          <view class='float_right'>
-            <text class='text_gray_32'>{{choosed_date}}</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-          </view>
+    <view style='padding:0rpx 30rpx 30rpx 30rpx;background:#ffffff'>
+      <view>
+        <text class='text_gray_32'>{{choosed_date}}</text>
+        <view class='float_right'>
+          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
         </view>
-      </picker>
+      </view>
+      <!-- <picker  mode="date" fields="month" start="1970-01" end="2100-01" bindchange="datePickerChange">
+      </picker> -->
       <view class='divide_line_f5f5f5'></view>
       <view style='padding:30rpx 0'>
         <text class='text_666_30 float_left'>当期收入额</text>
-        <text class='text_number float_right'>400000.00</text>
+        <text class='text_number float_right'>{{taxDatas.personal_income}}</text>
+      </view>
+      <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
+      <view style='padding:30rpx 0'>
+        <text class='text_666_30 float_left'>当期免税收入</text>
+        <text class='text_number float_right'>{{taxDatas.tax_free_income}}</text>
       </view>
       <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
       <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>累计工资收入</text>
-        <text class='text_number float_right'>400000.00</text>
+        <text class='text_666_30 float_left'>专项扣除合计</text>
+        <text class='text_number float_right'>{{taxDatas.special_deduction}}</text>
       </view>
       <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
       <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>累计免税收入</text>
-        <text class='text_number float_right'>40.00</text>
+        <text class='text_666_30 float_left'>减除费用</text>
+        <text class='text_number float_right'>{{taxDatas.reduction_cost}}</text>
       </view>
       <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
       <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>累计基本减除费用</text>
-        <text class='text_number float_right'>8000.00</text>
+        <text class='text_666_30 float_left'>专项附加扣除合计</text>
+        <text class='text_number float_right'>{{taxDatas.special_additional_deduction}}</text>
       </view>
       <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
       <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>累计专项扣除额</text>
-        <text class='text_number float_right'>84783.00</text>
+        <text class='text_666_30 float_left'>其他扣除合计</text>
+        <text class='text_number float_right'>{{taxDatas.other_deduction}}</text>
       </view>
       <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
       <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>累计专项附加扣除额</text>
-        <text class='text_number float_right'>32200.00</text>
+        <text class='text_666_30 float_left'>累计应纳税所得额</text>
+        <text class='text_number float_right'>{{taxDatas.accumulated_taxable_income}}</text>
       </view>
       <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
       <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>累计其他扣除额</text>
-        <text class='text_number float_right'>0.00</text>
+        <text class='text_666_30 float_left'>税率</text>
+        <text class='text_number float_right'>{{taxDatas.tax_rate}}%</text>
       </view>
       <view class='divide_line_f5f5f5' style='margin-top:30rpx'></view>
       <view style='padding:30rpx 0'>
-        <text class='text_666_30 float_left'>累计预缴应纳税所得额</text>
-        <text class='text_number float_right'>32983000.00</text>
+        <text class='text_666_30 float_left'>速算扣除数</text>
+        <text class='text_number float_right'>{{taxDatas.deduction_number}}</text>
       </view>
     </view>
     <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
@@ -57,12 +61,12 @@
       <view>
         <view class='view_bg_wrap' style='margin-top: 44rpx;'>
           <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
-            <text class='text_num_wrap'>3838.9</text>
+            <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text>
             <text class='text_text_wrap'>累计应预扣预缴税额</text>
           </view>
           <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
           <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
-            <text class='text_num_wrap'>10398.01</text>
+            <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text>
             <text class='text_text_wrap'>已预扣预缴税额</text>
           </view>
           
@@ -70,7 +74,7 @@
 
         <view class='view_bg_wrap' style='margin-top: 180rpx;'>
           <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
-            <text class='text_num_wrap'>133.09</text>
+            <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text>
             <text class='text_text_wrap'>本期应预扣预缴税额</text>
           </view>
           

@@ -4,12 +4,14 @@ var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 
 Page({
-
+  loadCount:0,
+  timestamp: 0,
+  Authorization: null,
   data: {
     // tab切换  
     isshow : false,
     currentTab: 0,
-    datas: [{
+    taxDatas: [{
       "id": "154024896031100928",
       "created_at": 1511525284,
       "updated_at": 1511525284,
@@ -32,29 +34,30 @@ Page({
       "prepay_tax": 475.6,  //已预交税额
       "option_date": 152135596800
     }],
-    choosed_date: '',
-    long_date: 0
+    salaryDatas: {},
+    choosed_date: ''
   },
   onLoad: function(options) {
     var mydate = new Date();
-      this.setData({
-        choosed_date: mydate.getFullYear() + "年" + (mydate.getMonth()+1)+"月",
-        long_date: mydate.getTime()/1000
-      })
-
-
+    this.setData({
+      choosed_date: mydate.getFullYear() + "年" + (mydate.getMonth()+1)+"月",
+    })
+    this.timestamp = (mydate.getTime() / 1000).toFixed(0)
+    this.loadData(this.timestamp);
+  },
+  loadData: function (timestamp) {
     var that = this
-    var Authorization = getApp().globalData.Authorization;
-    //OSS 上传前init
+    this.Authorization = getApp().globalData.Authorization;
     wx.showLoading()
+    that.loadCount = 2
     wx.request({
       url: baseUrl + "payroll/v1/tax/person-records",
       header: {
-        'Authorization': Authorization
+        'Authorization': this.Authorization
       },
       success: function (result) {
         that.setData({
-          datas: result.items
+          taxDatas: result.items
         })
 
       },
@@ -62,11 +65,46 @@ Page({
         console.log('OSS init  失败', res)
       },
       complete: function () {
-        wx.hideLoading()
+        that.loadCount--
+        if (!that.loadCount) {
+          wx.hideLoading()
+        }
+      }
+    })
+    wx.request({
+      url: baseUrl + "payroll/v1/salary/person-records",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: { 'cycle_date': timestamp },
+      success: function (result) {
+        console.log('rest', result.data)
+        that.setData({
+          salaryDatas: that.handleSalaryData(result.data.items)
+        })
+      },
+      fail: function (res) {
+        console.log('salary获取失败', res)
+      },
+      complete: function () {
+        that.loadCount--
+        if (!that.loadCount) {
+          wx.hideLoading()
+        }
       }
     })
+
   },
 
+  handleSalaryData: function (items) {
+    for (var i = 0; i < items.length; ++i) {
+      var item = items[i]
+      item.payroll_date = format.formatTime_date(item.payroll_date)
+      item.count_date = format.formatDate_min(item.start_time) + '-' + format.formatDate_min(item.end_time)
+      item.detals = this.handleDetailsData(item)
+    }
+    return items;
+  },
   // handleData: function (items) {
   //   for (var i = 0; i < items.length; ++i) {
   //     if (items.taxation_method)
@@ -75,13 +113,13 @@ Page({
 
   datePickerChange: function(e) {
     console.log("e",e)
-    var datelong = Date.parse(new Date(e.detail.value))/1000
-    console.log('datelong', datelong)
+    var timestamp = Date.parse(new Date(e.detail.value))/1000
     this.setData({
-      long_date: datelong,
-      choosed_date: format.yearFormString(datelong) + "年" + format.monthFormString(datelong)+"月"
+      choosed_date: format.yearFormString(timestamp) + "年" + format.monthFormString(timestamp)+"月"
     })
-  },
+    this.dateStamp = timestamp
+    this.loadData(timestamp);
+  }, 
 
   /** 
   * 点击tab切换 
@@ -112,10 +150,50 @@ Page({
     this.setData({
       isshow: !this.data.isshow
     })
+    // console.log('idddddd',e.currentTarget.id)
+    // if (!e.currentTarget.id) return
+    // var that = this
+    // wx.showLoading()
+    // wx.request({
+    //   url: baseUrl + "payroll/v1/salary/person-records/" + e.currentTarget.id,
+    //   header: {
+    //     'Authorization': this.Authorization
+    //   },
+    //   data: {},
+    //   success: function (result) {
+    //     console.log('rest', result.data)
+    //     that.handleDetailsData(result.data)
+    //   },
+    //   fail: function (res) {
+    //   },
+    //   complete: function () {
+    //     wx.hideLoading()
+        
+    //   }
+    // })
   },
+
+   handleDetailsData: function (data) {
+
+    var titles = JSON.parse(data['slip_titles'])  
+    var detail = JSON.parse(data['detail'])
+    var details = []
+    for (var i = 0; i < titles.length; ++i) {
+       var titleData = titles[i]
+       var value = detail[titleData['key']]
+
+      details.push({
+        title: titleData['original_column'],
+        value: value
+      })
+    }
+     console.log('details', details)
+     return details
+  },
+
   goItemDetails: function (e) {
     wx.navigateTo({
-      url: "adPayDetails/adPayDetails?id=" + e.currentTarget.id
+      url: "adPayDetails/adPayDetails?id=" + e.currentTarget.id + "&date=" + this.data.choosed_date
     })
   },
 })
\ No newline at end of file

@@ -15,7 +15,7 @@
   <view style='height:10rpx;background:#f8f8f8'></view>
   <view class="swiper-box page" style="height:100%;margin-top:20rpx" bindchange="bindChange">
     <view wx:if="{{currentTab==0}}">
-      <view wx:for="{{datas}}" style='margin-bottom:20rpx'>
+      <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'>
         <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'>
           <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>所得项目:{{item.taxation_method=='salary'?'工资薪金':'劳务报酬'}}</text>
           <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
@@ -28,17 +28,17 @@
         </view>
       </view>
     </view>
-    <view wx:else>
-      <view wx:for="{{datas}}" style='margin-bottom:20rpx'>
+    <view wx:else>     <!-- 工资明细 -->
+      <view wx:for="{{salaryDatas}}" style='margin-bottom:20rpx'>
         <view class='card_rectangle_bg_column' style='padding:30rpx'>
-          <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>薪酬批次工资:业务部八月工资</text>
+          <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>薪酬批次工资:{{}}</text>
           <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
-          <text class='text_666_28'>发薪日:2018、10、31</text>
-          <text class='text_666_28'>计薪时间:2018/10/01-2018/10/31</text>
-          <text class='text_666_28'>应发额度:23460.00</text>
-          <text class='text_666_28'>实发:13980.00</text>
+          <text class='text_666_28'>发薪日:{{item.payroll_date}}</text>
+          <text class='text_666_28'>计薪时间:{{item.count_date}}</text>
+          <text class='text_666_28'>应发额度:{{item.pay_salary}}</text>
+          <text class='text_666_28'>实发:{{item.salary}}</text>
           <view class='divide_line_f5f5f5' style='margin:20rpx 0'></view>
-          <view wx:if="{{!isshow}}" bindtap='gospan'>
+          <view wx:if="{{!isshow}}" bindtap='gospan' id='{{item.id}}'>
             <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>展开</text>
             <image class='head_image_wrap_down' src='/images/arrow_blue_down.png'></image>
           </view>
@@ -46,10 +46,10 @@
             <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>收起</text>
             <image class='head_image_wrap_up' src='/images/arrow_blue_up.png'></image>
           </view>
-          <view wx:if="{{isshow}}" wx:for="{{datas}}">
+          <view wx:if="{{isshow}}" wx:for="{{item.detals}}" wx:for-item='detal'>
             <view>
-              <text style='font-size:28rpx;color:#999;text-align:left'>中文姓名</text>
-              <text style='font-size:28rpx;color:#999;text-align:right'>嘎嘎</text>
+              <text class='text_wrap_left' style='font-size:28rpx;color:#999;text-align:left'>{{detal.title}}</text>
+              <text class='text_wrap_right' style='font-size:28rpx;color:#999;text-align:right'>{{detal.value}}</text>
             </view>
           </view>
         </view>

@@ -24,12 +24,12 @@ Page({
 
     relativeData: {
       isrequre: true,
-      label: '关系',
+      label: '与本人关系',
       bindtype: 'relative',
       selected: '',
       disabled: false,
       placeholder: '请选择关系',
-      values: ["子女", "配偶"],
+      values: ["子","女" ,"配偶", "父母", "祖父母", "外祖父母"],
       onChange: 'onPickerSelect'
     },
     personstatusData: {
@@ -45,7 +45,7 @@ Page({
       isrequre: true,
       label: '证照类型',
       bindtype: 'cardtype',
-      selected: '',
+      selected: '居民身份证',
       placeholder: '请选择证照类型',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
         '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
@@ -69,6 +69,7 @@ Page({
       onChange: 'onPickerSelect'
     },
     genderData: {
+      isblack:true,
       label: '性别',
       bindtype: 'gender',
       selected: '',
@@ -402,7 +403,7 @@ Page({
             birthDate: that.data.birthDate,
             card_number: id_info.id_card_number
           })
-
+          this.dealIdInfo(id_info.id_card_number)
         }
       },
     })
@@ -625,7 +626,7 @@ Page({
   },
 
   formSubmit: function(e) {
-    console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
+    // console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
     var regMoney = /^[0-9]*(\.[0,10]{1,2})?$/;
     var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
     var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,}$/;
@@ -647,10 +648,11 @@ Page({
     //   this.showtoast('有必填项未填写');
     //   return
     // } 
-    else if (this.data.cardtypeData.selected.length < 1) {
-      this.showtoast('有必填项未填写');
-      return
-    } else if (this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
+    // else if (this.data.cardtypeData.selected.length < 1) {
+    //   this.showtoast('有必填项未填写');
+    //   return
+    // } 
+    else if (this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
       this.showtoast('有必填项未填写');
       return
     } else if (this.data.isIdCard && !format.isIDCardNum(formdata.id_card_no)) {
@@ -659,13 +661,15 @@ Page({
     } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
       this.showtoast('有必填项未填写');
       return
-    } else if (formdata.mobile.length < 1) {
-      this.showtoast('有必填项未填写');
-      return
-    } else if (!regMobile.test(formdata.mobile)) {
-      this.showtoast('请输入正确手机号');
-      return
-    }
+    } 
+    // else if (formdata.mobile.length < 1) {
+    //   this.showtoast('有必填项未填写');
+    //   return
+    // } 
+    // else if (!regMobile.test(formdata.mobile)) {
+    //   this.showtoast('请输入正确手机号');
+    //   return
+    // }
     // else if (this.data.investInfo.selected.length < 1) {
     //   this.showtoast('有必填项未填写');
     //   return
@@ -717,55 +721,57 @@ Page({
       method: "POST",
       data: {
         'certification_status': that.getCertifyStatus(formdata),
-        "name": that.data.name.length > 0 ? that.data.name : formdata.name,
         "family_ties": that.data.relativeData.selected,
-        "native": "中国",
-        "id_card_type": that.data.cardtypeData.selected,
+        "id_card_type": '居民身份证',//that.data.cardtypeData.selected,
         "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
+        "name": that.data.name.length > 0 ? that.data.name : formdata.name,
         "gender": that.data.genderData.selected,
-        "birth_date": that.data.long_birth_date,
-        "profession": request_profession,
-        "education": that.data.degreeData.selected,
-        "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : '',
-        // "taxpayer_status": that.data.personstatusData.selected,
-        "is_martyr_family": that.data.lieshuInfo.selected,
-        "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : formdata.martyr_family_no,
-        "is_disability": that.data.disabilityInfo.selected,
-        "disability_no": that.data.disabilityInfo.selected == '否' ? '' : formdata.disability_no,
-        "is_lonely_man": that.data.lonelyolderInfo.selected,
+        //"age": formdata.age ? formdata.age : '',//不传
+        "native": "中国",
         "is_overseas_personnel": "否",
-        "comment": formdata.comment,
-        "current_address": {
-          "province_code": that.data.currentaddressInfo.address_code[0],
-          "province": that.data.currentaddressInfo.address_value[0],
-          "city_code": that.data.currentaddressInfo.address_code[1],
-          "city": that.data.currentaddressInfo.address_value[1],
-          "district_code": that.data.currentaddressInfo.address_code[2],
-          "district": that.data.currentaddressInfo.address_value[2]
-        },
-        "current_address_detail": formdata.current_address_detail,
-        "huji_address": {
-          "province_code": that.data.birthaddressInfo.address_code[0],
-          "province": that.data.birthaddressInfo.address_value[0],
-          "city_code": that.data.birthaddressInfo.address_code[1],
-          "city": that.data.birthaddressInfo.address_value[1],
-          "district_code": that.data.birthaddressInfo.address_code[2],
-          "district": that.data.birthaddressInfo.address_value[2]
-        },
-        "huji_address_detail": formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
-        "mobile": formdata.mobile + "",
-        "contact_address": {
-          "province_code": that.data.contactaddressInfo.address_code[0],
-          "province": that.data.contactaddressInfo.address_value[0],
-          "city_code": that.data.contactaddressInfo.address_code[1],
-          "city": that.data.contactaddressInfo.address_value[1],
-          "district_code": that.data.contactaddressInfo.address_code[2],
-          "district": that.data.contactaddressInfo.address_value[2]
-        },
-        "contact_address_detail": formdata.contact_address_detail,
-        "email": formdata.email,
-        "bank": that.data.bankInfo.selected,
-        "bank_account": formdata.bank_account,
+
+        // "birth_date": that.data.long_birth_date,
+        // "profession": request_profession,
+        // "education": that.data.degreeData.selected,
+        // "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : '',
+        // "taxpayer_status": that.data.personstatusData.selected,
+        // "is_martyr_family": that.data.lieshuInfo.selected,
+        // "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : formdata.martyr_family_no,
+        // "is_disability": that.data.disabilityInfo.selected,
+        // "disability_no": that.data.disabilityInfo.selected == '否' ? '' : formdata.disability_no,
+        // "is_lonely_man": that.data.lonelyolderInfo.selected,
+        // "comment": formdata.comment,
+        // "current_address": {
+        //   "province_code": that.data.currentaddressInfo.address_code[0],
+        //   "province": that.data.currentaddressInfo.address_value[0],
+        //   "city_code": that.data.currentaddressInfo.address_code[1],
+        //   "city": that.data.currentaddressInfo.address_value[1],
+        //   "district_code": that.data.currentaddressInfo.address_code[2],
+        //   "district": that.data.currentaddressInfo.address_value[2]
+        // },
+        // "current_address_detail": formdata.current_address_detail,
+        // "huji_address": {
+        //   "province_code": that.data.birthaddressInfo.address_code[0],
+        //   "province": that.data.birthaddressInfo.address_value[0],
+        //   "city_code": that.data.birthaddressInfo.address_code[1],
+        //   "city": that.data.birthaddressInfo.address_value[1],
+        //   "district_code": that.data.birthaddressInfo.address_code[2],
+        //   "district": that.data.birthaddressInfo.address_value[2]
+        // },
+        // "huji_address_detail": formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
+        // "mobile": formdata.mobile + "",
+        // "contact_address": {
+        //   "province_code": that.data.contactaddressInfo.address_code[0],
+        //   "province": that.data.contactaddressInfo.address_value[0],
+        //   "city_code": that.data.contactaddressInfo.address_code[1],
+        //   "city": that.data.contactaddressInfo.address_value[1],
+        //   "district_code": that.data.contactaddressInfo.address_code[2],
+        //   "district": that.data.contactaddressInfo.address_value[2]
+        // },
+        // "contact_address_detail": formdata.contact_address_detail,
+        // "email": formdata.email,
+        // "bank": that.data.bankInfo.selected,
+        // "bank_account": formdata.bank_account,
         // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : null,
         // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : null,
         // "is_employee": that.data.employeeInfo.selected,
@@ -833,8 +839,8 @@ Page({
     var cardtype = this.data.cardtypeData.selected;
     var card_no = formdata.id_card_no ? formdata.id_card_no : this.data.card_number;
     var gender = this.data.genderData.selected;
-    var birth_day = this.data.birthDate.selected;
-    if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && birth_day == this.data.birthday) {
+    //var birth_day = this.data.birthDate.selected;
+    if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender ){// && birth_day == this.data.birthday) {
       return 'active'
     } else {
       return ''
@@ -849,6 +855,91 @@ Page({
     })
   },
 
+  dealIdInfo: function (idCardNum) {
+    var info = this.analyzeIDCard(idCardNum)
+    console.log('info', info.age, info.sex)
+    if (info.age) {
+      this.setData({
+        age: info.age
+      })
+    }
+    if (info.sex) {
+      var gender_data = this.data.genderData
+      gender_data.selected = info.sex
+      this.setData({
+        genderData: gender_data
+      })
+    }
+
+  },
+
+  idChange: function (e) {
+    console.log('idCardNoChange', e.detail.value)
+    var idCardNo = e.detail.value
+    if (e.detail.value.length == 18){
+      if (!format.isIDCardNum(idCardNo)) {
+        wx.showToast({
+          image: "../../../../images/warn.png",
+          title: '身份证格式有误'
+        })
+        return;
+      }
+      this.dealIdInfo(idCardNo)
+    }
+  },
+  idDone: function (e) {
+
+    var idCardNo = e.detail.value
+    if (!idCardNo.length) {
+      wx.showToast({
+        image: "../../../../images/warn.png",
+        title: '请输入身份证号'
+      })
+      return;
+    }
+    if (!format.isIDCardNum(idCardNo)) {
+      wx.showToast({
+        image: "../../../../images/warn.png",
+        title: '身份证格式有误'
+      })
+      return;
+    }
+
+  },
+
+  analyzeIDCard: function(IDCard){
+    var sexAndAge = {}
+    //获取用户身份证号码
+    var userCard = IDCard;
+    //如果身份证号码为undefind则返回空
+    if(!userCard) {
+      return sexAndAge;
+    }
+      //获取性别
+      if(parseInt(userCard.substr(16, 1)) % 2 == 1){
+      sexAndAge.sex = '男'
+    }else {
+      sexAndAge.sex = '女'
+    }
+    //获取出生年月日
+    //userCard.substring(6,10) + "-" + userCard.substring(10,12) + "-" + userCard.substring(12,14);
+    var yearBirth = userCard.substring(6, 10);
+    var monthBirth = userCard.substring(10, 12);
+    var dayBirth = userCard.substring(12, 14);
+    //获取当前年月日并计算年龄
+    var myDate = new Date();
+    var monthNow = myDate.getMonth() + 1;
+    var dayNow = myDate.getDay();
+    var age = myDate.getFullYear() - yearBirth;
+    if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+      age--;
+    }
+    //得到年龄
+    sexAndAge.age = age;
+    //返回性别和年龄
+    return sexAndAge;
+},
+
   /**
    * 生命周期函数--监听页面隐藏
    */

 <!--pages/main/addinfo/addinfo.wxml-->
 <import src="../../../common/picker_cell" />
 
-<view class='page'>
+<view class='page__'>
   <form bindsubmit='formSubmit'>
 
-    <!-- 成员关系 -->
-    <view class='head_wrap' hidden="{{isself}}">
-      <text class='head_text_wrap1'>成员关系</text>
-    </view>
     <view class='data_list' hidden="{{isself}}">
       <view class='data_item'>
-        <view class='item_body'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>姓名</text>
-          <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' placeholder-class='text_999_30' maxlength='15'></input>
-        </view>
-        <view class="divide_line"></view>
-        <!-- <view class='item_body' bindtap='openpicker'>
-          <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
-          <text class='text_black_28 float_left'>关系</text>
-          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-          <text class='text_333_28 float_right'>请选择关系</text>
-        </view> -->
 
         <template is="picker_cell_normal" data="{{...relativeData}}" />
-      </view>
-    </view>
-
-    <!-- 基本信息 -->
-    <view class='head_wrap' bindtap='span' id='1'>
-      <text class='head_text_wrap1'>基本信息</text>
-      <text class='head_text_wrap2' hidden='{{!isshow01}}'>（点击收起非必填选项）</text>
-      <text class='head_text_wrap2' hidden='{{isshow01}}'>（点击展开非必填选项）</text>
-      <view style='float:right' wx:if='{{isshow01}}'>
-        <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
-      </view>
-      <view wx:else style='float:right'>
-        <image class='head_image_wrap_down' src='/images/arrow_down.png'></image>
-      </view>
-      <!-- <image class='{{isshow01}}?head_image_wrap_up:head_image_wrap_down' src="{{isshow01?'/images/arrow_up.png':'/images/arrow_down.png'}}"></image> -->
-    </view>
-
-    <view class='data_list'>
-      <view class='data_item'>
-        <view class='item_body' hidden="{{!isself}}">
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>姓名</text>
-          <input class='input_wrap float_right' placeholder='请填写姓名' value=''   placeholder-class='text_999_30' maxlength='15'></input>
-        </view>
         <view class="divide_line"></view>
 
         <view class='item_body'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>国籍（地区）</text>
-         <text class='text_999_30 float_right' >中国</text>
-        </view>
-        <view class="divide_line"></view>
-
-        <!-- <view class='item_body'>
-          <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
-          <text class='text_black_28 float_left'>纳税人状态</text>
-          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-          <text class='text_333_28 float_right'>在职</text>
-        </view> -->
-
-        <!-- 注释2018/11/26 -->
-        <!-- <template is="picker_cell_normal" data="{{...personstatusData}}" />
-        <view class="divide_line"></view> -->
-
-        <!-- <view class='item_body'>
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>证照类型</text>
-          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-          <text class='text_333_28 float_right'>居民身份证</text>
-        </view> -->
-        <template is="picker_cell_normal" data="{{...cardtypeData}}" />
+          <text class='text_777_30 float_right'>居民身份证</text>
+        </view>
         <view class="divide_line"></view>
 
         <view class='item_body'>
@@ -83,272 +23,49 @@
           <view wx:if="{{isIdCard}}"   >
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
             <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
-             <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_999_30' name='id_card_no' maxlength='24' value='{{card_number}}'></input>
+             <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange"></input>
           </view>
           <view wx:else>
-            <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_999_30' name='id_card_no' maxlength='24' value='{{card_number}}'></input>
+            <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange"></input>
           </view>
         </view>
         <view class="divide_line"></view>
 
-        <!-- <view class='item_body'>
-          <text class='head_red_star float_left'>*</text>
-          <text class='text_black_28 float_left'>是否境外人员</text>
-          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-          <text class='text_333_28 float_right'>否</text>
-        </view> -->
-        <template is="picker_cell_normal" data="{{...forignerInfo}}" />
-        <!-- 非必填部分 -->
-        <view hidden='{{!isshow01}}'>
-          <view class="divide_line"></view>
-
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>性别</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'>男</text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...genderData}}" />
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>出生年月</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...birthDate}}" />
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>职业</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...professionData}}" />
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>学历</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...degreeData}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
-            <text class='text_666_30 float_left'style='line-height: 90rpx'>纳税人识别号</text>
-            <input class='input_wrap float_right' name='taxpayer_no' type='number'  placeholder-class='text_999_30' placeholder='请输入纳税人识别号' maxlength='24'></input>
-          </view>
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>是否残疾</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...disabilityInfo}}" />
-          <view class="divide_line" hidden="{{disabilityInfo.selected!='是'}}"></view>
-          <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}">
-            <text class='text_666_30 float_left'>残疾证号</text>
-            <input class='input_wrap float_right' name='disability_no' type='number'  placeholder-class='text_999_30' placeholder='请输入残疾证号' maxlength='24'></input>
-          </view>
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>是否烈属</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...lieshuInfo}}" />
-          <view class="divide_line" hidden="{{lieshuInfo.selected!='是'}}"></view>
-          <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}">
-            <text class='text_666_30 float_left'>烈属证号</text>
-            <input class='input_wrap float_right' name='martyr_family_no' type='number'  placeholder-class='text_999_30' placeholder='请输入烈属证号' maxlength='24'></input>
-          </view>
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>是否孤老</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...lonelyolderInfo}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>备注</text>
-            <input class='input_wrap float_right' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_30' placeholder='请输入备注' ></input>
-          </view>
+        <view class='item_body'>
+          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
+          <text class='text_black_30 float_left' style='line-height: 90rpx'>姓名</text>
+          <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' placeholder-class='text_777_30' maxlength='15'></input>
         </view>
-      </view>
-    </view>
 
-    <!-- 联系方式 -->
-    <view class='head_wrap' style='margin-top:20rpx' bindtap='span' id='2'>
-      <text class='head_text_wrap1'>联系方式</text>
-      <text class='head_text_wrap2' hidden='{{!isshow02}}'>（点击收起非必填选项）</text>
-      <text class='head_text_wrap2' hidden='{{isshow02}}'>（点击展开非必填选项）</text>
-      <view style='float:right' wx:if='{{isshow02}}'>
-        <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
-      </view>
-      <view wx:else style='float:right'>
-        <image class='head_image_wrap_down' src='/images/arrow_down.png'></image>
-      </view>
-    </view>
 
-    <view class='data_list'>
-      <view class='data_item'>
-        <!-- <view class='item_body'>
+        <view class='item_body' hidden="{{!isself}}">
           <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_28 float_left'>联系电话</text>
-          <input class='input_wrap float_right' placeholder='请输入手机号' value='{{taxInfo.mobile}}' name='mobile' type='number'  placeholder-class='text_999_28' maxlength='11'></input>
-        </view> -->
-        <!-- 非必填部分02 -->
-        <view hidden='{{!isshow02}}'>
-        <view class='item_body'>
-          <text class='text_666_30 float_left' style='line-height: 90rpx'>联系电话</text>
-          <input class='input_wrap float_right' placeholder='请输入手机号' value='{{taxInfo.mobile}}' name='mobile' type='number'  placeholder-class='text_999_28' maxlength='11'></input>
+          <text class='text_black_30 float_left' style='line-height: 90rpx'>姓名</text>
+          <input class='input_wrap float_right' placeholder='请填写姓名' value=''   placeholder-class='text_777_30' maxlength='15'></input>
         </view>
-          <!-- <view class="divide_line"></view> -->
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>联系地址</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...contactaddressInfo}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>详细地址</text>
-            <input class='input_wrap float_right' name='contact_address_detail'  placeholder-class='text_999_30' placeholder='请输入详细联系地址'></input>
-          </view>
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>开户银行</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...bankInfo}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>银行账号</text>
-            <input class='input_wrap float_right' name='bank_account'  placeholder-class='text_999_30' placeholder='请输入银行账号' maxlength='24'></input>
-          </view>
-          <view class="divide_line"></view>
-          <view class='item_body'>
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>电子邮箱</text>
-            <input class='input_wrap float_right' name='email'  placeholder-class='text_999_30' placeholder='请输入电子邮箱' maxlength='20'></input>
-          </view>
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>居住地</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...currentaddressInfo}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>详细地址</text>
-            <input class='input_wrap float_right' name='current_address_detail'  placeholder-class='text_999_30' placeholder='请输入详细居住地址'></input>
-          </view>
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>户籍所在地</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...birthaddressInfo}}" />
+        <view class="divide_line"></view>
+
+        <template is="picker_cell_normal" data="{{...genderData}}" />
           <view class="divide_line"></view>
           <view class='item_body'>
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>详细地址</text>
-            <input class='input_wrap float_right' name='huji_address_detail'  placeholder-class='text_999_30' placeholder='请输入详细户籍地址'></input>
+            <text class='text_black_30 float_left'style='line-height: 90rpx'>年龄</text>
+            <input class='input_wrap float_right' name='age' type='number'  placeholder-class='text_777_30' placeholder='请输入年龄' maxlength='2' value='{{age}}'></input>
           </view>
           <view class="divide_line"></view>
-        </view>
 
-      </view>
-    </view>
 
-    <!-- 任职雇佣信息 -->
-    <!-- <view class='head_wrap' style='margin-top:20rpx' bindtap='span' id='3'>
-      <text class='head_text_wrap1'>任职受雇信息</text>
-      <text class='head_text_wrap2' hidden='{{!isshow03}}'>（点击收起非必填选项）</text>
-      <text class='head_text_wrap2' hidden='{{isshow03}}'>（点击展开非必填选项）</text>
-      <view style='float:right' wx:if='{{isshow03}}'>
-        <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
-      </view>
-      <view wx:else style='float:right'>
-        <image class='head_image_wrap_down' src='/images/arrow_down.png'></image>
-      </view>
-    </view> -->
+        <view class='item_body'>
+          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
+          <text class='text_black_30 float_left' style='line-height: 90rpx'>国籍</text>
+         <text class='text_777_30 float_right' >中国</text>
+        </view>
 
-    <view class='data_list' hidden='true'>
-      <view class='data_item'>
-        <!-- <view class='item_body'>
-          <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
-          <text class='text_black_28 float_left'>是否股东、投资者</text>
-          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-          <text class='text_333_28 float_right'>是</text>
-        </view> -->
-        <template is="picker_cell_normal" data="{{...investInfo}}" />
-        <view class="divide_line"></view>
-        <!-- <view class='item_body'>
-          <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
-          <text class='text_black_28 float_left'>是否特定行业</text>
-          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-          <text class='text_333_28 float_right'></text>
-        </view> -->
-        <template is="picker_cell_normal" data="{{...specificIndustryInfo}}" />
         <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>是否雇员</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...employeeInfo}}" />
-        <view hidden='{{!isshow03}}'>
-          <view class="divide_line"></view>
-          <view class='item_body'>
-            <text class='text_666_30 float_left'style='line-height: 90rpx'>公司股本总额</text>
-            <input class='input_wrap float_right' name='company_equity_total' type='digit'  placeholder-class='text_999_30' placeholder='请输入股本总额(保留两位小数)' maxlength='13'></input>
-          </view>
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>在职受雇日期</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...startDate}}" />
-
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>离职日期</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...endDate}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>工号</text>
-            <input class='input_wrap float_right' name='employee_no' placeholder-class='text_999_30' placeholder='请输入工号' maxlength='24'></input>
-          </view>
-          <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>是否天使投资个人</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
-          </view> -->
-          <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
-          <view class="divide_line" ></view>
-          <view class='item_body' >
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>个人投资总额</text>
-            <input class='input_wrap float_right' name='personal_equity_total' type='digit'  placeholder-class='text_999_30' placeholder='请输入个人投资总额(保留两位小数)' maxlength='13'></input>
-          </view>
-          <view class="divide_line"></view>
-        </view>
+        <template is="picker_cell_normal" data="{{...forignerInfo}}" />
 
-<!-- 
-        <view style='width:100%'>
-          <text class='text_666_28 float_left'>备注</text>
-          <input class='extra_input float_right' value='' name='comment'></input>
-        </view> -->
       </view>
-      
     </view>
 
-    <view hidden='{{isshow02}}' style='background:#f8f8f8;height:500rpx'></view>
-    <view hidden='{{!isshow02}}' style='background:#f8f8f8;height:200rpx'></view>
-    
     <view class="btn_bottom">
       <button class="btn_bottom" formType="submit"> 保存</button>
     </view>

 /* pages/main/addinfo/addinfo.wxss */
 
 /* pages/main//editinfo/editinfo.wxss */
-
-.page {
+page{
   background: #f8f8f8;
 }
+.page{
+  background: #FFF;
+}
 
 .head_wrap {
   height: 90rpx;
@@ -105,3 +107,11 @@
   width: 100%;
   height: 2rpx;
 }
+
+
+.text_999_30 {
+  font-size: 30rpx;
+  color: #999;
+  text-align: right;
+  line-height: 80rpx;
+}
\ No newline at end of file

-<view class='page'>
+<view class='page' style='padding-bottom:160rpx;'>
 
   <view wx:if="{{taxlist.length>0}}" hidden='{{!load_finish}}'>
     <block wx:for="{{taxlist}}" wx:key="" indx='index'>
@@ -44,10 +44,14 @@
     </block>
   </view>
 
-  <view class='rectangle_dashed_bg' bindtap="goadd">
+  <!-- <view class='rectangle_dashed_bg' bindtap="goadd">
     <view class='text_blue_28' style='text-align:center'>
       十 添加家庭成员
     </view>
+  </view> -->
+  <view class='bottom_btn_wrap' >
+    <view class='btn_blue_radius' bindtap="goadd">
+      <view class='text_white_34'>添加家庭成员</view>
+    </view>
   </view>
-
 </view>
\ No newline at end of file

@@ -29,7 +29,20 @@
   border: 3rpx dashed #d7e4fb;
   border-radius: 8rpx;
 }
-
+.bottom_btn_wrap{
+  background: #FFFFFF;
+  box-shadow: 0 -2px 8px 0 rgba(208,208,208,0.30);
+  height: 136rpx;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}
+.btn_blue_radius{
+  margin: 26rpx 30rpx;
+  background: #357AEB;
+  border-radius: 5px;
+  height: 84rpx;
+}
 .text_gray_bg {
   height: 32rpx;
   margin: 0rpx 20rpx;
@@ -74,7 +87,13 @@
   color: #fff;
   line-height: 20px;
 }
-
+.text_white_34 {
+  font-family: PingFangSC-Regular;
+  font-size: 17px;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 42px;
+}
 .text_white_22 {
   font-family: PingFangSC-Regular;
   font-size: 22rpx;

@@ -17,6 +17,13 @@ function formatTime_date(date) {
   return [year, month, day].map(formatNumber).join('-') 
 }
 
+function formatDate_min(date) {
+  var year = yearFormString(date)
+  var month = monthFormString(date)
+  var day = dayFormString(date)
+  return [year, month, day].map(formatNumber).join('/')
+}
+
 function formatNumber(n) {
   n = n.toString()
   return n[1] ? n : '0' + n
@@ -97,6 +104,7 @@ function isIDCardNum(idCardNo) {
 module.exports = {
   formatTime: formatTime,
   formatTime_date: formatTime_date,  
+  formatDate_min: formatDate_min,
   formatDateString: formatDateString,
   yearFormString: yearFormString,
   monthFormString: monthFormString,