优化

@@ -14,6 +14,7 @@ Page({
     additionlist: [],
     additionlist: [],
     complete_item:[],
     complete_item:[],
     choosed_date: '',
     choosed_date: '',
+    has_showModal:false,//当前页面是否展示过modal
     show_modal:false,
     show_modal:false,
     tip_detail:"尊敬的用户您好！2020年度的专项附加扣除申报已经启动，请您及时确认填报信息，确保专项附加扣除能正常享受扣除。",
     tip_detail:"尊敬的用户您好！2020年度的专项附加扣除申报已经启动，请您及时确认填报信息，确保专项附加扣除能正常享受扣除。",
     declareStatus: {
     declareStatus: {
@@ -120,7 +121,7 @@ Page({
         if (res && res.data) {
         if (res && res.data) {
           console.log("show_modal", !res.data.new_addition_status)
           console.log("show_modal", !res.data.new_addition_status)
           that.setData({
           that.setData({
-            show_modal: !res.data.new_addition_status,
+            show_modal: !that.data.has_showModal&&!res.data.new_addition_status,
             complete_item: res.data.complete_item,
             complete_item: res.data.complete_item,
             additionlist: that.handleData(res.data.items) 
             additionlist: that.handleData(res.data.items) 
           })
           })
@@ -172,14 +173,16 @@ Page({
 // 暂不确认
 // 暂不确认
   doNotConfirm:function(){
   doNotConfirm:function(){
     this.setData({
     this.setData({
-      show_modal: false
+      show_modal: false,
+      has_showModal: true
     })
     })
   },
   },
 
 
 // 立即确认
 // 立即确认
   doConfirm: function () {
   doConfirm: function () {
     this.setData({
     this.setData({
-      show_modal: false
+      show_modal: false,
+      has_showModal:true
     })
     })
     this.quickAdd()
     this.quickAdd()
    },
    },
@@ -192,7 +195,7 @@ Page({
       url: baseUrl + 'persontax/v1/person-additions-update',
       url: baseUrl + 'persontax/v1/person-additions-update',
       method:"POST",
       method:"POST",
       data: {
       data: {
-        id_card_no: app.globalData.userInfo?app.globalData.userInfo.id:""
+        user_id: app.globalData.userInfo?app.globalData.userInfo.id:""
       },
       },
       header: {
       header: {
         'content-type': 'application/json',
         'content-type': 'application/json',

@@ -100,13 +100,17 @@ Page({
     spousedataData: {}, //配偶数据
     spousedataData: {}, //配偶数据
     reduce_amount: -1,
     reduce_amount: -1,
     selected_reduceindex: 0,
     selected_reduceindex: 0,
-    selected_addindex: 0
+    selected_addindex: 0,
+    choosed_date:""//上一个页面选择的年份
   },
   },
 
 
   /**
   /**
    * Lifecycle function--Called when page load
    * Lifecycle function--Called when page load
    */
    */
   onLoad: function(options) {
   onLoad: function(options) {
+    var pages = getCurrentPages()
+    var frontPage = pages[pages.length - 2]
+    console.log("front",frontPage.data)
     var that = this
     var that = this
     var housetype, housestatus
     var housetype, housestatus
     wx.showLoading({
     wx.showLoading({
@@ -124,6 +128,7 @@ Page({
       housestatus = options.status
       housestatus = options.status
     }
     }
     this.setData({
     this.setData({
+      choosed_date: frontPage.data.choosed_date,
       cur_status: housestatus,
       cur_status: housestatus,
       employee_status: options.employee_status ? options.employee_status:"",
       employee_status: options.employee_status ? options.employee_status:"",
       house_type: housetype,
       house_type: housetype,
@@ -158,6 +163,7 @@ Page({
     var Authorization = getApp().globalData.Authorization;
     var Authorization = getApp().globalData.Authorization;
     wx.request({
     wx.request({
       url: baseUrl + that.data.url_arr[that.data.cur_status] + that.data.legal_entity_id,
       url: baseUrl + that.data.url_arr[that.data.cur_status] + that.data.legal_entity_id,
+      data: { years: that.data.choosed_date},
       header: {
       header: {
         'content-type': 'application/json',
         'content-type': 'application/json',
         "Authorization": Authorization
         "Authorization": Authorization