优化

@@ -22,13 +22,20 @@ Page({
     cardtype: "",
     nation: "",
     birthday_datelong: -1,
+    choosed_date: ""//上一个页面选择的年份
   },
 
   /**
    * Lifecycle function--Called when page load
    */
   onLoad: function(options) {
+    var pages = getCurrentPages()
+    var frontPage = pages[pages.length - 2]
+    console.log("front", frontPage.data)
     console.log("onLoad", options)
+    this.setData({
+      choosed_date: frontPage.data.choosed_date,
+    })
     if (options.id) {
       this.setData({
         legal_entity_id: options.id,
@@ -191,6 +198,7 @@ Page({
     wx.request({
       url: baseUrl + 'persontax/v1/co-supporters',
       data: {
+        'years': that.data.choosed_date+"",
         "id": that.data.supporter_id,
         "legal_entity_id": that.data.legal_entity_id,
         "co_supporter": formdata.name,

@@ -537,7 +537,8 @@ Page({
     // },
     edu_lable: "school",
     oldersupport_lable: "",
-    img_path: "/images/upload_img.png"
+    img_path: "/images/upload_img.png",
+    choosed_date: ""//上一个页面选择的年份
   },
 
   /**
@@ -636,6 +637,7 @@ Page({
     }
 
     this.setData({
+      choosed_date: frontPage.data.choosed_date,
       title: title,
       cur_index: nameKey,
       house_type: house_type,
@@ -1975,6 +1977,7 @@ Page({
     }
     newdata.legal_entity_id = this.legal_entity_id
     newdata.legal_entity = this.legal_entity
+    newdata.years = this.data.choosed_date+""
     if (this.isEdit) {
       newdata.id = this.edit_id
     }

@@ -41,7 +41,8 @@ Page({
         sureid: false,
         disable_change: '',
         status: "",
-        extra_message: ''
+        extra_message: '',
+        choosed_date: ""//上一个页面选择的年份
       },
     ],
   },
@@ -50,10 +51,14 @@ Page({
    * Lifecycle function--Called when page load
    */
   onLoad: function(options) {
+    var pages = getCurrentPages()
+    var frontPage = pages[pages.length - 2]
+    console.log("front", frontPage.data)
     console.log("onLoad", options)
     this.setData({
       legal_entity_id: options.legal_entity_id,
       legal_entity: options.legal_entity,
+      choosed_date: frontPage.data.choosed_date,
       type: options.type,
       selectdata: options.select_data ? JSON.parse(options.select_data) : {}
     })
@@ -222,6 +227,7 @@ Page({
     wx.request({
       url: baseUrl + 'persontax/v1/additional-settings',
       data: {
+        "years": that.data.choosed_date+"",
         "legal_entity_id": this.data.legal_entity_id,
         "legal_entity": this.data.legal_entity,
         "options": array

@@ -14,6 +14,7 @@ Page({
     additionlist: [],
     complete_item:[],
     choosed_date: '',
+    addition_data_last_year:false,//上一年是否有数据
     has_showModal:false,//当前页面是否展示过modal
     show_modal:false,
     tip_detail:"尊敬的用户您好！2020年度的专项附加扣除申报已经启动，请您及时确认填报信息，确保专项附加扣除能正常享受扣除。",
@@ -121,6 +122,7 @@ Page({
         if (res && res.data) {
           console.log("show_modal", !res.data.new_addition_status)
           that.setData({
+            addition_data_last_year: res.data.last_addition_status,
             show_modal: !that.data.has_showModal&&!res.data.new_addition_status,
             complete_item: res.data.complete_item,
             additionlist: that.handleData(res.data.items) 

@@ -133,10 +133,7 @@
     </view> -->
 
   </view>
-  <view wx:if="{{hascompleted&&additionlist.length<1&&choosed_date!=2020}}" style='background:#fff;'>
-        <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/noreduce_img.png'></image>
-  </view>
-  <view wx:if="{{hascompleted&&additionlist.length<1&&choosed_date==2020}}" style='background:#fef6e9;padding:40rpx 30rpx;display:flex;'>
+  <view wx:if="{{hascompleted&&additionlist.length<1&&choosed_date==2020&&addition_data_last_year}}" style='background:#fef6e9;padding:40rpx 30rpx;display:flex;'>
     <view style="margin-right:20rpx;margin-top:10rpx">
       <image style='width:40rpx;height:40rpx;' src='/images/warn_yellow.png'></image>
     </view>
@@ -147,4 +144,7 @@
     </view>
 
   </view>
+   <view wx:elif="{{hascompleted&&additionlist.length<1}}" style='background:#fff;'>
+        <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/noreduce_img.png'></image>
+  </view>
 </view>
\ No newline at end of file