提交 0c9c3383efd2338b1de7e37406899b525fe6ccae

作者 wangyu
1 个父辈 333699f9

优化

@@ -15,6 +15,10 @@ Page({ @@ -15,6 +15,10 @@ Page({
15 "medical_fund": "大病医疗", 15 "medical_fund": "大病医疗",
16 "house_fund": "住房" 16 "house_fund": "住房"
17 }, 17 },
  18 + singlechildtype:{
  19 + "D": "独生子女",
  20 + "S": "非独生子女"
  21 + },
18 reducetype: { 22 reducetype: {
19 "":"月", 23 "":"月",
20 "month": "月", 24 "month": "月",
@@ -90,8 +90,8 @@ @@ -90,8 +90,8 @@
90 <!-- 赡养老人 --> 90 <!-- 赡养老人 -->
91 <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}"> 91 <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}">
92 <view style='height:90rpx;width:100%;clear:both;'> 92 <view style='height:90rpx;width:100%;clear:both;'>
93 - <text class='text_left'>赡养类型</text>  
94 - <text class='text_right_333'>{{datas.support_type}}</text> 93 + <text class='text_left'>是否独生子女</text>
  94 + <text class='text_right_333'>{{singlechildtype[datas.support_type]}}</text>
95 </view> 95 </view>
96 <view style='height:90rpx;width:100%;clear:both;'> 96 <view style='height:90rpx;width:100%;clear:both;'>
97 <text class='text_left'>被赡养人姓名</text> 97 <text class='text_left'>被赡养人姓名</text>
@@ -88,7 +88,7 @@ Page({ @@ -88,7 +88,7 @@ Page({
88 lefttext: "添加家庭成员并申报", 88 lefttext: "添加家庭成员并申报",
89 righttext: "确定为该选择的人申报", 89 righttext: "确定为该选择的人申报",
90 }, 90 },
91 - reduce_amount:0, 91 + reduce_amount: 0,
92 selected_reduceindex: 0, 92 selected_reduceindex: 0,
93 selected_addindex: 0 93 selected_addindex: 0
94 }, 94 },
@@ -264,7 +264,7 @@ Page({ @@ -264,7 +264,7 @@ Page({
264 goadd: function(e) { //添加 264 goadd: function(e) { //添加
265 console.log("goadd", e) 265 console.log("goadd", e)
266 var that = this 266 var that = this
267 - if (this.data.cur_status == 'support_duty'){ 267 + if (this.data.cur_status == 'support_duty') {
268 if (this.data.issinglechildData.selected.length < 1) { 268 if (this.data.issinglechildData.selected.length < 1) {
269 this.showToast("请选择是否独生子女") 269 this.showToast("请选择是否独生子女")
270 return 270 return
@@ -360,10 +360,11 @@ Page({ @@ -360,10 +360,11 @@ Page({
360 for (var i = 0; i < data.items.length; i++) { 360 for (var i = 0; i < data.items.length; i++) {
361 if (data.items[i].family_ties == '子' || data.items[i].family_ties == '女') { 361 if (data.items[i].family_ties == '子' || data.items[i].family_ties == '女') {
362 childRelativelist.push(data.items[i]) 362 childRelativelist.push(data.items[i])
363 - } else if (data.items[i].family_ties != '祖父母' && data.items[i].family_ties != '外祖父母') {  
364 - medicalRelativelist.push(data.items[i])  
365 - } else if (data.items[i].family_ties == '祖父母' || data.items[i].family_ties == '外祖父母') { 363 + }
  364 + if (data.items[i].family_ties == '父母' || data.items[i].family_ties == '祖父母' || data.items[i].family_ties == '外祖父母') {
366 olderRelativelist.push(data.items[i]) 365 olderRelativelist.push(data.items[i])
  366 + } else {
  367 + medicalRelativelist.push(data.items[i])
367 } 368 }
368 } 369 }
369 childmodal.datas = childRelativelist 370 childmodal.datas = childRelativelist
@@ -478,14 +479,14 @@ Page({ @@ -478,14 +479,14 @@ Page({
478 } 479 }
479 }, 480 },
480 481
481 - bindinput:function(e){  
482 - console.log("bindinput",e) 482 + bindinput: function(e) {
  483 + console.log("bindinput", e)
483 this.setData({ 484 this.setData({
484 reduce_amount: parseFloat(e.detail.value) 485 reduce_amount: parseFloat(e.detail.value)
485 }) 486 })
486 }, 487 },
487 488
488 - showToast: function (data) { 489 + showToast: function(data) {
489 if (data && data.length > 0) { 490 if (data && data.length > 0) {
490 wx.showToast({ 491 wx.showToast({
491 title: data, 492 title: data,
@@ -498,7 +499,7 @@ Page({ @@ -498,7 +499,7 @@ Page({
498 * Lifecycle function--Called when page hide 499 * Lifecycle function--Called when page hide
499 */ 500 */
500 onHide: function() { 501 onHide: function() {
501 - 502 +
502 }, 503 },
503 504
504 /** 505 /**
注册登录 后发表评论