Merge branch '机器人dev' into 海峡new

@@ -81,7 +81,7 @@ App({
           that.configOssUrl()
           that.configOssUrl()
           if (relaunch) {
           if (relaunch) {
             wx.reLaunch({
             wx.reLaunch({
-              url: '../guide/guide'
+              url: '../guide/guide',
             })
             })
           }
           }
         }
         }
@@ -149,6 +149,7 @@ App({
     // baseUrl: "https://api.workai.com.cn/",
     // baseUrl: "https://api.workai.com.cn/",
     baseUrl: "https://api.fjhxrl.com/",
     baseUrl: "https://api.fjhxrl.com/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
+    OSSImgHeader:"https://hropublic.oss-cn-beijing.aliyuncs.com/weixin/",
     userInfo: null,
     userInfo: null,
     hostInfo: null,
     hostInfo: null,
     hasLogin: false,
     hasLogin: false,

 {
 {
-  "pages": [
+  "pages": [  
     "pages/main/guide/guide",
     "pages/main/guide/guide",
     "pages/getPhone/getPhone",
     "pages/getPhone/getPhone",
     "pages/main/smartchat/chat",
     "pages/main/smartchat/chat",
+    
     "pages/main/taxperson/home",
     "pages/main/taxperson/home",
     "pages/main/taxperson/editinfo/editinfo",
     "pages/main/taxperson/editinfo/editinfo",
     "pages/main/taxperson/addinfo/addinfo",
     "pages/main/taxperson/addinfo/addinfo",
     "pages/main/taxperson/idinfo/idinfo",
     "pages/main/taxperson/idinfo/idinfo",
+
     "pages/main/addtionalreduce/home",
     "pages/main/addtionalreduce/home",
     "pages/main/addtionalreduce/godeclare/godeclare",
     "pages/main/addtionalreduce/godeclare/godeclare",
     "pages/main/addtionalreduce/godetail/godetail",
     "pages/main/addtionalreduce/godetail/godetail",
@@ -14,16 +16,32 @@
     "pages/main/addtionalreduce/addextrainfo/addextrainfo",
     "pages/main/addtionalreduce/addextrainfo/addextrainfo",
     "pages/main/addtionalreduce/adddupporters/adddupporters",
     "pages/main/addtionalreduce/adddupporters/adddupporters",
     "pages/main/addtionalreduce/additiondetail/additiondetail",
     "pages/main/addtionalreduce/additiondetail/additiondetail",
+
     "pages/main/advancepayment/adPayHome",
     "pages/main/advancepayment/adPayHome",
+
     "pages/main/finalpayment/home",
     "pages/main/finalpayment/home",
     "pages/main/finalpayment/inputinfo/inputinfo",
     "pages/main/finalpayment/inputinfo/inputinfo",
     "pages/main/finalpayment/historylist/historylist",
     "pages/main/finalpayment/historylist/historylist",
     "pages/main/finalpayment/historydetail/historydetail",
     "pages/main/finalpayment/historydetail/historydetail",
+
+    "pages/main/finalpay/home",
+    "pages/main/finalpay/incomeDetail/incomeDetail",
+    "pages/main/finalpay/addUnitInfo/addUnitInfo",
+    "pages/main/finalpay/refundInfo/refundInfo",
+    "pages/main/finalpay/refundDetail/refundDetail",
+    "pages/main/finalpay/freeIncomeDetail/freeIncomeDetail",
+    "pages/main/finalpay/otherDeductDetail/healthInsurDetail",
+    "pages/main/finalpay/otherDeductDetail/endowmentInsurDetail",
+    "pages/main/finalpay/otherDeductDetail/otherDeductDetail",
+    "pages/main/finalpay/donationDetail/donationDetail",
+    "pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail",
+
     "pages/login/login",
     "pages/login/login",
     "pages/main/advancepayment/adPayDetails/adPayDetails",
     "pages/main/advancepayment/adPayDetails/adPayDetails",
     "pages/main/verify/verify_info",
     "pages/main/verify/verify_info",
     "pages/main/verify/verify_result/verify_result",
     "pages/main/verify/verify_result/verify_result",
-    "pages/main/verify/verify_idcard/verify_idcard"
+    "pages/main/verify/verify_idcard/verify_idcard",
+    "pages/common/webview"
   ],
   ],
   "window": {
   "window": {
     "backgroundTextStyle": "light",
     "backgroundTextStyle": "light",

+// pages/common/webview.js
+var baseUrl = getApp().globalData.baseUrl;
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    h5_url:"",
+    url02: "http://dev.workai.com.cn//html/financialFinalSettlement_01.html",
+    url01: "http://dev.workai.com.cn//html/financialFinalSettlement_02.html",
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+      if(options.type == 1){
+          this.setData({
+            h5_url: this.updateUrl(this.data.url01)
+          })
+      }else{
+        this.setData({
+          h5_url: this.updateUrl(this.data.url02)
+        })
+      }
+      console.log("url",this.data.h5_url)
+    wx.setNavigationBarTitle({
+      title: options.type==1?"《公告》":"《公告》解读"
+    })
+  },
+
+  updateUrl(s){
+    if (baseUrl.indexOf("https")>-1 || baseUrl.indexOf("com")>-1){//正式环境
+      // return "https://emp.workai.com.cn//html/financialFinalSettlement_01.html"
+      return s.replace("dev", "emp").replace("http","https")
+    }else{
+      return s
+    }
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+{
+  "usingComponents": {}
+}

+<!--pages/common/webview.wxml-->
+<web-view src="{{h5_url}}"></web-view>

+/* pages/common/webview.wxss */

@@ -8,7 +8,7 @@ Page({
    * 页面的初始数据
    * 页面的初始数据
    */
    */
   data: {
   data: {
-
+    bg: getApp().globalData.OSSImgHeader + "bg.png"
   },
   },
 
 
   /**
   /**

 
 
 <!-- <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">获取用户手机号</button>  -->
 <!-- <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">获取用户手机号</button>  -->
 <view class='page'>
 <view class='page'>
-  <image src='/images/bg.png' class='back-img' mode="bottom aspectFill"></image>
+  <image src='{{bg}}' class='back-img' mode="bottom aspectFill"></image>
   <view class='content-wrap'>
   <view class='content-wrap'>
     <image style="width:160rpx;height:36rpx;margin:0 60rpx" src="/images/login_tip.png"></image>
     <image style="width:160rpx;height:36rpx;margin:0 60rpx" src="/images/login_tip.png"></image>
     <view style="font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;color:#828699;margin:15rpx 60rpx 150rpx 60rpx">您需要登录后才能进行个人信息采集、专项附加扣除填报、查看个人工资条和扣税明细。</view>
     <view style="font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;color:#828699;margin:15rpx 60rpx 150rpx 60rpx">您需要登录后才能进行个人信息采集、专项附加扣除填报、查看个人工资条和扣税明细。</view>

@@ -7,6 +7,7 @@ var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-
 
 
 Page({
 Page({
   data: {
   data: {
+    bg: getApp().globalData.OSSImgHeader + "bg.png",
     mobile: '',
     mobile: '',
     verifyCode: "",
     verifyCode: "",
     tenant_id: "",
     tenant_id: "",

 <!--pages/login/login.wxml-->
 <!--pages/login/login.wxml-->
 <view class="page">
 <view class="page">
 
 
-  <image src='/images/bg.png' class='back-img' mode="bottom aspectFill"></image>
+  <image src='{{bg}}' class='back-img' mode="bottom aspectFill"></image>
 
 
   <view class='data_wrap'>
   <view class='data_wrap'>
     <view style='margin-left:126rpx;margin-right:126rpx'>
     <view style='margin-left:126rpx;margin-right:126rpx'>

@@ -119,7 +119,7 @@ Page({
         "Authorization": Authorization
         "Authorization": Authorization
       },
       },
       success: function (res) {
       success: function (res) {
-        if (res && res.data) {
+        if (res.statusCode==200 && res.data) {
           console.log("show_modal", !res.data.new_addition_status)
           console.log("show_modal", !res.data.new_addition_status)
           that.setData({
           that.setData({
             addition_data_last_year: res.data.last_addition_status,
             addition_data_last_year: res.data.last_addition_status,
@@ -204,7 +204,7 @@ Page({
         "Authorization": Authorization
         "Authorization": Authorization
       },
       },
       success: function (res) {
       success: function (res) {
-        if (res && res.data) {
+        if (res.statusCode==200 && res.data) {
           console.log("res", res)
           console.log("res", res)
           that.setData({
           that.setData({
             choosed_date: "2020"
             choosed_date: "2020"

@@ -35,12 +35,14 @@ Page({
     imgpath: '',
     imgpath: '',
     new_data: null,
     new_data: null,
     modal_images: {
     modal_images: {
-      "children_education": "/images/childedu_declare.png",
-      "continuing_education": "/images/continueedu_declare.png",
-      "support_duty": "/images/support_older_declare.png",
-      "medical_fund": "/images/health_declare.png",
-      // "house_fund": "/images/house_declare_loan.png"
+      "children_education": getApp().globalData.OSSImgHeader + "childedu_declare.png",
+      "continuing_education": getApp().globalData.OSSImgHeader +"continueedu_declare.png",
+      "support_duty": getApp().globalData.OSSImgHeader +"support_older_declare.png",
+      "medical_fund": getApp().globalData.OSSImgHeader +"health_declare.png",
     },
     },
+    house_fund_loan: getApp().globalData.OSSImgHeader + "house_declare_loan.png",
+    house_fund_rent: getApp().globalData.OSSImgHeader + "house_declare_rent.png",
+    openmodal_img: getApp().globalData.OSSImgHeader + "openmodal_img.png",
     showModal_img: false,
     showModal_img: false,
     showModal_reducetype: false,
     showModal_reducetype: false,
     showModal_addtype: false,
     showModal_addtype: false,

@@ -3,7 +3,7 @@
 
 
 <view style='width:100%;height:100%;'>
 <view style='width:100%;height:100%;'>
   <view style='display:flex;flex-direction:column;margin-bottom:140rpx;'>
   <view style='display:flex;flex-direction:column;margin-bottom:140rpx;'>
-    <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showModalImg'></image>
+    <image class='openmodal_img' src="{{openmodal_img}}" bindtap='showModalImg'></image>
 
 
     <view style='height:100rpx;padding:0 30rpx;background:#FFF' wx:if="{{cur_status=='children_education'||cur_status=='house_fund'}}">
     <view style='height:100rpx;padding:0 30rpx;background:#FFF' wx:if="{{cur_status=='children_education'||cur_status=='house_fund'}}">
       <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
       <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
@@ -396,8 +396,8 @@
   <!-- 申报说明 -->
   <!-- 申报说明 -->
   <view style='top:200rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
   <view style='top:200rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
     <image wx:if="{{cur_status!='house_fund'}}" class='modal_img' src="{{modal_images[cur_status]}}"></image>
     <image wx:if="{{cur_status!='house_fund'}}" class='modal_img' src="{{modal_images[cur_status]}}"></image>
-    <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_rent'}}" class='modal_img02' src="/images/house_declare_rent.png"></image>
-    <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_loan'}}" class='modal_img' src="/images/house_declare_loan.png"></image>
+    <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_rent'}}" class='modal_img02' src="{{house_declare_rent}}"></image>
+    <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_loan'}}" class='modal_img' src="{{house_declare_loan}}"></image>
     <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
     <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
         <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
         <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
       <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
       <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>

@@ -6,6 +6,7 @@ var baseUrl = app.globalData.baseUrl;
 Page({
 Page({
 
 
   data: {
   data: {
+    payment_bg: getApp().globalData.OSSImgHeader + "payment_bg.png",
     // tab切换  
     // tab切换  
     isshow: false,
     isshow: false,
     currentTab: 0,
     currentTab: 0,

@@ -58,7 +58,7 @@
         </view>
         </view>
       </view>
       </view>
       <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
       <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
-        <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
+        <image class=' payment_img_bg ' src='{{payment_bg}}' style='position:absolute;z-index: 1;'></image>
         <view>
         <view>
           <view class='view_bg_wrap' style='margin-top: 44rpx;'>
           <view class='view_bg_wrap' style='margin-top: 44rpx;'>
             <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
             <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
@@ -140,7 +140,7 @@
         </view>
         </view>
       </view>
       </view>
       <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
       <view style='margin:30rpx;positive:relative;width:92%;height:312rpx'>
-        <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
+        <image class=' payment_img_bg ' src='{{payment_bg}}' style='position:absolute;z-index: 1;'></image>
         <view>
         <view>
           <view class='view_bg_wrap' style='margin-top: 44rpx;'>
           <view class='view_bg_wrap' style='margin-top: 44rpx;'>
             <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
             <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>

+// pages/main/finalpay/addUnitInfo/addUnitInfo.js
+
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+Page({
+
+
+  data: {
+    year: "2019",
+    unit_id:"",
+  },
+
+
+  onLoad: function(options) {
+    this.setData({
+      unit_id:options.unit_id
+    })
+  },
+
+
+  onReady: function() {
+
+  },
+
+
+  onShow: function() {
+
+  },
+
+  formSubmit: function(e) { //提交
+    console.log("formSubmit", e);
+    var formdata = e.detail.value
+    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.year_donation_deducted || formdata.years_bouns || formdata.tax_savings || formdata.accumulated_withholding_tax){
+      this.submitRequest(formdata)
+    }else{
+      this.showToast("其他收入内容不能为空")
+      return
+    }
+  },
+
+  submitRequest: function(request_data) {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/record",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "POST",
+      data: {
+        "declaring_unit_id":that.data.unit_id,
+        "item": {
+          "total_salary": that.parseToFloat(request_data.total_salary),  //工资薪金,
+          "remuneration_labor": that.parseToFloat(request_data.remuneration_labor),  //劳务报酬,
+          "author_payment": that.parseToFloat(request_data.author_payment),  //稿酬,
+          "special_manage_cost": that.parseToFloat(request_data.special_manage_cost),  //特许经营权使用费,
+          "other_free_income": that.parseToFloat(request_data.other_free_income),  //其他免税收入,
+
+          "personal_endowment": that.parseToFloat(request_data.personal_endowment),  //基本养老保险,
+          "personal_medical": that.parseToFloat(request_data.personal_medical),  //基本医疗保险,
+          "personal_unemployment": that.parseToFloat(request_data.personal_unemployment),  //失业险,
+          "personal_house_fund": that.parseToFloat(request_data.personal_house_fund),  //住房公积金,
+          "childrens_education": that.parseToFloat(request_data.childrens_education),  //子女教育支出,
+          "caring_old_people": that.parseToFloat(request_data.caring_old_people),  //赡养老人
+          "housing_loan_interest": that.parseToFloat(request_data.housing_loan_interest),  //住房贷款利息支出
+          "housing_rent": that.parseToFloat(request_data.housing_rent),   //住房租金支出
+          "serious_illness_medical": that.parseToFloat(request_data.serious_illness_medical),//大病医疗支出
+          "continuing_education": that.parseToFloat(request_data.continuing_education),  //继续教育支出
+
+          "annuity": that.parseToFloat(request_data.annuity),  //年金
+          "commercial_insurance": that.parseToFloat(request_data.commercial_insurance),  //商业健康保险
+          "tax_extension": that.parseToFloat(request_data.tax_extension),   //税延养老保险
+          "other_fee": that.parseToFloat(request_data.other_fee),//其他税前扣除额
+          "year_donation_deducted": that.parseToFloat(request_data.year_donation_deducted),  //准予扣除的捐赠
+          "years_bouns": that.parseToFloat(request_data.years_bouns),  //全年一次性奖金
+          "donation_deducted": that.parseToFloat(request_data.donation_deducted),  //准予扣除的捐赠
+          "tax_savings": that.parseToFloat(request_data.tax_savings),  //减免税额
+          "accumulated_withholding_tax": that.parseToFloat(request_data.accumulated_withholding_tax),  //应扣缴税额
+        },
+        "years": that.data.year
+      },
+      success: function(result) {
+        console.log("refund", result)
+        if (result.statusCode == 200) {
+            that.showToast("提交成功!")
+            wx.navigateBack({
+              delta:1
+            })
+        }else{
+          that.showToast(result.data.message)
+        }
+      },
+    })
+  },
+
+  parseToFloat(s){
+    if(s&&s.length>0){
+      var num = parseFloat(s)
+      return Math.round(num*100)/100
+    }else{
+      return 0
+    }
+    
+  },
+
+  showToast: function(data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
+  },
+
+  onHide: function() {
+
+  },
+
+
+  onUnload: function() {
+
+  },
+
+
+  onPullDownRefresh: function() {
+
+  },
+
+
+  onReachBottom: function() {
+
+  },
+
+
+  onShareAppMessage: function() {
+
+  }
+})

+{
+"navigationBarTitleText": "添加其他单位收入"
+}

+<!--pages/main/finalpay/addUnitInfo/addUnitInfo.wxml-->
+
+<view class="page">
+  <form bindsubmit='formSubmit'>
+    <view class="swiper-box page" style="height:100%;" bindchange="bindChange">
+      <!-- 境内收入 -->
+      <view style="background:#fff;margin-top:20rpx">
+        <view style="margin-bottom:20rpx;margin-left:30rpx">
+          <text class="text_black3_34">境内收入</text>
+        </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='total_salary'></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='remuneration_labor'></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='author_payment'></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='special_manage_cost'></input>
+        </view>
+      </view>
+      <!-- 免税收入 -->
+      <view style="background:#fff;margin-top:20rpx">
+        <view style="margin-bottom:20rpx;margin-left:30rpx">
+          <text class="text_black3_34">免税收入</text>
+        </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='other_free_income'></input>
+        </view>
+      </view>
+      <!-- 专项扣除 -->
+      <view style="background:#fff;margin-top:20rpx">
+        <view style="margin-bottom:20rpx;margin-left:30rpx">
+          <text class="text_black3_34">专项扣除</text>
+        </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='personal_endowment'></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='personal_medical'></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='personal_unemployment'></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='personal_house_fund'></input>
+        </view>
+      </view>
+      <!-- 专项附加扣除 -->
+      <view style="background:#fff;margin-top:20rpx">
+        <view style="margin-bottom:20rpx;margin-left:30rpx">
+          <text class="text_black3_34">专项附加扣除</text>
+        </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='childrens_education'></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='continuing_education'></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='housing_loan_interest'></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='housing_rent'></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='caring_old_people'></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='serious_illness_medical'></input>
+        </view>
+      </view>
+      <!-- 其他扣除 -->
+      <view style="background:#fff;margin-top:20rpx">
+        <view style="margin-bottom:20rpx;margin-left:30rpx">
+          <text class="text_black3_34">其他扣除</text>
+        </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='annuity'></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='commercial_insurance'></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='tax_extension'></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='other_fee'></input>
+        </view>
+      </view>
+      <!-- 捐赠扣除 -->
+      <view style="background:#fff;margin-top:20rpx">
+        <view style="margin-bottom:20rpx;margin-left:30rpx">
+          <text class="text_black3_34">捐赠扣除</text>
+        </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='year_donation_deducted'></input>
+        </view>
+        <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">
+        <view style="margin-bottom:20rpx;margin-left:30rpx">
+          <text class="text_black3_34">减免/已缴纳税额</text>
+        </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='tax_savings'></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='accumulated_withholding_tax'></input>
+        </view>
+      </view>
+    </view>
+  <view style='width:100%;height:180rpx;background:#f5f5f5'></view>
+    <view class="btn_bottom" >
+      <button class="btn_bottom" formType="submit">提交</button>
+    </view>
+  </form>
+</view>

+/* pages/main/finalpay/addUnitInfo/addUnitInfo.wxss */
+.page {
+  background-color: #f5f5f5;
+}
+
+.text_translate_34 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 34rpx;
+  color: #80000000;
+  line-height: 24px;
+}
+
+.text_black6_32 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 32rpx;
+  color: #666666;
+  text-align: center;
+  line-height: 32px;
+}
+
+.text_black3_34 {
+  font-family:PingFangSC-Medium,PingFang SC;
+  font-size: 34rpx;
+  color: #333333;
+  text-align: center;
+  line-height: 24px;
+}
+
+.text_gray7_34 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 34rpx;
+  color:rgba(119,119,119,1);
+  line-height: 24px;
+}
+
+.input_wrap {
+  max-width: 500rpx;
+  height: 104rpx;
+  font-size: 34rpx;
+  color: #333;
+  text-align: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  float: right
+}

+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    settlement_record_id: "",
+    year: "2019",
+    showAddView: false,
+    infoList: [{}],
+    total_account:0,
+    project: ["正常工资薪金", "劳务报酬", "稿酬", "特许经营权使用费"],
+    deductcontent: ["高级专家延长离退休期间工薪免征个人所得税", "解除劳动合同当地工资3倍以内免税", "符合条件的津补贴免征个人所得税", "生育津贴和生育医疗费免税", "工伤保险免税", "符合条件的外交人员免征个人所得税", "外籍个人出差补贴免税", "外籍个人探亲费、语言训练费、子女教育费免税", "外籍个人生活费用免税", "符合条件的外籍来华专家工资薪金所得免征个人所得税", "薪金所得免征个人所得数", "横琴、香港、澳门居民免税", "平潭台湾居民免税", "安家费、退职费、退休工资、离休工资、离休生活补助费免税"],
+    deductproperty: ["其他"],
+    income_item: "",
+    reduction_item: "",
+    reduction_nature: "",
+    reduction_tax: "",
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+    this.setData({
+      settlement_record_id: options.id
+    })
+    this.getInfoList()
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function () {
+
+  },
+
+  getInfoList: function () {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/reduction-tax",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id
+      },
+      success: function (result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          that.setData({
+            total_account: result.data.total_account,
+            infoList: result.data.items,
+            income_item: "",
+            reduction_item: "",
+            reduction_nature: "",
+            reduction_tax: "",
+          })
+        }
+      },
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function () {
+
+  },
+
+  // 所得项目
+  bindProjectChange: function (e) {
+    console.log('picker，携带值为', e.detail.value)
+    this.setData({
+      income_item: this.data.project[e.detail.value]
+    })
+  },
+
+  // 减免事项名称
+  bindDeductContent: function (e) {
+    console.log('picker，携带值为', e.detail.value)
+    this.setData({
+      reduction_item: this.data.deductcontent[e.detail.value]
+    })
+  },
+
+  // 减免性质名称
+  bindDeductProperty: function (e) {
+    console.log('picker，携带值为', e.detail.value)
+    this.setData({
+      reduction_nature: this.data.deductproperty[e.detail.value]
+    })
+  },
+
+  // 减免税额
+  bindIncome: function (e) {
+    console.log('输入框', e.detail.value)
+    this.setData({
+      reduction_tax: e.detail.value
+    })
+  },
+
+  addItem: function () { //继续添加
+    if (!this.data.showAddView) {//是否新增了view
+      this.setData({
+        showAddView: true
+      })
+      return
+    }
+    if (!this.data.income_item || this.data.income_item.length < 1) {
+      this.showToast("请选择所得项目")
+      return
+    }
+    if (!this.data.reduction_item || this.data.reduction_item.length < 1) {
+      this.showToast("请选择减免事项名称")
+      return
+    }
+    if (!this.data.reduction_nature || this.data.reduction_nature.length < 1) {
+      this.showToast("请选择减免性质名称")
+      return
+    }
+    if (!this.data.reduction_tax || this.data.reduction_tax.length < 1) {
+      this.showToast("请填写减免税额")
+      return
+    }
+    this.goSubmit("1")
+  },
+
+  goSubmit: function (type) {
+    if (!this.data.income_item || this.data.income_item.length < 1) {
+      this.showToast("请选择所得项目")
+      return
+    }
+    if (!this.data.reduction_item || this.data.reduction_item.length < 1) {
+      this.showToast("请选择减免事项名称")
+      return
+    }
+    if (!this.data.reduction_nature || this.data.reduction_nature.length < 1) {
+      this.showToast("请选择减免性质名称")
+      return
+    }
+    if (!this.data.reduction_tax || this.data.reduction_tax.length < 1) {
+      this.showToast("请填写减免税额")
+      return
+    }
+    var that = this
+    this.Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/reduction-tax",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "POST",
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id,
+        "income_item": that.data.income_item,
+        "reduction_item": that.data.reduction_item,
+        "reduction_nature": that.data.reduction_nature,
+        "reduction_tax": parseFloat(that.data.reduction_tax),
+      },
+      success: function (result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          if (type == '1') {
+            that.getInfoList()
+            that.setData({
+              showAddView: true
+            })
+          } else {
+            wx.navigateBack({
+              delat: 1
+            })
+          }
+        }
+      },
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function () {
+
+  },
+
+  showToast: function (data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+{
+ "navigationBarTitleText": "减免事项附表"
+}

+<view >
+  <view style="background:#fff;padding:0 30rpx;">
+    <text class="text_gray7_34">减免税额合计</text>
+    <text class="text_black3_34 float_right">{{total_account}}</text>
+  </view>
+
+   <!-- 列表数据，不可修改 -->
+  <view wx:for="{{infoList}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff">
+      <text class="text_gray7_34">所得项目</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.income_item}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff" >
+      <text class="text_gray7_34">减免事项名称</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.reduction_item}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff">
+      <text class="text_gray7_34">减免性质名称</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.reduction_nature}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">减免税额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" bindblur="bindIncome" value="{{item.reduction_tax}}"></input>
+    </view>
+  </view>
+
+  <!-- 添加项，可编辑 -->
+  <view wx:if="{{showAddView}}" style="background:#fff;margin-top:20rpx">
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindProjectChange" range="{{project}}">
+      <text class="text_gray7_34">所得项目</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' value="{{income_item}}" disabled="true"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindDeductContent" range="{{deductcontent}}">
+      <text class="text_gray7_34">减免事项名称</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入'  value="{{reduction_item}}" disabled="true"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindDeductProperty" range="{{deductproperty}}">
+      <text class="text_gray7_34">减免性质名称</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{reduction_nature}}" disabled="true"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">减免税额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" bindblur="bindIncome" value="{{reduction_tax}}"></input>
+    </view>
+  </view>
+
+  <view style="background:#fff;margin-top:20rpx;height:104rpx;display:flex;align-items:center;justify-content:center;margin-bottom:84rpx" bindtap="addItem">
+    <image style="width:28rpx;height:28rpx;margin-right:16rpx" src="/images/add_extra.png"></image>
+    <text style="font-size:28rpx;color:#4986fe">继续添加</text>
+  </view>
+  <view class="btn_bottom" bindtap="goSubmit">
+    <button class="btn_bottom" >保存</button>
+  </view>
+</view>

+/* pages/main/finalpay/deductOrPayedDetail/deductOrPayedDetail.wxss */
+page {
+  background-color: #f5f5f5;
+}
+
+.text_gray7_34 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 34rpx;
+  color: #777777;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.text_black3_34 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 34rpx;
+  color: #333333;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.input_wrap {
+  width: 448rpx;
+  height: 104rpx;
+  font-size: 32rpx;
+  color: #fff;
+  text-align: right;
+  overflow: hidden;
+  float: right;
+  text-overflow: ellipsis;
+white-space: nowrap;
+
+}
+
+.arrow_wrap {
+  width: 50rpx;
+  height: 50rpx;
+  margin-top: 26rpx
+}

+// pages/main/finalpay/donationDetail/donationDetail.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+const regex = /^[0-9a-zA-Z]{1,}$/
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    settlement_record_id:"",
+    year: "2019",
+    showAddView: false,
+    infoList: [{}],
+    total_account: 0,
+    deductPick: ["30%", "100%"],
+    "donated_unit_code": "",
+    "donated_unit_name": "",
+    "donation_code": "",
+    "donation_year": "",
+    "donation_account": "",
+    "deduction_ratio": "", //扣除比例 
+    "comment": "",
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function(options) {
+    this.setData({
+      settlement_record_id: options.id
+    })
+    this.getInfoList()
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function() {
+
+  },
+
+  getInfoList: function() {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/donation-deduction",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id
+      },
+      success: function(result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          that.setData({
+            total_account: result.data.total_account,
+            infoList: result.data.items,
+            "donated_unit_code": "",
+            "donated_unit_name": "",
+            "donation_code": "",
+            "donation_year": "",
+            "donation_account": "",
+            "deduction_ratio": "", //扣除比例 
+            "comment": "",
+          })
+        }
+      },
+    })
+  },
+
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function() {
+
+  },
+
+  getInputInfo:function(e){//
+    console.log("输入框", e.currentTarget.id,e.detail.value)
+    var key = e.currentTarget.id+""
+    if ("donated_unit_code"==key){
+      this.setData({"donated_unit_code": e.detail.value,})
+    }
+    if ("donated_unit_name" == key) {
+      this.setData({ "donated_unit_name": e.detail.value, })
+    }
+    if ("donation_code" == key) {
+      this.setData({ "donation_code": e.detail.value, })
+    }
+    if ("donation_year" == key) {
+      this.setData({ "donation_year": e.detail.value, })
+    }
+    if ("donation_account" == key) {
+      this.setData({ "donation_account": e.detail.value, })
+    }
+    if ("comment" == key) {
+      this.setData({ "comment": e.detail.value, })
+    }
+  },
+
+  deductRatioPicker:function(e){//捐赠比例
+    console.log('picker，携带值为', e.detail.value)
+    var new_data = this.data.deductPick[e.detail.value]
+    this.setData({
+      deduction_ratio: new_data ? new_data.replace("%",""):""
+    })
+  },
+
+  addItem: function() { //继续添加
+    if (!this.data.showAddView) {//是否新增了view
+      this.setData({
+        showAddView: true
+      })
+      return
+    }
+    if (this.data.donated_unit_code.length > 0 && !regex.test(this.data.donated_unit_code)) {
+      this.showToast("受赠单位纳税人识别号格式有误")
+      return
+    }
+    if (!this.data.donated_unit_name || this.data.donated_unit_name.length < 1) {
+      this.showToast("请填写受赠单位名称")
+      return
+    }
+    if (this.data.donation_code.length > 0 && !regex.test(this.data.donation_code)) {
+      this.showToast("捐赠凭证码格式有误")
+      return
+    }
+    if (!this.data.donation_year || this.data.donation_year.length < 1) {
+      this.showToast("请填写捐赠年度")
+      return
+    }
+    if (!this.data.donation_account || this.data.donation_account.length < 1) {
+      this.showToast("请填写扣除金额")
+      return
+    }
+    if (!this.data.deduction_ratio || this.data.deduction_ratio.length < 1) {
+      this.showToast("请选择扣除比例")
+      return
+    }
+    this.goSubmit("1")
+  },
+
+  goSubmit: function(type) {//type=“1”，继续添加(当前页面)，type=2保存，返回列表
+    if (!this.data.donated_unit_code || this.data.donated_unit_code.length < 1) {
+      this.showToast("请填写受赠单位纳税人识别号")
+      return
+    }
+    if (!this.data.donated_unit_name || this.data.donated_unit_name.length < 1) {
+      this.showToast("请填写受赠单位名称")
+      return
+    }
+    if (!this.data.donation_code || this.data.donation_code.length < 1) {
+      this.showToast("请填写捐赠凭证码")
+      return
+    }
+    if (!this.data.donation_year || this.data.donation_year.length < 1) {
+      this.showToast("请填写捐赠年度")
+      return
+    }
+    if (!this.data.donation_account || this.data.donation_account.length < 1) {
+      this.showToast("请填写扣除金额")
+      return
+    }
+    if (!this.data.deduction_ratio || this.data.deduction_ratio.length < 1) {
+      this.showToast("请选择扣除比例")
+      return
+    }
+    var that = this
+    this.Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/donation-deduction",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "POST",
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id,
+        "donated_unit_code": that.data.donated_unit_code,
+        "donated_unit_name": that.data.donated_unit_name,
+        "donation_code": that.data.donation_code,
+        "donation_year": that.data.donation_year,
+        "donation_account": parseFloat(that.data.donation_account),
+        "deduction_ratio": parseFloat(that.data.deduction_ratio),
+        "comment":that.data.comment
+      },
+      success: function (result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          if (type == '1') {
+            that.getInfoList()
+            that.setData({
+              showAddView: true
+            })
+          } else {
+            wx.navigateBack({
+              delat: 1
+            })
+          }
+        }
+      },
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function () {
+
+  },
+
+  showToast: function (data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function() {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function() {
+
+  }
+})

+{
+  "navigationBarTitleText": "捐赠扣除明细"
+}

+<view>
+  <view style="background:#fff;padding:0 30rpx;">
+    <text class="text_gray7_34">准予扣除的捐赠额合计</text>
+    <text class="text_black3_34 float_right">{{total_account}}</text>
+  </view>
+
+  <!-- 列表数据，不可修改 -->
+  <view wx:for="{{infoList}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx;display: flex;">
+      <view style="font-size: 32rpx;color: #777777;text-align: center;width:320rpx;display:flex;align-items: center;">受赠单位纳税人识别号(统一社会信用代码)</view>
+      <input style='text-align:right;color:#000;font-size: 30rpx;height:104rpx;width:366rpx' disabled="true" value="{{item.donated_unit_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">受赠单位名称</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.donated_unit_name}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">报捐赠凭证号</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.donation_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">捐赠年度</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.donation_year}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">捐赠金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.donation_account}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="" range="{{deductPick}}">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">扣除比例</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.deduction_ratio}}%"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">备注</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.comment}}"></input>
+    </view>
+  </view>
+
+  <!-- 添加项，可编辑 -->
+  <view wx:if="{{showAddView}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx;display: flex;">
+      <view style="font-size: 32rpx;color: #777777;text-align: center;width:320rpx;display:flex;align-items: center;">受赠单位纳税人识别号(统一社会信用代码)</view>
+      <input style='text-align:right;color:#000;font-size: 30rpx;height:104rpx;width:366rpx' placeholder='请输入' id="donated_unit_code" maxlength="20" bindblur="getInputInfo" value="{{donated_unit_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">受赠单位名称</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="donated_unit_name" bindblur="getInputInfo" value="{{donated_unit_name}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">报捐赠凭证号</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="donation_code" bindblur="getInputInfo" maxlength="20" value="{{donation_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">捐赠年度</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="donation_year" type="number" bindblur="getInputInfo" maxlength="4" value="{{donation_year}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">捐赠金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" maxlength="20" id="donation_account" bindblur="getInputInfo" value="{{donation_account}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="deductRatioPicker" range="{{deductPick}}">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">扣除比例</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' disabled="true" style='text-align: right;color:#000;' placeholder='请选择' name='' value="{{deduction_ratio}}%"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">备注</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="comment" bindblur="getInputInfo" value="{{comment}}"></input>
+    </view>
+  </view>
+
+  <view style="background:#fff;margin-top:20rpx;height:104rpx;display:flex;align-items:center;justify-content:center;margin-bottom:168rpx" bindtap="addItem">
+    <image style="width:28rpx;height:28rpx;margin-right:16rpx" src="/images/add_extra.png"></image>
+    <text style="font-size:28rpx;color:#4986fe">继续添加</text>
+  </view>
+  <view class="btn_bottom" bindtap="goSubmit">
+    <button class="btn_bottom">保存</button>
+  </view>
+</view>

+/* pages/main/finalpay/donationDetail/donationDetail.wxss */
+page {
+  background-color: #f5f5f5;
+}
+
+.text_gray7_34 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 34rpx;
+  color: #777777;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.text_black3_34 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 34rpx;
+  color: #333333;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.input_wrap {
+  max-width: 600rpx;
+  height: 104rpx;
+  font-size: 32rpx;
+  color: #fff;
+  text-align: right;
+  overflow: hidden;
+  float: right;
+}
+
+.arrow_wrap {
+  width: 50rpx;
+  height: 50rpx;
+  margin-top: 26rpx
+}
+
+.red_star_right_10{
+  color:red;
+  font-size: 30rpx;
+  line-height: 104rpx;
+  float:left;
+  margin-right: 10rpx;
+}

+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    settlement_record_id: "",
+    year: "2019",
+    showAddView:false,
+    infoList: [{}],
+    total_account: 0,
+    project: ["正常工资薪金", "劳务报酬", "稿酬", "特许经营权使用费"],
+    deductcontent: ["高级专家延长离退休期间工薪免征个人所得税", "解除劳动合同当地工资3倍以内免税", "符合条件的津补贴免征个人所得税", "生育津贴和生育医疗费免税", "工伤保险免税", "符合条件的外交人员免征个人所得税", "外籍个人出差补贴免税", "外籍个人探亲费、语言训练费、子女教育费免税", "外籍个人生活费用免税", "符合条件的外籍来华专家工资薪金所得免征个人所得税", "薪金所得免征个人所得数", "横琴、香港、澳门居民免税", "平潭台湾居民免税", "安家费、退职费、退休工资、离休工资、离休生活补助费免税"],
+    deductproperty: ["其他"],
+    income_item: "",
+    reduction_item: "",
+    reduction_nature: "",
+    exempt_income: "",
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function(options) {
+    this.setData({
+      settlement_record_id: options.id
+    })
+    this.getInfoList()
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function() {
+
+  },
+
+  getInfoList: function() {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/exempt-income",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id
+      },
+      success: function(result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          that.setData({
+            total_account: result.data.total_account,
+            infoList: result.data.items,
+            income_item: "",
+            reduction_item: "",
+            reduction_nature: "",
+            exempt_income: "",
+          })
+        }
+      },
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function() {
+
+  },
+
+  // 所得项目
+  bindProjectChange: function(e) {
+    console.log('picker，携带值为', e.detail.value)
+    this.setData({
+      income_item: this.data.project[e.detail.value]
+    })
+  },
+
+  // 减免事项名称
+  bindDeductContent: function(e) {
+    console.log('picker，携带值为', e.detail.value)
+    this.setData({
+      reduction_item: this.data.deductcontent[e.detail.value]
+    })
+  },
+
+  // 减免性质名称
+  bindDeductProperty: function(e) {
+    console.log('picker，携带值为', e.detail.value)
+    this.setData({
+      reduction_nature: this.data.deductproperty[e.detail.value]
+    })
+  },
+
+  // 免税收入金额
+  bindIncome: function(e) {
+    console.log('输入框', e.detail.value)
+    this.setData({
+      exempt_income: e.detail.value
+    })
+  },
+
+  addItem: function() { //继续添加
+    if (!this.data.showAddView){//是否新增了view
+      this.setData({
+        showAddView:true
+      })
+      return
+    }
+    if (!this.data.income_item || this.data.income_item.length < 1) {
+      this.showToast("请选择所得项目")
+      return
+    }
+    if (!this.data.reduction_item || this.data.reduction_item.length < 1) {
+      this.showToast("请选择减免事项名称")
+      return
+    }
+    if (!this.data.reduction_nature || this.data.reduction_nature.length < 1) {
+      this.showToast("请选择减免性质名称")
+      return
+    }
+    if (!this.data.exempt_income || this.data.exempt_income.length < 1) {
+      this.showToast("请填写免税收入金额")
+      return
+    }
+    this.goSubmit("1")
+  },
+
+  goSubmit: function(type) {//type=“1”，继续添加(当前页面)，type=2保存，返回列表
+    if (!this.data.income_item || this.data.income_item.length < 1) {
+      this.showToast("请选择所得项目")
+      return
+    }
+    if (!this.data.reduction_item || this.data.reduction_item.length < 1) {
+      this.showToast("请选择减免事项名称")
+      return
+    }
+    if (!this.data.reduction_nature || this.data.reduction_nature.length < 1) {
+      this.showToast("请选择减免性质名称")
+      return
+    }
+    if (!this.data.exempt_income || this.data.exempt_income.length < 1) {
+      this.showToast("请填写免税收入金额")
+      return
+    }
+    var that = this
+    this.Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/exempt-income",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "POST",
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id,
+        "income_item": that.data.income_item,
+        "reduction_item": that.data.reduction_item,
+        "reduction_nature": that.data.reduction_nature,
+        "exempt_income": parseFloat(that.data.exempt_income),
+      },
+      success: function(result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          if(type=='1'){
+            that.getInfoList()
+            that.setData({
+              showAddView:true
+            })
+          }else {
+              wx.navigateBack({
+                delat:1
+              })
+          }
+        }
+      },
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function() {
+
+  },
+
+  showToast: function (data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function() {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function() {
+
+  }
+})

+{
+ "navigationBarTitleText": "免税收入附表"
+}

+<view>
+  <view style="background:#fff;padding:0 30rpx;">
+    <text class="text_gray7_34">免税收入合计</text>
+    <text class="text_black3_34 float_right">{{total_account}}</text>
+  </view>
+
+  <!-- 列表数据，不可修改 -->
+  <view wx:for="{{infoList}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff">
+      <text class="text_gray7_34">所得项目</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.income_item}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff" >
+      <text class="text_gray7_34">减免事项名称</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.reduction_item}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff">
+      <text class="text_gray7_34">减免性质名称</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.reduction_nature}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">免税收入金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" bindblur="bindIncome" value="{{item.exempt_income}}"></input>
+    </view>
+  </view>
+
+  <!-- 添加项，可编辑 -->
+  <view wx:if="{{showAddView}}" style="background:#fff;margin-top:20rpx">
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindProjectChange" range="{{project}}">
+      <text class="text_gray7_34">所得项目</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' value="{{income_item}}" disabled="true"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindDeductContent" range="{{deductcontent}}">
+      <text class="text_gray7_34">减免事项名称</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入'  value="{{reduction_item}}" disabled="true"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindDeductProperty" range="{{deductproperty}}">
+      <text class="text_gray7_34">减免性质名称</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{reduction_nature}}" disabled="true"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">免税收入金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" bindblur="bindIncome" value="{{exempt_income}}"></input>
+    </view>
+  </view>
+
+  <view style="background:#fff;margin-top:20rpx;height:104rpx;display:flex;align-items:center;justify-content:center;margin-bottom:84rpx" bindtap="addItem">
+    <image style="width:28rpx;height:28rpx;margin-right:16rpx" src="/images/add_extra.png"></image>
+    <text style="font-size:28rpx;color:#4986fe">继续添加</text>
+  </view>
+  <view class="btn_bottom" bindtap="goSubmit">
+    <button class="btn_bottom">保存</button>
+  </view>
+</view>

+/* pages/main/finalpay/freeIncomeDetail/freeIncomeDetail.wxss */
+page {
+  background-color: #f5f5f5;
+}
+
+.text_gray7_34 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 34rpx;
+  color: #777777;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.text_black3_34 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 34rpx;
+  color: #333333;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.input_wrap {
+  width: 448rpx;
+  height: 104rpx;
+  font-size: 32rpx;
+  color: #fff;
+  text-align: right;
+  overflow: hidden;
+  float: right;
+  text-overflow: ellipsis;
+white-space: nowrap;
+
+}
+
+.arrow_wrap {
+  width: 50rpx;
+  height: 50rpx;
+  margin-top: 26rpx
+}

+// pages/main/finalpay/home.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+var format = require('../../../utils/util.js');
+Page({
+
+
+  data: {
+    year: "2019",
+    declare_status: "", //申报状态"0" //待申报  "1" //申报成功  “2” 申报中
+    refund_status: "", //退税状态  "0" 无需退税； "1" 待退税；"2" 退税中"3" 退税成功；"4"退税失败；"5"放弃退税；
+    pay_status: "", //补税状态    "0" 豁免；  "1" 待补税；"2" 补税成功
+    declaring_unit_status: "", //1:本单位申报，2：本单位其他申报，3：其他单位申报，4:待确认申报//5用户自行申报
+    payinfo: {},
+    unitInfo: [],
+    showUnit: false,
+    declaring_unit_id: "",
+    declaring_unit:"",
+    showModal_selfDeclare: false,
+    uniqual_title01:"",
+    uniqual_content01: "",
+    declare_text_extra: "",//请等候申报结果
+    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:""
+  },
+
+
+  onLoad: function(options) {
+   
+  },
+
+
+  onReady: function() {
+
+  },
+
+
+  onShow: function() {
+    this.getPayInfo();
+  },
+
+  yearPick: function() {
+
+  },
+
+  getPayInfo: function() {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/declare-detail",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        'years': that.data.year
+      },
+      success: function(result) {
+        console.log("payinfo", result)
+        if (result.statusCode == 200) {
+          that.updateText(result.data)
+          that.setData({
+            declare_status: result.data.declare_status,
+            refund_status: result.data.refund_status,
+            pay_status: result.data.pay_status,
+            declaring_unit: result.data.declaring_unit,
+            declaring_unit_status: result.data.declaring_unit_status,
+            new_refund_tax: Math.abs(result.data.refund_tax),
+            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
+          })
+        }
+      },
+    })
+  },
+
+  getUnitInfo: function() { //获取申报单位
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    that.setData({
+      showUnit: true
+    })
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/declare-unit",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {},
+      success: function(result) {
+        console.log("unitInfo", result.data)
+        if (result.statusCode == 200) {
+          that.setData({
+            unitInfo: result.data.items
+          })
+        }
+      },
+      complete: function(e) {
+        that.setData({
+          showUnit: true
+        })
+      }
+    })
+  },
+
+  updateDeclareState: function(id) { //是否在本单位申报
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/record",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "PUT",
+      data: {
+        "years":that.data.year,
+        'declaring_unit_id': id,
+        "declaring_unit_status": id?'':'5',
+      },
+      success: function(result) {
+        console.log("declareinfo", result)
+        if (result.statusCode == 200) {
+          that.setData({
+
+          })
+          that.getPayInfo();
+        }
+      },
+    })
+  },
+
+  // 是否放弃退税，（是:"5",否:""）
+  forgiveRefund: function(s) {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/record",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "PUT",
+      data: {
+        "years": that.data.year,
+        'refund_status': s
+      },
+      success: function(result) {
+        console.log("refund", result)
+        if (result.statusCode == 200) {
+          that.getPayInfo();
+          that.setData({
+
+          })
+        }
+      },
+    })
+  },
+
+  // 确认提交申请退税
+  commitRefund: function() {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/record",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "PUT",
+      data: {
+        "years": that.data.year,
+        "name": "xxxx", //姓名,
+        "bank": "xxxx", //开户行,
+        "bank_card_no": "xxxx", //银行卡号,
+        "bank_province": "xxxx", //银行省份,
+      },
+      success: function(result) {
+        console.log("refund", result)
+        if (result.statusCode == 200) {
+          that.setData({
+
+          })
+        }
+      },
+    })
+  },
+
+
+  // 跳转到H5页面测试
+  skipH5_01: function() {
+    wx.navigateTo({
+      url: '../../common/webview?type=1',
+    })
+  },
+
+  skipH5_02: function() {
+    wx.navigateTo({
+      url: '../../common/webview?type=2',
+    })
+  },
+
+  finalpay_detail: function() {//
+    wx.navigateTo({
+      url: 'incomeDetail/incomeDetail',
+    })
+  },
+
+  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: '',
+      content: '确认不在本单位进行汇算清缴申报吗？',
+      confirmColor: '#357aeb',
+      success(res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+          that.updateDeclareState("")
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  },
+
+  unitPick: function(e) { //选择申报单位
+    console.log("unitPick", e)
+    var info_arr = e.currentTarget.id.split("~")
+    this.setData({
+      declaring_unit_id: info_arr[1] ,
+      declaring_unit: info_arr[0],
+      showUnit: false,
+      show_other_unit_view:true,
+    })
+  },
+
+  selfdeclare_close() { //关闭自行申报弹窗
+    this.setData({
+      showModal_selfDeclare: false
+    })
+  },
+
+  declareBySelf: function() { //查看自行申报方式
+    this.setData({
+      showModal_selfDeclare: true
+    })
+  },
+
+  godeclareHistory: function() {
+    wx.redirectTo({
+      url: '../advancepayment/adPayHome',
+    })
+  },
+
+  noOtherUnitInfo: function() { //没有其他单位个税申报
+    this.updateDeclareState(this.data.declaring_unit_id)
+    this.setData({
+      show_other_unit_view:false
+    })
+  },
+
+  otherUnitInfo: function() { //有其他单位个税申报
+    wx.navigateTo({
+      url: 'addUnitInfo/addUnitInfo?unit_id='+this.data.declaring_unit_id,
+    })
+    this.setData({
+      show_other_unit_view: false
+    })
+  },
+
+  // 申请退税
+  doRefund: function() {
+    wx.navigateTo({
+      url: 'refundInfo/refundInfo',
+    })
+  },
+
+  // 放弃退税
+  doNotRefund: function() {
+    var that = this
+    wx.showModal({
+      title: '确认放弃退税吗？',
+      content: '',
+      confirmColor: '#357aeb',
+      success(res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+          that.forgiveRefund("5")
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  },
+
+  refundDetail:function(){//退税详情
+    wx.navigateTo({
+      url: 'refundDetail/refundDetail?status=' + this.data.refund_status,
+    })
+  },
+
+  updateText:function(data){
+    var text = ""
+    var text_status = ""
+    var text_title = "应补退税额"
+    if (data.declare_status=='2'){//申报中
+      text = "请等候申报结果"
+    } else {//申报成功
+      if (data.declare_result=='0') {//申报结果0:退税,1:补税,2:无需补退税
+        text_title = "应退税额"
+        if (data.refund_status == "1") {
+          text = "请确认是否申请退款？"
+        } else if (data.refund_status == '2') {
+          text = "申请退税中"
+          text_status = "退税中"
+        } else if (data.refund_status == '4') {
+          text = "退税失败，请确认您的银行卡信息是否正确？"
+          text_status = "退税失败"
+        } else if (data.refund_status == '5') {
+          text = "您已放弃退税"
+          text_status = "已放弃"
+        }
+      } else if (data.declare_result == '1'){//补税
+        text_title = "应补税额"
+        if (data.exempt == 'yes') {
+          text = "您已享受豁免"
+          text_status = "豁免"
+        } else if (data.pay_status == '1') {
+          text = "请等待企业为您代缴税款"
+          text_status = "待缴款"
+        } else if (data.pay_status == '2') {
+          text = "单位已为您代缴税款"
+          text_status = "已缴款"
+        }
+      }
+
+      // if (data.refund_tax > 0 || data.refund_tax == 0) {
+      //   text_title = "应补税额"
+      // } else {
+      //   text_title = "应退税额"
+      // }
+    } 
+    this.setData({
+      declare_text_extra:text,
+      uniqual_content01:text_status,
+      uniqual_title01: text_title,
+    })
+  },
+
+  onHide: function() {
+
+  },
+
+
+  onUnload: function() {
+
+  },
+
+
+  onPullDownRefresh: function() {
+
+  },
+
+
+  onReachBottom: function() {
+
+  },
+
+
+  onShareAppMessage: function() {
+
+  }
+})

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "汇算清缴"
+}

+<!--pages/main/finalpay/home.wxml-->
+
+<view class="page">
+  <view wx:if="{{!showUnit}}">
+    <view style="background:#fff;padding:28rpx" bindtap="yearPick">
+      <text class="text_black_bold">2019年度个人综合所得汇算清缴</text>
+      <view wx:if="{{year>2020}}" class="float_right">
+        <image class="arrow_wrap" src="/images/arrow_down.png"></image>
+      </view>
+    </view>
+    <scroll-view style="padding-bottom: 360rpx;">
+      <view style="background:#fff;padding:30rpx 30rpx 50rpx 30rpx;margin-top:20rpx">
+        <text class="text_gray3_26">了解汇算清缴具体内容，请阅读 </text>
+        <text class="text_blue_26" bindtap="skipH5_01"> 《2019年度汇算清缴事项公告》 </text>
+        <text class="text_blue_26" bindtap="skipH5_02"> 《国家税务总局办理2019年度个人所得税综合所得汇算清缴事项的公告 》</text>
+        <text class="text_blue_26"> 的解读 </text>
+      </view>
+
+      <view style="background:#fff9f0;padding:24rpx;display: flex;">
+        <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==''||(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>
+        </view>
+        <view wx:elif="{{declaring_unit_status=='5'}}">
+          <text class="text_gray6_28">您已选择自行申报，可继续查看在本单位的个税申报记录 </text>
+        </view>
+        <view wx:else>
+          <text class="text_gray6_28">您选择在 {{declaring_unit}} 完成2019年度的个人综合所得汇算清缴。 </text>
+        </view>
+      </view>
+
+      <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>
+        </view>
+        <view class="divide_line_f5f5f5" style="margin:20rpx 0"></view>
+        <view >
+          <text class="text_gray6_28">收入总额：</text>
+          <text class="text_gray3_28 float_right" style="line-height:50rpx">￥{{payinfo.total_salary}}</text>
+        </view>
+        <view class="view_gray_bg" style="padding:16rpx 20rpx;flex-direction: column">
+          <view class="text_gray7_26">其中本单位收入额：{{payinfo.total_salary_on}}</view>
+          <text class="text_gray7_26">其中其他单位收入额：{{payinfo.total_salary_else}}</text>
+        </view>
+        <view style="margin:20rpx 0">
+          <text class="text_gray6_28">累计应纳税额：</text>
+          <text class="text_gray3_28 float_right" style="line-height:50rpx">￥{{payinfo.accumulated_payable_tax}}</text>
+        </view>
+        <view class="divide_line_f5f5f5"></view>
+        <view style="margin:20rpx 0">
+          <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>
+        <view style="margin:20rpx 0">
+          <text class="text_black_bold">{{uniqual_title01}}:</text>
+          <text wx:if="{{declare_status=='2'}}" class="text_orange_28 float_right" style="line-height:50rpx">计算中</text>
+          <text wx:else class="text_orange_28 float_right" style="line-height:50rpx">￥{{new_refund_tax}}</text>
+          <view wx:if="{{uniqual_content01=='已放弃'}}" class="light_gray_bg">
+            <text style="font-size:11px;color:rgba(0,0,0,0.35);margin: 0 auto">{{uniqual_content01}}</text>
+          </view>
+          <view wx:elif="{{uniqual_content01=='退税失败'}}" class="light_red_bg">
+            <text style="font-size:11px;color:#fff;margin: 0 auto">{{uniqual_content01}}</text>
+          </view>
+          <view wx:else class="light_yellow_bg">
+            <text style="font-size:11px;color:#fff;margin: 0 auto">{{uniqual_content01}}</text>
+          </view>
+        </view>
+        <view class="divide_line_f5f5f5"></view>
+        <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==''||(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_gray6_28">天</text>
+      </view>
+      <view bindtap="declareNotHere" class="btn_blue_radius" style="margin:20rpx 30rpx ">
+        <view class="text_white_34">不在本单位申报</view>
+      </view>
+      <view bindtap="declareHere" class="btn_white_radius" style="margin:0rpx 30rpx ">
+        <view class="text_blue_34">在本单位申报</view>
+      </view>
+    </view>
+
+    <view wx:elif="{{declaring_unit_status=='5'}}" style="width:100%;height:260rpx;position: fixed;bottom: 0;background-color:#fff">
+      <view bindtap="declareBySelf" class="btn_blue_radius" style="margin:20rpx 30rpx ">
+        <view class="text_white_34">查看自行申报方式</view>
+      </view>
+      <view bindtap="godeclareHistory" class="btn_white_radius" style="margin:0rpx 30rpx ">
+        <view class="text_blue_34">查看个税申报记录</view>
+      </view>
+    </view>
+
+    <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"> {{other_end_days}} </text>
+        <text class="text_gray6_28">天</text>
+      </view>
+      <view bindtap="noOtherUnitInfo" class="btn_blue_radius" style="margin:20rpx 30rpx ">
+        <view class="text_white_34">没有其他单位的收入个税</view>
+      </view>
+      <view bindtap="otherUnitInfo" class="btn_white_radius" style="margin:0rpx 30rpx ">
+        <view class="text_blue_34">有其他单位的收入个税</view>
+      </view>
+    </view>
+
+    <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"> {{refund_end_days}} </text>
+        <text class="text_gray6_28">天</text>
+      </view>
+      <view bindtap="doRefund" class="btn_blue_radius" style="margin:20rpx 30rpx ">
+        <view class="text_white_34">申请退税</view>
+      </view>
+      <view bindtap="doNotRefund" class="btn_white_radius" style="margin:0rpx 30rpx ">
+        <view class="text_blue_34">放弃退税</view>
+      </view>
+    </view>
+
+    <view wx:elif="{{declaring_unit_status!='5'&&(refund_status=='2'||refund_status=='3'||refund_status=='4')}}" style="width:100%;height:144rpx;position: fixed;bottom: 0;background-color:#fff">
+      <view bindtap="refundDetail" class="btn_white_radius" style="margin:30rpx ">
+        <view class="text_blue_34">查看退税详情</view>
+      </view>
+    </view>
+
+    <view class="mask" wx:if="{{showModal_selfDeclare}}"></view>
+    <view class='modal_lg' style='' wx:if="{{showModal_selfDeclare}}">
+      <text class='text_black_bold'>个人如何自行完成汇算清缴申报？</text>
+      <text class='text_gray6_28' style="margin-top:30rpx">为便利纳税人，税务机关为纳税人提供高效、快捷的网络办税渠道。纳税人可优先通过网上税务局(包括手机个人所得税app)办理年度汇算，税务机关将按规定为纳税人提供申报表预填服务；不方便通过上述方式办理的，也可以通过邮寄方式或到办税服务厅办理。</text>
+      <text class='text_gray6_28' style="margin-top:30rpx">选择邮寄申报的，纳税人需将申报表寄送至任职受雇单位(没有任职受雇单位的，为户籍或者经常居住地)所在省、自治区、直辖区、计划单列市税务局公告指定的税务机关。</text>
+      <view style="margin-top:30rpx">
+        <text class='text_gray6_28'> 更详细内容请查看</text>
+        <text class='text_blue_28' bindtap="skipH5_02">《国家税务局关于办理2019年度个人所得税综合所得汇算清缴事项的公告》</text>
+      </view>
+      <view class="btn_blue_radius" style="width:100%;margin-top:40rpx;text-align: center;" bindtap="selfdeclare_close">
+        <text class="text_white_34" style="text-align: center;">我知道了</text>
+      </view>
+
+    </view>
+  </view>
+
+  <view wx:if="{{showUnit&&unitInfo.length>0}}" style="background-color:#fff">
+    <view class="text_gray3_34" style="padding:30rpx">选择申报单位</view>
+    <view class="divide_line"></view>
+    <view wx:for="{{unitInfo}}" style="height:104rpx;margin-left:50rpx;margin-right:30rpx" bindtap="unitPick" id="{{item.declaring_unit}}~{{item.declaring_unit_id}}">
+      <text class="text_gray3_32" style="line-height:104rpx">{{item.declaring_unit}}</text>
+      <image class="icon_choosed" hidden="true" src="/images/icon_chat_choosed.png"></image>
+      <view class="divide_line"></view>
+    </view>
+  </view>
+</view>

+/* pages/main/finalpay/home.wxss */
+
+.page {
+  width: 100%;
+  height: 100%;
+  background-color: #f5f5f5;
+}
+
+.text_black_bold {
+  font-size: 36rpx;
+  color: #000;
+  font-family: PingFangSC-Medium, PingFang SC;
+  line-height: 50rpx;
+   font-weight:bold;
+}
+
+.arrow_wrap {
+  position: relative;
+  width: 28rpx;
+  height: 16rpx;
+  margin-top: 16rpx;
+  align-self: center;
+}
+
+.text_gray3_26 {
+  font-size: 26rpx;
+  color: #333;
+  font-family: PingFangSC-Regular, PingFang SC;
+  line-height: 36rpx;
+}
+
+.text_gray6_28 {
+  font-size: 28rpx;
+  color: #666;
+  font-family: PingFangSC-Regular, PingFang SC;
+  line-height: 40rpx;
+}
+
+.text_yellow_28 {
+  font-size: 28rpx;
+  color: #fa0;
+  font-family: PingFangSC-Regular, PingFang SC;
+  line-height: 40rpx;
+}
+
+.text_blue_26 {
+  font-size: 26rpx;
+  color: #3795ff;
+  font-family: PingFangSC-Regular, PingFang SC;
+  line-height: 36rpx;
+}
+
+.text_blue_28 {
+  font-size: 28rpx;
+  color: #3795ff;
+  font-family: PingFangSC-Regular, PingFang SC;
+  line-height: 36rpx;
+}
+
+.btn_blue_radius {
+  margin: 26rpx 30rx;
+  background: #357aeb;
+  border-radius: 5px;
+  height: 84rpx;
+}
+
+.btn_white_radius {
+  margin: 26rpx 30rx;
+  background: #fff;
+  border-radius: 5px;
+  border: 1px solid rgba(228, 231, 240, 1);
+  height: 84rpx;
+}
+
+.text_white_34 {
+  font-family: PingFangSC-Regular;
+  font-size: 34rpx;
+  color: #fff;
+  text-align: center;
+  line-height: 42px;
+}
+
+.text_blue_34 {
+  font-family: PingFangSC-Regular;
+  font-size: 34rpx;
+  color: #357aeb;
+  text-align: center;
+  line-height: 42px;
+}
+
+.text_gray3_34 {
+  font-family: PingFangSC-Regular;
+  font-size: 34rpx;
+  color: #333;
+}
+
+.text_gray3_32 {
+  font-family: PingFangSC-Regular;
+  font-size: 32rpx;
+  color: #333;
+}
+
+.text_gray3_28 {
+  font-family: PingFangSC-Regular;
+  font-size: 28rpx;
+  color: #333;
+}
+
+.icon_choosed {
+  width: 24rpx;
+  height: 26rpx;
+  margin-top: 10rpx;
+  margin-right: 20rpx;
+  float: right;
+}
+
+.view_gray_bg {
+  margin: 20rpx 0;
+  width: 100%;
+  background: rgba(247, 245, 246, 1);
+  opacity: 0.5;
+}
+
+.text_gray9_26 {
+  font-size: 26rpx;
+  color:rgba(153,153,153,1);
+  font-family: PingFangSC-Regular, PingFang SC;
+  line-height: 40rpx;
+}
+
+.text_gray7_26 {
+  font-size: 26rpx;
+  color:#777;
+  font-family: PingFangSC-Regular, PingFang SC;
+  line-height: 40rpx;
+}
+
+.light_gray_bg {
+  float: right;
+  width: 50px;
+  margin:10rpx ;
+  background: rgba(228, 231, 240, 1);
+  border-radius: 2px;
+  display: flex;
+}
+
+.light_yellow_bg {
+  float: right;
+  width: 40px;
+  margin:10rpx ;
+  background: rgba(255, 143, 31, 1);
+  border-radius: 2px;
+  display: flex;
+}
+
+.light_red_bg {
+  float: right;
+  width: 40px;
+  margin:10rpx ;
+  background: rgba(255, 96, 16, 1);
+  border-radius: 2px;
+  display: flex;
+}
+
+.text_orange_28 {
+  font-size: 17px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: rgba(255, 143, 31, 1);
+  line-height: 52px;
+}
+
+/* 遮罩层 */
+
+.mask {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.7;
+  z-index: 10;
+}
+
+.modal_lg {
+  width: 80%;
+  position: fixed;
+  left: 0;
+  right: 0;
+  margin: 0 auto;
+  background-color: #fff;
+  border-radius: 7px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  top: 160rpx;
+  z-index: 10;
+  padding: 40rpx;
+}

+// pages/main/finalpay/incomeDetail/incomeDetail.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    settlement_record_id:"",
+    currentTab:1,
+    year:"2019",
+    incomeInfo:{},
+    showExtraInfo:false
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+    this.getIncomeDetail()
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function () {
+
+  },
+
+  onShow: function () {
+
+  },
+
+  /** 
+  * 点击tab切换 
+  */
+  swichNav: function (e) {
+    var that = this;
+    if (e.target.dataset.current==3){
+      that.setData({
+        showExtraInfo: true
+      })
+    }else{
+      that.setData({
+        showExtraInfo: false
+      })
+    }
+    if (this.data.currentTab === e.target.dataset.current) {
+      return false;
+    } else {
+      that.setData({
+        currentTab: e.target.dataset.current
+      })
+      this.getIncomeDetail()
+    }
+  },
+
+  //获取收入明细
+  getIncomeDetail:function(){
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/record",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        "years":that.data.year,
+        "declaring_unit_status": that.data.currentTab
+      },
+      success: function (result) {
+        console.log("incomeInfo", result)
+        if (result.statusCode == 200) {
+            that.setData({
+              settlement_record_id:result.data.id,
+              incomeInfo:result.data.item
+            })
+        }
+      },
+    })
+  },
+
+// 免税收入附表
+  freeIncomeDetail: function () { 
+      wx.navigateTo({
+        url: '../freeIncomeDetail/freeIncomeDetail?id=' + this.data.settlement_record_id,
+      })
+  },
+
+// 其他扣除附表
+  otherDeductDetail:function(){
+    wx.navigateTo({
+      url: '../otherDeductDetail/otherDeductDetail?id=' + this.data.settlement_record_id + "&health_account=" + this.data.incomeInfo.commercial_insurance + "&endowment_account=" + this.data.incomeInfo.tax_extension,
+    })
+  },
+
+  // 捐赠明细
+  donationDetail:function(){
+    wx.navigateTo({
+      url: '../donationDetail/donationDetail?id=' + this.data.settlement_record_id,
+    })
+  },
+
+// 减免/已缴纳税额明细
+  deductOrPayedDetail:function(){
+    wx.navigateTo({
+      url: '../deductOrPayedDetail/deductOrPayedDetail?id=' + this.data.settlement_record_id,
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+{
+ "navigationBarTitleText": "收入明细"
+}

+<!--pages/main/finalpay/incomeDetail/incomeDetail.wxml-->
+<view class="page">
+
+  <view class="swiper-tab" style='display:flex'>
+    <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" style="margin:0 10rpx" data-current="1" bindtap="swichNav">本单位收入</view>
+    <view class="swiper-tab-list {{currentTab==2 ? 'on' : ''}}" style="margin:0 10rpx" data-current="2" bindtap="swichNav">本单位其他收入</view>
+    <view class="swiper-tab-list {{currentTab==3 ? 'on' : ''}}" style="margin:0 10rpx" data-current="3" bindtap="swichNav">其他单位收入</view>
+  </view>
+
+  <scroll-view class="swiper-box page" style="height:100%;" bindchange="bindChange">
+  <!-- 境内收入 -->
+    <view style="background:#fff;padding:30rpx;margin-top:20rpx">
+      <view style="margin-bottom:20rpx">
+        <text class="text_black3_34;">境内收入</text>
+      </view>
+      <view>
+        <text class="text_black6_32">工资薪金收入</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.total_salary}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">劳务报酬收入</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.remuneration_labor}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">稿酬收入</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.author_payment}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">特许经营权</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.special_manage_cost}}</text>
+      </view>
+    </view>
+    <!-- 免税收入 -->
+    <view style="background:#fff;padding:30rpx;margin-top:20rpx">
+      <view style="margin-bottom:20rpx">
+        <text class="text_black3_34">免税收入</text>
+        <text wx:if="{{showExtraInfo}}" class="float_right" style="font-size:14px;color:#4986FE" bindtap="freeIncomeDetail">查看附表</text>
+      </view>
+      <view>
+        <text class="text_black6_32">其他免税收入</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.other_free_income}}</text>
+      </view>
+    </view>
+<!-- 专项扣除 -->
+    <view style="background:#fff;padding:30rpx;margin-top:20rpx">
+      <view style="margin-bottom:20rpx">
+        <text class="text_black3_34">专项扣除</text>
+      </view>
+      <view>
+        <text class="text_black6_32">养老保险</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.personal_endowment}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">医疗保险</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.personal_medical}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">失业保险</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.personal_unemployment}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">住房公积金</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.personal_house_fund}}</text>
+      </view>
+    </view>
+    <!-- 专项附加扣除 -->
+    <view style="background:#fff;padding:30rpx;margin-top:20rpx">
+      <view style="margin-bottom:20rpx">
+        <text class="text_black3_34">专项附加扣除</text>
+      </view>
+      <view>
+        <text class="text_black6_32">子女教育</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.childrens_education}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">继续教育</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.continuing_education}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">住房贷款利息</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.housing_loan_interest}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">住房租金</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.housing_rent}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">赡养老人</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.caring_old_people}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">大病医疗</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.serious_illness_medical}}</text>
+      </view>
+    </view>
+    <!-- 其他扣除 -->
+    <view style="background:#fff;padding:30rpx;margin-top:20rpx">
+      <view style="margin-bottom:20rpx">
+        <text class="text_black3_34">其他扣除</text>
+        <text wx:if="{{showExtraInfo}}" class="float_right" style="font-size:14px;color:#4986FE" bindtap="otherDeductDetail">查看附表</text>
+      </view>
+      <view>
+        <text class="text_black6_32">年金</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.annuity}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">商业健康保险</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.commercial_insurance}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">税延养老保险</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.tax_extension}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">其他</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.other_fee}}</text>
+      </view>
+    </view>
+    <!-- 捐赠扣除 -->
+    <view style="background:#fff;padding:30rpx;margin-top:20rpx">
+      <view style="margin-bottom:20rpx">
+        <text class="text_black3_34">捐赠扣除</text>
+        <text wx:if="{{showExtraInfo}}" class="float_right" style="font-size:14px;color:#4986FE" bindtap="donationDetail">查看明细</text>
+      </view>
+      <view>
+        <text class="text_black6_32">准予扣除的捐赠额</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.donation_deducted}}</text>
+      </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.year_donation_deducted}}</text>
+      </view>
+    </view>
+    <!-- 减免/已缴纳税额 -->
+    <view style="background:#fff;padding:30rpx;margin-top:20rpx">
+      <view style="margin-bottom:20rpx">
+        <text class="text_black3_34">减免/已缴纳税额</text>
+        <text wx:if="{{showExtraInfo}}" class="float_right" style="font-size:14px;color:#4986FE" bindtap="deductOrPayedDetail">查看明细</text>
+      </view>
+      <view>
+        <text class="text_black6_32">减免税额</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.tax_savings}}</text>
+      </view>
+      <view>
+        <text class="text_black6_32">已缴税额</text>
+        <text class="text_black6_32 float_right">{{incomeInfo.accumulated_withholding_tax}}</text>
+      </view>
+    </view>
+  </scroll-view>
+</view>

+/* pages/main/finalpay/incomeDetail/incomeDetail.wxss */
+.page {
+  background-color: #f5f5f5;
+}
+
+.swiper-tab {
+  width: 100%;
+  text-align: center;
+  line-height: 88rpx;
+  background: #fff;
+  box-sizing: border-box;
+}
+
+.swiper-tab-list {
+  font-size: 30rpx;
+  display: inline-block;
+  color: #333;
+  flex: 1
+}
+
+.on {
+  color: #4e8fe7;
+  border-bottom: 6rpx solid #4e8fe7;
+}
+
+.text_black3_34 {
+  font-family:PingFangSC-Medium,PingFang SC;
+  font-size: 34rpx;
+  color: #333333;
+  text-align: center;
+  line-height: 24px;
+}
+
+.text_black6_32 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 32rpx;
+  color: #666666;
+  text-align: center;
+  line-height: 32px;
+}

+// pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+var format = require('../../../../utils/util.js');
+const regex = /^[0-9a-zA-Z]{1,}$/
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    settlement_record_id: "",
+    year: "2019",
+    infoList: [{}],
+    total_account:0,
+    showAddView: false,
+    option_start_date: "",
+    option_end_date: "",
+
+    "tax_extension_account": "",
+    "option_start_time": "", //申报扣除月份起,
+    "option_end_time": "", //申报扣除月份止,
+    "tax_check_code": "",
+    "year_premium": "", //年度保费,
+    "month_premium": "", //月度保费 
+    "year_deduction": "", //本年扣除金额
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function(options) {
+    this.setData({
+      settlement_record_id: options.id
+    })
+    this.getInfoList()
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function() {
+
+  },
+
+  getInfoList: function() {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/tax-extension",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id
+      },
+      success: function(result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          that.setData({
+            total_account: result.data.total_account,
+            infoList: that.handleData(result.data.items),
+
+            option_start_date: "",
+            option_end_date: "",
+            "tax_extension_account": "",
+            "option_start_time": "", //申报扣除月份起,
+            "option_end_time": "", //申报扣除月份止,
+            "tax_check_code": "",
+            "year_premium": "", //年度保费,
+            "month_premium": "", //月度保费 
+            "year_deduction": "", //本年扣除金额
+          })
+        }
+      },
+    })
+  },
+
+  handleData: function(items) { //解析列表数据时间戳
+    for (var i = 0; i < items.length; i++) {
+      if (items[i].option_start_time && items[i].option_start_time > 1000) {
+        items[i].option_start_time = format.formatTime_date(items[i].option_start_time)
+      } else {
+        items[i].option_start_time = ""
+      }
+      if (items[i].option_end_time && items[i].option_end_time > 1000) {
+        items[i].option_end_time = format.formatTime_date(items[i].option_end_time)
+      } else {
+        items[i].option_end_time = ""
+      }
+    }
+    return items
+  },
+
+  bindDatePicker: function(e) { //时间选择
+    var datelong = Date.parse(new Date(e.detail.value)) / 1000
+    console.log("picker", e)
+    if ("option_start_time" == e.currentTarget.id) {
+      this.setData({
+        option_start_date: e.detail.value,
+        option_start_time: datelong
+      })
+    } else if ("option_end_time" == e.currentTarget.id) {
+      this.setData({
+        option_end_date: e.detail.value,
+        option_end_time: datelong
+      })
+    }
+
+  },
+
+  getInputInfo: function(e) { //
+    console.log("输入框", e.currentTarget.id, e.detail.value)
+    var key = e.currentTarget.id + ""
+    if ("tax_extension_account" == key) {
+      this.setData({
+        "tax_extension_account": e.detail.value,
+      })
+    }
+    if ("tax_check_code" == key) {
+      this.setData({
+        "tax_check_code": e.detail.value,
+      })
+    }
+    if ("year_premium" == key) {
+      this.setData({
+        "year_premium": e.detail.value,
+      })
+    }
+    if ("month_premium" == key) {
+      this.setData({
+        "month_premium": e.detail.value,
+      })
+    }
+    if ("year_deduction" == key) {
+      this.setData({
+        "year_deduction": e.detail.value,
+      })
+    }
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function() {
+
+  },
+
+  addItem: function() { //继续添加
+    if (!this.data.showAddView) { //是否新增了view
+      this.setData({
+        showAddView: true
+      })
+      return
+    }
+    if (!this.data.tax_extension_account || this.data.tax_extension_account.length < 1) {
+      this.showToast("请填写税延养老账号编号")
+      return
+    }
+    if (!regex.test(this.data.tax_extension_account)) {
+      this.showToast("税延养老账户编号格式有误")
+      return
+    }
+    if (!this.data.option_start_time || this.data.option_start_time.length < 1000 || !this.data.option_end_time || this.data.option_end_time.length < 1000) {
+      this.showToast("请选择申报扣除起止月")
+      return
+    }
+    if (!this.data.tax_check_code || this.data.tax_check_code.length < 1) {
+      this.showToast("请填写报税校验码")
+      return
+    }
+    if (!regex.test(this.data.tax_check_code)) {
+      this.showToast("报税校验码格式有误")
+      return
+    }
+    if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
+      this.showToast("请填写本年扣除金额")
+      return
+    }
+    this.goSubmit("1")
+  },
+
+  goSubmit: function(type) {
+    if (!this.data.tax_extension_account || this.data.tax_extension_account.length < 1) {
+      this.showToast("请填写税延养老账户编号")
+      return
+    }
+    if (!regex.test(this.data.tax_extension_account)) {
+      this.showToast("税延养老账号编号格式有误")
+      return
+    }
+    if (!this.data.option_start_time || this.data.option_start_time.length < 1000 || !this.data.option_end_time || this.data.option_end_time.length < 1000) {
+      this.showToast("请选择申报扣除起止月")
+      return
+    }
+    if (!this.data.tax_check_code || this.data.tax_check_code.length < 1) {
+      this.showToast("请填写报税校验码")
+      return
+    }
+    if (!regex.test(this.data.tax_check_code)) {
+      this.showToast("报税校验码格式有误")
+      return
+    }
+    if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
+      this.showToast("请填写本年扣除金额")
+      return
+    }
+
+    var that = this
+    this.Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/tax-extension",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "POST",
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id,
+        "tax_extension_account": that.data.tax_extension_account,
+        "option_start_time": that.data.option_start_time, //申报扣除月份起,
+        "option_end_time": that.data.option_end_time, //申报扣除月份止,
+        "tax_check_code": that.data.tax_check_code,
+        "year_premium": parseFloat(that.data.year_premium), //年度保费,
+        "month_premium": parseFloat(that.data.month_premium), //月度保费 
+        "year_deduction": parseFloat(that.data.year_deduction), //本年扣除金额
+      },
+      success: function(result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          if (type == '1') {
+            that.getInfoList()
+            that.setData({
+              showAddView: true
+            })
+          } else {
+            wx.navigateBack({
+              delta: 2
+            })
+          }
+        }
+      }
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function() {
+
+  },
+
+  showToast: function(data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
+  },
+
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function() {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function() {
+
+  }
+})

+{
+ "navigationBarTitleText": "税延养老保险附表"
+}

+<!--pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.wxml-->
+<view>
+  <view style="background:#fff;padding:0 30rpx;">
+    <text class="text_gray7_34">税延养老保险合计</text>
+    <text class="text_black3_34 float_right">{{total_account}}</text>
+  </view>
+
+  <!-- 列表数据，不可修改 -->
+  <view wx:for="{{infoList}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">税延养老账户编号</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.tax_extension_account}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDeductContent">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">申报扣除期起</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.option_start_time}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDeductContent">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">申报扣除期止</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.option_end_time}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">报税校验码</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.tax_check_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">年度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.year_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">月度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.month_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">本年扣除金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.year_deduction}}"></input>
+    </view>
+  </view>
+
+  <!-- 添加项，可编辑 -->
+  <view wx:if="{{showAddView}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">税延养老账户编号</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="tax_extension_account" bindblur="getInputInfo" maxlength="20" value="{{tax_extension_account}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDatePicker" id="option_start_time">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">申报扣除期起</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{option_start_date}}" disabled="true"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDatePicker" id="option_end_time">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">申报扣除期止</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{option_end_date}}" disabled="true"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">报税校验码</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="tax_check_code" bindblur="getInputInfo" maxlength="20" value="{{tax_check_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">年度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入'  type="digit" id="year_premium" bindblur="getInputInfo" value="{{year_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">月度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" id="month_premium" bindblur="getInputInfo" value="{{month_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">本年扣除金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" id="year_deduction" bindblur="getInputInfo" value="{{year_deduction}}"></input>
+    </view>
+  </view>
+
+  <view style="background:#fff;margin-top:20rpx;height:104rpx;display:flex;align-items:center;justify-content:center;margin-bottom:84rpx" bindtap="addItem">
+    <image style="width:28rpx;height:28rpx;margin-right:16rpx" src="/images/add_extra.png"></image>
+    <text style="font-size:28rpx;color:#4986fe">继续添加</text>
+  </view>
+  <view class="btn_bottom" bindtap="goSubmit">
+    <button class="btn_bottom">保存</button>
+  </view>
+</view>

+/* pages/main/finalpay/otherDeductDetail/endowmentInsurDetail.wxss */
+
+page {
+  background-color: #f5f5f5;
+}
+
+.text_gray7_34 {
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 34rpx;
+  color: #777;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.text_black3_34 {
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 34rpx;
+  color: #333;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.input_wrap {
+  max-width: 600rpx;
+  height: 104rpx;
+  font-size: 32rpx;
+  color: #fff;
+  text-align: right;
+  overflow: hidden;
+  float: right;
+}
+
+.arrow_wrap {
+  width: 50rpx;
+  height: 50rpx;
+  margin-top: 26rpx
+}
+
+.red_star_right_10 {
+  color: red;
+  font-size: 30rpx;
+  line-height: 104rpx;
+  float: left;
+  margin-right: 10rpx;
+}

+// pages/main/finalpay/otherDeductDetail/healthInsurDetail.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+var format = require('../../../../utils/util.js');
+const regex = /^[0-9a-zA-Z]{1,}$/
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    settlement_record_id:"",
+    year: "2019",
+    showAddView: false,
+    infoList: [{}],
+    total_account:0,
+    effect_date:"",
+
+    "tax_code": "",
+    "date_policy": "", //保单生效日期,
+    "year_premium": "", //年度保费
+    "month_premium": "", //月度保费 
+    "year_deduction": "", //本年扣除金额
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function(options) {
+    this.setData({
+      settlement_record_id: options.id
+    })
+    this.getInfoList()
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function() {
+
+  },
+
+  getInfoList: function() {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/commercial-insurance-tax",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id
+      },
+      success: function(result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          that.setData({
+            total_account: result.data.total_account,
+            infoList: that.handleData(result.data.items) ,
+            "tax_code": "",
+            "date_policy": "",
+            "year_premium": "",
+            "month_premium": "",
+            "year_deduction": "",
+          })
+        }
+      },
+    })
+  },
+
+  handleData: function (items){
+    for (var i = 0; i < items.length; i++) {
+      if (items[i].date_policy && items[i].date_policy>1000){
+        items[i].date_policy = format.formatTime_date(items[i].date_policy)
+      }else{
+        items[i].date_policy = ""
+      }
+    }
+    return items
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function() {
+
+  },
+
+  getInputInfo: function(e) { //
+    console.log("输入框", e.currentTarget.id, e.detail.value)
+    var key = e.currentTarget.id + ""
+    if ("tax_code" == key) {
+      this.setData({
+        "tax_code": e.detail.value,
+      })
+    }
+    if ("year_premium" == key) {
+      this.setData({
+        "year_premium": e.detail.value,
+      })
+    }
+    if ("month_premium" == key) {
+      this.setData({
+        "month_premium": e.detail.value,
+      })
+    }
+    if ("year_deduction" == key) {
+      this.setData({
+        "year_deduction": e.detail.value,
+      })
+    }
+  },
+
+  datePolicyPicker: function(e) {
+    var datelong = Date.parse(new Date(e.detail.value)) / 1000
+    console.log("日期", e.detail.value, datelong)
+    this.setData({
+      effect_date: e.detail.value,
+      date_policy: datelong
+    })
+  },
+
+  addItem: function() { //继续添加
+    if (!this.data.showAddView) {//是否新增了view
+      this.setData({
+        showAddView: true
+      })
+      return
+    }
+    if (!this.data.tax_code || this.data.tax_code.length < 1) {
+      this.showToast("请填写税优识别码")
+      return
+    }
+    if (!regex.test(this.data.tax_code)) {
+      this.showToast("税优识别码格式有误")
+      return
+    }
+    if (!this.data.date_policy || this.data.date_policy.length < 1000) {
+      this.showToast("请选择保单生效日期")
+      return
+    }
+    if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
+      this.showToast("请填写本年扣除金额")
+      return
+    }
+    this.goSubmit("1")
+  },
+
+  goSubmit: function (type) {//type=“1”，继续添加(当前页面)，type=2保存，返回列表
+    if (!this.data.tax_code || this.data.tax_code.length < 1) {
+      this.showToast("请填写税优识别码")
+      return
+    }
+    if (!regex.test(this.data.tax_code)) {
+      this.showToast("税优识别码格式有误")
+      return
+    }
+    if (!this.data.date_policy || this.data.date_policy.length < 1000) {
+      this.showToast("请选择保单生效日期")
+      return
+    }
+    if (!this.data.year_deduction || this.data.year_deduction.length < 1) {
+      this.showToast("请填写本年扣除金额")
+      return
+    }
+    var that = this
+    this.Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/commercial-insurance-tax",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "POST",
+      data: {
+        "years": that.data.year,
+        "settlement_record_id": that.data.settlement_record_id,
+        "tax_code": that.data.tax_code,
+        "date_policy": that.data.date_policy , //保单生效日期,
+        "year_premium": parseFloat(that.data.year_premium)  ,//年度保费,
+        "month_premium": parseFloat(that.data.month_premium), //月度保费 
+        "year_deduction": parseFloat(that.data.year_deduction), //本年扣除金额
+      },
+      success: function (result) {
+        console.log("infoList", result)
+        if (result.statusCode == 200) {
+          if (type == '1') {
+            that.getInfoList()
+            that.setData({
+              showAddView: true
+            })
+          } else {
+            wx.navigateBack({
+              delta: 2
+            })
+          }
+        }
+      },
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function() {
+
+  },
+
+  showToast: function (data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function() {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function() {
+
+  }
+})

+{
+  "navigationBarTitleText": "商业健康保险附表"
+}

+<view>
+  <view style="background:#fff;padding:0 30rpx;">
+    <text class="text_gray7_34">商业健康保险合计</text>
+    <text class="text_black3_34 float_right">{{total_account}}</text>
+  </view>
+
+  <!-- 列表数据，不可修改 -->
+  <view wx:for="{{infoList}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">税优识别码</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" maxlength="20"  value="{{item.tax_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="bindDeductContent">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">保单生效日期</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.date_policy}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">年度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.year_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">月度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true" value="{{item.month_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">本年扣除金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' disabled="true"value="{{item.year_deduction}}"></input>
+    </view>
+  </view>
+
+ <!-- 添加项，可编辑 -->
+   <view  wx:if="{{showAddView}}" style="background:#fff;margin-top:20rpx">
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">税优识别码</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' id="tax_code" bindblur="getInputInfo" value="{{tax_code}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="date" bindchange="datePolicyPicker">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">保单生效日期</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请选择'  value="{{effect_date}}" disabled="true"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">年度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' type="digit" id="year_premium" bindblur="getInputInfo"  value="{{year_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">月度保费</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入'  type="digit" id="month_premium" bindblur="getInputInfo" value="{{month_premium}}"></input>
+    </view>
+    <view class="divide_line_30"></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class='red_star_right_10'>*</text>
+      <text class="text_gray7_34">本年扣除金额</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入'  type="digit" id="year_deduction" bindblur="getInputInfo" value="{{year_deduction}}"></input>
+    </view>
+  </view>
+
+  <view style="background:#fff;margin-top:20rpx;height:104rpx;display:flex;align-items:center;justify-content:center;margin-bottom:84rpx" bindtap="addItem">
+    <image style="width:28rpx;height:28rpx;margin-right:16rpx" src="/images/add_extra.png"></image>
+    <text style="font-size:28rpx;color:#4986fe">继续添加</text>
+  </view>
+  <view class="btn_bottom" bindtap="goSubmit">
+    <button class="btn_bottom">保存</button>
+  </view>
+</view>

+/* pages/main/finalpay/otherDeductDetail/healthInsurDetail.wxss */
+
+page {
+  background-color: #f5f5f5;
+}
+
+.text_gray7_34 {
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 34rpx;
+  color: #777;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.text_black3_34 {
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 34rpx;
+  color: #333;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.input_wrap {
+  max-width: 600rpx;
+  height: 104rpx;
+  font-size: 32rpx;
+  color: #fff;
+  text-align: right;
+  overflow: hidden;
+  float: right;
+}
+
+.arrow_wrap {
+  width: 50rpx;
+  height: 50rpx;
+  margin-top: 26rpx
+}
+
+.red_star_right_10 {
+  color: red;
+  font-size: 30rpx;
+  line-height: 104rpx;
+  float: left;
+  margin-right: 10rpx;
+}

+// pages/main/finalpay/otherDeductDetail/otherDeductDetail.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    settlement_record_id: "",
+    endowment_account: "0",
+    health_account: "0"
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function(options) {
+    console.log("id", options)
+    this.setData({
+      settlement_record_id: options.id,
+      endowment_account: options.endowment_account,
+      health_account: options.health_account
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function() {
+
+  },
+
+  // 商业健康保险
+  healthInsurDetail: function() {
+    wx.navigateTo({
+      url: 'healthInsurDetail?id=' + this.data.settlement_record_id,
+    })
+  },
+
+  // 税延养老保险
+  endowmentInsurDetail: function() {
+    wx.navigateTo({
+      url: 'endowmentInsurDetail?id=' + this.data.settlement_record_id,
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function() {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function() {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function() {
+
+  }
+})

+{
+  "navigationBarTitleText": "特殊收入扣除项目"
+}

+<view>
+  <view style="background:#fff;padding:0 30rpx;" bindtap="healthInsurDetail">
+    <text class="text_gray7_34">商业健康保险合计</text>
+    <image class='arrow_wrap' style='margin-top: 32rpx' src='/images/arrow_right.png'></image>
+    <text class="text_black3_34 float_right">{{health_account}}</text>
+  </view>
+  <view class="divide_line_30"></view>
+  <view style="background:#fff;padding:0 30rpx;" bindtap="endowmentInsurDetail">
+    <text class="text_gray7_34">税延养老保险合计</text>
+    <image class='arrow_wrap' style='margin-top: 32rpx' src='/images/arrow_right.png'></image>
+    <text class="text_black3_34 float_right">{{endowment_account}}</text>
+  </view>
+</view>

+/* pages/main/finalpay/otherDeductDetail/otherDeductDetail.wxss */
+page {
+  background-color: #f5f5f5;
+}
+
+.text_gray7_34 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 34rpx;
+  color: #777777;
+  text-align: center;
+  line-height: 104rpx;
+}
+
+.text_black3_34 {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 34rpx;
+  color: #333333;
+  text-align: center;
+  line-height: 104rpx;
+}

+; // pages/main/finalpay/refundDetail/refundDetail.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    year: "2019",
+    refund_status: "", //退税状态  "0" 无需退税； "1" 待退税；"2" 退税中"3" 退税成功；"4"退税失败；"5"放弃退税；
+    status_arr: ["", "", "退税中", "退税成功", "退税失败","放弃退税"],
+    refundInfo: {},
+    refund_tax: 0
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function(options) {
+    console.log(options)
+    this.getRefundDetail()
+    this.setData({
+      refund_status: options.status,
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function() {
+
+  },
+
+  getRefundDetail: function() { //退税明细
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/refund-detail",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        years: that.data.year,
+      },
+      success: function(result) {
+        console.log("declareinfo", result)
+        if (result.statusCode == 200) {
+          that.setData({
+            refund_tax: Math.abs(result.data.item.accumulated_refund_tax),
+            refundInfo: result.data.item
+          })
+        }
+      },
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function() {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function() {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function() {
+
+  }
+})

+{
+  "navigationBarTitleText": "退税详情"
+}

+<view>
+
+  <view style="background:#fff;padding:30rpx;margin-top:20rpx">
+    <view wx:if="{{refund_status=='3'}}" style="margin-bottom:20rpx">
+      <text class="text_black3_34">退税详情</text>
+      <view class="light_blue_bg" style="display:flex">
+        <text style="font-size:14px;color:#54B4F5;margin: 0 auto">退款成功</text>
+      </view>
+    </view>
+    <view wx:elif="{{refund_status!=0&&refund_status!=1}}" style="margin-bottom:20rpx">
+      <text class="text_black3_34">退税详情</text>
+      <view class="light_yellow_bg" style="display:flex">
+        <text style="font-size:14px;color:#FF8F1F;margin: 0 auto">{{status_arr[refund_status]}}</text>
+      </view>
+    </view>
+    <view class="divide_line" style="margin-bottom:20rpx"></view>
+    <view>
+      <text class="text_black6_32">开户人姓名</text>
+      <text class="text_black6_32 float_right">{{refundInfo.name}}</text>
+    </view>
+    <view>
+      <text class="text_black6_32">申请退税金额</text>
+      <text class="text_black6_32 float_right">{{refund_tax}}</text>
+    </view>
+    <view>
+      <text class="text_black6_32">银行卡号</text>
+      <text class="text_black6_32 float_right">{{refundInfo.bank_card_no}}</text>
+    </view>
+    <view>
+      <text class="text_black6_32">开户银行名称</text>
+      <text class="text_black6_32 float_right">{{refundInfo.bank}}</text>
+    </view>
+    <view>
+      <text class="text_black6_32">开户银行省份</text>
+      <text class="text_black6_32 float_right">{{refundInfo.bank_province}}</text>
+    </view>
+  </view>
+</view>

+/* pages/main/finalpay/refundDetail/refundDetail.wxss */
+
+.page {
+  width: 100%;
+  height: 100%;
+  background-color: #f5f5f5;
+}
+
+.text_black3_34 {
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-size: 34rpx;
+  color: #333;
+  text-align: center;
+  line-height: 24px;
+}
+
+.text_black6_32 {
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 32rpx;
+  color: #666;
+  text-align: center;
+  line-height: 32px;
+}
+
+.light_blue_bg {
+  float: right;
+  width: 64px;
+  height: 20px;
+  background: rgba(221, 240, 253, 1);
+  border-radius: 2px;
+}
+
+.light_yellow_bg {
+  float: right;
+  width: 64px;
+  height: 20px;
+  background:rgba(255,233,211,1);
+  border-radius: 2px;
+}

+// pages/main/finalpay/refundInfo/refundInfo.js
+var OSSInit;
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+var format = require('../../../../utils/util.js');
+var province = require('../../../../utils/province.js');
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    year:"2019",
+    province: [],
+    bankList:[],
+    name: '',
+    bank: '',
+    bank_card_no: '',
+    bank_province: '',
+    show_modal: false
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function(options) {
+    this.initOSS()
+    var userinfo = app.globalData.userInfo
+    console.log("userinfo", userinfo)
+    this.getRefundDetail()
+    this.getbanklist()
+    this.loadProvince()
+    this.setData({
+      name: userinfo ? userinfo.name : ""
+    })
+  },
+
+  getbanklist: function () {
+    var that = this
+    var Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/bank-list',
+      method: "GET",
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        console.log(res)
+        that.setData({
+          bankList: res.data.banks,
+        })
+      },
+      fail(res) {
+        console.log(res)
+      },
+      complete() {
+        wx.hideLoading()
+      }
+    })
+  },
+
+  getRefundDetail: function () { //退税明细
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/refund-detail",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        years: that.data.year,
+      },
+      success: function (result) {
+        console.log("refundinfo", result.data)
+        if (result.statusCode == 200) {
+          that.setData({
+            bank: result.data.item.bank,
+            bank_card_no: result.data.item.bank_card_no,
+            bank_province: result.data.item.bank_province
+          })
+        }
+      },
+    })
+  },
+
+
+  loadProvince: function() {
+    province.init(this)
+    var provincelist = this.data.province
+    var province_data = []
+    for (var i = 0; i < provincelist.length; i++) {
+      province_data.push(provincelist[i].name)
+    }
+    this.setData({
+      province: province_data,
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function() {
+
+  },
+
+  initOSS: function() {
+    var that = this
+    var Authorization = getApp().globalData.Authorization;
+    //OSS 上传前init
+    wx.showLoading()
+    wx.request({
+      url: baseUrl + "filemeta/v1/inits",
+      header: {
+        'Authorization': Authorization
+      },
+      method: 'POST',
+      data: {
+        "access_type": "web_upload",
+        "action ": "put_object",
+        "instance_id": "",
+        "object_type": "wx_image"
+      },
+      success: function(result) {
+
+        OSSInit = result.data
+        console.log(' OSS init 成功', OSSInit)
+      },
+      fail: function(res) {
+        console.log('OSS init  失败', res)
+      },
+      complete: function() {
+        wx.hideLoading()
+      }
+    })
+  },
+
+  /**
+   * Lifecycle function--Called when page show
+   */
+  onShow: function() {
+
+  },
+
+  bindbank: function() {
+    var that = this
+    wx.chooseImage({
+      sourceType: ['camera', 'album'],
+      // sizeType: ['original'],
+      count: 1,
+      success: function(res) {
+        console.log('success', res)
+        wx.getFileSystemManager().readFile({
+          filePath: res.tempFilePaths[0], // 选择图片返回的相对路径
+          encoding: 'base64', // 编码格式
+          success: res => { // 成功的回调
+            that.ocrBankImage(res.data)
+          }
+        })
+      }
+    })
+  },
+
+  // 识别银行卡照片
+  ocrBankImage: function(imginfo) {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    setTimeout(function() {
+      wx.showLoading({
+        title: "识别银行卡中",
+        mask: true
+      })
+    }, 1000)
+
+    wx.request({
+      url: baseUrl + "common/v1/ocr/bankcards",
+      method: "POST",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        "image": imginfo
+      },
+      success: function(result) {
+        console.log("bankinfo", result)
+
+        if (result.statusCode == 200) {
+          var result_new = result.data.bank.split("银行")
+          that.setData({
+            bank: result_new[0] + "银行",
+            bank_card_no: result.data.bank_card_no,
+            hideLoading: true,
+          })
+          wx.hideLoading()
+        } else {
+          wx.hideLoading()
+          that.showToast("照片无法识别，请重试")
+        }
+      },
+      fail: function() {
+        wx.hideLoading()
+        that.showToast("照片无法识别，请重试")
+      }
+    })
+  },
+
+  bindRegionChange: function(e) {
+    console.log('picker，携带值为', e.detail.value)
+    this.setData({
+      bank_province: this.data.province[e.detail.value]
+    })
+  },
+
+  bindbankChange: function (e) {
+    console.log('picker，携带值为', e.detail.value)
+    this.setData({
+      bank: this.data.bankList[e.detail.value]
+    })
+  },
+
+  formSubmit: function(e) {
+    var formdata = e.detail.value
+    console.log("formdata", formdata);
+    if (formdata.name.length < 1) {
+      this.showToast("请输入姓名")
+      return
+    }
+    if (formdata.bank_card_no.length < 1) {
+      this.showToast("请输入银行卡号")
+      return
+    }
+    if (!format.banknoCheck(formdata.bank_card_no)) {
+      this.showToast('银行卡号格式有误')
+      return
+    }
+    if (this.data.bank.length < 1) {
+      this.showToast("请输入银行名称")
+      return
+    }
+    if (this.data.bank_province.length < 1) {
+      this.showToast("请选择开户银行省份")
+      return
+    }
+    this.setData({
+      bank_card_no: formdata.bank_card_no,
+      show_modal: true
+    })
+  },
+
+  commitCancel: function() {
+    this.setData({
+      show_modal: false
+    })
+  },
+
+
+  commitConfirm: function() {
+    this.setData({
+      show_modal: false
+    })
+    // 是否放弃退税，（是:"5",否:""）
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/record",
+      header: {
+        'Authorization': this.Authorization
+      },
+      method: "PUT",
+      data: {
+        'name': that.data.name,
+        "bank": that.data.bank,
+        "bank_card_no": that.data.bank_card_no,
+        "bank_province": that.data.bank_province,
+        "refund_status": "",
+        "years": "2019",
+
+      },
+      success: function(result) {
+        console.log("submit", result)
+        if (result.statusCode == 200) {
+          wx.navigateBack({
+            delta: 1
+          })
+        }
+      },
+    })
+  },
+
+  showToast: function(data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
+  },
+
+
+  /**
+   * Lifecycle function--Called when page hide
+   */
+  onHide: function() {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page unload
+   */
+  onUnload: function() {
+
+  },
+
+  /**
+   * Page event handler function--Called when user drop down
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * Called when page reach bottom
+   */
+  onReachBottom: function() {
+
+  },
+
+  /**
+   * Called when user click on the top right corner to share
+   */
+  onShareAppMessage: function() {
+
+  }
+})

+{
+  "navigationBarTitleText": "退税信息"
+}

+<!--pages/main/finalpay/refundInfo/refundInfo.wxml-->
+<view class="page">
+  <form style="width:100%;" bindsubmit='formSubmit'>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff;margin-bottom:1rpx">
+      <text class="text_gray7_34">开户人姓名</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' value="{{name}}" disabled="true"></input>
+    </view>
+    <view class='divide_line_30'></view>
+    <view style="height:104rpx;padding:0 30rpx;background-color:#fff">
+      <text class="text_gray7_34" style="line-height:104rpx">银行卡号</text>
+      <image class='image_camera' src='/images/camera.png' bindtap='bindbank'></image>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='bank_card_no' value="{{bank_card_no}}" maxlength='19' type='number'></input>
+    </view>
+    <view class='divide_line_30'></view>
+    <!-- <view style="height:104rpx;padding:0 30rpx;background-color:#fff">
+      <text class="text_gray7_34" style="line-height:104rpx">开户银行名称</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='bank' value="{{bank}}"></input>
+    </view> -->
+    <picker style="height:104rpx;padding-left:30rpx;background-color:#fff" mode="selector" bindchange="bindbankChange" range="{{bankList}}" >
+      <text class="text_gray7_34">开户银行名称</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <view wx:if="{{bank.length>0}}" class="input_wrap rigion_choosed">
+        {{bank}}
+      </view>
+      <view wx:else class="input_wrap rigion_notchoosed}}">
+        请选择开户银行 </view>
+    </picker>
+    <view class='divide_line_30'></view>
+    <!-- <view style="height:104rpx;padding:0 30rpx;background-color:#fff">
+      <text class="text_gray7_34" style="line-height:104rpx">开户银行省份</text>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='bank_card_province' value="{{bank_card_province}}"></input>
+    </view> -->
+
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindRegionChange" range="{{province}}" >
+      <text class="text_gray7_34">开户银行省份</text>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
+      <view wx:if="{{bank_province.length>0}}" class="input_wrap rigion_choosed">
+        {{bank_province}}
+      </view>
+      <view wx:else class="input_wrap rigion_notchoosed}}">
+        请选择开户银行省份 </view>
+    </picker>
+
+    <view class="btn_bottom">
+      <button class="btn_bottom" formType="submit">保存</button>
+    </view>
+  </form>
+  <view class="mask" wx:if="{{show_modal}}"></view>
+  <view class='modal_lg' style='' wx:if="{{show_modal}}">
+    <!-- <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'></view> -->
+    <view class="text_title"> 确认提交吗？</view>
+    <view style="margin:2rpx 40rpx">
+      <text class="text_gray6_28">姓名：</text>
+      <text class="text_gray6_28 float_right">{{name}}</text>
+    </view>
+    <view style="margin:2rpx 40rpx">
+      <text class="text_gray6_28">银行卡号：</text>
+      <text class="text_gray6_28 float_right">{{bank_card_no}}</text>
+    </view>
+    <view style="margin:2rpx 40rpx">
+      <text class="text_gray6_28">开户行名称：</text>
+      <text class="text_gray6_28 float_right">{{bank}}</text>
+    </view>
+    <view style="margin:2rpx 40rpx">
+      <text class="text_gray6_28">开户行省份:</text>
+      <text class="text_gray6_28 float_right">{{bank_province}}</text>
+    </view>
+    <view class='divide_line_f5f5f5' style="margin-top:30rpx"></view>
+
+    <view style='width:100%;display: flex;'>
+      <text class='text_cancel' bindtap='commitCancel'>取消</text>
+      <view style='width:1px;background:#F5F5F5;'></view>
+      <text class='text_confirm' bindtap='commitConfirm'>确认</text>
+    </view>
+
+  </view>
+</view>

+/* pages/main/finalpay/refundInfo/refundInfo.wxss */
+
+.page {
+  width: 100%;
+  height: 100%;
+  background-color: #f5f5f5;
+}
+
+.text_black3_34 {
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 34rpx;
+  color: #333;
+  line-height: 104rpx;
+}
+
+.text_gray7_34 {
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 34rpx;
+  color: #777;
+  line-height: 104rpx;
+}
+
+.text_gray6_28 {
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 28rpx;
+  color: #666;
+}
+
+.input_wrap {
+  max-width: 600rpx;
+  height: 104rpx;
+  font-size: 32rpx;
+  color: #fff;
+  text-align: right;
+  overflow: hidden;
+  float: right;
+}
+
+.rigion_choosed{
+  color:#000;
+  line-height:104rpx
+}
+
+.rigion_notchoosed{
+  color:#777;
+  line-height:104rpx
+}
+
+.image_camera {
+  width: 42rpx;
+  height: 42rpx;
+  margin-left: 10rpx;
+  margin-top: 30rpx;
+  float: right;
+}
+
+.arrow_wrap {
+  width: 60rpx;
+  height: 60rpx;
+  margin-top: 20rpx
+}
+
+/* 遮罩层 */
+
+.mask {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.7;
+  z-index: 10;
+}
+
+.modal_lg {
+  width: 72%;
+  position: fixed;
+  left: 0;
+  right: 0;
+  margin: 0 auto;
+  background-color: #fff;
+  border-radius: 7px;
+  display: flex;
+  flex-direction: column;
+  top: 260rpx;
+  z-index: 10;
+}
+
+.text_cancel {
+  font-family: PingFangSC-Regular;
+  font-size: 36rpx;
+  color: #999;
+  letter-spacing: 0;
+  text-align: center;
+  flex: 1;
+  padding: 30rpx;
+}
+
+.text_confirm {
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-size: 36rpx;
+  color: #357aeb;
+  letter-spacing: 0;
+  text-align: center;
+  flex: 1;
+  padding: 30rpx;
+}
+
+.text_title {
+  font-size: 18px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  color: rgba(51, 51, 51, 1);
+  padding: 40rpx;
+  text-align: center;
+}

@@ -10,6 +10,7 @@ Page({
    * Page initial data
    * Page initial data
    */
    */
   data: {
   data: {
+    payment_bg: getApp().globalData.OSSImgHeader + "payment_bg.png",
     choosed_date: '',
     choosed_date: '',
     long_date: 0
     long_date: 0
   },
   },

@@ -13,7 +13,7 @@
       </picker>
       </picker>
       <view class='divide_line_f5f5f5'></view>
       <view class='divide_line_f5f5f5'></view>
       <view style='margin: 30rpx;positive:relative;width:92%;height:454rpx'>
       <view style='margin: 30rpx;positive:relative;width:92%;height:454rpx'>
-        <image class=' payment_img_bg ' src='/images/payment_bg.png ' style='position:absolute;z-index: 1;'></image>
+        <image class=' payment_img_bg ' src='{{payment_bg}}' style='position:absolute;z-index: 1;'></image>
         <view>
         <view>
           <view class='view_bg_wrap' style='margin-top: 48rpx;'>
           <view class='view_bg_wrap' style='margin-top: 48rpx;'>
             <view style='flex: 1;text-align:center;display: flex;flex-direction: column;'>
             <view style='flex: 1;text-align:center;display: flex;flex-direction: column;'>

@@ -7,9 +7,11 @@ Page({
    * 页面的初始数据
    * 页面的初始数据
    */
    */
   data: {
   data: {
+    verify_dialog: getApp().globalData.OSSImgHeader + "verify_dialog.png",
     isshow: false,
     isshow: false,
     onresume: false,
     onresume: false,
-    has_verify: true
+    has_verify: true,
+    guide_bg: getApp().globalData.OSSImgHeader+"guide_bg.png"
   },
   },
 
 
   /**
   /**
@@ -94,7 +96,9 @@ Page({
             })
             })
           } else if (skip_type == "4") {
           } else if (skip_type == "4") {
             wx.navigateTo({
             wx.navigateTo({
-              url: '../finalpayment/home',
+              //第一版本的跳转路径
+              // url: '../finalpayment/home',
+              url:'../finalpay/home',
             })
             })
           } 
           } 
         }
         }

@@ -6,7 +6,7 @@
   <scroll-view>
   <scroll-view>
     <view class="bg_wrap">
     <view class="bg_wrap">
 
 
-      <image class='bgimg' src='/images/guide_bg.png'></image>
+      <image class='bgimg' src='{{guide_bg}}'></image>
 
 
       <view class='card_rectangle_bg_row' style='margin-top:310rpx;padding:30rpx' bindtap='gotaxPerson'>
       <view class='card_rectangle_bg_row' style='margin-top:310rpx;padding:30rpx' bindtap='gotaxPerson'>
         <image class="icon_wrap" src="/images/tax_person.png"></image>
         <image class="icon_wrap" src="/images/tax_person.png"></image>
@@ -38,7 +38,7 @@
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view>
       </view>
 
 
-      <!-- <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
+      <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
         <image class="icon_wrap" src="/images/final_payment.png"></image>
         <image class="icon_wrap" src="/images/final_payment.png"></image>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
@@ -46,7 +46,7 @@
           <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看个人年度税收信息，年度汇算清缴</text>
           <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看个人年度税收信息，年度汇算清缴</text>
         </view>
         </view>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
-      </view> -->
+      </view>
 
 
       <!-- <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
       <!-- <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
         <image class="icon_wrap" src="/images/tax_calculate.png"></image>
         <image class="icon_wrap" src="/images/tax_calculate.png"></image>
@@ -69,7 +69,7 @@
   <view class="mask" wx:if="{{!has_verify&&onresume}}"></view>
   <view class="mask" wx:if="{{!has_verify&&onresume}}"></view>
 
 
   <view style='top:180rpx;position:absolute;z-index:10;right:0;left:0;margin:auto;text-align:center;' wx:if="{{!has_verify&&onresume}}">
   <view style='top:180rpx;position:absolute;z-index:10;right:0;left:0;margin:auto;text-align:center;' wx:if="{{!has_verify&&onresume}}">
-    <image style='height:860rpx' src='/images/verify_dialog.png'>
+    <image style='height:860rpx' src='{{verify_dialog}}'>
     </image>
     </image>
     <view style='position:absolute;top:660rpx;right:0;left:0;display:flex;flex-direction:column'>
     <view style='position:absolute;top:660rpx;right:0;left:0;display:flex;flex-direction:column'>
       <view class='btn_blue_radius' bindtap="go_verify_idcard">
       <view class='btn_blue_radius' bindtap="go_verify_idcard">

 var format = require('../../../../utils/util.js');
 var format = require('../../../../utils/util.js');
+var province = require('../../../../utils/province.js');
 var app = getApp();
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 var baseUrl = app.globalData.baseUrl;
 const reg_18_Number = /^[0-9]{18}$/;
 const reg_18_Number = /^[0-9]{18}$/;
@@ -16,10 +17,11 @@ Page({
    * 页面的初始数据
    * 页面的初始数据
    */
    */
   data: {
   data: {
+    province: [],
     isshow01: false,
     isshow01: false,
     isshow02: false,
     isshow02: false,
     isshow03: false,
     isshow03: false,
-    hasOtherCard:false,
+    hasOtherCard: false,
     taxInfo: {},
     taxInfo: {},
     proffessionlist: {},
     proffessionlist: {},
     banklist: {},
     banklist: {},
@@ -32,7 +34,7 @@ Page({
     birthday: '',
     birthday: '',
     idInfoData: '',
     idInfoData: '',
     id_error: false,
     id_error: false,
-    has_certify:false,
+    has_certify: false,
     curAddress_haschanged: false,
     curAddress_haschanged: false,
     birthAddress_haschanged: false,
     birthAddress_haschanged: false,
     contactAddress_haschanged: false,
     contactAddress_haschanged: false,
@@ -40,8 +42,8 @@ Page({
     long_birth_date: 0,
     long_birth_date: 0,
     long_start_date: 0,
     long_start_date: 0,
     long_end_date: 0,
     long_end_date: 0,
-    personal_equity_total:0,
-    company_equity_total:0,
+    personal_equity_total: 0,
+    company_equity_total: 0,
     huji_address_detail: '',
     huji_address_detail: '',
     personstatusData: {
     personstatusData: {
       isrequre: true,
       isrequre: true,
@@ -104,7 +106,7 @@ Page({
       label: '纳税人类型',
       label: '纳税人类型',
       bindtype: 'taxpayerType',
       bindtype: 'taxpayerType',
       placeholder: '请选择纳税人类型',
       placeholder: '请选择纳税人类型',
-      selected:"居民",
+      selected: "居民",
       values: ["居民", "非居民"],
       values: ["居民", "非居民"],
       onChange: 'onPickerSelect'
       onChange: 'onPickerSelect'
     },
     },
@@ -114,18 +116,26 @@ Page({
       bindtype: 'forigner',
       bindtype: 'forigner',
       placeholder: '请选择',
       placeholder: '请选择',
       disabled: true,
       disabled: true,
-      selected:"否",
+      selected: "否",
       values: ["否", "是"],
       values: ["否", "是"],
       onChange: 'onPickerSelect'
       onChange: 'onPickerSelect'
     },
     },
     bankInfo: {
     bankInfo: {
       label: '开户银行',
       label: '开户银行',
       bindtype: 'bank',
       bindtype: 'bank',
-      maxWidth:490,
+      maxWidth: 490,
       placeholder: '请选择开户银行',
       placeholder: '请选择开户银行',
       selected: '',
       selected: '',
       onChange: 'onPickerSelect'
       onChange: 'onPickerSelect'
     },
     },
+    bankProvinceInfo: {
+      label: '开户银行省份',
+      bindtype: 'bank_province',
+      maxWidth: 490,
+      placeholder: '请选择开户银行省份',
+      selected: '',
+      onChange: 'onPickerSelect'
+    },
     genderData: {
     genderData: {
       label: '性别',
       label: '性别',
       isrequre: true,
       isrequre: true,
@@ -216,7 +226,7 @@ Page({
     // 时间picker
     // 时间picker
     birthDate: {
     birthDate: {
       label: '出生日期',
       label: '出生日期',
-      isrequre:true,
+      isrequre: true,
       bindtype: 'birthday',
       bindtype: 'birthday',
       placeholder: '出生日期',
       placeholder: '出生日期',
       selected: '',
       selected: '',
@@ -306,7 +316,7 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function(options) {
   onLoad: function(options) {
-    
+
     console.log('options.id', options.id)
     console.log('options.id', options.id)
     if (options.id && options.id.length > 0) {
     if (options.id && options.id.length > 0) {
       this.setData({
       this.setData({
@@ -317,9 +327,28 @@ Page({
     this.getproffessiondata()
     this.getproffessiondata()
     this.getbanklist()
     this.getbanklist()
     this.getCountry()
     this.getCountry()
+    this.loadProvince()
   },
   },
-//****************获取国籍数据************/
-  getCountry: function () {
+
+//****************获取开户行省份************/
+  loadProvince: function () {
+    province.init(this)
+    var provincelist = this.data.province
+    var province_data = []
+    var bankprovince_info = this.data.bankProvinceInfo
+    for (var i = 0; i < provincelist.length; i++) {
+      province_data.push(provincelist[i].name)
+    }
+
+    bankprovince_info.values = province_data
+    this.setData({
+      bankProvinceInfo: bankprovince_info
+    })
+    console.log("bankProvinceInfo", this.data.bankProvinceInfo)
+  },
+
+  //****************获取国籍数据************/
+  getCountry: function() {
     var that = this
     var that = this
     wx.showLoading({
     wx.showLoading({
       title: '',
       title: '',
@@ -332,7 +361,7 @@ Page({
         'content-type': 'application/json', // 默认值
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
         "Authorization": Authorization
       },
       },
-      success: function (res) {
+      success: function(res) {
         var countrys = res.data.concat()
         var countrys = res.data.concat()
         that.data.birthCountryData.values = res.data
         that.data.birthCountryData.values = res.data
         if (countrys.indexOf('中国') > -1) {
         if (countrys.indexOf('中国') > -1) {
@@ -364,7 +393,7 @@ Page({
   },
   },
 
 
 
 
-//****************获取自然人数据************/
+  //****************获取自然人数据************/
   getpersonalTax: function(id) {
   getpersonalTax: function(id) {
     var that = this
     var that = this
     wx.showLoading({
     wx.showLoading({
@@ -383,7 +412,7 @@ Page({
         that.setData({
         that.setData({
           taxInfo: res.data,
           taxInfo: res.data,
           // isself: '魏先森' != res.data.name ? false : true
           // isself: '魏先森' != res.data.name ? false : true
-          isself: res.data.family_ties=="本人" ? true : false
+          isself: res.data.family_ties == "本人" ? true : false
         })
         })
         that.handleDatas(res.data)
         that.handleDatas(res.data)
       },
       },
@@ -398,16 +427,16 @@ Page({
   },
   },
 
 
   //对各参数初始赋值
   //对各参数初始赋值
-  handleDatas: function (tax_info) {
+  handleDatas: function(tax_info) {
     //todo
     //todo
     console.log('tax_info', tax_info)
     console.log('tax_info', tax_info)
     var curdate = format.curDateTime()
     var curdate = format.curDateTime()
-    this.dealCardType(tax_info.id_card_type)//为防止干扰其他字段，需要先执行
+    this.dealCardType(tax_info.id_card_type) //为防止干扰其他字段，需要先执行
 
 
     this.data.name = tax_info.name
     this.data.name = tax_info.name
     this.data.other_name = tax_info.other_name
     this.data.other_name = tax_info.other_name
-    if (tax_info.certification_status == 'active' && tax_info.id_card_no.length) {//已通过拍摄身份证认证过，不能修改
-      if (tax_info.id_card_type=='居民身份证'){
+    if (tax_info.certification_status == 'active' && tax_info.id_card_no.length) { //已通过拍摄身份证认证过，不能修改
+      if (tax_info.id_card_type == '居民身份证') {
         this.data.genderData.disabled = true
         this.data.genderData.disabled = true
         this.data.birthDate.disabled = true
         this.data.birthDate.disabled = true
       }
       }
@@ -424,7 +453,7 @@ Page({
 
 
     this.data.other_card_number = tax_info.other_id_card_no
     this.data.other_card_number = tax_info.other_id_card_no
     this.data.overseas = tax_info.is_overseas_personnel
     this.data.overseas = tax_info.is_overseas_personnel
-    if (tax_info.native){
+    if (tax_info.native) {
       this.data.countryData.selected = tax_info.native
       this.data.countryData.selected = tax_info.native
     }
     }
     this.data.birthCountryData.selected = tax_info.birth_native
     this.data.birthCountryData.selected = tax_info.birth_native
@@ -436,7 +465,7 @@ Page({
     this.data.mobile = tax_info.mobile
     this.data.mobile = tax_info.mobile
     this.data.investInfo.selected = tax_info.is_investor
     this.data.investInfo.selected = tax_info.is_investor
     this.data.specificIndustryInfo.selected = tax_info.is_specific_profession
     this.data.specificIndustryInfo.selected = tax_info.is_specific_profession
-    
+
     this.data.genderData.selected = tax_info.gender
     this.data.genderData.selected = tax_info.gender
     if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
     if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
       this.data.birthDate.selected = ''
       this.data.birthDate.selected = ''
@@ -444,17 +473,17 @@ Page({
       // this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
       // this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
       this.data.birthDate.selected = tax_info.birth_date_str //format.formatTime_date(tax_info.birth_date) 
       this.data.birthDate.selected = tax_info.birth_date_str //format.formatTime_date(tax_info.birth_date) 
     }
     }
-//非必填
+    //非必填
     if (tax_info.join_date > 1000) {
     if (tax_info.join_date > 1000) {
       // this.data.startDate.selected = format.yearFormString(tax_info.join_date) + '-' + format.monthFormString(tax_info.join_date) + '-' + format.dayFormString(tax_info.join_date)
       // this.data.startDate.selected = format.yearFormString(tax_info.join_date) + '-' + format.monthFormString(tax_info.join_date) + '-' + format.dayFormString(tax_info.join_date)
-      this.data.startDate.selected = format.formatTime_date(tax_info.join_date) 
+      this.data.startDate.selected = format.formatTime_date(tax_info.join_date)
     }
     }
     if (tax_info.separate_date > 1000) {
     if (tax_info.separate_date > 1000) {
-      this.data.endDate.selected = format.formatTime_date(tax_info.separate_date) 
+      this.data.endDate.selected = format.formatTime_date(tax_info.separate_date)
     }
     }
     const firstEntryDate = format.formatTime_date(tax_info.first_entry_date)
     const firstEntryDate = format.formatTime_date(tax_info.first_entry_date)
     const predictLeaveDate = format.formatTime_date(tax_info.predict_leave_date)
     const predictLeaveDate = format.formatTime_date(tax_info.predict_leave_date)
-    this.data.firstEntryDate.selected = (firstEntryDate.indexOf("01-01-01") == -1) ? firstEntryDate:''
+    this.data.firstEntryDate.selected = (firstEntryDate.indexOf("01-01-01") == -1) ? firstEntryDate : ''
     this.data.firstEntryDate.datelong = tax_info.first_entry_date
     this.data.firstEntryDate.datelong = tax_info.first_entry_date
     this.data.predictLeaveDate.selected = (predictLeaveDate.indexOf("01-01-01") == -1) ? predictLeaveDate : ''
     this.data.predictLeaveDate.selected = (predictLeaveDate.indexOf("01-01-01") == -1) ? predictLeaveDate : ''
     this.data.predictLeaveDate.datelong = tax_info.predict_leave_date
     this.data.predictLeaveDate.datelong = tax_info.predict_leave_date
@@ -468,6 +497,7 @@ Page({
     this.data.lieshuInfo.selected = tax_info.is_martyr_family
     this.data.lieshuInfo.selected = tax_info.is_martyr_family
     this.data.lonelyolderInfo.selected = tax_info.is_lonely_man
     this.data.lonelyolderInfo.selected = tax_info.is_lonely_man
     this.data.bankInfo.selected = tax_info.bank
     this.data.bankInfo.selected = tax_info.bank
+    this.data.bankProvinceInfo.selected = tax_info.bank_province
     this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
     this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
     this.data.currentaddressInfo.selected = tax_info.current_address.province + tax_info.current_address.city + tax_info.current_address.district
     this.data.currentaddressInfo.selected = tax_info.current_address.province + tax_info.current_address.city + tax_info.current_address.district
     this.data.birthaddressInfo.selected = (tax_info.huji_address.province + tax_info.huji_address.city + tax_info.huji_address.district).replace(/(^\s*)|(\s*$)/g, "")
     this.data.birthaddressInfo.selected = (tax_info.huji_address.province + tax_info.huji_address.city + tax_info.huji_address.district).replace(/(^\s*)|(\s*$)/g, "")
@@ -485,8 +515,9 @@ Page({
       specificIndustryInfo: this.data.specificIndustryInfo,
       specificIndustryInfo: this.data.specificIndustryInfo,
       genderData: this.data.genderData,
       genderData: this.data.genderData,
       bankInfo: this.data.bankInfo,
       bankInfo: this.data.bankInfo,
+      bankProvinceInfo: this.data.bankProvinceInfo,
       personal_equity_total: tax_info.personal_equity_total ? tax_info.personal_equity_total : 0,
       personal_equity_total: tax_info.personal_equity_total ? tax_info.personal_equity_total : 0,
-      company_equity_total: tax_info.company_equity_total ? tax_info.company_equity_total: 0,
+      company_equity_total: tax_info.company_equity_total ? tax_info.company_equity_total : 0,
 
 
       professionData: this.data.professionData,
       professionData: this.data.professionData,
       degreeData: this.data.degreeData,
       degreeData: this.data.degreeData,
@@ -501,7 +532,7 @@ Page({
 
 
       long_birth_date: tax_info.birth_date,
       long_birth_date: tax_info.birth_date,
       birthDate: this.data.birthDate,
       birthDate: this.data.birthDate,
-      long_start_date: tax_info.join_date ? tax_info.join_date:0,
+      long_start_date: tax_info.join_date ? tax_info.join_date : 0,
       startDate: this.data.startDate,
       startDate: this.data.startDate,
       long_end_date: tax_info.separate_date ? tax_info.separate_date : 0,
       long_end_date: tax_info.separate_date ? tax_info.separate_date : 0,
       endDate: this.data.endDate,
       endDate: this.data.endDate,
@@ -531,7 +562,7 @@ Page({
         "Authorization": Authorization
         "Authorization": Authorization
       },
       },
       success: function(res) {
       success: function(res) {
-        if (res.data.items.length<1){
+        if (res.data.items.length < 1) {
           return
           return
         }
         }
         proffession_info.values = that.handleProfession(res.data.items)
         proffession_info.values = that.handleProfession(res.data.items)
@@ -617,7 +648,7 @@ Page({
       },
       },
       success: function(res) {
       success: function(res) {
         console.log(res)
         console.log(res)
-        bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
+        bank_info.values = res.data.banks //that.handleBankinfo(res.data.items)
 
 
         that.setData({
         that.setData({
           // banklist: res.data.items,
           // banklist: res.data.items,
@@ -692,7 +723,7 @@ Page({
           //   return
           //   return
           // }
           // }
           that.setData({
           that.setData({
-            has_certify:true,
+            has_certify: true,
             idInfoData: id_info,
             idInfoData: id_info,
             name: id_info.name,
             name: id_info.name,
             birthday: birth_day,
             birthday: birth_day,
@@ -716,7 +747,7 @@ Page({
   },
   },
 
 
   span: function(e) {
   span: function(e) {
-    console.log(e,'9808909')
+    console.log(e, '9808909')
     if ("1" == e.currentTarget.id) {
     if ("1" == e.currentTarget.id) {
       this.setData({
       this.setData({
         isshow01: !this.data.isshow01
         isshow01: !this.data.isshow01
@@ -733,7 +764,7 @@ Page({
 
 
   },
   },
 
 
-  dealCardType: function (new_type){
+  dealCardType: function(new_type) {
     // console.log('cardtype_code', new_type_code)
     // console.log('cardtype_code', new_type_code)
     console.log('cardtype', new_type)
     console.log('cardtype', new_type)
     var is_idcard = this.data.isIdCard
     var is_idcard = this.data.isIdCard
@@ -767,12 +798,12 @@ Page({
       this.data.countryData.selected = ''
       this.data.countryData.selected = ''
       this.data.countryData.disabled = false
       this.data.countryData.disabled = false
       this.data.nameText = '英文名'
       this.data.nameText = '英文名'
-      if (new_type.indexOf('通行证') != -1){
-        this.data.otherCardtypeData.values = ['港澳居民居住证'];// [{ 'code': '4', 'name': '港澳居民居住证'}];
+      if (new_type.indexOf('通行证') != -1) {
+        this.data.otherCardtypeData.values = ['港澳居民居住证']; // [{ 'code': '4', 'name': '港澳居民居住证'}];
         this.data.otherCardtypeData.isrequre = false
         this.data.otherCardtypeData.isrequre = false
-      }else{
-        this.data.otherCardtypeData.values = ['港澳居民来往内地通行证'];// [{ 'code': '3', 'name': '港澳居民来往内地通行证'}];
-        this.data.otherCardtypeData.selected = '港澳居民来往内地通行证'; 
+      } else {
+        this.data.otherCardtypeData.values = ['港澳居民来往内地通行证']; // [{ 'code': '3', 'name': '港澳居民来往内地通行证'}];
+        this.data.otherCardtypeData.selected = '港澳居民来往内地通行证';
         this.data.otherCardtypeData.isrequre = true
         this.data.otherCardtypeData.isrequre = true
       }
       }
     } else if (new_type.indexOf("台湾") != -1) {
     } else if (new_type.indexOf("台湾") != -1) {
@@ -780,11 +811,11 @@ Page({
       this.data.countryData.disabled = true
       this.data.countryData.disabled = true
       this.data.nameText = '英文名'
       this.data.nameText = '英文名'
       if (new_type.indexOf('通行证') != -1) {
       if (new_type.indexOf('通行证') != -1) {
-        this.data.otherCardtypeData.values = ['台湾居民居住证'];//[{ 'code': '6', 'name': '台湾居民居住证' }];
+        this.data.otherCardtypeData.values = ['台湾居民居住证']; //[{ 'code': '6', 'name': '台湾居民居住证' }];
         this.data.otherCardtypeData.isrequre = false
         this.data.otherCardtypeData.isrequre = false
       } else {
       } else {
         this.data.otherCardtypeData.values = ['台湾居民来往大陆通行证']; //[{ 'code': '5', 'name': '台湾居民来往大陆通行证' }];
         this.data.otherCardtypeData.values = ['台湾居民来往大陆通行证']; //[{ 'code': '5', 'name': '台湾居民来往大陆通行证' }];
-        this.data.otherCardtypeData.selected = '台湾居民来往大陆通行证'; 
+        this.data.otherCardtypeData.selected = '台湾居民来往大陆通行证';
         this.data.otherCardtypeData.isrequre = true
         this.data.otherCardtypeData.isrequre = true
       }
       }
 
 
@@ -794,12 +825,12 @@ Page({
       this.data.countryData.disabled = false
       this.data.countryData.disabled = false
       this.data.nameText = '中文名'
       this.data.nameText = '中文名'
       if (new_type.indexOf("外国护照") != -1) {
       if (new_type.indexOf("外国护照") != -1) {
-      //   this.data.otherCardtypeData.values = [{ 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
-        this.data.otherCardtypeData.values = ['外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）','外国人工作许可证（C类）'];
+        //   this.data.otherCardtypeData.values = [{ 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
+        this.data.otherCardtypeData.values = ['外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
         this.data.otherCardtypeData.isrequre = false
         this.data.otherCardtypeData.isrequre = false
       } else {
       } else {
         this.data.otherCardtypeData.values = ['外国护照']; //[{ 'code': '7', 'name': '外国护照' }];
         this.data.otherCardtypeData.values = ['外国护照']; //[{ 'code': '7', 'name': '外国护照' }];
-        this.data.otherCardtypeData.selected = '外国护照'; 
+        this.data.otherCardtypeData.selected = '外国护照';
         this.data.otherCardtypeData.isrequre = true
         this.data.otherCardtypeData.isrequre = true
       }
       }
     }
     }
@@ -815,8 +846,8 @@ Page({
       overseas: this.data.overseas,
       overseas: this.data.overseas,
       taxpayerTypeData: this.data.taxpayerTypeData
       taxpayerTypeData: this.data.taxpayerTypeData
     })
     })
-    
-    
+
+
   },
   },
 
 
 
 
@@ -837,10 +868,12 @@ Page({
         var selected = cardtypeData.selected
         var selected = cardtypeData.selected
         if (new_type != selected) {
         if (new_type != selected) {
           this.dealCardType(new_type)
           this.dealCardType(new_type)
-          var setData = { card_number: ''}
+          var setData = {
+            card_number: ''
+          }
           if ((new_type.indexOf('外国人') != -1) && (selected.indexOf('外国人') != -1)) {
           if ((new_type.indexOf('外国人') != -1) && (selected.indexOf('外国人') != -1)) {
             console.log('外国人', new_type, selected)
             console.log('外国人', new_type, selected)
-          }else {
+          } else {
             setData.other_card_number = ''
             setData.other_card_number = ''
           }
           }
           this.setData(setData)
           this.setData(setData)
@@ -880,19 +913,19 @@ Page({
           })
           })
         }
         }
         break;
         break;
-      // case 'tax_reason':
-      //   var taxReasonData = this.data.taxReasonData
-      //   var reason = taxReasonData.values[e.detail.value]
-      //   if (reason != taxReasonData.selected) {
-      //     taxReasonData.selected = reason
-      //     this.setData({
-      //       taxReasonData: taxReasonData
-      //     })
-      //   }
-      //   break;
+        // case 'tax_reason':
+        //   var taxReasonData = this.data.taxReasonData
+        //   var reason = taxReasonData.values[e.detail.value]
+        //   if (reason != taxReasonData.selected) {
+        //     taxReasonData.selected = reason
+        //     this.setData({
+        //       taxReasonData: taxReasonData
+        //     })
+        //   }
+        //   break;
       case 'taxpayerType':
       case 'taxpayerType':
         var taxpayerTypeData = this.data.taxpayerTypeData
         var taxpayerTypeData = this.data.taxpayerTypeData
-          taxpayerTypeData.selected = taxpayerTypeData.values[e.detail.value]
+        taxpayerTypeData.selected = taxpayerTypeData.values[e.detail.value]
         this.setData({
         this.setData({
           taxpayerTypeData: taxpayerTypeData
           taxpayerTypeData: taxpayerTypeData
         })
         })
@@ -911,6 +944,13 @@ Page({
           bankInfo: bank_data
           bankInfo: bank_data
         })
         })
         break;
         break;
+      case 'bank_province':
+        var bankprovince_data = this.data.bankProvinceInfo
+        bankprovince_data.selected = bankprovince_data.values[e.detail.value]
+        this.setData({
+          bankProvinceInfo: bankprovince_data
+        })
+        break;
       case 'gender':
       case 'gender':
         var gender_data = this.data.genderData
         var gender_data = this.data.genderData
         gender_data.selected = gender_data.values[e.detail.value]
         gender_data.selected = gender_data.values[e.detail.value]
@@ -989,7 +1029,7 @@ Page({
         this.data.firstEntryDate.selected = e.detail.value
         this.data.firstEntryDate.selected = e.detail.value
         this.data.firstEntryDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
         this.data.firstEntryDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
         this.data.predictLeaveDate.start = e.detail.value
         this.data.predictLeaveDate.start = e.detail.value
-        if (this.data.firstEntryDate.datelong>this.data.predictLeaveDate.datelong){
+        if (this.data.firstEntryDate.datelong > this.data.predictLeaveDate.datelong) {
           this.data.predictLeaveDate.selected = ''
           this.data.predictLeaveDate.selected = ''
         }
         }
         this.setData({
         this.setData({
@@ -1106,7 +1146,7 @@ Page({
       other_name: e.detail.value
       other_name: e.detail.value
     })
     })
   },
   },
-  idcardblur: function (e) {
+  idcardblur: function(e) {
     var idCardNo = e.detail.value
     var idCardNo = e.detail.value
     this.setData({
     this.setData({
       card_number: idCardNo
       card_number: idCardNo
@@ -1141,8 +1181,8 @@ Page({
       if (this.data.isIdCard && !format.isIDCardNum(idCardNo)) {
       if (this.data.isIdCard && !format.isIDCardNum(idCardNo)) {
         this.showtoast('证照号码有误');
         this.showtoast('证照号码有误');
         return;
         return;
-      } 
-      if (this.data.isIdCard){
+      }
+      if (this.data.isIdCard) {
         this.dealIdInfo(idCardNo)
         this.dealIdInfo(idCardNo)
         return;
         return;
       }
       }
@@ -1151,7 +1191,7 @@ Page({
         return
         return
       }
       }
     }
     }
-    if (e.detail.value.length == 9){
+    if (e.detail.value.length == 9) {
       if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(idCardNo)) {
       if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(idCardNo)) {
         this.showtoast('证照号码有误');
         this.showtoast('证照号码有误');
         return
         return
@@ -1165,7 +1205,7 @@ Page({
     }
     }
   },
   },
   //根据身份证号码，获取相关信息
   //根据身份证号码，获取相关信息
-  dealIdInfo: function (idCardNum) {
+  dealIdInfo: function(idCardNum) {
     var info = format.analyzeIDCard(idCardNum)
     var info = format.analyzeIDCard(idCardNum)
     console.log('info', info.age, info.sex)
     console.log('info', info.age, info.sex)
     if (info.age) {
     if (info.age) {
@@ -1184,14 +1224,14 @@ Page({
       })
       })
     }
     }
   },
   },
-  personalmoney:function(e){
+  personalmoney: function(e) {
     console.log('personalmoney', e)
     console.log('personalmoney', e)
     this.setData({
     this.setData({
       personal_equity_total: e.detail.value
       personal_equity_total: e.detail.value
     })
     })
   },
   },
 
 
-  companymoney:function(e){
+  companymoney: function(e) {
     console.log('companymoney', e)
     console.log('companymoney', e)
     this.setData({
     this.setData({
       company_equity_total: e.detail.value
       company_equity_total: e.detail.value
@@ -1202,8 +1242,8 @@ Page({
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
     var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
     var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
     // var regname = /^[\u4E00-\u9FA5A-Za-z·s]{2,20}$/;          
     // var regname = /^[\u4E00-\u9FA5A-Za-z·s]{2,20}$/;          
-    var regname_c = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,30}$/;  //中文
-    var regname_e = /^[A-Za-z][A-Za-z\s]*[A-Za-z]$/;         //英文
+    var regname_c = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,30}$/; //中文
+    var regname_e = /^[A-Za-z][A-Za-z\s]*[A-Za-z]$/; //英文
     // var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
     // var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
     // var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/;
     // var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/;
     var regMoney = /^([1-9][\d]{0,10}|0)(\.[\d]{1,2})?$/
     var regMoney = /^([1-9][\d]{0,10}|0)(\.[\d]{1,2})?$/
@@ -1212,7 +1252,7 @@ Page({
     if (this.data.cardtypeData.selected.length < 1) {
     if (this.data.cardtypeData.selected.length < 1) {
       this.showtoast('请选择证照类型');
       this.showtoast('请选择证照类型');
       return
       return
-    } 
+    }
     if (this.data.card_number.length < 1) {
     if (this.data.card_number.length < 1) {
       this.showtoast('请填写证照号码');
       this.showtoast('请填写证照号码');
       return
       return
@@ -1235,7 +1275,7 @@ Page({
     } else if (this.data.name.length > 0 && !regname_c.test(this.data.name)) {
     } else if (this.data.name.length > 0 && !regname_c.test(this.data.name)) {
       // this.showtoast('请输入正确姓名');
       // this.showtoast('请输入正确姓名');
       // return
       // return
-    } 
+    }
     if (this.data.genderData.selected.length < 1) {
     if (this.data.genderData.selected.length < 1) {
       this.showtoast('请选择性别');
       this.showtoast('请选择性别');
       return
       return
@@ -1243,7 +1283,7 @@ Page({
     if (this.data.birthDate.selected.length < 1) {
     if (this.data.birthDate.selected.length < 1) {
       this.showtoast('请选择出生日期');
       this.showtoast('请选择出生日期');
       return
       return
-    } 
+    }
     if (this.data.countryData.selected.length < 1) {
     if (this.data.countryData.selected.length < 1) {
       this.showtoast('请选择国籍');
       this.showtoast('请选择国籍');
       return
       return
@@ -1251,11 +1291,11 @@ Page({
     if (this.data.taxpayerTypeData.selected.length < 1) {
     if (this.data.taxpayerTypeData.selected.length < 1) {
       this.showtoast('请选择纳税人类型');
       this.showtoast('请选择纳税人类型');
       return
       return
-    } 
+    }
     if (this.data.hasOtherCard && !this.data.firstEntryDate.selected) {
     if (this.data.hasOtherCard && !this.data.firstEntryDate.selected) {
       this.showtoast('请选择首次入境时间');
       this.showtoast('请选择首次入境时间');
       return
       return
-    } 
+    }
     if (this.data.hasOtherCard && !this.data.predictLeaveDate.selected) {
     if (this.data.hasOtherCard && !this.data.predictLeaveDate.selected) {
       this.showtoast('请选择预计离境时间');
       this.showtoast('请选择预计离境时间');
       return
       return
@@ -1270,24 +1310,24 @@ Page({
     if (this.data.hasOtherCard && !otherTypeSel && this.data.otherCardtypeData.isrequre) {
     if (this.data.hasOtherCard && !otherTypeSel && this.data.otherCardtypeData.isrequre) {
       this.showtoast('请选择其他证照类型');
       this.showtoast('请选择其他证照类型');
       return
       return
-    } 
+    }
     if (this.data.hasOtherCard && !otherHasInput && this.data.otherCardtypeData.isrequre) {
     if (this.data.hasOtherCard && !otherHasInput && this.data.otherCardtypeData.isrequre) {
       this.showtoast('请输入其他证照号码');
       this.showtoast('请输入其他证照号码');
       return
       return
     }
     }
-    if (otherTypeSel.indexOf('居住证') > -1 && otherHasInput &&  !reg_18_Number.test(formdata.other_card_number)) {
+    if (otherTypeSel.indexOf('居住证') > -1 && otherHasInput && !reg_18_Number.test(formdata.other_card_number)) {
       this.showtoast('其他证照号码有误');
       this.showtoast('其他证照号码有误');
       return
       return
-    }else if (otherTypeSel.indexOf('永久居留') > -1 && otherHasInput && !reg_15_n_a.test(formdata.other_card_number)) {
+    } else if (otherTypeSel.indexOf('永久居留') > -1 && otherHasInput && !reg_15_n_a.test(formdata.other_card_number)) {
       this.showtoast('其他证照号码有误');
       this.showtoast('其他证照号码有误');
       return
       return
-    } 
+    }
     if (this.data.hasOtherCard && !this.data.birthCountryData.selected) {
     if (this.data.hasOtherCard && !this.data.birthCountryData.selected) {
       this.showtoast('请选择出生国家');
       this.showtoast('请选择出生国家');
       return
       return
-    } 
+    }
     if (this.data.other_name.length > 0) {
     if (this.data.other_name.length > 0) {
-      if (this.data.cardtypeData.selected != '居民身份证' && this.data.cardtypeData.selected != '中国护照'){
+      if (this.data.cardtypeData.selected != '居民身份证' && this.data.cardtypeData.selected != '中国护照') {
         var regname = (this.data.nameText == '中文名') ? regname_c : regname_e
         var regname = (this.data.nameText == '中文名') ? regname_c : regname_e
         this.data.other_name = this.data.other_name.replace(/(^\s*)|(\s*$)/g, "");
         this.data.other_name = this.data.other_name.replace(/(^\s*)|(\s*$)/g, "");
         if (!regname.test(this.data.other_name)) {
         if (!regname.test(this.data.other_name)) {
@@ -1295,7 +1335,7 @@ Page({
           return
           return
         }
         }
       }
       }
-    } 
+    }
     if (this.data.mobile.length < 1) {
     if (this.data.mobile.length < 1) {
       this.showtoast('请输入手机号码');
       this.showtoast('请输入手机号码');
       return
       return
@@ -1343,19 +1383,47 @@ Page({
     //   this.showtoast('邮箱格式有误');
     //   this.showtoast('邮箱格式有误');
     //   return
     //   return
     // }
     // }
-    if (this.data.bankInfo.selected.length > 0 && formdata.bank_account.length < 1) {
-      this.showtoast('请输入银行卡号')
-      return
+    if (this.data.bankInfo.selected && this.data.bankInfo.selected.length > 0) {
+      if (!this.data.bankProvinceInfo.selected || this.data.bankProvinceInfo.selected.length < 1) {
+        this.showtoast('请选择开户银行省份')
+        return
+      }
+      if (!formdata.bank_account || formdata.bank_account.length < 1) {
+        this.showtoast('请输入银行账户')
+        return
+      } else if (!format.banknoCheck(formdata.bank_account)) {
+        this.showtoast('银行卡号格式有误')
+        return
+      }
+    }
+
+    if (this.data.bankProvinceInfo.selected && this.data.bankProvinceInfo.selected.length > 0) {
+      if (!this.data.bankInfo.selected || this.data.bankInfo.selected.length < 1) {
+        this.showtoast('请选择开户银行')
+        return
+      }
+      if (!formdata.bank_account || formdata.bank_account.length < 1) {
+        this.showtoast('请输入银行账户')
+        return
+      } else if (!format.banknoCheck(formdata.bank_account)) {
+        this.showtoast('银行卡号格式有误')
+        return
+      }
     }
     }
+
     if (formdata.bank_account && formdata.bank_account.length > 0) {
     if (formdata.bank_account && formdata.bank_account.length > 0) {
-      if (!format.banknoCheck(formdata.bank_account)){
+      if (!format.banknoCheck(formdata.bank_account)) {
         this.showtoast('银行卡号格式有误')
         this.showtoast('银行卡号格式有误')
         return
         return
       }
       }
-      if (!this.data.bankInfo.selected) {
+      if (!this.data.bankInfo.selected || this.data.bankInfo.selected.length<1) {
         this.showtoast('请选择开户银行')
         this.showtoast('请选择开户银行')
         return
         return
       }
       }
+      if (!this.data.bankProvinceInfo.selected || this.data.bankProvinceInfo.selected.length<1) {
+        this.showtoast('请选择开户银行省份')
+        return
+      }
     }
     }
     this.goCommit(formdata);
     this.goCommit(formdata);
     // else if (this.data.personstatusData.selected.length < 1) {
     // else if (this.data.personstatusData.selected.length < 1) {
@@ -1384,7 +1452,7 @@ Page({
     //   this.showtoast('有必填项未填写');
     //   this.showtoast('有必填项未填写');
     //   return
     //   return
     // } else 
     // } else 
-    
+
     //  else if (this.data.company_equity_total && this.data.company_equity_total.length > 0 && !regMoney.test(this.data.company_equity_total)) {
     //  else if (this.data.company_equity_total && this.data.company_equity_total.length > 0 && !regMoney.test(this.data.company_equity_total)) {
     //   this.showtoast('请输入正确金额');
     //   this.showtoast('请输入正确金额');
     //   return
     //   return
@@ -1420,14 +1488,14 @@ Page({
         'certification_status': that.getCertifyStatus(formdata),
         'certification_status': that.getCertifyStatus(formdata),
         "name": that.data.name,
         "name": that.data.name,
         "other_name": that.data.hasOtherCard ? that.data.other_name : '',
         "other_name": that.data.hasOtherCard ? that.data.other_name : '',
-        "family_ties": '本人',//that.data.relativeData.selected,
+        "family_ties": '本人', //that.data.relativeData.selected,
         "native": that.data.countryData.selected,
         "native": that.data.countryData.selected,
-        "taxpayer_type": that.data.taxpayerTypeData.selected == '非居民' ? 'non-resident' :'resident',
+        "taxpayer_type": that.data.taxpayerTypeData.selected == '非居民' ? 'non-resident' : 'resident',
         "is_overseas_personnel": that.data.overseas,
         "is_overseas_personnel": that.data.overseas,
         'birth_native': that.data.hasOtherCard ? that.data.birthCountryData.selected : '',
         'birth_native': that.data.hasOtherCard ? that.data.birthCountryData.selected : '',
         "id_card_type": that.data.cardtypeData.selected, //selected_code,
         "id_card_type": that.data.cardtypeData.selected, //selected_code,
         "id_card_no": that.data.card_number,
         "id_card_no": that.data.card_number,
-        "other_id_card_type": that.data.hasOtherCard ?  that.data.otherCardtypeData.selected : '', //selected_code,
+        "other_id_card_type": that.data.hasOtherCard ? that.data.otherCardtypeData.selected : '', //selected_code,
         "other_id_card_no": that.data.hasOtherCard ? (formdata.other_card_number ? formdata.other_card_number : '') : '',
         "other_id_card_no": that.data.hasOtherCard ? (formdata.other_card_number ? formdata.other_card_number : '') : '',
         "gender": that.data.genderData.selected,
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
         "birth_date": that.data.long_birth_date,
@@ -1444,6 +1512,7 @@ Page({
         "profession": request_profession,
         "profession": request_profession,
         "education": that.data.degreeData.selected,
         "education": that.data.degreeData.selected,
         "bank": that.data.bankInfo.selected,
         "bank": that.data.bankInfo.selected,
+        "bank_province": that.data.bankProvinceInfo.selected,
         "bank_account": formdata.bank_account,
         "bank_account": formdata.bank_account,
         // "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no,
         // "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no,
         // "taxpayer_status": that.data.personstatusData.selected,
         // "taxpayer_status": that.data.personstatusData.selected,
@@ -1453,10 +1522,10 @@ Page({
         "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : formdata.martyr_family_no,
         "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : formdata.martyr_family_no,
         "is_lonely_man": that.data.lonelyolderInfo.selected,
         "is_lonely_man": that.data.lonelyolderInfo.selected,
         "comment": formdata.comment,
         "comment": formdata.comment,
-        
+
         "contact_address": that.data.hasOtherCard ? request_contact_address : {},
         "contact_address": that.data.hasOtherCard ? request_contact_address : {},
-        "contact_address_detail": that.data.hasOtherCard ? formdata.contact_address_detail: '',
-        
+        "contact_address_detail": that.data.hasOtherCard ? formdata.contact_address_detail : '',
+
         // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : this.data.taxInfo.join_date,
         // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : this.data.taxInfo.join_date,
         // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : this.data.taxInfo.separate_date,
         // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : this.data.taxInfo.separate_date,
         // "is_employee": that.data.employeeInfo.selected,
         // "is_employee": that.data.employeeInfo.selected,
@@ -1475,9 +1544,9 @@ Page({
         console.log(res)
         console.log(res)
         if (res.statusCode < 300) {
         if (res.statusCode < 300) {
           wx.navigateBack({
           wx.navigateBack({
-            delta:1
+            delta: 1
           })
           })
-        } else if (res.data.code == 400 && res.data.errors.email){
+        } else if (res.data.code == 400 && res.data.errors.email) {
           that.showtoast('邮箱格式有误')
           that.showtoast('邮箱格式有误')
         } else {
         } else {
           that.showtoast(res.data.message ? res.data.message : '请求出错')
           that.showtoast(res.data.message ? res.data.message : '请求出错')
@@ -1560,7 +1629,7 @@ Page({
     wx.showToast({
     wx.showToast({
       title: str,
       title: str,
       duration: 2000,
       duration: 2000,
-      icon:'none'
+      icon: 'none'
       // image: '/images/error.png'
       // image: '/images/error.png'
     })
     })
   },
   },
@@ -1573,7 +1642,7 @@ Page({
     var gender = this.data.genderData.selected;
     var gender = this.data.genderData.selected;
     var long_birth_date = Date.parse(new Date(this.data.birthDate.selected)) / 1000;
     var long_birth_date = Date.parse(new Date(this.data.birthDate.selected)) / 1000;
     console.log("birth_day", long_birth_date + "---" + this.data.long_birth_date)
     console.log("birth_day", long_birth_date + "---" + this.data.long_birth_date)
-    if ((this.data.has_certify&&name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && long_birth_date == this.data.long_birth_date)) {
+    if ((this.data.has_certify && name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && long_birth_date == this.data.long_birth_date)) {
       return 'active'
       return 'active'
     } else {
     } else {
       return ''
       return ''

@@ -186,6 +186,8 @@
           <view class="divide_line_30"></view>
           <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...bankInfo}}" />
           <template is="picker_cell_normal" data="{{...bankInfo}}" />
           <view class="divide_line_30"></view>
           <view class="divide_line_30"></view>
+          <template is="picker_cell_normal" data="{{...bankProvinceInfo}}" />
+          <view class="divide_line_30"></view>
           <view class='item_body'>
           <view class='item_body'>
             <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>银行账号</text>
             <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>银行账号</text>
             <input class='input_wrap' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_30' placeholder='请输入银行账号' maxlength='19' type='number'></input>
             <input class='input_wrap' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_30' placeholder='请输入银行账号' maxlength='19' type='number'></input>

+var province = [{
+  "name": "北京市",
+  "code": "110000",
+},
+{
+  "name": "天津市",
+  "code": "120000",
+},
+{
+  "name": "河北省",
+  "code": "130000",
+},
+{
+  "name": "山西省",
+  "code": "140000",
+},
+{
+  "name": "内蒙古自治区",
+  "code": "150000",
+},
+{
+  "name": "辽宁省",
+  "code": "210000",
+},
+{
+  "name": "吉林省",
+  "code": "220000",
+},
+{
+  "name": "黑龙江省",
+  "code": "230000",
+},
+{
+  "name": "上海市",
+  "code": "310000",
+},
+{
+  "name": "江苏省",
+  "code": "320000",
+},
+{
+  "name": "浙江省",
+  "code": "330000",
+},
+{
+  "name": "安徽省",
+  "code": "340000",
+},
+{
+  "name": "福建省",
+  "code": "350000",
+},
+{
+  "name": "江西省",
+  "code": "360000",
+},
+{
+  "name": "山东省",
+  "code": "370000",
+},
+{
+  "name": "河南省",
+  "code": "410000",
+},
+{
+  "name": "湖北省",
+  "code": "420000",
+},
+{
+  "name": "湖南省",
+  "code": "430000",
+},
+{
+  "name": "广东省",
+  "code": "440000",
+},
+{
+  "name": "广西壮族自治区",
+  "code": "450000",
+},
+{
+  "name": "海南省",
+  "code": "460000",
+},
+{
+  "name": "重庆市",
+  "code": "500000",
+},
+{
+  "name": "四川省",
+  "code": "510000",
+},
+{
+  "name": "贵州省",
+  "code": "520000",
+},
+{
+  "name": "云南省",
+  "code": "530000",
+},
+{
+  "name": "西藏自治区",
+  "code": "540000",
+},
+{
+  "name": "陕西省",
+  "code": "610000",
+},
+{
+  "name": "甘肃省",
+  "code": "620000",
+},
+{
+  "name": "青海省",
+  "code": "630000",
+},
+{
+  "name": "宁夏回族自治区",
+  "code": "640000",
+},
+{
+  "name": "新疆维吾尔自治区",
+  "code": "650000",
+},
+{
+  "name": "台湾省",
+  "code": "710000"
+},
+{
+  "name": "香港特别行政区",
+  "code": "810000"
+},
+{
+  "name": "澳门特别行政区",
+  "code": "820000"
+}]
+
+function init(that) {
+  that.setData({
+    'province': province
+  });
+}
+
+module.exports = {
+  init: init
+}

@@ -59,6 +59,16 @@ function dayFormString(dateStr) {
   return day
   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.ceil(days);
+}
+
 //获取当前时间，格式YYYY-MM-DD
 //获取当前时间，格式YYYY-MM-DD
 function curDateTime() {
 function curDateTime() {
     var d = new Date();
     var d = new Date();
@@ -252,5 +262,7 @@ module.exports = {
   isMobile: isMobile,
   isMobile: isMobile,
   getAge: getAge,
   getAge: getAge,
   banknoCheck: banknoCheck,
   banknoCheck: banknoCheck,
-  checkEmail: checkEmail
+  checkEmail: checkEmail,
+  daysTillNow: daysTillNow,
+  getDateString: getDateString
 }
 }