提交 14bf831ee2933b096c2d9d464ca1b00e42b351e4

作者 wangyu
1 个父辈 d289d227

优化

... ... @@ -70,6 +70,31 @@ Page({
70 70 })
71 71 },
72 72
  73 +// 免税收入
  74 + freeIncomeDetail: function () {
  75 +
  76 + },
  77 +
  78 +// 其他扣除
  79 + otherDeductDetail:function(){
  80 +
  81 + },
  82 +
  83 + // 捐赠明细
  84 + donationDetail:function(){
  85 +
  86 + },
  87 +
  88 + // 捐赠明细
  89 + donationDetail: function () {
  90 +
  91 + },
  92 +
  93 +// 减免/已缴纳税额
  94 + payedDetail:function(){
  95 +
  96 + },
  97 +
73 98 /**
74 99 * Lifecycle function--Called when page hide
75 100 */
... ...
... ... @@ -34,6 +34,7 @@
34 34 <view style="background:#fff;padding:30rpx;margin-top:20rpx">
35 35 <view style="margin-bottom:20rpx">
36 36 <text class="text_black3_34">免税收入</text>
  37 + <text class="float_right" style="font-size:14px;color:#4986FE" bindtap="freeIncomeDetail">查看附表</text>
37 38 </view>
38 39 <view>
39 40 <text class="text_black6_32">其他免税收入</text>
... ... @@ -96,6 +97,7 @@
96 97 <view style="background:#fff;padding:30rpx;margin-top:20rpx">
97 98 <view style="margin-bottom:20rpx">
98 99 <text class="text_black3_34">其他扣除</text>
  100 + <text class="float_right" style="font-size:14px;color:#4986FE" bindtap="otherDeductDetail">查看附表</text>
99 101 </view>
100 102 <view>
101 103 <text class="text_black6_32">年金</text>
... ... @@ -118,6 +120,7 @@
118 120 <view style="background:#fff;padding:30rpx;margin-top:20rpx">
119 121 <view style="margin-bottom:20rpx">
120 122 <text class="text_black3_34">捐赠扣除</text>
  123 + <text class="float_right" style="font-size:14px;color:#4986FE" bindtap="donationDetail">查看明细</text>
121 124 </view>
122 125 <view>
123 126 <text class="text_black6_32">准予扣除的捐赠额</text>
... ... @@ -136,6 +139,7 @@
136 139 <view style="background:#fff;padding:30rpx;margin-top:20rpx">
137 140 <view style="margin-bottom:20rpx">
138 141 <text class="text_black3_34">减免/已缴纳税额</text>
  142 + <text class="float_right" style="font-size:14px;color:#4986FE" bindtap="payedDetail">查看明细</text>
139 143 </view>
140 144 <view>
141 145 <text class="text_black6_32">减免税额</text>
... ...
... ... @@ -1384,7 +1384,7 @@ Page({
1384 1384 // return
1385 1385 // }
1386 1386 if (this.data.bankInfo.selected && this.data.bankInfo.selected.length > 0) {
1387   - if (this.data.bankProvinceInfo && this.data.bankProvinceInfo.selected.length < 1) {
  1387 + if (!this.data.bankProvinceInfo.selected || this.data.bankProvinceInfo.selected.length < 1) {
1388 1388 this.showtoast('请选择开户银行省份')
1389 1389 return
1390 1390 }
... ... @@ -1397,8 +1397,8 @@ Page({
1397 1397 }
1398 1398 }
1399 1399
1400   - if (this.data.bankProvinceInfo && this.data.bankProvinceInfo.selected.length > 0) {
1401   - if (this.data.bankInfo && this.data.bankInfo.selected.length < 1) {
  1400 + if (this.data.bankProvinceInfo.selected && this.data.bankProvinceInfo.selected.length > 0) {
  1401 + if (!this.data.bankInfo.selected || this.data.bankInfo.selected.length < 1) {
1402 1402 this.showtoast('请选择开户银行')
1403 1403 return
1404 1404 }
... ... @@ -1416,11 +1416,11 @@ Page({
1416 1416 this.showtoast('银行卡号格式有误')
1417 1417 return
1418 1418 }
1419   - if (!this.data.bankInfo.selected) {
  1419 + if (!this.data.bankInfo.selected || this.data.bankInfo.selected.length<1) {
1420 1420 this.showtoast('请选择开户银行')
1421 1421 return
1422 1422 }
1423   - if (!this.data.bankProvinceInfo.selected) {
  1423 + if (!this.data.bankProvinceInfo.selected || this.data.bankProvinceInfo.selected.length<1) {
1424 1424 this.showtoast('请选择开户银行省份')
1425 1425 return
1426 1426 }
... ...
注册登录 后发表评论