汇算清缴修复bug

@@ -6,8 +6,8 @@ Page({
    */
   data: {
     h5_url:"",
-    url01: "http://dev.workai.com.cn//html/financialFinalSettlement_01.html",
-    url02: "http://dev.workai.com.cn//html/financialFinalSettlement_02.html",
+    url02: "http://dev.workai.com.cn//html/financialFinalSettlement_01.html",
+    url01: "http://dev.workai.com.cn//html/financialFinalSettlement_02.html",
   },
 
   /**
@@ -23,6 +23,9 @@ Page({
           h5_url: this.data.url02
         })
       }
+    wx.setNavigationBarTitle({
+      title: options.type==1?"《公告》":"《公告》解读"
+    })
   },
 
   /**

@@ -33,7 +33,7 @@ Page({
     if (formdata.total_salary || formdata.total_salary || formdata.remuneration_labor || formdata.author_payment || formdata.special_manage_cost || formdata.other_free_income || formdata.personal_endowment || formdata.personal_medical || formdata.personal_unemployment || formdata.personal_house_fund || formdata.childrens_education || formdata.continuing_education || formdata.housing_loan_interest || formdata.housing_rent || formdata.caring_old_people || formdata.serious_illness_medical || formdata.annuity || formdata.commercial_insurance || formdata.tax_extension || formdata.other_fee || formdata.donation_deducted || formdata.years_bouns || formdata.tax_savings || formdata.accumulated_withholding_tax){
       this.submitRequest(formdata)
     }else{
-      this.showToast("请输入内容")
+      this.showToast("其他收入内容不能为空")
       return
     }
   },

@@ -138,11 +138,15 @@
           <text class="text_gray7_34" style="line-height:104rpx">准予扣除的捐赠额</text>
           <input class='input_wrap' style='text-align: right;color:#000;' type="digit" placeholder='请输入' name='donation_deducted'></input>
         </view>
-        <view class='divide_line_30'></view>
-        <view style="height:104rpx;padding:0 30rpx">
+        <view style="height:104rpx;padding:0 30rpx;margin-top:20rpx">
           <text class="text_gray7_34" style="line-height:104rpx">全年一次性奖金</text>
           <input class='input_wrap' style='text-align: right;color:#000;' type="digit" placeholder='请输入' name='years_bouns'></input>
         </view>
+         <view class='divide_line_30'></view>
+        <view style="height:104rpx;padding:0 30rpx">
+          <text class="text_gray7_34" style="line-height:104rpx">准予扣除的捐赠额</text>
+          <input class='input_wrap' style='text-align: right;color:#000;' type="digit" placeholder='请输入' name='donation_deducted'></input>
+        </view>
       </view>
       <!-- 减免/已缴纳税额 -->
       <view style="background:#fff;margin-top:20rpx">

@@ -23,6 +23,10 @@ Page({
     new_refund_tax:0,
     declare_end_date:"",
     declare_end_days: 0,
+    other_end_date: "",
+    other_end_days: 0,
+    refund_end_date: "",
+    refund_end_days: 0,
     show_other_unit_view:false,
     exempt_status:""
   },
@@ -67,8 +71,12 @@ Page({
             pay_status: result.data.pay_status,
             declaring_unit_status: result.data.declaring_unit_status,
             new_refund_tax: Math.abs(result.data.refund_tax),
-            declare_end_date: format.yearFormString(result.data.declare_end_time) + "年" + format.monthFormString(result.data.declare_end_time) + "月" + format.dayFormString(result.data.declare_end_time) + "日",
+            declare_end_date: format.getDateString(result.data.declare_end_time) ,
             declare_end_days: format.daysTillNow(Date.parse(new Date())/1000,result.data.declare_end_time),
+            other_end_date: format.getDateString(result.data.other_end_time),
+            other_end_days: format.daysTillNow(Date.parse(new Date()) / 1000, result.data.other_end_time),
+            refund_end_date: format.getDateString(result.data.refund_end_time),
+            refund_end_days: format.daysTillNow(Date.parse(new Date()) / 1000, result.data.refund_end_time),
             exempt_status: result.data.exempt,
             payinfo: result.data
           })
@@ -206,10 +214,24 @@ Page({
   },
 
   declareHere: function() {
+    if(this.data.declaring_unit_status==''){
+      wx.showToast({
+        icon:"none",
+        title: '单位还没有启用汇算清缴申报，请等候单位通知',
+      })
+      return
+    }
     this.getUnitInfo()
   },
 
   declareNotHere: function() {
+    if (this.data.declaring_unit_status == '') {
+      wx.showToast({
+        icon: "none",
+        title: '单位还没有启用汇算清缴申报，请等候单位通知',
+      })
+      return
+    }
     var that = this
     wx.showModal({
       title: '',

@@ -20,7 +20,7 @@
         <view style="margin-right:12rpx">
           <image style="width:28rpx;height:28rpx;margin-top:6rpx" src="/images/warn_yellow.png"></image>
         </view>
-        <view wx:if="{{declaring_unit_status=='4'}}">
+        <view wx:if="{{declaring_unit_status==''||(declaring_unit_status=='4'&&!show_other_unit_view)}}">
           <text class="text_gray6_28">请于 </text>
           <text class="text_yellow_28">  {{declare_end_date}}前 </text>
           <text class="text_gray6_28">确认是否在本单位进行汇算清缴，否则默认为您在其他单位申报或自行申报。 </text>
@@ -33,8 +33,8 @@
         </view>
       </view>
 
-      <view wx:if="{{declaring_unit_status!='4'&&declaring_unit_status!='5'&&!show_other_unit_view}}" style="background:#fff;padding:30rpx 30rpx 80rpx 30rpx;">
-        <text class="text_black_bold">{{declare_status=='1'?'汇算清缴申报中…':'汇算清缴申报完成!'}}</text>
+      <view wx:if="{{declaring_unit_status!=''&&declaring_unit_status!='4'&&declaring_unit_status!='5'&&!show_other_unit_view}}" style="background:#fff;padding:30rpx 30rpx 80rpx 30rpx;">
+        <text class="text_black_bold">{{declare_status=='2'?'汇算清缴申报中…':'汇算清缴申报完成!'}}</text>
         <view wx:if="{{declare_text_extra.length>0&&refund_status!='0'}}" style="display: flex;margin:20rpx 0">
           <image style="width:28rpx;height:28rpx;margin-right:12rpx;margin-top:6rpx" src="/images/warn_yellow.png"></image>
           <text class="text_gray6_28">{{declare_text_extra}} </text>
@@ -54,7 +54,7 @@
         </view>
         <view class="divide_line_f5f5f5"></view>
         <view style="margin:20rpx 0">
-          <text class="text_gray6_28">已缴费税额：</text>
+          <text class="text_gray6_28">已预缴税额：</text>
           <text class="text_gray3_28 float_right" style="line-height:50rpx">￥{{payinfo.accumulated_prepay_tax}}</text>
         </view>
         <view class="divide_line_f5f5f5"></view>
@@ -76,7 +76,7 @@
         <view class=" float_right" style="margin:20rpx 0;font-size: 28rpx;color: #3795ff;" bindtap="finalpay_detail">查看详情</view>
       </view>
     </scroll-view>
-    <view wx:if="{{declaring_unit_status=='4'&&!show_other_unit_view}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff">
+    <view wx:if="{{declaring_unit_status==''||(declaring_unit_status=='4'&&!show_other_unit_view)}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff">
       <view style="display: flex;justify-content: center;margin-top:20rpx">
         <text class="text_gray6_28">距离确认是否在本单位进行汇算清缴时间还有  </text>
         <text class="text_yellow_28"> {{declare_end_days}} </text>
@@ -102,7 +102,7 @@
     <view wx:elif="{{declaring_unit_status=='4'&&show_other_unit_view}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff">
       <view style="display: flex;justify-content: center;margin-top:20rpx">
         <text class="text_gray6_28">距离确认填报其他单位个税申报明细时间还有  </text>
-        <text class="text_yellow_28"> {{declare_end_days}} </text>
+        <text class="text_yellow_28"> {{other_end_days}} </text>
         <text class="text_gray6_28">天</text>
       </view>
       <view bindtap="noOtherUnitInfo" class="btn_blue_radius" style="margin:20rpx 30rpx ">
@@ -116,7 +116,7 @@
     <view wx:elif="{{refund_status=='1'}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff">
       <view style="display: flex;justify-content: center;margin-top:20rpx">
         <text class="text_gray6_28">距离确认是否申请退税时间还有  </text>
-        <text class="text_yellow_28"> {{declare_end_days}} </text>
+        <text class="text_yellow_28"> {{refund_end_days}} </text>
         <text class="text_gray6_28">天</text>
       </view>
       <view bindtap="doRefund" class="btn_blue_radius" style="margin:20rpx 30rpx ">

@@ -127,10 +127,14 @@
         <text class="text_black6_32">准予扣除的捐赠额</text>
         <text class="text_black6_32 float_right">{{incomeInfo.donation_deducted}}</text>
       </view>
-      <view>
+      <view style="margin-top:20rpx">
         <text class="text_black6_32">全年一次性奖金</text>
         <text class="text_black6_32 float_right">{{incomeInfo.years_bouns}}</text>
       </view>
+      <view>
+        <text class="text_black6_32">准予扣除的捐赠额</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.donation_deducted}}</text>
+      </view>
     </view>
     <!-- 减免/已缴纳税额 -->
     <view style="background:#fff;padding:30rpx;margin-top:20rpx">

@@ -59,10 +59,14 @@ function dayFormString(dateStr) {
   return day
 }
 
+function getDateString(date_stamp){//时间戳转年月日
+  return yearFormString(date_stamp) + "年" + monthFormString(date_stamp) + "月" + dayFormString(date_stamp) + "日"
+}
+
 // 两个日期间隔天数
 function daysTillNow(startDate, endDate){
   var days = (endDate - startDate) / (24 * 60 * 60 );
-  return Math.floor(days);
+  return Math.ceil(days);
 }
 
 //获取当前时间，格式YYYY-MM-DD
@@ -259,5 +263,6 @@ module.exports = {
   getAge: getAge,
   banknoCheck: banknoCheck,
   checkEmail: checkEmail,
-  daysTillNow: daysTillNow
+  daysTillNow: daysTillNow,
+  getDateString: getDateString
 }