wangyu / naturalPersonTax · 提交

提交 e1ca6ae73faab391a8e31e8ed26d3d47f5d0a485

作者 wangyu
1 个父辈 8c8fa297
构建： 未知

优化

内嵌 并排对比
正在显示 9 个修改的文件 包含 56 行增加 和 27 行删除
@@ -180,7 +180,7 @@ Page({ @@ -180,7 +180,7 @@ Page({
180 bindtype: 'reduce_type', 180 bindtype: 'reduce_type',
181 selected: '', 181 selected: '',
182 isblack: 'true', 182 isblack: 'true',
183 - values: ["月度扣除", "年度扣除"], 183 + values: ["月度", "年度"],
184 placeholder: '请选择扣除方式', 184 placeholder: '请选择扣除方式',
185 onChange: 'onPickerSelect' 185 onChange: 'onPickerSelect'
186 }, 186 },
@@ -333,11 +333,11 @@ Page({ @@ -333,11 +333,11 @@ Page({
333 var reduce_typeData = this.data.reducetypeData 333 var reduce_typeData = this.data.reducetypeData
334 var deduction_amount 334 var deduction_amount
335 if (options.reducetype == '月度'){ 335 if (options.reducetype == '月度'){
336 - reduce_typeData.selected = '月度扣除' 336 + reduce_typeData.selected = '月度'
337 deduction_amount = Deduce_amounts_month[nameKey] 337 deduction_amount = Deduce_amounts_month[nameKey]
338 }else { 338 }else {
339 deduction_amount = Deduce_amounts_year[nameKey] 339 deduction_amount = Deduce_amounts_year[nameKey]
340 - reduce_typeData.selected = '年度扣除' 340 + reduce_typeData.selected = '年度'
341 } 341 }
342 342
343 var title = '添加' + (options.title ? options.title : AddTypeNames[nameKey]) 343 var title = '添加' + (options.title ? options.title : AddTypeNames[nameKey])
@@ -223,8 +223,8 @@ @@ -223,8 +223,8 @@
223 <view class='divide_line_f5f5f5'></view> 223 <view class='divide_line_f5f5f5'></view>
224 <view style='height:90rpx'> 224 <view style='height:90rpx'>
225 <text class='text_black_30 float_left'>扣除金额</text> 225 <text class='text_black_30 float_left'>扣除金额</text>
226 - <text wx:if="{{reducetypeData.selected=='月度扣除'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/月</text>  
227 - <text wx:if="{{reducetypeData.selected=='年度扣除'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/年</text> 226 + <text wx:if="{{reducetypeData.selected=='月度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/月</text>
  227 + <text wx:if="{{reducetypeData.selected=='年度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/年</text>
228 <!-- <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> --> 228 <!-- <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> -->
229 </view> 229 </view>
230 <view class='divide_line_f5f5f5'></view> 230 <view class='divide_line_f5f5f5'></view>
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 </view> 56 </view>
57 <view style='height:90rpx;width:100%'> 57 <view style='height:90rpx;width:100%'>
58 <text class='text_left'>扣除方式</text> 58 <text class='text_left'>扣除方式</text>
59 - <text class='text_right_333'>月度扣除</text> 59 + <text class='text_right_333'>月度</text>
60 </view> 60 </view>
61 <view style='height:90rpx;width:100%'> 61 <view style='height:90rpx;width:100%'>
62 <text class='text_left'>扣除金额</text> 62 <text class='text_left'>扣除金额</text>
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 </view> 129 </view>
130 <view style='height:90rpx;width:100%'> 130 <view style='height:90rpx;width:100%'>
131 <text class='text_left'>扣除方式</text> 131 <text class='text_left'>扣除方式</text>
132 - <text class='text_right_333'>月度扣除</text> 132 + <text class='text_right_333'>月度</text>
133 </view> 133 </view>
134 <view style='height:90rpx;width:100%'> 134 <view style='height:90rpx;width:100%'>
135 <text class='text_left'>扣除金额</text> 135 <text class='text_left'>扣除金额</text>
@@ -193,7 +193,7 @@ @@ -193,7 +193,7 @@
193 </view> 193 </view>
194 <view style='height:90rpx;width:100%'> 194 <view style='height:90rpx;width:100%'>
195 <text class='text_left'>扣除方式</text> 195 <text class='text_left'>扣除方式</text>
196 - <text class='text_right_333'>月度扣除</text> 196 + <text class='text_right_333'>月度</text>
197 </view> 197 </view>
198 <view style='height:90rpx;width:100%'> 198 <view style='height:90rpx;width:100%'>
199 <text class='text_left'>扣除金额</text> 199 <text class='text_left'>扣除金额</text>
@@ -48,11 +48,14 @@ Page({ @@ -48,11 +48,14 @@ Page({
48 lookandadd:function(e){ 48 lookandadd:function(e){
49 console.log("lookandadd", e); 49 console.log("lookandadd", e);
50 if (this.data.additiondata.options && this.data.additiondata.options.length>0){ 50 if (this.data.additiondata.options && this.data.additiondata.options.length>0){
  51 + var newstatus
  52 + if (this.data.additiondata.options[e.currentTarget.id].indexOf("house_fund"!=-1)){
  53 + newstatus = "house_fund"
  54 + }
51 wx.navigateTo({ 55 wx.navigateTo({
52 - url: '../lookandupdate/lookandupdate?status=' + this.data.additiondata.options[e.currentTarget.id] + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity, 56 + url: '../lookandupdate/lookandupdate?status=' + newstatus + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
53 }) 57 })
54 } 58 }
55 -  
56 }, 59 },
57 60
58 /** 61 /**
1 // pages/main/addtionalreduce/childreneducate/childreneducate.js 1 // pages/main/addtionalreduce/childreneducate/childreneducate.js
2 var app = getApp(); 2 var app = getApp();
3 var baseUrl = app.globalData.baseUrl; 3 var baseUrl = app.globalData.baseUrl;
4 - 4 +var format = require('../../../../utils/util.js');
5 Page({ 5 Page({
6 6
7 /** 7 /**
@@ -45,8 +45,8 @@ Page({ @@ -45,8 +45,8 @@ Page({
45 "house_fund": "persontax/v1/house-funds/" 45 "house_fund": "persontax/v1/house-funds/"
46 }, 46 },
47 reducetype: { 47 reducetype: {
48 - "month": "月度扣除",  
49 - "year": "年度扣除" 48 + "month": "月度",
  49 + "year": "年度"
50 }, 50 },
51 additionInfo: [], 51 additionInfo: [],
52 reducetypeData: ["月度", "年度"], 52 reducetypeData: ["月度", "年度"],
@@ -117,7 +117,6 @@ Page({ @@ -117,7 +117,6 @@ Page({
117 success: function(res) { 117 success: function(res) {
118 if (res && res.data) { 118 if (res && res.data) {
119 console.log("res", res) 119 console.log("res", res)
120 -  
121 that.setData({ 120 that.setData({
122 additionInfo: res.data.items 121 additionInfo: res.data.items
123 }) 122 })
@@ -16,7 +16,10 @@ @@ -16,7 +16,10 @@
16 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> 16 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
17 <view style='height:110rpx'> 17 <view style='height:110rpx'>
18 <text class='text_gray_36 float_left' style='line-height:110rpx'>{{item.children_name}}</text> 18 <text class='text_gray_36 float_left' style='line-height:110rpx'>{{item.children_name}}</text>
19 - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> 19 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  20 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  21 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
  22 +
20 </view> 23 </view>
21 <view style='padding-right: 30rpx'> 24 <view style='padding-right: 30rpx'>
22 <view class='divide_line_f5f5f5'></view> 25 <view class='divide_line_f5f5f5'></view>
@@ -30,7 +33,7 @@ @@ -30,7 +33,7 @@
30 </view> 33 </view>
31 <view style='height:70rpx'> 34 <view style='height:70rpx'>
32 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 35 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
33 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text> 36 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
34 </view> 37 </view>
35 <view style='height:70rpx'> 38 <view style='height:70rpx'>
36 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 39 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -51,7 +54,9 @@ @@ -51,7 +54,9 @@
51 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> 54 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
52 <view style='height:110rpx'> 55 <view style='height:110rpx'>
53 <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text> 56 <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
54 - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> 57 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  58 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  59 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
55 </view> 60 </view>
56 <view style='padding-right:30rpx'> 61 <view style='padding-right:30rpx'>
57 <view class='divide_line_f5f5f5'></view> 62 <view class='divide_line_f5f5f5'></view>
@@ -77,7 +82,7 @@ @@ -77,7 +82,7 @@
77 </view> 82 </view>
78 <view style='height:70rpx'> 83 <view style='height:70rpx'>
79 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 84 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
80 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text> 85 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
81 </view> 86 </view>
82 <view style='height:70rpx'> 87 <view style='height:70rpx'>
83 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 88 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -88,7 +93,9 @@ @@ -88,7 +93,9 @@
88 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> 93 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
89 <view style='height:110rpx'> 94 <view style='height:110rpx'>
90 <text class='text_gray_36' style='line-height:110rpx'>学历教育</text> 95 <text class='text_gray_36' style='line-height:110rpx'>学历教育</text>
91 - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> 96 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  97 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  98 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
92 </view> 99 </view>
93 <view style='padding-right:right'> 100 <view style='padding-right:right'>
94 <view class='divide_line_f5f5f5'></view> 101 <view class='divide_line_f5f5f5'></view>
@@ -110,7 +117,7 @@ @@ -110,7 +117,7 @@
110 </view> 117 </view>
111 <view style='height:70rpx'> 118 <view style='height:70rpx'>
112 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 119 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
113 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text> 120 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
114 </view> 121 </view>
115 <view style='height:70rpx'> 122 <view style='height:70rpx'>
116 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 123 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -129,7 +136,9 @@ @@ -129,7 +136,9 @@
129 <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'> 136 <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
130 <view style='height:110rpx'> 137 <view style='height:110rpx'>
131 <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text> 138 <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
132 - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> 139 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  140 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  141 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
133 </view> 142 </view>
134 <view style='padding-right:30rpx'> 143 <view style='padding-right:30rpx'>
135 <view class='divide_line_f5f5f5'></view> 144 <view class='divide_line_f5f5f5'></view>
@@ -143,7 +152,7 @@ @@ -143,7 +152,7 @@
143 </view> 152 </view>
144 <view style='height:70rpx'> 153 <view style='height:70rpx'>
145 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 154 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
146 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text> 155 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
147 </view> 156 </view>
148 <view style='height:70rpx'> 157 <view style='height:70rpx'>
149 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 158 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -188,7 +197,9 @@ @@ -188,7 +197,9 @@
188 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> 197 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
189 <view style='height:110rpx'> 198 <view style='height:110rpx'>
190 <text class='text_gray_36' style='line-height:110rpx'>支出明细</text> 199 <text class='text_gray_36' style='line-height:110rpx'>支出明细</text>
191 - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> 200 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  201 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  202 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
192 </view> 203 </view>
193 <view style='padding-right:30rpx'> 204 <view style='padding-right:30rpx'>
194 <view class='divide_line_f5f5f5'></view> 205 <view class='divide_line_f5f5f5'></view>
@@ -228,7 +239,9 @@ @@ -228,7 +239,9 @@
228 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> 239 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
229 <view style='height:110rpx'> 240 <view style='height:110rpx'>
230 <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text> 241 <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text>
231 - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> 242 + <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
  243 + <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
  244 + <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
232 </view> 245 </view>
233 <view style='padding-right: 30rpx'> 246 <view style='padding-right: 30rpx'>
234 <view class='divide_line_f5f5f5'></view> 247 <view class='divide_line_f5f5f5'></view>
@@ -239,7 +252,7 @@ @@ -239,7 +252,7 @@
239 </view> 252 </view>
240 <view style='height:70rpx'> 253 <view style='height:70rpx'>
241 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 254 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
242 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text> 255 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
243 </view> 256 </view>
244 <view style='height:70rpx'> 257 <view style='height:70rpx'>
245 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 258 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -239,7 +239,6 @@ @@ -239,7 +239,6 @@
239 .declare_style { 239 .declare_style {
240 width: 144rpx; 240 width: 144rpx;
241 height: 48rpx; 241 height: 48rpx;
242 - background: #f5a623;  
243 border-radius: 20px 0px 0px 20px; 242 border-radius: 20px 0px 0px 20px;
244 font-family: PingFangSC-Regular; 243 font-family: PingFangSC-Regular;
245 font-size: 13px; 244 font-size: 13px;
@@ -249,5 +248,18 @@ @@ -249,5 +248,18 @@
249 justify-content: center; 248 justify-content: center;
250 line-height: 48rpx; 249 line-height: 48rpx;
251 margin-top: 30rpx; 250 margin-top: 30rpx;
  251 + float:right;
  252 +}
  253 +
  254 +.orange_bg{
  255 + background: #f5a623;
  256 +}
  257 +
  258 +.red_bg{
  259 + background: #f56723;
  260 +}
  261 +
  262 +.blue_bg{
  263 + background: #357AEB;
252 } 264 }
253 265
@@ -34,6 +34,7 @@ Page({ @@ -34,6 +34,7 @@ Page({
34 }, 34 },
35 35
36 bindKeyInput(e) { 36 bindKeyInput(e) {
  37 + console.log("bindKeyInput",e)
37 this.setData({ 38 this.setData({
38 inputValue: e.detail.value 39 inputValue: e.detail.value
39 }) 40 })
@@ -47,6 +48,7 @@ Page({ @@ -47,6 +48,7 @@ Page({
47 data: { 48 data: {
48 text: that.data.inputValue 49 text: that.data.inputValue
49 }, 50 },
  51 + method:"POST",
50 header: { 52 header: {
51 'content-type': 'application/json', 53 'content-type': 'application/json',
52 "Authorization": Authorization 54 "Authorization": Authorization
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 </view> 20 </view>
21 </scroll-view> 21 </scroll-view>
22 <view class='bottom_wrap'> 22 <view class='bottom_wrap'>
23 - <input class='input_wrap' confirm-type="send"></input> 23 + <input class='input_wrap' confirm-type="send" bindinput="bindKeyInput"></input>
24 <view class='btn_send_wrap' bindtap='sendMsg'>发送</view> 24 <view class='btn_send_wrap' bindtap='sendMsg'>发送</view>
25 </view> 25 </view>
26 </view> 26 </view>
请 注册 或 登录 后发表评论