Merge branch 'dev2.0' into dev_wy

@@ -3,9 +3,9 @@ var format = require('../../../../utils/util.js');
 var OSSInit;
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
-const AddTypeNames = { 'children_education': '子女教育', 'continuing_education': '继续教育', 'support_duty': '赡养老人', 'medical_fund': '大病医疗', 'house_fund_rent': '住房' }
-const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '','house_fund_rent':''}
-const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '', 'house_fund_rent': '' }
+const AddTypeNames = { 'children_education': '子女教育', 'continuing_education': '继续教育', 'support_duty': '赡养老人', 'medical_fund': '大病医疗', 'house_fund': '住房' }
+const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '','house_fund':''}
+const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '', 'house_fund': '' }
 
 Page({
   idcard_belong:null,//照片信息获取返回时判断所属
@@ -689,7 +689,7 @@ Page({
         newdata.cardtype = this.data.cardtypeData.selected
         newdata.taxperson_relative = this.data.taxperson_relativeData.selected
         break;
-      case 'house_fund_rent':
+      case 'house_fund':
         console.log('TITLE', this.data.title)
         if (!formdata.lover_name || formdata.lover_name.length < 1) {
           this.showToast('请填写配偶姓名')

@@ -160,7 +160,7 @@
         </view>
       </view>
       <!-- 住房 -->
-      <view wx:if="{{cur_index=='house_fund_rent'}}" style='padding:0 30rpx;'>
+      <view wx:if="{{cur_index=='house_fund'}}" style='padding:0 30rpx;'>
 
         <view wx:if="{{title=='添加住房贷款利息'}}">
 
@@ -267,7 +267,7 @@
           </view>
         </view>
 
-         <view wx:if="{{cur_index=='house_fund_rent'}}">
+         <view wx:if="{{cur_index=='house_fund'}}">
           <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>