Merge branch '机器人_py' into 机器人dev

@@ -1306,7 +1306,7 @@ Page({
               children_name: id_info.name,
               children_name: id_info.name,
               commonbirthDate: that.data.commonbirthDate
               commonbirthDate: that.data.commonbirthDate
             }
             }
-            that.dealBrithDate(info.birthDay)//根据出生日期 计算 学前受教育时间
+            that.dealBrithDate(id_info.birthDay)//根据出生日期 计算 学前受教育时间
             if (format.getAge(birth_day) < 3) {
             if (format.getAge(birth_day) < 3) {
               that.showToast('子女年龄小于3岁,不可申报')
               that.showToast('子女年龄小于3岁,不可申报')
             }
             }

@@ -518,6 +518,7 @@ Page({
       },
       },
       success: function(res) {
       success: function(res) {
         console.log(res)
         console.log(res)
+        wx.hideLoading()
         if (res.statusCode == 200) {
         if (res.statusCode == 200) {
           wx.navigateBack({
           wx.navigateBack({
             delta: 1
             delta: 1
@@ -525,7 +526,6 @@ Page({
         } else {
         } else {
           that.showtoast(res.data.message)
           that.showtoast(res.data.message)
         }
         }
-        wx.hideLoading()
       },
       },
       fail(res) {
       fail(res) {
         console.log(res)
         console.log(res)