Merge branch 'dev2.0' into dev_wy

 // pages/main/addtionalreduce/addextrainfo/addextrainfo.js
+var format = require('../../../../utils/util.js');
 var OSSInit;
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
@@ -351,8 +352,70 @@ Page({
       title: title,
     })
     this.initOSS()
+    if (options.datas && options.datas.length){
+      this.handleTransData(JSON.parse(options.datas))
+    }
   },
 
+  handleTransData: function (data) {
+
+    switch (this.data.cur_index + '') {
+      case 'children_education':
+        var setData = {}
+        if (data.id_card_no && data.id_card_no.length) {
+          setData.children_id_card_no = data.id_card_no
+        }
+        if (data.name && data.name.length) {
+          setData.children_name = data.name
+        }
+        if (data.birth_date && data.birth_date>0) {
+          var childrenbirthDate = this.data.childrenbirthDate
+          childrenbirthDate.selected = format.formatTime_date(data.birth_date)
+          childrenbirthDate.datelong = data.birth_date
+          setData.childrenbirthDate = childrenbirthDate
+        }
+        if (data.percent && data.percent.length) {
+          setData.percent = data.percent
+        }
+        if (data.student_no && data.student_no.length) {
+          setData.percent = data.children_student_no
+        }
+        if (data.education_period && data.education_period.length) {
+          var childedudegreeData = this.data.childedudegreeData
+          childedudegreeData.selected = data.education_period
+          setData.childedudegreeData = childedudegreeData
+        }
+        if (data.education_start && data.education_start.length) {
+          var studystartdate = this.data.studystartdate
+          studystartdate.selected = format.formatTime_date(data.education_start)
+          studystartdate.datelong = data.education_start
+          setData.studystartdate = studystartdate
+        }
+        if (data.education_end && data.education_end.length) {
+          var studyenddate = this.data.studyenddate
+          studyenddate.selected = format.formatTime_date(data.education_end)
+          studyenddate.datelong = data.education_end
+          setData.studyenddate = studyenddate
+        }
+        // if (data.spouse_name && data.spouse_name.length) {
+        // }
+        // if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
+        // }
+        // if (this.data.loverbirthDate.selected.length) {
+        // }
+        // if (this.data.taxperson_relativeData.selected.length) {
+        // }
+        // if (data.relationship && data.relationship.length) {
+        // }
+        this.setData(setData)
+      break;
+    }
+
+  },
+
+
+
+
   initOSS: function() {
     var that = this
     var Authorization = getApp().globalData.Authorization;

@@ -41,14 +41,14 @@
           <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
           <text class='text_black_30 float_left'>分配比例</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text>
-          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分配比例' type='number'  name='percent'></input>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分配比例' type='number'  name='percent' value='{{percent}}'></input>
         </view>
 
         <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>
           <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
           <text class='text_black_30 float_left'>子女学籍号</text>
-          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女学籍号' name='children_student_no'></input>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女学籍号' name='children_student_no' value='{{children_student_no}}'></input>
         </view>
         <view class='divide_line_f5f5f5'></view>