Merge branch 'dev_wy' into dev2.0

@@ -15,6 +15,10 @@ Page({
       "medical_fund": "大病医疗",
       "medical_fund": "大病医疗",
       "house_fund": "住房"
       "house_fund": "住房"
     },
     },
+    singlechildtype:{
+      "D": "独生子女",
+      "S": "非独生子女"
+    },
     reducetype: {
     reducetype: {
       "":"月",
       "":"月",
       "month": "月",
       "month": "月",

@@ -90,8 +90,8 @@
   <!-- 赡养老人 -->
   <!-- 赡养老人 -->
   <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}">
   <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}">
     <view style='height:90rpx;width:100%;clear:both;'>
     <view style='height:90rpx;width:100%;clear:both;'>
-      <text class='text_left'>赡养类型</text>
-      <text class='text_right_333'>{{datas.support_type}}</text>
+      <text class='text_left'>是否独生子女</text>
+      <text class='text_right_333'>{{singlechildtype[datas.support_type]}}</text>
     </view>
     </view>
     <view style='height:90rpx;width:100%;clear:both;'>
     <view style='height:90rpx;width:100%;clear:both;'>
       <text class='text_left'>被赡养人姓名</text>
       <text class='text_left'>被赡养人姓名</text>

@@ -88,7 +88,7 @@ Page({
       lefttext: "添加家庭成员并申报",
       lefttext: "添加家庭成员并申报",
       righttext: "确定为该选择的人申报",
       righttext: "确定为该选择的人申报",
     },
     },
-    reduce_amount:0,
+    reduce_amount: 0,
     selected_reduceindex: 0,
     selected_reduceindex: 0,
     selected_addindex: 0
     selected_addindex: 0
   },
   },
@@ -264,7 +264,7 @@ Page({
   goadd: function(e) { //添加
   goadd: function(e) { //添加
     console.log("goadd", e)
     console.log("goadd", e)
     var that = this
     var that = this
-    if (this.data.cur_status == 'support_duty'){
+    if (this.data.cur_status == 'support_duty') {
       if (this.data.issinglechildData.selected.length < 1) {
       if (this.data.issinglechildData.selected.length < 1) {
         this.showToast("请选择是否独生子女")
         this.showToast("请选择是否独生子女")
         return
         return
@@ -360,10 +360,11 @@ Page({
       for (var i = 0; i < data.items.length; i++) {
       for (var i = 0; i < data.items.length; i++) {
         if (data.items[i].family_ties == '子' || data.items[i].family_ties == '女') {
         if (data.items[i].family_ties == '子' || data.items[i].family_ties == '女') {
           childRelativelist.push(data.items[i])
           childRelativelist.push(data.items[i])
-        } else if (data.items[i].family_ties != '祖父母' && data.items[i].family_ties != '外祖父母') {
-          medicalRelativelist.push(data.items[i])
-        } else if (data.items[i].family_ties == '祖父母' || data.items[i].family_ties == '外祖父母') {
+        }
+        if (data.items[i].family_ties == '父母' || data.items[i].family_ties == '祖父母' || data.items[i].family_ties == '外祖父母') {
           olderRelativelist.push(data.items[i])
           olderRelativelist.push(data.items[i])
+        } else {
+          medicalRelativelist.push(data.items[i])
         }
         }
       }
       }
       childmodal.datas = childRelativelist
       childmodal.datas = childRelativelist
@@ -478,14 +479,14 @@ Page({
     }
     }
   },
   },
 
 
-  bindinput:function(e){
-    console.log("bindinput",e)
+  bindinput: function(e) {
+    console.log("bindinput", e)
     this.setData({
     this.setData({
       reduce_amount: parseFloat(e.detail.value)
       reduce_amount: parseFloat(e.detail.value)
     })
     })
   },
   },
 
 
-  showToast: function (data) {
+  showToast: function(data) {
     if (data && data.length > 0) {
     if (data && data.length > 0) {
       wx.showToast({
       wx.showToast({
         title: data,
         title: data,
@@ -498,7 +499,7 @@ Page({
    * Lifecycle function--Called when page hide
    * Lifecycle function--Called when page hide
    */
    */
   onHide: function() {
   onHide: function() {
-    
+
   },
   },
 
 
   /**
   /**