优化逻辑

@@ -6,7 +6,7 @@ Page({
 
 
   data: {
-    year: 2019,
+    year: "2019",
     unit_id:"",
   },
 
@@ -49,18 +49,58 @@ Page({
       method: "POST",
       data: {
         "declaring_unit_id":that.data.unit_id,
-        "item": request_data,
+        "item": {
+          "total_salary": that.parseToFloat(request_data.total_salary),  //工资薪金,
+          "remuneration_labor": that.parseToFloat(request_data.setData),  //劳务报酬,
+          "author_payment": that.parseToFloat(request_data.remuneration_labor),  //稿酬,
+          "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),//其他税前扣除额
+          "donation_deducted": that.parseToFloat(request_data.donation_deducted),  //准予扣除的捐赠
+          "years_bouns": that.parseToFloat(request_data.years_bouns),  //全年一次性奖金
+
+          "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
+            })
         }
       },
     })
   },
 
+  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({

@@ -7,25 +7,29 @@ Page({
 
   data: {
     year: "2019",
-    declare_status: "", //申报状态"0" //待申报  "1" //申报成功
-    refund_status: "", //退税状态  "0" 无需退税； "1" 待退税；"2" 退税中；"3" 退税成功；"4"退税失败；"5"放弃退税
-    pay_status: "", //补税状态    "0" 无需补税；  "1" 待补税；"2" 补税成功
+    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:待确认申报//用户自行申报
     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,
     show_other_unit_view:false,
+    exempt_status:""
   },
 
 
   onLoad: function(options) {
-    this.getPayInfo();
+   
   },
 
 
@@ -35,7 +39,7 @@ Page({
 
 
   onShow: function() {
-
+    this.getPayInfo();
   },
 
   yearPick: function() {
@@ -55,24 +59,17 @@ Page({
       },
       success: function(result) {
         console.log("payinfo", result)
-        var text01="应补退税额"
         if (result.statusCode == 200) {
-          if (that.data.declare_status=='1'){//申报成功
-            if (result.data.refund_tax > 0 || result.data.refund_tax == 0){
-              text01="应补税额"
-            } else {
-              text01 = "应退税额"
-            }  
-          }
+          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_status: result.data.declaring_unit_status,
             new_refund_tax: Math.abs(result.data.refund_tax),
-            uniqual_title01:text01,
             declare_end_date: format.yearFormString(result.data.declare_end_time) + "年" + format.monthFormString(result.data.declare_end_time) + "月" + format.dayFormString(result.data.declare_end_time) + "日",
             declare_end_days: format.daysTillNow(Date.parse(new Date())/1000,result.data.declare_end_time),
+            exempt_status: result.data.exempt,
             payinfo: result.data
           })
         }
@@ -146,7 +143,7 @@ Page({
       method: "PUT",
       data: {
         "years": that.data.year,
-        'refund_status': ''
+        'refund_status': s
       },
       success: function(result) {
         console.log("refund", result)
@@ -231,8 +228,10 @@ Page({
 
   unitPick: function(e) { //选择申报单位
     console.log("unitPick", e)
+    var info_arr = e.currentTarget.id.split("~")
     this.setData({
-      declaring_unit_id: e.currentTarget.id,
+      declaring_unit_id: info_arr[1] ,
+      declaring_unit: info_arr[0],
       showUnit: false,
       show_other_unit_view:true,
     })
@@ -257,7 +256,7 @@ Page({
   },
 
   noOtherUnitInfo: function() { //没有其他单位个税申报
-    this.updateDeclareState(e.currentTarget.id)
+    this.updateDeclareState(this.data.declaring_unit_id)
     this.setData({
       show_other_unit_view:false
     })
@@ -281,6 +280,7 @@ Page({
 
   // 放弃退税
   doNotRefund: function() {
+    var that = this
     wx.showModal({
       title: '确认放弃退税吗？',
       content: '',
@@ -288,7 +288,7 @@ Page({
       success(res) {
         if (res.confirm) {
           console.log('用户点击确定')
-          this.forgiveRefund("5")
+          that.forgiveRefund("5")
         } else if (res.cancel) {
           console.log('用户点击取消')
         }
@@ -296,6 +296,48 @@ Page({
     })
   },
 
+  updateText:function(data){
+    var text = ""
+    var text_status = ""
+    var text_title = "应补退税额"
+    if (data.declare_status=='1'){//申报中
+      text = "请等候申报结果"
+    } else {//申报成功
+      if (data.refund_tax > 0 || data.refund_tax == 0) {
+        text_title = "应补税额"
+      } else {
+        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.exempt == 'yes') {
+        text = "您已享受豁免"
+        text_status = "豁免"
+      } else if (data.pay_status == '1') {
+        text = "请等待企业为您代缴税款"
+        text_status = "待缴款"
+      } else if (data.pay_status == '2') {
+        text = "单位已为您代缴税款"
+        text_status = "已缴款"
+      }
+    } 
+    this.setData({
+      declare_text_extra:text,
+      uniqual_content01:text_status,
+      uniqual_title01: text_title,
+    })
+  },
+
   onHide: function() {
 
   },

@@ -8,7 +8,7 @@
         <image class="arrow_wrap" src="/images/arrow_down.png"></image>
       </view>
     </view>
-    <scroll-view style="margin-bottom: 360rpx;">
+    <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>
@@ -29,15 +29,15 @@
           <text class="text_gray6_28">您已选择自行申报，可继续查看在本单位的个税申报记录 </text>
         </view>
         <view wx:else>
-          <text class="text_gray6_28">您选择在 北京小爱智能科技有限公司 完成2019年度的个人综合所得汇算清缴。 </text>
+          <text class="text_gray6_28">您选择在 {{declaring_unit}} 完成2019年度的个人综合所得汇算清缴。 </text>
         </view>
       </view>
 
       <view wx:if="{{declaring_unit_status!='4'&&declaring_unit_status!='5'&&!show_other_unit_view}}" style="background:#fff;padding:30rpx 30rpx 50rpx 30rpx;">
-        <text class="text_black_bold">{{declare_status=='0'?'汇算清缴申报中…':'汇算清缴申报完成!'}}</text>
-        <view style="display: flex;margin:20rpx 0">
+        <text class="text_black_bold">{{declare_status=='1'?'汇算清缴申报中…':'汇算清缴申报完成!'}}</text>
+        <view hidden="{{declare_text_extra.length<1}}" style="display: flex;margin:20rpx 0">
           <image style="width:28rpx;height:28rpx;margin-right:12rpx;margin-top:4rpx" src="/images/warn_yellow.png"></image>
-          <text class="text_gray6_28">请等候申报结果 </text>
+          <text class="text_gray6_28">{{declare_text_extra}} </text>
         </view>
         <view class="divide_line_f5f5f5"></view>
         <view style="margin-top:20rpx">
@@ -60,23 +60,23 @@
         <view class="divide_line_f5f5f5"></view>
         <view style="margin:20rpx 0">
           <text class="text_black_bold">{{uniqual_title01}}:</text>
-          <text wx:if="{{declare_status=='0'}}" class="text_gray3_28 float_right" style="line-height:50rpx">计算中</text>
+          <text wx:if="{{declare_status=='1'}}" class="text_gray3_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="{{refund_status=='5'}}" class="light_gray_bg">
-            <text style="font-size:11px;color:rgba(0,0,0,0.35);margin: 0 auto">已放弃</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="{{refund_status=='4'}}" class="light_red_bg">
-            <text style="font-size:11px;color:#fff;margin: 0 auto">退税失败</text>
+          <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:elif="{{refund_status=='4'}}" class="light_yellow_bg">
-            <text style="font-size:11px;color:#fff;margin: 0 auto">申请中</text>
+          <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="text_blue_28 float_right" style="line-height:50rpx;" bindtap="finalpay_detail">查看详情</view>
       </view>
     </scroll-view>
-    <view wx:if="{{declaring_unit_status=='4'}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;background-color:#fff">
+    <view wx:if="{{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>
@@ -146,7 +146,7 @@
   <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_id}}">
+    <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>

@@ -8,7 +8,7 @@ Page({
    */
   data: {
     currentTab:1,
-    year:2019,
+    year:"2019",
     incomeInfo:{},
   },
 

 // pages/main/finalpay/refundInfo/refundInfo.js
+var OSSInit;
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
+var format = require('../../../../utils/util.js');
 Page({
 
   /**
    * Page initial data
    */
   data: {
-    show_modal:false
+    name: '',
+    bank: '',
+    bank_card_no: '',
+    bank_card_province: '',
+    show_modal: false
   },
 
   /**
@@ -15,6 +21,11 @@ Page({
    */
   onLoad: function(options) {
     this.initOSS()
+    var userinfo = app.globalData.userInfo
+    console.log("userinfo", userinfo)
+    this.setData({
+      name: userinfo ? userinfo.name : ""
+    })
   },
 
   /**
@@ -70,13 +81,22 @@ Page({
       count: 1,
       success: function(res) {
         console.log('success', res)
-        that.ocrBankImage(res.tempFilePaths[0])
+        wx.showLoading({
+          title: "识别中"
+        })
+        wx.getFileSystemManager().readFile({
+          filePath: res.tempFilePaths[0], // 选择图片返回的相对路径
+          encoding: 'base64', // 编码格式
+          success: res => { // 成功的回调
+            that.ocrBankImage(res.data)
+          }
+        })
       }
     })
   },
 
   // 识别银行卡照片
-  ocrBankImage: function(path) {
+  ocrBankImage: function(imginfo) {
     var that = this
     this.Authorization = getApp().globalData.Authorization;
     wx.request({
@@ -86,33 +106,64 @@ Page({
         'Authorization': this.Authorization
       },
       data: {
-        "image": path
+        "image": imginfo
       },
       success: function(result) {
-        console.log("payinfo", result)
+        console.log("bankinfo", result)
         if (result.statusCode == 200) {
-
+          wx.hideLoading()
+          that.setData({
+            bank: result.data.bank.split("银行")[0] + "银行",
+            bank_card_no: result.data.bank_card_no
+          })
         }
       },
     })
   },
 
+  bindRegionChange: function (e) {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+      region: e.detail.value
+    })
+  },
+
   formSubmit: function(e) {
-    console.log("formSubmit", 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 (formdata.bank.length < 1) {
+      this.showToast("请输入银行名称")
+      return
+    }
+    if (!formdata.bank_card_province.length < 1) {
+      this.showToast("请输入开户银行省份")
+      return
+    }
     this.setData({
-      show_modal:true
+      show_modal: true
     })
   },
 
-  commitCancel:function(){
+  commitCancel: function() {
     this.setData({
       show_modal: false
     })
   },
 
 
-  commitConfirm: function () {
+  commitConfirm: function() {
     this.setData({
       show_modal: false
     })
@@ -124,14 +175,14 @@ Page({
       header: {
         'Authorization': this.Authorization
       },
-      method:"PUT",
+      method: "PUT",
       data: {
         'name': '',
         "bank": '',
         "bank_card_no": '',
         "bank_card_province": ''
       },
-      success: function (result) {
+      success: function(result) {
         console.log("submit", result)
         if (result.statusCode == 200) {
           that.setData({
@@ -140,7 +191,18 @@ Page({
         }
       },
     })
-   },
+  },
+
+  showToast: function(data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none",
+        duration: 2000
+      })
+    }
+  },
+
 
   /**
    * Lifecycle function--Called when page hide

@@ -3,24 +3,33 @@
   <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="汪闲僧"></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='name' value="{{name}}"></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'></input>
+      <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'></input>
+      <input class='input_wrap' style='text-align: right;color:#000;' placeholder='请输入' name='bank' value="{{bank}}"></input>
     </view>
     <view class='divide_line_30'></view>
-    <view style="height:104rpx;padding:0 30rpx;background-color:#fff">
+    <!-- <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'></input>
-    </view>
+      <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:0 30rpx;background-color:#fff" mode="province" bindchange="bindRegionChange" value="{{region}}">
+      <text class="text_gray7_34">开户银行省份</text>
+      <view class="input_wrap rigion_notchoosed}}">
+        请选择 </view>
+      <view class="input_wrap rigion_choosed">
+        {{region[0]}}
+      </view>
+    </picker>
 
     <view class="btn_bottom">
       <button class="btn_bottom" formType="submit">保存</button>
@@ -31,20 +40,20 @@
     <!-- <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">张三</text>
+      <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">4832588325825925</text>
+      <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">中国邮政储蓄银行</text>
+      <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">湖北</text>
+      <text class="text_gray6_28">开户行省份:</text>
+      <text class="text_gray6_28 float_right">{{bank_card_province}}</text>
     </view>
     <view class='divide_line_f5f5f5' style="margin-top:30rpx"></view>
 

@@ -33,11 +33,19 @@
   color: #fff;
   text-align: right;
   overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
   float: right;
 }
 
+.rigion_choosed{
+  color:#000;
+  line-height:104rpx
+}
+
+.rigion_notchoosed{
+  color:#777;
+  line-height:104rpx
+}
+
 .image_camera {
   width: 42rpx;
   height: 42rpx;