汇算清缴页面和收入信息页面添加

@@ -144,8 +144,8 @@ App({
     // baseUrl: "http://192.144.144.220:20000/",
     // baseUrl: "http://154.8.229.55:20000/",
     // baseUrl: "http://47.110.250.177:20000/",
-    // baseUrl: "http://47.110.158.110:20000/",
-    baseUrl: "https://api.workai.com.cn/",
+    baseUrl: "http://47.110.158.110:20000/",
+    // baseUrl: "https://api.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     userInfo: null,
     hostInfo: null,

@@ -15,15 +15,22 @@
     "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",
     "pages/main/finalpayment/historydetail/historydetail",
+
+    "pages/main/finalpay/home",
+    "pages/main/finalpay/incomeDetail/incomeDetail",
+    "pages/main/finalpay/incomeAddition/incomeAddition",
+
     "pages/login/login",
     "pages/main/advancepayment/adPayDetails/adPayDetails",
     "pages/main/verify/verify_info",
     "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": {
     "backgroundTextStyle": "light",

+// pages/common/webview.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    h5_url:"",
+    url01: "http://emp.workai.com.cn//html/financialFinalSettlement_01.html",
+    url02: "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.data.url01
+          })
+      }else{
+        this.setData({
+          h5_url: this.data.url02
+        })
+      }
+  },
+
+  /**
+   * 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

+{
+  "usingComponents": {}
+}
\ No newline at end of file

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

+/* pages/common/webview.wxss */
\ No newline at end of file

+// pages/main/finalpay/home.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
+Page({
+
+
+  data: {
+    declare_status: "",//申报状态
+    refund_status: "",//退税状态
+    pay_status: "",//补税状态
+    payinfo:{},
+    unitInfo: [{
+      "declaring_unit": "申报单位",
+      "declaring_unit_id": "申报单位id",
+    },
+      {
+        "declaring_unit": "申报单位",
+        "declaring_unit_id": "申报单位id",
+      }],
+    showUnit:false,
+  },
+
+
+  onLoad: function(options) {
+    this.getPayInfo();
+  },
+
+
+  onReady: function() {
+
+  },
+
+
+  onShow: function() {
+
+  },
+
+  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': '2019' },
+      success: function (result) {
+        console.log("payinfo",result)
+        if (result.statusCode==200) {
+          that.setData({
+            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/declaring-unit",
+      header: {
+        'Authorization': this.Authorization
+      },
+      data: { },
+      success: function (result) {
+        console.log("unitInfo", result)
+        if (result.statusCode == 200) {
+          that.setData({
+            unitInfo: result.data
+          })
+        }
+      },
+      complete:function(e){
+        that.setData({
+          showUnit:true
+        })
+      }
+    })
+  },
+
+  // 跳转到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() {
+    this.getUnitInfo()
+  },
+
+  declareNotHere: function() {
+    wx.showModal({
+      title: '',
+      content: '确认不在本单位进行汇算清缴申报吗？',
+      confirmColor: '#357aeb',
+      success(res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+          
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  },
+
+  onHide: function() {
+
+  },
+
+
+  onUnload: function() {
+
+  },
+
+
+  onPullDownRefresh: function() {
+
+  },
+
+
+  onReachBottom: function() {
+
+  },
+
+
+  onShareAppMessage: function() {
+
+  }
+})
\ No newline at end of file

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "汇算清缴"
+}
\ No newline at end of file

+<!--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 class="float_right">
+        <image class="arrow_wrap" src="/images/arrow_down.png"></image>
+      </view>
+    </view>
+
+    <view style="background:#fff;padding:30rpx 30rpx 60rpx 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;" src="/images/warn_yellow.png"></image>
+      </view>
+      <view>
+        <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>
+
+    <view hidden="true" style="background:#fff;">
+      <view style="padding:30rpx;">
+        <text class="text_black_bold">汇算清缴</text>
+        <text class="text_blue_28 float_right" style="line-height:50rpx" bindtap="finalpay_detail">查看详情</text>
+      </view>
+    </view>
+
+    <view 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>
+        <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>
+  <view wx:elif="{{unitInfo.length>0}}" style="">
+    <view wx:for="{{unitInfo}}">
+      <text>{{item.declaring_unit}}</text>
+    </view>
+  </view>
+</view>
\ No newline at end of file

+/* pages/main/finalpay/home.wxss */
+
+.page {
+  background-color: #f5f5f5;
+}
+
+.text_black_bold {
+  font-size: 36rpx;
+  color: #000;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  line-height: 50rpx
+}
+
+.arrow_wrap {
+  position: relative;
+  width: 28rpx;
+  height: 16rpx;
+  margin-top: 16rpx;
+  align-self: center;
+}
+
+.text_gray3_26 {
+  font-size: 26rpx;
+  color: #333333;
+  font-family:PingFangSC-Regular,PingFang SC;
+  line-height: 36rpx
+}
+
+.text_gray6_28 {
+  font-size: 28rpx;
+  color: #666666;
+  font-family:PingFangSC-Regular,PingFang SC;
+  line-height: 40rpx
+}
+
+.text_yellow_28 {
+  font-size: 28rpx;
+  color: #ffaa00;
+  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: 17px;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 42px;
+}
+
+.text_blue_34 {
+  font-family: PingFangSC-Regular;
+  font-size: 17px;
+  color: #357aeb;
+  text-align: center;
+  line-height: 42px;
+}

+// pages/main/finalpay/incomeAddition/incomeAddition.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

+{
+  "usingComponents": {}
+}
\ No newline at end of file

+<!--pages/main/finalpay/incomeAddition/incomeAddition.wxml-->
+<text>pages/main/finalpay/incomeAddition/incomeAddition.wxml</text>

+/* pages/main/finalpay/incomeAddition/incomeAddition.wxss */
\ No newline at end of file

+// pages/main/finalpay/incomeDetail/incomeDetail.js
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    currentTab:0,
+  },
+
+  /**
+   * Lifecycle function--Called when page load
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * Lifecycle function--Called when page is initially rendered
+   */
+  onReady: function () {
+
+  },
+
+  onShow: function () {
+
+  },
+
+  /** 
+  * 点击tab切换 
+  */
+  swichNav: function (e) {
+    var that = this;
+
+    if (this.data.currentTab === e.target.dataset.current) {
+      return false;
+    } else {
+      that.setData({
+        currentTab: e.target.dataset.current
+      })
+    }
+  },
+
+  /**
+   * 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/incomeDetail/incomeDetail.wxml-->
+<view class="page">
+
+  <view class="swiper-tab" style='display:flex'>
+    <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" style="margin:0 10rpx" data-current="0" bindtap="swichNav">本单位收入</view>
+    <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>
+
+  <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">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">劳务报酬收入</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">稿酬收入</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">特许经营权</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">其他免税收入</text>
+        <text class="text_black6_32 float_right">100000</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">2000</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">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">医疗保险</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">失业保险</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">住房公积金</text>
+        <text class="text_black6_32 float_right">100000</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">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">继续教育</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">住房贷款利息</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">住房租金</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">赡养老人</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">大病医疗</text>
+        <text class="text_black6_32 float_right">100000</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">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">商业健康保险</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">税延养老保险</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">其他</text>
+        <text class="text_black6_32 float_right">100000</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">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">全年一次性奖金</text>
+        <text class="text_black6_32 float_right">100000</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">100000</text>
+      </view>
+      <view>
+        <text class="text_black6_32">已缴税额</text>
+        <text class="text_black6_32 float_right">100000</text>
+      </view>
+    </view>
+  </scroll-view>
+</view>
\ No newline at end of file

+/* 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;
+}
\ No newline at end of file

@@ -94,7 +94,9 @@ Page({
             })
           } else if (skip_type == "4") {
             wx.navigateTo({
-              url: '../finalpayment/home',
+              //第一版本的跳转路径
+              // url: '../finalpayment/home',
+              url:'../finalpay/home',
             })
           } 
         }

@@ -36,7 +36,7 @@
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </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>
         <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;'>
@@ -44,7 +44,7 @@
           <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看个人年度税收信息，年度汇算清缴</text>
         </view>
         <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'>
         <image class="icon_wrap" src="/images/tax_calculate.png"></image>