汇算清缴模块新页面添加及部分逻辑添加

@@ -80,7 +80,7 @@ App({
           that.configOssUrl()
           if (relaunch) {
             wx.reLaunch({
-              url: '../guide/guide'
+              url:' ../guide/guide'
             })
           }
         }

@@ -3,10 +3,12 @@
     "pages/main/guide/guide",
     "pages/getPhone/getPhone",
     "pages/main/smartchat/chat",
+    
     "pages/main/taxperson/home",
     "pages/main/taxperson/editinfo/editinfo",
     "pages/main/taxperson/addinfo/addinfo",
     "pages/main/taxperson/idinfo/idinfo",
+
     "pages/main/addtionalreduce/home",
     "pages/main/addtionalreduce/godeclare/godeclare",
     "pages/main/addtionalreduce/godetail/godetail",
@@ -14,8 +16,9 @@
     "pages/main/addtionalreduce/addextrainfo/addextrainfo",
     "pages/main/addtionalreduce/adddupporters/adddupporters",
     "pages/main/addtionalreduce/additiondetail/additiondetail",
+
     "pages/main/advancepayment/adPayHome",
-    
+
     "pages/main/finalpayment/home",
     "pages/main/finalpayment/inputinfo/inputinfo",
     "pages/main/finalpayment/historylist/historylist",
@@ -25,6 +28,8 @@
     "pages/main/finalpay/incomeDetail/incomeDetail",
     "pages/main/finalpay/incomeAddition/incomeAddition",
     "pages/main/finalpay/addUnitInfo/addUnitInfo",
+    "pages/main/finalpay/refundInfo/refundInfo",
+    "pages/main/finalpay/refundDetail/refundDetail",
 
     "pages/login/login",
     "pages/main/advancepayment/adPayDetails/adPayDetails",

@@ -5,21 +5,18 @@ Page({
 
 
   data: {
-    declare_status: "",//申报状态
+    declare_status: "",//申报状态"0" //待申报  "1" //申报成功
     refund_status: "",//退税状态
     pay_status: "",//补税状态
+    declaring_unit_status: "4",//1:本单位申报，2：本单位其他申报，3：其他单位申报，4:待确认申报
     payinfo:{},
-    unitInfo: [{
-      "declaring_unit": "bjxa",
-      "declaring_unit_id": "申报单位id",
-    },
-      {
-        "declaring_unit": "albb",
-        "declaring_unit_id": "申报单位id",
-      }],
+    unitInfo: [],
     showUnit:false,
     declaring_unit_id:"",
     showModal_selfDeclare:false,
+    declare_status_arr:["待申报","申报成功"],
+    refund_status_arr: ["待退税", "退税中", "退税成功", "退税失败","放弃退税"],
+    pay_status_arr: ["无需补税", "待补税","补税成功"],
   },
 
 
@@ -68,16 +65,16 @@ Page({
       showUnit: true
     })
     wx.request({
-      url: baseUrl + "payroll/v1/settlement-tax/declaring-unit",
+      url: baseUrl + "payroll/v1/settlement-tax/declare-unit",
       header: {
         'Authorization': this.Authorization
       },
       data: { },
       success: function (result) {
-        console.log("unitInfo", result)
+        console.log("unitInfo", result.data)
         if (result.statusCode == 200) {
           that.setData({
-            unitInfo: result.data
+            unitInfo: result.data.items
           })
         }
       },
@@ -89,6 +86,74 @@ Page({
     })
   },
 
+  updateDeclareState: function (id) {//是否在本单位申报
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/record",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: { 'declaring_unit_id': id },
+      success: function (result) {
+        console.log("declareinfo", result)
+        if (result.statusCode == 200) {
+          that.setData({
+            
+          })
+        }
+      },
+    })
+  },
+
+  // 是否放弃退税，（是:"5",否:""）
+  forgiveRefund: function () {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/record",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: { 'refund_status': '' },
+      success: function (result) {
+        console.log("refund", result)
+        if (result.statusCode == 200) {
+          that.setData({
+
+          })
+        }
+      },
+    })
+  },
+
+  // 确认提交申请退税
+  forgiveRefund: function () {
+    var that = this
+    this.Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + "payroll/v1/settlement-tax/record",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: {
+        "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({
@@ -113,6 +178,7 @@ Page({
   },
 
   declareNotHere: function() {
+    var that = this
     wx.showModal({
       title: '',
       content: '确认不在本单位进行汇算清缴申报吗？',
@@ -120,7 +186,7 @@ Page({
       success(res) {
         if (res.confirm) {
           console.log('用户点击确定')
-          
+          that.updateDeclareState("")
         } else if (res.cancel) {
           console.log('用户点击取消')
         }
@@ -131,10 +197,10 @@ Page({
   unitPick:function(e){//选择申报单位
     console.log("unitPick",e)
     this.setData({
-      declaring_unit_id:"",
+      declaring_unit_id: e.currentTarget.id,
       showUnit: false
     })
-
+    this.updateDeclareState(e.currentTarget.id)
   },
 
   selfdeclare_close(){//关闭自行申报弹窗

@@ -16,25 +16,25 @@
       <text class="text_blue_26"> 的解读 </text>
     </view>
 
-    <view style="background:#fff9f0;padding:24rpx;display: flex;">
+    <view  style="background:#fff9f0;padding:24rpx;display: flex;">
       <view style="margin-right:12rpx">
         <image style="width:28rpx;height:28rpx;" src="/images/warn_yellow.png"></image>
       </view>
-      <view>
+      <view wx:if="{{declaring_unit_status=='4'}}">
         <text class="text_gray6_28">请于 </text>
         <text class="text_yellow_28">  2020年10月1日前 </text>
         <text class="text_gray6_28">确认是否在本单位进行汇算清缴，否则默认为您在其他单位申报或自行申报。 </text>
       </view>
-      <view hidden="true">
-        <text class="text_gray6_28">您将在 北京小爱智能科技有限公司 完成2019年度的个人综合所得汇算清缴。 </text>
-      </view>
-      <view hidden="true">
+      <view wx:elif="{{declaring_unit_status=='5'}}">
         <text class="text_gray6_28">您已选择自行申报，可继续查看在本单位的个税申报记录 </text>
       </view>
+      <view wx:else>
+        <text class="text_gray6_28">您将在 北京小爱智能科技有限公司 完成2019年度的个人综合所得汇算清缴。 </text>
+      </view>
     </view>
 
-    <view style="background:#fff;padding:0 30rpx">
-      <text class="text_black_bold" style="margin-top:30rpx">汇算清缴申报中…</text>
+    <view wx:if="{{declaring_unit_status!='4'&&declaring_unit_status!='5'}}" style="background:#fff;padding:0 30rpx">
+      <text class="text_black_bold"  style="margin-top:30rpx">汇算清缴申报中…</text>
       <view 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>
@@ -42,31 +42,31 @@
       <view class="divide_line_f5f5f5"></view>
       <view style="margin-top:20rpx">
         <text class="text_gray6_28">收入总额：</text>
-        <text class="text_gray3_28 float_right" style="line-height:50rpx" >￥12939</text>
+        <text class="text_gray3_28 float_right" style="line-height:50rpx">￥12939</text>
       </view>
-      <view class="view_gray_bg" style="padding:16rpx 20rpx;flex-direction: column">  
-      <view class="text_gray9_26">其中本单位收入额：</view>
-      <text class="text_gray9_26">其中其他单位收入额：</text>
+      <view class="view_gray_bg" style="padding:16rpx 20rpx;flex-direction: column">
+        <view class="text_gray9_26">其中本单位收入额：</view>
+        <text class="text_gray9_26">其中其他单位收入额：</text>
       </view>
       <view style="margin:20rpx 0">
         <text class="text_gray6_28">累计应纳税额：</text>
-        <text class="text_gray3_28 float_right" style="line-height:50rpx" >￥12939</text>
+        <text class="text_gray3_28 float_right" style="line-height:50rpx">￥12939</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" >￥12939</text>
+        <text class="text_gray3_28 float_right" style="line-height:50rpx">￥12939</text>
       </view>
       <view class="divide_line_f5f5f5"></view>
       <view style="margin:20rpx 0">
         <text class="text_black_bold">应补退税额：</text>
-        <text class="text_gray3_28 float_right" style="line-height:50rpx" >￥12939</text>
+        <text class="text_gray3_28 float_right" style="line-height:50rpx">￥12939</text>
       </view>
       <view class="divide_line_f5f5f5"></view>
       <text class="text_blue_28 float_right" style="line-height:50rpx" bindtap="finalpay_detail">查看详情</text>
     </view>
 
-    <view wx:if="{{false}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;">
+    <view wx:if="{{declaring_unit_status=='4'}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;">
       <view style="display: flex;justify-content: center;">
         <text class="text_gray6_28">距离确认是否在本单位进行汇算清缴时间还有  </text>
         <text class="text_yellow_28"> 28 </text>
@@ -80,7 +80,7 @@
       </view>
     </view>
 
-    <view wx:if="{{false}}" style="width:100%;height:260rpx;position: fixed;bottom: 0;">
+    <view wx:if="{{declaring_unit_status=='5'}}" style="width:100%;height:260rpx;position: fixed;bottom: 0;">
       <view bindtap="declareBySelf" class="btn_blue_radius" style="margin:20rpx 30rpx ">
         <view class="text_white_34">查看自行申报方式</view>
       </view>
@@ -89,7 +89,7 @@
       </view>
     </view>
 
-    <view wx:if="{{false}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;">
+    <view wx:if="{{declaring_unit_status=='1'||declaring_unit_status=='2'}}" style="width:100%;height:300rpx;position: fixed;bottom: 0;">
       <view style="display: flex;justify-content: center;">
         <text class="text_gray6_28">距离确认是否在本单位进行汇算清缴时间还有  </text>
         <text class="text_yellow_28"> 28 </text>
@@ -122,10 +122,10 @@
   <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="margin-left:20rpx;padding:30rpx" bindtap="unitPick">
-      <text class="text_gray3_32" id="{{item.declaring_unit_id}}">{{item.declaring_unit}}</text>
+    <view wx:for="{{unitInfo}}" style="height:104rpx;margin-left:50rpx;margin-right:30rpx" bindtap="unitPick" id="{{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" style="margin-top:30rpx"></view>
+      <view class="divide_line"></view>
     </view>
   </view>
 </view>
\ No newline at end of file

+// pages/main/finalpay/refundDetail/refundDetail.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 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 () {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "退税详情"
+}
\ No newline at end of file

+<view>
+
+  <view style="background:#fff;padding:30rpx;margin-top:20rpx">
+    <view 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:if="{{false}}" 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">申请中</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">张三</text>
+    </view>
+    <view>
+      <text class="text_black6_32">申请退税金额</text>
+      <text class="text_black6_32 float_right">30000.00</text>
+    </view>
+    <view>
+      <text class="text_black6_32">银行卡号</text>
+      <text class="text_black6_32 float_right">62218828283939</text>
+    </view>
+    <view>
+      <text class="text_black6_32">开户银行名称</text>
+      <text class="text_black6_32 float_right">招商银行</text>
+    </view>
+    <view>
+      <text class="text_black6_32">开户银行省份</text>
+      <text class="text_black6_32 float_right">湖北</text>
+    </view>
+  </view>
+</view>
\ No newline at end of file

+/* 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: 50px;
+  height: 20px;
+  background:rgba(255,233,211,1);
+  border-radius: 2px;
+}

+// pages/main/finalpay/refundInfo/refundInfo.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 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 () {
+
+  }
+})
\ No newline at end of file

+{
+  "navigationBarTitleText": "退税信息"
+}
\ No newline at end of file

+<!--pages/main/finalpay/refundInfo/refundInfo.wxml-->
+<view class="page">
+  <form style="width:100%;">
+    <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='' value="汪闲僧"></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=''></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=''></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=''></input>
+    </view>
+
+<view class="btn_bottom" >
+      <button class="btn_bottom" formType="submit">保存</button>
+    </view>
+  </form>
+
+</view>
\ No newline at end of file

+/* 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;
+}
+
+.input_wrap {
+  max-width: 600rpx;
+  height: 104rpx;
+  font-size: 34rpx;
+  color: #fff;
+  text-align: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  float: right
+}
\ No newline at end of file