提交 65d331c44bfd0c124e8b70596ad7faa2fcb12fab

作者 pangy
2 个父辈 df1ed25d a7c3df9d

Merge branch 'dev_py' into dev2.0

@@ -3,9 +3,9 @@ var format = require('../../../../utils/util.js'); @@ -3,9 +3,9 @@ var format = require('../../../../utils/util.js');
3 var OSSInit; 3 var OSSInit;
4 var app = getApp(); 4 var app = getApp();
5 var baseUrl = app.globalData.baseUrl; 5 var baseUrl = app.globalData.baseUrl;
6 -const AddTypeNames = { 'children_education': '子女教育', 'continuing_education': '继续教育', 'support_duty': '赡养老人', 'medical_fund': '大病医疗', 'house_fund_rent': '住房' }  
7 -const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '','house_fund_rent':''}  
8 -const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '', 'house_fund_rent': '' } 6 +const AddTypeNames = { 'children_education': '子女教育', 'continuing_education': '继续教育', 'support_duty': '赡养老人', 'medical_fund': '大病医疗', 'house_fund': '住房' }
  7 +const Deduce_amounts_month = { 'children_education': 1000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '','house_fund':''}
  8 +const Deduce_amounts_year = { 'children_education': 12000, 'continuing_education': '', 'support_duty': '', 'medical_fund': '', 'house_fund': '' }
9 9
10 Page({ 10 Page({
11 idcard_belong:null,//照片信息获取返回时判断所属 11 idcard_belong:null,//照片信息获取返回时判断所属
@@ -689,7 +689,7 @@ Page({ @@ -689,7 +689,7 @@ Page({
689 newdata.cardtype = this.data.cardtypeData.selected 689 newdata.cardtype = this.data.cardtypeData.selected
690 newdata.taxperson_relative = this.data.taxperson_relativeData.selected 690 newdata.taxperson_relative = this.data.taxperson_relativeData.selected
691 break; 691 break;
692 - case 'house_fund_rent': 692 + case 'house_fund':
693 console.log('TITLE', this.data.title) 693 console.log('TITLE', this.data.title)
694 if (!formdata.lover_name || formdata.lover_name.length < 1) { 694 if (!formdata.lover_name || formdata.lover_name.length < 1) {
695 this.showToast('请填写配偶姓名') 695 this.showToast('请填写配偶姓名')
@@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
160 </view> 160 </view>
161 </view> 161 </view>
162 <!-- 住房 --> 162 <!-- 住房 -->
163 - <view wx:if="{{cur_index=='house_fund_rent'}}" style='padding:0 30rpx;'> 163 + <view wx:if="{{cur_index=='house_fund'}}" style='padding:0 30rpx;'>
164 164
165 <view wx:if="{{title=='添加住房贷款利息'}}"> 165 <view wx:if="{{title=='添加住房贷款利息'}}">
166 166
@@ -267,7 +267,7 @@ @@ -267,7 +267,7 @@
267 </view> 267 </view>
268 </view> 268 </view>
269 269
270 - <view wx:if="{{cur_index=='house_fund_rent'}}"> 270 + <view wx:if="{{cur_index=='house_fund'}}">
271 <view style='height:90rpx'> 271 <view style='height:90rpx'>
272 <text class='text_black_30 float_left'>配偶姓名</text> 272 <text class='text_black_30 float_left'>配偶姓名</text>
273 <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> 273 <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>
注册登录 后发表评论