优化

@@ -29,6 +29,7 @@
     "pages/main/finalpay/addUnitInfo/addUnitInfo",
     "pages/main/finalpay/addUnitInfo/addUnitInfo",
     "pages/main/finalpay/refundInfo/refundInfo",
     "pages/main/finalpay/refundInfo/refundInfo",
     "pages/main/finalpay/refundDetail/refundDetail",
     "pages/main/finalpay/refundDetail/refundDetail",
+    "pages/main/finalpay/freeIncomeDetail/freeIncomeDetail",
 
 
     "pages/login/login",
     "pages/login/login",
     "pages/main/advancepayment/adPayDetails/adPayDetails",
     "pages/main/advancepayment/adPayDetails/adPayDetails",

+
+Page({
+
+  /**
+   * Page initial data
+   */
+  data: {
+    info:[{}],
+    projectlist: ["正常工资薪金", "劳务报酬", "稿酬", "特许经营权使用费"],
+    deductcontent:["1","2"],
+    deductproperty: ["---", "===="],
+  },
+
+  /**
+   * 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 () {
+
+  }
+})

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

+
+<view class="page">
+  <view style="background:#fff;padding:0 30rpx;">
+    <text class="text_gray7_34">免税收入合计</text>
+    <text class="text_black3_34 float_right">{{3000}}</text>
+  </view>
+
+  <view style="background:#fff;margin-top:20rpx" wx:for="{{info}}">
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindRegionChange" 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='请输入' name='' value="{{}}"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindRegionChange" 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='请输入' name='' value="{{}}"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+    <picker style="height:104rpx;padding-left: 30rpx;background-color:#fff" mode="selector" bindchange="bindRegionChange" 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='请选择' name='' value="{{}}"></input>
+    </picker>
+    <view class="divide_line_30"></view>
+  </view>
+  <view class="btn_bottom">
+    <button class="btn_bottom" formType="submit">保存</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 {
+  max-width: 600rpx;
+  height: 104rpx;
+  font-size: 32rpx;
+  color: #fff;
+  text-align: right;
+  overflow: hidden;
+  float: right;
+}
+
+.arrow_wrap {
+  width: 60rpx;
+  height: 60rpx;
+  margin-top: 20rpx
+}

@@ -72,7 +72,9 @@ Page({
 
 
 // 免税收入
 // 免税收入
   freeIncomeDetail: function () { 
   freeIncomeDetail: function () { 
-
+      wx.navigateTo({
+        url: '../freeIncomeDetail/freeIncomeDetail',
+      })
   },
   },
 
 
 // 其他扣除
 // 其他扣除
@@ -91,7 +93,7 @@ Page({
   },
   },
 
 
 // 减免/已缴纳税额
 // 减免/已缴纳税额
-  payedDetail:function(){
+  deductOrPayedDetail:function(){
 
 
   },
   },
 
 

@@ -139,7 +139,7 @@
     <view style="background:#fff;padding:30rpx;margin-top:20rpx">
     <view style="background:#fff;padding:30rpx;margin-top:20rpx">
       <view style="margin-bottom:20rpx">
       <view style="margin-bottom:20rpx">
         <text class="text_black3_34">减免/已缴纳税额</text>
         <text class="text_black3_34">减免/已缴纳税额</text>
-        <text class="float_right" style="font-size:14px;color:#4986FE" bindtap="payedDetail">查看明细</text>
+        <text class="float_right" style="font-size:14px;color:#4986FE" bindtap="deductOrPayedDetail">查看明细</text>
       </view>
       </view>
       <view>
       <view>
         <text class="text_black6_32">减免税额</text>
         <text class="text_black6_32">减免税额</text>