Merge branch 'dev_py' into dev2.0

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @12f05a5
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @12f05a5
@@ -4,9 +4,7 @@ var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 Page({
   idcard_belong:null,//照片信息获取返回时判断所属
-  /**
-   * Page initial data
-   */
+  legal_entity_id: "",
   data: {
     deduction_amount:'',
     lable: 0,
@@ -14,7 +12,7 @@ Page({
     title: '',
     isIdCard:true,
     extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
-    cur_index: 0,
+    cur_index: 'children_education',
     lovercardtypeData: {
       label: '身份证件类型',
       bindtype: 'lovercardtype',
@@ -322,17 +320,17 @@ Page({
     wx.setNavigationBarTitle({
       title: this.data.title,
     })
+    this.legal_entity_id = options.legal_entity_id
     var reduce_typeData = this.data.reducetypeData
     var deduction_amount = 1200
     reduce_typeData.selected = '月度扣除'
     this.setData({
       title: '添加' + options.title,
-      cur_index: options.index,
+      cur_index: options.status,
       reducetypeData: reduce_typeData,
       deduction_amount: deduction_amount
     })
-
     this.initOSS()
   },
@@ -446,7 +444,7 @@ Page({
     var formdata = e.detail.value
     var newdata = formdata;
     switch (this.data.cur_index + '') {
-      case '0':
+      case 'children_education':
         if (!formdata.children_id_card_no || formdata.children_id_card_no.length < 1) {
           this.showToast('请填写子女证件号码')
           return
@@ -509,7 +507,7 @@ Page({
         newdata.children_nation = "中国"
         newdata.nation = "中国"
         break;
-      case '1':
+      case 'continuing_education':
         if (this.data.edutypeData.selected.length < 1) {
           this.showToast('请选择教育类型')
           return
@@ -555,7 +553,7 @@ Page({
         newdata.education_end = this.data.studystartdate.datelong
         newdata.education_start = this.data.studyenddate.datelong
         break;
-      case '2':
+      case 'support_duty':
         if (this.data.supporttypeData.selected.length < 1) {
           this.showToast('请选择赡养类型')
           return
@@ -585,7 +583,7 @@ Page({
         newdata.support_type = this.data.supporttypeData.selected
         newdata.older_cardtype = this.data.oldercardtypeData.selected
         break;
-      case '3':
+      case 'medical_fund':
         if (!formdata.name || formdata.name.length < 1) {
           this.showToast('请填写姓名')
           return
@@ -608,7 +606,7 @@ Page({
         newdata.cardtype = this.data.cardtypeData.selected
         newdata.taxperson_relative = this.data.taxperson_relativeData.selected
         break;
-      case '4':
+      case 'house_fund_rent':
         console.log('TITLE', this.data.title)
         if (!formdata.lover_name || formdata.lover_name.length < 1) {
           this.showToast('请填写配偶姓名')
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @12f05a5
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @12f05a5
@@ -4,7 +4,7 @@
 <view class='page'>
   <form bindsubmit='formSubmit'>
       <!-- 添加子女 -->
-      <view wx:if="{{cur_index==0}}">
+      <view wx:if="{{cur_index=='children_education'}}">
         <view style='padding:0 30rpx;'>
           <template is="picker_cell_normal" data="{{...childrencardtypeData}}" />
           <view class='divide_line_f5f5f5'></view>
@@ -63,7 +63,7 @@
         </view>
       </view>
       <!-- 继续教育 -->
-      <view wx:if="{{cur_index==1}}" style='padding:0 30rpx;'>
+      <view wx:if="{{cur_index=='continuing_education'}}" style='padding:0 30rpx;'>
         <template is="picker_cell_normal" data="{{...edutypeData}}" />
         <view class='divide_line_f5f5f5'></view>
@@ -100,7 +100,7 @@
       </view>
       <!-- 赡养老人 -->
-      <view wx:if="{{cur_index==2}}" style='padding:0 30rpx;'>
+      <view wx:if="{{cur_index=='support_duty'}}" style='padding:0 30rpx;'>
         <template is="picker_cell_normal" data="{{...supporttypeData}}" />
         <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>
@@ -133,7 +133,7 @@
         </view> -->
       </view>
       <!-- 大病医疗 -->
-      <view wx:if="{{cur_index==3}}" style='padding:0 30rpx;'>
+      <view wx:if="{{cur_index=='medical_fund'}}" style='padding:0 30rpx;'>
         <view style='height:90rpx'>
           <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='name'></input>
@@ -160,7 +160,7 @@
         </view>
       </view>
       <!-- 住房 -->
-      <view wx:if="{{cur_index==4}}" style='padding:0 30rpx;'>
+      <view wx:if="{{cur_index=='house_fund_rent'}}" style='padding:0 30rpx;'>
         <view wx:if="{{title=='添加住房贷款利息'}}">
@@ -235,7 +235,7 @@
       <view style='padding:0 30rpx;'>
-        <view wx:if="{{cur_index==0}}">
+        <view wx:if="{{cur_index=='children_education'}}">
           <view style='height:90rpx'>
             <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='spouse_name' value='{{spouse_name}}'></input>
@@ -267,7 +267,7 @@
           </view>
         </view>
-         <view wx:if="{{cur_index==4}}">
+         <view wx:if="{{cur_index=='house_fund_rent'}}">
           <view style='height:90rpx'>
             <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='spouse_name' value='{{spouse_name}}'></input>