提交 fc928ccec01cadf30da6e72a151d2c97ff2d57aa
Merge branch 'dev2.0' into dev_py
# Conflicts: # pages/main/addtionalreduce/addextrainfo/addextrainfo.js
正在显示
9 个修改的文件
包含
421 行增加
和
529 行删除
@@ -5,62 +5,146 @@ Page({ | @@ -5,62 +5,146 @@ Page({ | ||
5 | * Page initial data | 5 | * Page initial data |
6 | */ | 6 | */ |
7 | data: { | 7 | data: { |
8 | - | 8 | + support_duty_id:"", |
9 | + name:"", | ||
10 | + id_card_no:"" | ||
9 | }, | 11 | }, |
10 | 12 | ||
11 | /** | 13 | /** |
12 | * Lifecycle function--Called when page load | 14 | * Lifecycle function--Called when page load |
13 | */ | 15 | */ |
14 | - onLoad: function (options) { | ||
15 | - | 16 | + onLoad: function(options) { |
17 | + this.setData({ | ||
18 | + support_duty_id:options.id | ||
19 | + }) | ||
16 | }, | 20 | }, |
17 | 21 | ||
18 | /** | 22 | /** |
19 | * Lifecycle function--Called when page is initially rendered | 23 | * Lifecycle function--Called when page is initially rendered |
20 | */ | 24 | */ |
21 | - onReady: function () { | 25 | + onReady: function() { |
22 | 26 | ||
23 | }, | 27 | }, |
24 | 28 | ||
25 | /** | 29 | /** |
26 | * Lifecycle function--Called when page show | 30 | * Lifecycle function--Called when page show |
27 | */ | 31 | */ |
28 | - onShow: function () { | 32 | + onShow: function() { |
33 | + var that = this | ||
34 | + wx.getStorage({ | ||
35 | + key: 'id_info', | ||
36 | + success: function(res) { | ||
37 | + console.log('id_info', res.data) | ||
38 | + if (res.data && res.data.length > 0) { | ||
39 | + var id_info = JSON.parse(res.data) | ||
40 | + if (that.data.name.length > 0 && id_info.name != that.data.name) { | ||
41 | + that.showtoast("姓名冲突") | ||
42 | + return | ||
43 | + } | ||
44 | + that.setData({ | ||
45 | + name: id_info.name, | ||
46 | + id_card_no: id_info.id_card_number | ||
47 | + }) | ||
48 | + } | ||
49 | + }, | ||
50 | + }) | ||
51 | + wx.removeStorage({ | ||
52 | + key: 'id_info', | ||
53 | + success(res) { | ||
54 | + console.log(res.data) | ||
55 | + } | ||
56 | + }) | ||
57 | + }, | ||
58 | + | ||
59 | + getIdInfo: function(e) { | ||
60 | + wx.navigateTo({ | ||
61 | + url: '../../taxperson/idinfo/idinfo' | ||
62 | + }) | ||
63 | + }, | ||
64 | + | ||
65 | + | ||
66 | + formSubmit: function (e) { | ||
67 | + console.log("formSubmit", e); | ||
68 | + var formdata = e.detail.value | ||
69 | + if (!formdata.name || formdata.name.length<1){ | ||
70 | + this.showToast("请输入姓名") | ||
71 | + return; | ||
72 | + } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) { | ||
73 | + this.showToast("请输入身份证号") | ||
74 | + return; | ||
75 | + } | ||
76 | + this.goAdd(formdata) | ||
77 | + }, | ||
78 | + | ||
79 | + goAdd: function (formdata){ | ||
80 | + var that = this; | ||
81 | + var Authorization = getApp().globalData.Authorization; | ||
82 | + wx.request({ | ||
83 | + url: baseUrl + 'persontax/v1/co-supporters', | ||
84 | + data: { | ||
85 | + "support_duty_id": that.data.support_duty_id, | ||
86 | + "co_supporter": formdata.name , | ||
87 | + "id_card_type": "1", | ||
88 | + "id_card_no": formdata.id_card_no, | ||
89 | + }, | ||
90 | + header: { | ||
91 | + 'content-type': 'application/json', | ||
92 | + "Authorization": Authorization | ||
93 | + }, | ||
94 | + success: function (res) { | ||
95 | + if (res && res.data) { | ||
96 | + console.log("res", res) | ||
97 | + if (res && res.statusCode < 200) { | ||
98 | + wx.navigateBack({ | ||
99 | + delta: 1 | ||
100 | + }) | ||
101 | + } | ||
102 | + } | ||
103 | + } | ||
104 | + }) | ||
105 | + }, | ||
29 | 106 | ||
107 | + showToast: function (data) { | ||
108 | + if (data && data.length > 0) { | ||
109 | + wx.showToast({ | ||
110 | + title: data, | ||
111 | + icon: "none" | ||
112 | + }) | ||
113 | + } | ||
30 | }, | 114 | }, |
31 | 115 | ||
32 | /** | 116 | /** |
33 | * Lifecycle function--Called when page hide | 117 | * Lifecycle function--Called when page hide |
34 | */ | 118 | */ |
35 | - onHide: function () { | 119 | + onHide: function() { |
36 | 120 | ||
37 | }, | 121 | }, |
38 | 122 | ||
39 | /** | 123 | /** |
40 | * Lifecycle function--Called when page unload | 124 | * Lifecycle function--Called when page unload |
41 | */ | 125 | */ |
42 | - onUnload: function () { | 126 | + onUnload: function() { |
43 | 127 | ||
44 | }, | 128 | }, |
45 | 129 | ||
46 | /** | 130 | /** |
47 | * Page event handler function--Called when user drop down | 131 | * Page event handler function--Called when user drop down |
48 | */ | 132 | */ |
49 | - onPullDownRefresh: function () { | 133 | + onPullDownRefresh: function() { |
50 | 134 | ||
51 | }, | 135 | }, |
52 | 136 | ||
53 | /** | 137 | /** |
54 | * Called when page reach bottom | 138 | * Called when page reach bottom |
55 | */ | 139 | */ |
56 | - onReachBottom: function () { | 140 | + onReachBottom: function() { |
57 | 141 | ||
58 | }, | 142 | }, |
59 | 143 | ||
60 | /** | 144 | /** |
61 | * Called when user click on the top right corner to share | 145 | * Called when user click on the top right corner to share |
62 | */ | 146 | */ |
63 | - onShareAppMessage: function () { | 147 | + onShareAppMessage: function() { |
64 | 148 | ||
65 | } | 149 | } |
66 | }) | 150 | }) |
1 | +<!--pages/main/addtionalreduce/adddupporters/adddupporters.wxml--> | ||
2 | +<view class='page'> | ||
3 | + <form bindsubmit='formSubmit'> | ||
4 | + <view style='height:90rpx;padding:0 30rpx'> | ||
5 | + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> | ||
6 | + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人姓名</text> | ||
7 | + <!-- <input placeholder-class='input_placeholder_wrap' class='input_wrap' placeholder='请输入姓名' name='name' value='{{name}}' maxlength='18'></input> --> | ||
8 | + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入姓名' name='name' value='{{name}}'></input> | ||
9 | + </view> | ||
10 | + <view class="divide_line"></view> | ||
11 | + <view style='height:90rpx;padding:0 30rpx'> | ||
12 | + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> | ||
13 | + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人证照类型</text> | ||
14 | + <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>居民身份证</text> | ||
15 | + </view> | ||
16 | + <view class='divide_line_f5f5f5'></view> | ||
17 | + <view style='height:90rpx;padding:0 30rpx'> | ||
18 | + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> | ||
19 | + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人证件号码</text> | ||
20 | + <view> | ||
21 | + <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image> | ||
22 | + <input class='input_wrap01 float_right' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type='idcard' value='{{id_card_no}}'></input> | ||
23 | + </view> | ||
24 | + </view> | ||
25 | + <view class="divide_line"></view> | ||
26 | + <view class="btn_bottom"> | ||
27 | + <button class="btn_bottom" formType="submit"> 保存</button> | ||
28 | + </view> | ||
29 | + </form> | ||
30 | +</view> |
1 | + | ||
2 | +.input_wrap { | ||
3 | + width: 460rpx; | ||
4 | + height: 90rpx; | ||
5 | + font-size: 30rpx; | ||
6 | + color: #333; | ||
7 | + text-align: right; | ||
8 | + overflow: hidden; | ||
9 | + text-overflow: ellipsis; | ||
10 | + white-space: nowrap; | ||
11 | +} | ||
12 | + | ||
13 | +.text_999_30 { | ||
14 | + font-family: PingFangSC-Regular; | ||
15 | + font-size: 30rpx; | ||
16 | + color: #999; | ||
17 | +} | ||
18 | + | ||
19 | +.input_wrap01 { | ||
20 | + width: 380rpx; | ||
21 | + height: 90rpx; | ||
22 | + font-size: 30rpx; | ||
23 | + color: #333; | ||
24 | + text-align: right; | ||
25 | + overflow: hidden; | ||
26 | + text-overflow: ellipsis; | ||
27 | + white-space: nowrap; | ||
28 | +} | ||
29 | + | ||
30 | +.image_camera { | ||
31 | + width: 42rpx; | ||
32 | + height: 42rpx; | ||
33 | + margin-left: 10rpx; | ||
34 | + margin-top: 22rpx; | ||
35 | +} |
@@ -722,7 +722,6 @@ Page({ | @@ -722,7 +722,6 @@ Page({ | ||
722 | }, | 722 | }, |
723 | 723 | ||
724 | addDatas: function (newdata){ | 724 | addDatas: function (newdata){ |
725 | - | ||
726 | wx.showModal({ | 725 | wx.showModal({ |
727 | title: '确认要提交申报吗?', | 726 | title: '确认要提交申报吗?', |
728 | content: '确认后将不能修改', | 727 | content: '确认后将不能修改', |
@@ -742,7 +741,7 @@ Page({ | @@ -742,7 +741,7 @@ Page({ | ||
742 | }, | 741 | }, |
743 | data: newdata, | 742 | data: newdata, |
744 | success(res) { | 743 | success(res) { |
745 | - if (res && res.statusCode == 200) { | 744 | + if (res && res.statusCode < 300) { |
746 | wx.navigateBack({ | 745 | wx.navigateBack({ |
747 | delta: 1 | 746 | delta: 1 |
748 | }) | 747 | }) |
@@ -750,7 +749,6 @@ Page({ | @@ -750,7 +749,6 @@ Page({ | ||
750 | } | 749 | } |
751 | }) | 750 | }) |
752 | } else if (res.cancel) { | 751 | } else if (res.cancel) { |
753 | - return; | ||
754 | } | 752 | } |
755 | } | 753 | } |
756 | }) | 754 | }) |
@@ -10,7 +10,7 @@ Page({ | @@ -10,7 +10,7 @@ Page({ | ||
10 | data: { | 10 | data: { |
11 | cur_status: "", | 11 | cur_status: "", |
12 | legal_entity_id: "", | 12 | legal_entity_id: "", |
13 | - legal_entity:"", | 13 | + legal_entity: "", |
14 | declareStatus: { | 14 | declareStatus: { |
15 | "to_declare ": "待申报", | 15 | "to_declare ": "待申报", |
16 | "declaring": "申报中", | 16 | "declaring": "申报中", |
@@ -40,9 +40,9 @@ Page({ | @@ -40,9 +40,9 @@ Page({ | ||
40 | url_arr: { | 40 | url_arr: { |
41 | "children_education": "persontax/v1/children-educations/", | 41 | "children_education": "persontax/v1/children-educations/", |
42 | "continuing_education": "persontax/v1/continuing-educations/", | 42 | "continuing_education": "persontax/v1/continuing-educations/", |
43 | - "support_duty": "support-duties/", | ||
44 | - "medical_fund": "persontax/v1/medical_founds/", | ||
45 | - "house_fund": "persontax/v1/house_founds/" | 43 | + "support_duty": "persontax/v1/support-duties/", |
44 | + "medical_fund": "persontax/v1/medical-funds/", | ||
45 | + "house_fund": "persontax/v1/house-funds/" | ||
46 | }, | 46 | }, |
47 | reducetype: { | 47 | reducetype: { |
48 | "month": "月度扣除", | 48 | "month": "月度扣除", |
@@ -54,20 +54,20 @@ Page({ | @@ -54,20 +54,20 @@ Page({ | ||
54 | children_modalData: { | 54 | children_modalData: { |
55 | title: "请选择子女进行申报", | 55 | title: "请选择子女进行申报", |
56 | datas: [], | 56 | datas: [], |
57 | - canceltext: "添加新子女并申报", | ||
58 | - confirmtext: "确定为该子女申报", | 57 | + lefttext: "添加新子女并申报", |
58 | + righttext: "确定为该子女申报", | ||
59 | }, | 59 | }, |
60 | support_older_modalData: { | 60 | support_older_modalData: { |
61 | title: "请选择父母或祖父母进行申报", | 61 | title: "请选择父母或祖父母进行申报", |
62 | datas: [], | 62 | datas: [], |
63 | - canceltext: "添加被赡养人并申报", | ||
64 | - confirmtext: "确定为该被赡养人申报", | 63 | + lefttext: "添加被赡养人并申报", |
64 | + righttext: "确定为该被赡养人申报", | ||
65 | }, | 65 | }, |
66 | medical_modalData: { | 66 | medical_modalData: { |
67 | title: "请选择本人、配偶或子女进行大病支出申报", | 67 | title: "请选择本人、配偶或子女进行大病支出申报", |
68 | datas: [], | 68 | datas: [], |
69 | - canceltext: "添加家庭成员并申报", | ||
70 | - confirmtext: "确定为该选择的人申报", | 69 | + lefttext: "添加家庭成员并申报", |
70 | + righttext: "确定为该选择的人申报", | ||
71 | }, | 71 | }, |
72 | selected_reduceindex: 0, | 72 | selected_reduceindex: 0, |
73 | selected_addindex: 0 | 73 | selected_addindex: 0 |
@@ -128,7 +128,7 @@ Page({ | @@ -128,7 +128,7 @@ Page({ | ||
128 | 128 | ||
129 | goaddSupporter: function() { | 129 | goaddSupporter: function() { |
130 | wx.navigateTo({ | 130 | wx.navigateTo({ |
131 | - url: '../adddupporters/adddupporters', | 131 | + url: '../adddupporters/adddupporters?support_duty_id=' + this.data.additionInfo.id, |
132 | }) | 132 | }) |
133 | }, | 133 | }, |
134 | 134 | ||
@@ -205,12 +205,12 @@ Page({ | @@ -205,12 +205,12 @@ Page({ | ||
205 | } | 205 | } |
206 | senddata = JSON.stringify(modalinfo.datas[e.currentTarget.id]) | 206 | senddata = JSON.stringify(modalinfo.datas[e.currentTarget.id]) |
207 | console.log("modalinfo", modalinfo) | 207 | console.log("modalinfo", modalinfo) |
208 | - if (modalinfo.datas.length < 2) { | 208 | + if (modalinfo.datas.length > 0) { |
209 | + this.showAddtionmodal(modalinfo) | ||
210 | + } else { | ||
209 | wx.navigateTo({ | 211 | wx.navigateTo({ |
210 | url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex], | 212 | url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex], |
211 | }) | 213 | }) |
212 | - } else { | ||
213 | - this.showAddtionmodal(modalinfo) | ||
214 | } | 214 | } |
215 | } | 215 | } |
216 | }, | 216 | }, |
@@ -311,25 +311,28 @@ Page({ | @@ -311,25 +311,28 @@ Page({ | ||
311 | }) | 311 | }) |
312 | }, | 312 | }, |
313 | 313 | ||
314 | - reduce_modalCancel: function() { //modal取消(扣除类型) | 314 | + reduce_modalLeft: function() { //modal取消(扣除类型) |
315 | this.setData({ | 315 | this.setData({ |
316 | showModal_reducetype: false | 316 | showModal_reducetype: false |
317 | }) | 317 | }) |
318 | }, | 318 | }, |
319 | 319 | ||
320 | - reduce_modalConfirm: function() { //modal确认(扣除类型) | 320 | + reduce_modalRight: function() { //modal确认(扣除类型) |
321 | this.setData({ | 321 | this.setData({ |
322 | showModal_reducetype: false | 322 | showModal_reducetype: false |
323 | }) | 323 | }) |
324 | }, | 324 | }, |
325 | 325 | ||
326 | - modalCancel: function() { //modal取消(添加) | 326 | + modalLeft: function() { //modal取消(添加) |
327 | this.setData({ | 327 | this.setData({ |
328 | showModal_addtype: false | 328 | showModal_addtype: false |
329 | }) | 329 | }) |
330 | + wx.navigateTo({ | ||
331 | + url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + "" + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex], | ||
332 | + }) | ||
330 | }, | 333 | }, |
331 | 334 | ||
332 | - modalConfirm: function(e) { //modal确认(添加) | 335 | + modalRight: function(e) { //modal确认(添加) |
333 | console.log("modalConfirm", e) | 336 | console.log("modalConfirm", e) |
334 | this.setData({ | 337 | this.setData({ |
335 | showModal_addtype: false | 338 | showModal_addtype: false |
@@ -337,9 +340,9 @@ Page({ | @@ -337,9 +340,9 @@ Page({ | ||
337 | var senddata = JSON.stringify(this.data.modalData.datas[this.data.selected_addindex]) | 340 | var senddata = JSON.stringify(this.data.modalData.datas[this.data.selected_addindex]) |
338 | console.log("senddata", senddata) | 341 | console.log("senddata", senddata) |
339 | wx.navigateTo({ | 342 | wx.navigateTo({ |
340 | - url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex], | 343 | + url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex], |
341 | }) | 344 | }) |
342 | - | 345 | + |
343 | }, | 346 | }, |
344 | 347 | ||
345 | goselect: function(e) { | 348 | goselect: function(e) { |
1 | <!--pages/main/addtionalreduce/childreneducate/childreneducate.wxml--> | 1 | <!--pages/main/addtionalreduce/childreneducate/childreneducate.wxml--> |
2 | 2 | ||
3 | -<view class='page'> | ||
4 | - <view style='display:flex;flex-direction:column;background:#FCFCFC'> | ||
5 | - <!-- <view style='height:180rpx'> | ||
6 | - <image style='width:100%;height:180rpx;position:absolute;' src='/images/extra_img_bg.png'></image> | ||
7 | - <view class='view_bg_wrap' style='margin-top: 48rpx;'> | ||
8 | - <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> | ||
9 | - <text class='text_text_wrap'>累计使用额度</text> | ||
10 | - <text class='text_num_wrap'>1610899.90</text> | ||
11 | - </view> | ||
12 | - <view style='width:2rpx;height:74rpx;background:#ffffff;'></view> | ||
13 | - <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'> | ||
14 | - <text class='text_text_wrap'>本月可使用额度</text> | ||
15 | - <text class='text_num_wrap'>39100.10</text> | ||
16 | - </view> | ||
17 | - </view> | ||
18 | - </view> | ||
19 | - <view style='width:100%;height:20rpx;background:#f5f5f5'></view> --> | ||
20 | - | ||
21 | - <!-- <view style='padding-left:30rpx;background:#ffffff;padding-top:30rpx' bindtap='showmodal'> | ||
22 | - <image class='icon_declare_wrap' src="/images/icon_declare.png"></image> | ||
23 | - <text style='padding-left:15rpx;' class='text_blue_28'>申报说明</text> | ||
24 | - </view> --> | 3 | +<view style='width:100%;height:100%;background:#FCFCFC;'> |
4 | + <view style='display:flex;flex-direction:column;margin-bottom:140rpx;'> | ||
25 | <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showModalImg'></image> | 5 | <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showModalImg'></image> |
26 | - | ||
27 | - <image style='width:55%;height:254rpx;align-self:center;margin-top:160rpx;margin-bottom:320rpx' hidden='true' src='/images/noreduce_img.png'></image> | ||
28 | - | ||
29 | - <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='showModalReducetype' hidden="{{cur_status=='continuing_education'}}"> | 6 | + <view style='height:100rpx;padding:0 30rpx;background:#FFF' bindtap='showModalReducetype' hidden="{{cur_status=='continuing_education'}}"> |
30 | <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text> | 7 | <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text> |
31 | <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image> | 8 | <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image> |
32 | <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text> | 9 | <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text> |
33 | </view> | 10 | </view> |
34 | 11 | ||
12 | + <view wx:if="{{additionInfo&&additionInfo.length>0}}"> | ||
35 | 13 | ||
36 | - <!-- <view wx:if='{{new_data&&new_data!=null}}' style='margin:30rpx;' class='card_rectangle_bg_column'> --> | ||
37 | - | ||
38 | - <!-- 子女教育 --> | ||
39 | - <!-- <view wx:if="{{cur_index==0}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'> | ||
40 | - <view style='height:40rpx '> | ||
41 | - <text class='text_999_28 float_left'>配偶姓名</text> | ||
42 | - <text class='text_333_28 float_right'>{{new_data.lover_name}}</text> | ||
43 | - </view> | ||
44 | - <view style='height:40rpx'> | ||
45 | - <text class='text_999_28 float_left'>配偶身份证件类型</text> | ||
46 | - <text class='text_333_28 float_right'>{{new_data.lover_cardtype}}</text> | ||
47 | - </view> | ||
48 | - <view style='height:40rpx'> | ||
49 | - <text class='text_999_28 float_left'>配偶身份证号</text> | ||
50 | - <text class='text_333_28 float_right'>{{new_data.lover_idno}}</text> | ||
51 | - </view> | ||
52 | - <view style='height:40rpx'> | ||
53 | - <text class='text_999_28 float_left'>出生日期</text> | ||
54 | - <text class='text_333_28 float_right'>{{new_data.lover_birthdate}}</text> | ||
55 | - </view> | ||
56 | - <view style='height:40rpx'> | ||
57 | - <text class='text_999_28 float_left'>国籍</text> | ||
58 | - <text class='text_333_28 float_right'>中国</text> | ||
59 | - </view> | ||
60 | - <view style='height:40rpx'> | ||
61 | - <text class='text_999_28 float_left'>与纳税人关系</text> | ||
62 | - <text class='text_333_28 float_right'>{{new_data.taxperson_relative}}</text> | ||
63 | - </view> | ||
64 | - | ||
65 | - <view style='height:40rpx'> | ||
66 | - <text class='text_999_28 float_left'>子女姓名</text> | ||
67 | - <text class='text_333_28 float_right'>{{new_data.children_name}}</text> | ||
68 | - </view> | ||
69 | - <view style='height:40rpx'> | ||
70 | - <text class='text_999_28 float_left'>子女身份证件类型</text> | ||
71 | - <text class='text_333_28 float_right'>{{new_data.children_cardtype}}</text> | ||
72 | - </view> | ||
73 | - <view style='height:40rpx'> | ||
74 | - <text class='text_999_28 float_left'>子女身份证号</text> | ||
75 | - <text class='text_333_28 float_right'>{{new_data.children_idno}}</text> | ||
76 | - </view> | ||
77 | - <view style='height:40rpx'> | ||
78 | - <text class='text_999_28 float_left'>出生日期</text> | ||
79 | - <text class='text_333_28 float_right'>{{new_data.children_birthDate}}</text> | ||
80 | - </view> | ||
81 | - <view style='height:40rpx'> | ||
82 | - <text class='text_999_28 float_left'>国籍</text> | ||
83 | - <text class='text_333_28 float_right'>中国</text> | ||
84 | - </view> | ||
85 | - <view style='height:40rpx'> | ||
86 | - <text class='text_999_28 float_left'>学籍号</text> | ||
87 | - <text class='text_333_28 float_right'>{{new_data.children_schoolno}}</text> | ||
88 | - </view> | ||
89 | - <view style='height:40rpx'> | ||
90 | - <text class='text_999_28 float_left'>受教育阶段</text> | ||
91 | - <text class='text_333_28 float_right'>{{new_data.edu_degree}}</text> | ||
92 | - </view> | ||
93 | - <view style='height:40rpx'> | ||
94 | - <text class='text_999_28 float_left'>受教育日期起</text> | ||
95 | - <text class='text_333_28 float_right'>{{new_data.study_startdate}}</text> | ||
96 | - </view> | ||
97 | - <view style='height:40rpx'> | ||
98 | - <text class='text_999_28 float_left'>预计受教育日期止</text> | ||
99 | - <text class='text_333_28 float_right'>{{new_data.study_enddate}}</text> | ||
100 | - </view> | ||
101 | - | ||
102 | - <view style='height:40rpx'> | ||
103 | - <text class='text_999_28 float_left'>扣除比例</text> | ||
104 | - <text class='text_333_28 float_right'>{{new_data.reduce_ratio}}</text> | ||
105 | - </view> | ||
106 | - </view> --> | ||
107 | - | ||
108 | - <!-- 继续教育 --> | ||
109 | - <!-- <view wx:if="{{cur_index==1}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> | ||
110 | - <view style='height:40rpx'> | ||
111 | - <text class='text_999_28 float_left'>教育类型</text> | ||
112 | - <text class='text_333_28 float_right'>{{new_data.edu_type}}</text> | ||
113 | - </view> | ||
114 | - <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==0}}'> | ||
115 | - <text class='text_999_28 float_left'>教育阶段</text> | ||
116 | - <text class='text_333_28 float_right'>{{new_data.degree_level}}</text> | ||
117 | - </view> | ||
118 | - <view style='height:40rpx'> | ||
119 | - <text class='text_999_28 float_left' wx:if='{{new_data.edu_type_lable==0}}'>受教育日期起</text> | ||
120 | - <text class='text_333_28 float_right'>{{new_data.study_startdate}}</text> | ||
121 | - </view> | ||
122 | - <view style='height:40rpx'> | ||
123 | - <text class='text_999_28 float_left' wx:if='{{new_data.edu_type_lable==0}}'>受教育日期止</text> | ||
124 | - <text class='text_333_28 float_right'>{{new_data.study_enddate}}</text> | ||
125 | - </view> | ||
126 | - | ||
127 | - <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==1}}'> | ||
128 | - <text class='text_999_28 float_left'>证书名称名称</text> | ||
129 | - <text class='text_333_28 float_right'>{{new_data.occupational_qualifiy_name}}</text> | ||
130 | - </view> | ||
131 | - <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==1}}'> | ||
132 | - <text class='text_999_28 float_left'>证书编号</text> | ||
133 | - <text class='text_333_28 float_right'>{{new_data.occupational_qualifiy_no}}</text> | ||
134 | - </view> | ||
135 | - <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==1}}'> | ||
136 | - <text class='text_999_28 float_left'>发证机关</text> | ||
137 | - <text class='text_333_28 float_right'>{{new_data.license_unit}}</text> | ||
138 | - </view> | ||
139 | - </view> --> | ||
140 | - | ||
141 | - <!-- 赡养老人 --> | ||
142 | - <!-- <view wx:if="{{cur_index==2}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> | ||
143 | - <view style='height:40rpx'> | ||
144 | - <text class='text_999_28 float_left'>赡养类型</text> | ||
145 | - <text class='text_333_28 float_right'>{{new_data.support_type}}</text> | ||
146 | - </view> | ||
147 | - <view style='height:40rpx'> | ||
148 | - <text class='text_999_28 float_left'>被赡养人姓名</text> | ||
149 | - <text class='text_333_28 float_right'>{{new_data.older_name}}</text> | ||
150 | - </view> | ||
151 | - <view style='height:40rpx'> | ||
152 | - <text class='text_999_28 float_left'>被赡养人身份证类型</text> | ||
153 | - <text class='text_333_28 float_right'>{{new_data.older_cardtype}}</text> | ||
154 | - </view> | ||
155 | - <view style='height:40rpx'> | ||
156 | - <text class='text_999_28 float_left'>老人身份证号</text> | ||
157 | - <text class='text_333_28 float_right'>{{new_data.older_idno}}</text> | ||
158 | - </view> | ||
159 | - <view wx:if="{{new_data.support_type=='独立赡养'}}" style='height:40rpx'> | ||
160 | - <text class='text_999_28 float_left'>被赡养人出生日期</text> | ||
161 | - <text class='text_333_28 float_right'>{{new_data.older_birthday}}</text> | ||
162 | - </view> | ||
163 | - <view wx:if="{{new_data.support_type=='独立赡养'}}" style='height:40rpx'> | ||
164 | - <text class='text_999_28 float_left'>被赡养人国籍(地区)</text> | ||
165 | - <text class='text_333_28 float_right'>中国</text> | ||
166 | - </view> | ||
167 | - <view wx:if="{{new_data.support_type=='独立赡养'}}" style='height:40rpx'> | ||
168 | - <text class='text_999_28 float_left'>与纳税人的关系</text> | ||
169 | - <text class='text_333_28 float_right'>{{new_data.older_relative}}</text> | ||
170 | - </view> | ||
171 | - | ||
172 | - <view style='height:40rpx'> | ||
173 | - <text class='text_999_28 float_left'>扣除方式</text> | ||
174 | - <text class='text_333_28 float_right'>{{new_data.reduce_type}}</text> | ||
175 | - </view> | ||
176 | - <view style='height:40rpx'> | ||
177 | - <text class='text_999_28 float_left'>扣除金额</text> | ||
178 | - <text class='text_333_28 float_right'>{{new_data.reduce_money}}元</text> | ||
179 | - </view> | ||
180 | - </view> --> | ||
181 | - | ||
182 | - <!-- 大病医疗 --> | ||
183 | - <!-- <view wx:if="{{cur_index==3}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> | ||
184 | - <view style='height:40rpx'> | ||
185 | - <text class='text_999_28 float_left'>姓名</text> | ||
186 | - <text class='text_333_28 float_right'>{{new_data.name}}</text> | ||
187 | - </view> | ||
188 | - <view style='height:40rpx'> | ||
189 | - <text class='text_999_28 float_left'>身份证件类型</text> | ||
190 | - <text class='text_333_28 float_right'>{{new_data.cardtype}}</text> | ||
191 | - </view> | ||
192 | - <view style='height:40rpx'> | ||
193 | - <text class='text_999_28 float_left'>身份证号</text> | ||
194 | - <text class='text_333_28 float_right'>{{new_data.idno}}</text> | ||
195 | - </view> | ||
196 | - <view style='height:40rpx'> | ||
197 | - <text class='text_999_28 float_left'>与纳税人关系</text> | ||
198 | - <text class='text_333_28 float_right'>{{new_data.taxperson_relative}}</text> | ||
199 | - </view> | ||
200 | - <view style='height:40rpx'> | ||
201 | - <text class='text_999_28 float_left'>医疗支出总金额</text> | ||
202 | - <text class='text_333_28 float_right'>{{new_data.total_money}}元</text> | ||
203 | - </view> | ||
204 | - <view style='height:40rpx'> | ||
205 | - <text class='text_999_28 float_left'>个人负担金额</text> | ||
206 | - <text class='text_333_28 float_right'>{{new_data.personal_money}}元</text> | 14 | + <view wx:if="{{cur_status=='children_education'}}"> |
15 | + <view wx:for="{{additionInfo}}"> | ||
16 | + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> | ||
17 | + <view style='height:110rpx'> | ||
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> | ||
20 | + </view> | ||
21 | + <view style='padding-right: 30rpx'> | ||
22 | + <view class='divide_line_f5f5f5'></view> | ||
23 | + <view style='height:70rpx'> | ||
24 | + <text class='text_999_28 ' style='line-height:70rpx'>子女姓名:</text> | ||
25 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text> | ||
26 | + </view> | ||
27 | + <view style='height:70rpx'> | ||
28 | + <text class='text_999_28 ' style='line-height:70rpx'>分配比例:</text> | ||
29 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text> | ||
30 | + </view> | ||
31 | + <view style='height:70rpx'> | ||
32 | + <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> | ||
34 | + </view> | ||
35 | + <view style='height:70rpx'> | ||
36 | + <text class='text_999_28 ' style='line-height:70rpx'>扣除金额:</text> | ||
37 | + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥{{item.deduction_amount}}</text> | ||
38 | + </view> | ||
39 | + <view class='divide_line_f5f5f5'></view> | ||
40 | + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> | ||
41 | + <view class='float_right' wx:if="{{item.status=='failed'}}"> | ||
42 | + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> | ||
43 | + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | ||
44 | + </view> | ||
45 | + </view> | ||
46 | + </view> | ||
207 | </view> | 47 | </view> |
208 | - </view> --> | 48 | + </view> |
209 | 49 | ||
210 | - <!-- 住房 --> | ||
211 | - <!-- <view wx:if="{{title=='住房贷款利息'||title=='住房租金'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'> | ||
212 | - <view style='height:40rpx'> | ||
213 | - <text class='text_999_28 float_left'>配偶姓名</text> | ||
214 | - <text class='text_333_28 float_right'>{{new_data.lover_name}}</text> | ||
215 | - </view> | ||
216 | - <view style='height:40rpx'> | ||
217 | - <text class='text_999_28 float_left'>配偶身份证件类型</text> | ||
218 | - <text class='text_333_28 float_right'>{{new_data.lover_cardtype}}</text> | ||
219 | - </view> | ||
220 | - <view style='height:40rpx'> | ||
221 | - <text class='text_999_28 float_left'>配偶身份证号</text> | ||
222 | - <text class='text_333_28 float_right'>{{new_data.lover_idno}}</text> | ||
223 | - </view> | ||
224 | - <view style='height:40rpx'> | ||
225 | - <text class='text_999_28 float_left'>出生日期</text> | ||
226 | - <text class='text_333_28 float_right'>{{new_data.lover_birthdate}}</text> | ||
227 | - </view> | ||
228 | - <view style='height:40rpx'> | ||
229 | - <text class='text_999_28 float_left'>国籍</text> | ||
230 | - <text class='text_333_28 float_right'>中国</text> | ||
231 | - </view> | ||
232 | - <view wx:if="{{title=='住房贷款利息'}}" style='display:flex;flex-direction:column'> | ||
233 | - <view style='height:40rpx'> | ||
234 | - <text class='text_999_28 float_left'>房屋坐落地址</text> | ||
235 | - <text class='text_333_28 float_right'>{{new_data.house_location}}</text> | ||
236 | - </view> | ||
237 | - <view style='height:40rpx'> | ||
238 | - <text class='text_999_28 float_left'>证书类型</text> | ||
239 | - <text class='text_333_28 float_right'>{{new_data.identify_type}}</text> | ||
240 | - </view> | ||
241 | - <view style='height:40rpx'> | ||
242 | - <text class='text_999_28 float_left'>证书编号</text> | ||
243 | - <text class='text_333_28 float_right'>{{new_data.identify_no}}</text> | ||
244 | - </view> | ||
245 | - <view style='height:40rpx'> | ||
246 | - <text class='text_999_28 float_left'>贷款类型</text> | ||
247 | - <text class='text_333_28 float_right'>{{new_data.loan_type}}</text> | ||
248 | - </view> | ||
249 | - <view style='height:40rpx'> | ||
250 | - <text class='text_999_28 float_left'>贷款合同编号</text> | ||
251 | - <text class='text_333_28 float_right'>{{new_data.contract_no}}</text> | ||
252 | - </view> | ||
253 | - <view style='height:40rpx'> | ||
254 | - <text class='text_999_28 float_left'>首次还款日期</text> | ||
255 | - <text class='text_333_28 float_right'>{{new_data.payback_date}}</text> | 50 | + <view wx:if="{{cur_status=='continuing_education'}}"> |
51 | + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> | ||
52 | + <view style='height:110rpx'> | ||
53 | + <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text> | ||
54 | + <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> | ||
256 | </view> | 55 | </view> |
257 | - <view style='height:40rpx'> | ||
258 | - <text class='text_999_28 float_left'>贷款期限(月数)</text> | ||
259 | - <text class='text_333_28 float_right'>{{new_data.loan_datelong}}</text> | 56 | + <view style='padding-right:30rpx'> |
57 | + <view class='divide_line_f5f5f5'></view> | ||
58 | + <view style='height:70rpx'> | ||
59 | + <text class='text_999_28 ' style='line-height:70rpx'>教育类别:</text> | ||
60 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{}}</text> | ||
61 | + </view> | ||
62 | + <view style='height:70rpx'> | ||
63 | + <text class='text_999_28 ' style='line-height:70rpx'>教育类型:</text> | ||
64 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text> | ||
65 | + </view> | ||
66 | + <view style='height:70rpx'> | ||
67 | + <text class='text_999_28 ' style='line-height:70rpx'>证书名称:</text> | ||
68 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_name}}</text> | ||
69 | + </view> | ||
70 | + <view style='height:70rpx'> | ||
71 | + <text class='text_999_28 ' style='line-height:70rpx'>证书编号:</text> | ||
72 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text> | ||
73 | + </view> | ||
74 | + <view style='height:70rpx'> | ||
75 | + <text class='text_999_28 ' style='line-height:70rpx'>发证机关:</text> | ||
76 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text> | ||
77 | + </view> | ||
78 | + <view style='height:70rpx'> | ||
79 | + <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> | ||
81 | + </view> | ||
82 | + <view style='height:70rpx'> | ||
83 | + <text class='text_999_28 ' style='line-height:70rpx'>扣除金额:</text> | ||
84 | + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥{{item.deduction_amount}}</text> | ||
85 | + </view> | ||
260 | </view> | 86 | </view> |
261 | </view> | 87 | </view> |
262 | - <view wx:if="{{title=='住房租金'}}" style='display:flex;flex-direction:column'> | ||
263 | - <view style='height:40rpx'> | ||
264 | - <text class='text_999_28 float_left'>租赁房屋坐落地址</text> | ||
265 | - <text class='text_333_28 float_right'>{{new_data.house_location}}</text> | ||
266 | - </view> | ||
267 | - <view style='height:40rpx'> | ||
268 | - <text class='text_999_28 float_left'>出租方类型</text> | ||
269 | - <text class='text_333_28 float_right'>{{new_data.lease_type}}</text> | ||
270 | - </view> | ||
271 | - <view style='height:40rpx'> | ||
272 | - <text class='text_999_28 float_left'>出租房名称</text> | ||
273 | - <text class='text_333_28 float_right'>{{new_data.lease_name}}</text> | ||
274 | - </view> | ||
275 | - <view style='height:40rpx'> | ||
276 | - <text class='text_999_28 float_left'>出租房纳税人识别号</text> | ||
277 | - <text class='text_333_28 float_right'>{{new_data.lease_idno}}</text> | ||
278 | - </view> | ||
279 | - <view style='height:40rpx'> | ||
280 | - <text class='text_999_28 float_left'>证件类型</text> | ||
281 | - <text class='text_333_28 float_right'>{{new_data.identify_type}}</text> | ||
282 | - </view> | ||
283 | - <view style='height:40rpx'> | ||
284 | - <text class='text_999_28 float_left'>证件号码</text> | ||
285 | - <text class='text_333_28 float_right'>{{new_data.identify_no}}</text> | ||
286 | - </view> | ||
287 | - <view style='height:40rpx'> | ||
288 | - <text class='text_999_28 float_left'>租赁合同编号</text> | ||
289 | - <text class='text_333_28 float_right'>{{new_data.contract_no}}</text> | ||
290 | - </view> | ||
291 | - <view style='height:40rpx'> | ||
292 | - <text class='text_999_28 float_left'>租赁期起</text> | ||
293 | - <text class='text_333_28 float_right'>{{new_data.lease_startdate}}</text> | 88 | + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> |
89 | + <view style='height:110rpx'> | ||
90 | + <text class='text_gray_36' style='line-height:110rpx'>学历教育</text> | ||
91 | + <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> | ||
294 | </view> | 92 | </view> |
295 | - <view style='height:40rpx'> | ||
296 | - <text class='text_999_28 float_left'>租赁期止</text> | ||
297 | - <text class='text_333_28 float_right'>{{new_data.lease_enddate}}</text> | 93 | + <view style='padding-right:right'> |
94 | + <view class='divide_line_f5f5f5'></view> | ||
95 | + <view style='height:70rpx'> | ||
96 | + <text class='text_999_28 ' style='line-height:70rpx'>教育类别:</text> | ||
97 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text> | ||
98 | + </view> | ||
99 | + <view style='height:70rpx'> | ||
100 | + <text class='text_999_28 ' style='line-height:70rpx'>受教育阶段:</text> | ||
101 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_period}}</text> | ||
102 | + </view> | ||
103 | + <view style='height:70rpx'> | ||
104 | + <text class='text_999_28 ' style='line-height:70rpx'>受教育日期起:</text> | ||
105 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> | ||
106 | + </view> | ||
107 | + <view style='height:70rpx'> | ||
108 | + <text class='text_999_28 ' style='line-height:70rpx'>受教育日期止:</text> | ||
109 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> | ||
110 | + </view> | ||
111 | + <view style='height:70rpx'> | ||
112 | + <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> | ||
114 | + </view> | ||
115 | + <view style='height:70rpx'> | ||
116 | + <text class='text_999_28 ' style='line-height:70rpx'>扣除金额:</text> | ||
117 | + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥{{item.deduction_amount}}</text> | ||
118 | + </view> | ||
298 | </view> | 119 | </view> |
299 | - </view> | ||
300 | 120 | ||
301 | - <view style='height:40rpx'> | ||
302 | - <text class='text_999_28 float_left'>扣除方式</text> | ||
303 | - <text class='text_333_28 float_right'>{{new_data.reduce_type}}</text> | ||
304 | </view> | 121 | </view> |
305 | - <view style='height:40rpx'> | ||
306 | - <text class='text_999_28 float_left'>扣除金额</text> | ||
307 | - <text class='text_333_28 float_right'>{{new_data.reduce_money}}元</text> | 122 | + <view class='float_right' wx:if="{{item.status=='failed'}}"> |
123 | + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> | ||
124 | + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | ||
308 | </view> | 125 | </view> |
126 | + </view> | ||
309 | 127 | ||
310 | - </view> --> | ||
311 | - | ||
312 | - <!-- </view> --> | ||
313 | - | ||
314 | - | ||
315 | - <view wx:if="{{cur_status=='children_education'}}"> | ||
316 | - <view wx:for="{{additionInfo}}"> | ||
317 | - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> | 128 | + <view wx:if="{{cur_status=='support_duty'}}"> |
129 | + <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'> | ||
318 | <view style='height:110rpx'> | 130 | <view style='height:110rpx'> |
319 | - <text class='text_gray_36 float_left' style='line-height:110rpx'>{{item.children_name}}</text> | 131 | + <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text> |
320 | <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> | 132 | <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> |
321 | </view> | 133 | </view> |
322 | - <view style='padding-right: 30rpx'> | 134 | + <view style='padding-right:30rpx'> |
323 | <view class='divide_line_f5f5f5'></view> | 135 | <view class='divide_line_f5f5f5'></view> |
324 | <view style='height:70rpx'> | 136 | <view style='height:70rpx'> |
325 | - <text class='text_999_28 ' style='line-height:70rpx'>子女姓名:</text> | ||
326 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text> | 137 | + <text class='text_999_28 ' style='line-height:70rpx'>被赡养人姓名:</text> |
138 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> | ||
327 | </view> | 139 | </view> |
328 | <view style='height:70rpx'> | 140 | <view style='height:70rpx'> |
329 | - <text class='text_999_28 ' style='line-height:70rpx'>分配比例:</text> | ||
330 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text> | 141 | + <text class='text_999_28 ' style='line-height:70rpx'>分摊比例:</text> |
142 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> | ||
331 | </view> | 143 | </view> |
332 | <view style='height:70rpx'> | 144 | <view style='height:70rpx'> |
333 | <text class='text_999_28 ' style='line-height:70rpx'>扣除方式:</text> | 145 | <text class='text_999_28 ' style='line-height:70rpx'>扣除方式:</text> |
@@ -344,217 +156,122 @@ | @@ -344,217 +156,122 @@ | ||
344 | <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | 156 | <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> |
345 | </view> | 157 | </view> |
346 | </view> | 158 | </view> |
347 | - </view> | ||
348 | - </view> | ||
349 | - </view> | ||
350 | 159 | ||
351 | - <view wx:if="{{cur_status=='continuing_education'}}"> | ||
352 | - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> | ||
353 | - <view style='height:110rpx'> | ||
354 | - <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text> | ||
355 | - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> | ||
356 | - </view> | ||
357 | - <view style='padding-right:30rpx'> | ||
358 | - <view class='divide_line_f5f5f5'></view> | ||
359 | - <view style='height:70rpx'> | ||
360 | - <text class='text_999_28 ' style='line-height:70rpx'>教育类别:</text> | ||
361 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{}}</text> | ||
362 | - </view> | ||
363 | - <view style='height:70rpx'> | ||
364 | - <text class='text_999_28 ' style='line-height:70rpx'>教育类型:</text> | ||
365 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text> | ||
366 | - </view> | ||
367 | - <view style='height:70rpx'> | ||
368 | - <text class='text_999_28 ' style='line-height:70rpx'>证书名称:</text> | ||
369 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_name}}</text> | ||
370 | - </view> | ||
371 | - <view style='height:70rpx'> | ||
372 | - <text class='text_999_28 ' style='line-height:70rpx'>证书编号:</text> | ||
373 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text> | ||
374 | - </view> | ||
375 | - <view style='height:70rpx'> | ||
376 | - <text class='text_999_28 ' style='line-height:70rpx'>发证机关:</text> | ||
377 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text> | ||
378 | - </view> | ||
379 | - <view style='height:70rpx'> | ||
380 | - <text class='text_999_28 ' style='line-height:70rpx'>扣除方式:</text> | ||
381 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text> | ||
382 | - </view> | ||
383 | - <view style='height:70rpx'> | ||
384 | - <text class='text_999_28 ' style='line-height:70rpx'>扣除金额:</text> | ||
385 | - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥{{item.deduction_amount}}</text> | ||
386 | - </view> | ||
387 | - </view> | ||
388 | - </view> | ||
389 | - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> | ||
390 | - <view style='height:110rpx'> | ||
391 | - <text class='text_gray_36' style='line-height:110rpx'>学历教育</text> | ||
392 | - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> | ||
393 | - </view> | ||
394 | - <view style='padding-right:right'> | ||
395 | - <view class='divide_line_f5f5f5'></view> | ||
396 | - <view style='height:70rpx'> | ||
397 | - <text class='text_999_28 ' style='line-height:70rpx'>教育类别:</text> | ||
398 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text> | ||
399 | - </view> | ||
400 | - <view style='height:70rpx'> | ||
401 | - <text class='text_999_28 ' style='line-height:70rpx'>受教育阶段:</text> | ||
402 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_period}}</text> | ||
403 | - </view> | ||
404 | - <view style='height:70rpx'> | ||
405 | - <text class='text_999_28 ' style='line-height:70rpx'>受教育日期起:</text> | ||
406 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> | ||
407 | - </view> | ||
408 | - <view style='height:70rpx'> | ||
409 | - <text class='text_999_28 ' style='line-height:70rpx'>受教育日期止:</text> | ||
410 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> | ||
411 | - </view> | ||
412 | - <view style='height:70rpx'> | ||
413 | - <text class='text_999_28 ' style='line-height:70rpx'>扣除方式:</text> | ||
414 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text> | ||
415 | - </view> | ||
416 | - <view style='height:70rpx'> | ||
417 | - <text class='text_999_28 ' style='line-height:70rpx'>扣除金额:</text> | ||
418 | - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥{{item.deduction_amount}}</text> | ||
419 | - </view> | ||
420 | </view> | 160 | </view> |
421 | 161 | ||
422 | - </view> | ||
423 | - <view class='float_right' wx:if="{{item.status=='failed'}}"> | ||
424 | - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> | ||
425 | - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | ||
426 | - </view> | ||
427 | - </view> | ||
428 | - | ||
429 | - <view wx:if="{{cur_status=='support_duty'}}"> | ||
430 | - <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'> | ||
431 | - <view style='height:110rpx'> | ||
432 | - <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text> | ||
433 | - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> | ||
434 | - </view> | ||
435 | - <view style='padding-right:30rpx'> | ||
436 | - <view class='divide_line_f5f5f5'></view> | ||
437 | - <view style='height:70rpx'> | ||
438 | - <text class='text_999_28 ' style='line-height:70rpx'>被赡养人姓名:</text> | ||
439 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> | ||
440 | - </view> | ||
441 | - <view style='height:70rpx'> | ||
442 | - <text class='text_999_28 ' style='line-height:70rpx'>分摊比例:</text> | ||
443 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> | ||
444 | - </view> | ||
445 | - <view style='height:70rpx'> | ||
446 | - <text class='text_999_28 ' style='line-height:70rpx'>扣除方式:</text> | ||
447 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text> | ||
448 | - </view> | ||
449 | - <view style='height:70rpx'> | ||
450 | - <text class='text_999_28 ' style='line-height:70rpx'>扣除金额:</text> | ||
451 | - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥{{item.deduction_amount}}</text> | 162 | + <view wx:if="{{true}}"> |
163 | + <view style='background:#FFF;padding:30rpx'> | ||
164 | + <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id='{{index}}' bindtap='goadd'> | ||
165 | + 添加 | ||
166 | + </view> | ||
452 | </view> | 167 | </view> |
453 | - <view class='divide_line_f5f5f5'></view> | ||
454 | - <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> | ||
455 | - <view class='float_right' wx:if="{{item.status=='failed'}}"> | ||
456 | - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> | ||
457 | - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | 168 | + <view style='margin-left:30rpx' wx:if="{{cur_status=='support_duty'}}"> |
169 | + <text class='text_999_28'>您还没有添加继续共同赡养人,</text> | ||
170 | + <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text> | ||
458 | </view> | 171 | </view> |
459 | - </view> | ||
460 | 172 | ||
173 | + </view> | ||
461 | </view> | 174 | </view> |
462 | - </view> | ||
463 | 175 | ||
464 | - <view wx:if="{{cur_status=='medical_fund'}}"> | ||
465 | - <view class='divide_line_f5f5f5'></view> | ||
466 | - <view style='height:100rpx;margin:0 30rpx' bindtap='reducetype'> | ||
467 | - <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>个人负担总金额</text> | ||
468 | - <text class='text_orange_28 float_right' style='line-height:100rpx'>¥10</text> | ||
469 | - </view> | ||
470 | - <view class='divide_line_f5f5f5'></view> | ||
471 | - <view style='height:100rpx;margin:0 30rpx' bindtap='reducetype'> | ||
472 | - <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text> | ||
473 | - <text class='text_orange_28 float_right' style='line-height:100rpx'>¥0</text> | ||
474 | - </view> | ||
475 | - <view class='divide_line_f5f5f5'></view> | ||
476 | - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> | ||
477 | - <view style='height:110rpx'> | ||
478 | - <text class='text_gray_36' style='line-height:110rpx'>支出明细</text> | ||
479 | - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> | ||
480 | - </view> | ||
481 | - <view style='padding-right:30rpx'> | ||
482 | - <view class='divide_line_f5f5f5'></view> | ||
483 | - <view style='height:70rpx'> | ||
484 | - <text class='text_999_28 ' style='line-height:70rpx'>姓名:</text> | ||
485 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> | ||
486 | - </view> | ||
487 | - <view style='height:70rpx'> | ||
488 | - <text class='text_999_28 ' style='line-height:70rpx'>身份证件类型:</text> | ||
489 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> | ||
490 | - </view> | ||
491 | - <view style='height:70rpx'> | ||
492 | - <text class='text_999_28 ' style='line-height:70rpx'>身份证件号码:</text> | ||
493 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> | ||
494 | - </view> | ||
495 | - <view style='height:70rpx'> | ||
496 | - <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系:</text> | ||
497 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> | ||
498 | - </view> | ||
499 | - <view style='height:70rpx'> | ||
500 | - <text class='text_999_28 ' style='line-height:70rpx'>医疗支出总金额:</text> | ||
501 | - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥12345元</text> | ||
502 | - </view> | ||
503 | - <view style='height:70rpx'> | ||
504 | - <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额:</text> | ||
505 | - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥2345元</text> | 176 | + <view wx:if="{{cur_status=='medical_fund'}}"> |
177 | + <view class='divide_line_f5f5f5'></view> | ||
178 | + <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'> | ||
179 | + <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>个人负担总金额</text> | ||
180 | + <text class='text_orange_28 float_right' style='line-height:100rpx'>¥10</text> | ||
181 | + </view> | ||
182 | + <view class='divide_line_f5f5f5'></view> | ||
183 | + <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'> | ||
184 | + <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text> | ||
185 | + <text class='text_orange_28 float_right' style='line-height:100rpx'>¥0</text> | ||
186 | + </view> | ||
187 | + <view class='divide_line_f5f5f5'></view> | ||
188 | + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> | ||
189 | + <view style='height:110rpx'> | ||
190 | + <text class='text_gray_36' style='line-height:110rpx'>支出明细</text> | ||
191 | + <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> | ||
506 | </view> | 192 | </view> |
507 | - <view class='float_right' wx:if="{{item.status!='failed'}}"> | ||
508 | - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> | ||
509 | - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | 193 | + <view style='padding-right:30rpx'> |
194 | + <view class='divide_line_f5f5f5'></view> | ||
195 | + <view style='height:70rpx'> | ||
196 | + <text class='text_999_28 ' style='line-height:70rpx'>姓名:</text> | ||
197 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> | ||
198 | + </view> | ||
199 | + <view style='height:70rpx'> | ||
200 | + <text class='text_999_28 ' style='line-height:70rpx'>身份证件类型:</text> | ||
201 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> | ||
202 | + </view> | ||
203 | + <view style='height:70rpx'> | ||
204 | + <text class='text_999_28 ' style='line-height:70rpx'>身份证件号码:</text> | ||
205 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> | ||
206 | + </view> | ||
207 | + <view style='height:70rpx'> | ||
208 | + <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系:</text> | ||
209 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> | ||
210 | + </view> | ||
211 | + <view style='height:70rpx'> | ||
212 | + <text class='text_999_28 ' style='line-height:70rpx'>医疗支出总金额:</text> | ||
213 | + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥12345元</text> | ||
214 | + </view> | ||
215 | + <view style='height:70rpx'> | ||
216 | + <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额:</text> | ||
217 | + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥2345元</text> | ||
218 | + </view> | ||
219 | + <view class='float_right' wx:if="{{item.status!='failed'}}"> | ||
220 | + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> | ||
221 | + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | ||
222 | + </view> | ||
510 | </view> | 223 | </view> |
511 | </view> | 224 | </view> |
512 | </view> | 225 | </view> |
513 | - </view> | ||
514 | 226 | ||
515 | - <view wx:if="{{cur_status=='house_fund'}}"> | ||
516 | - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> | ||
517 | - <view style='height:110rpx'> | ||
518 | - <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text> | ||
519 | - <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> | ||
520 | - </view> | ||
521 | - <view style='padding-right: 30rpx'> | ||
522 | - <view class='divide_line_f5f5f5'></view> | ||
523 | - <view style=''> | ||
524 | - <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址:</text> | ||
525 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>北京市 市辖区 朝阳区</text> | ||
526 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>瑞创国际SA大厦1101</text> | ||
527 | - </view> | ||
528 | - <view style='height:70rpx'> | ||
529 | - <text class='text_999_28 ' style='line-height:70rpx'>扣除方式:</text> | ||
530 | - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text> | ||
531 | - </view> | ||
532 | - <view style='height:70rpx'> | ||
533 | - <text class='text_999_28 ' style='line-height:70rpx'>扣除金额:</text> | ||
534 | - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥{{item.deduction_amount}}</text> | 227 | + <view wx:if="{{cur_status=='house_fund'}}"> |
228 | + <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> | ||
229 | + <view style='height:110rpx'> | ||
230 | + <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text> | ||
231 | + <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> | ||
535 | </view> | 232 | </view> |
536 | - <view class='divide_line_f5f5f5'></view> | ||
537 | - <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> | ||
538 | - <view class='float_right' wx:if="{{item.status=='failed'}}"> | ||
539 | - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> | ||
540 | - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | 233 | + <view style='padding-right: 30rpx'> |
234 | + <view class='divide_line_f5f5f5'></view> | ||
235 | + <view style=''> | ||
236 | + <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址:</text> | ||
237 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>北京市 市辖区 朝阳区</text> | ||
238 | + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>瑞创国际SA大厦1101</text> | ||
239 | + </view> | ||
240 | + <view style='height:70rpx'> | ||
241 | + <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> | ||
243 | + </view> | ||
244 | + <view style='height:70rpx'> | ||
245 | + <text class='text_999_28 ' style='line-height:70rpx'>扣除金额:</text> | ||
246 | + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>¥{{item.deduction_amount}}</text> | ||
247 | + </view> | ||
248 | + <view class='divide_line_f5f5f5'></view> | ||
249 | + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> | ||
250 | + <view class='float_right' wx:if="{{item.status=='failed'}}"> | ||
251 | + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> | ||
252 | + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> | ||
253 | + </view> | ||
541 | </view> | 254 | </view> |
542 | </view> | 255 | </view> |
543 | </view> | 256 | </view> |
257 | + | ||
544 | </view> | 258 | </view> |
545 | - <view style='background:#FFF;padding:30rpx'> | ||
546 | - <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id='{{index}}' bindtap='goadd'> | ||
547 | - 添加 | ||
548 | - </view> | 259 | + <view wx:if="{{!additionInfo||additionInfo.length<1}}"> |
260 | + <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image> | ||
549 | </view> | 261 | </view> |
550 | 262 | ||
551 | - <view style='margin-left:30rpx' wx:if="{{cur_status=='support_duty'}}"> | ||
552 | - <text class='text_999_28'>您还没有添加继续共同赡养人,</text> | ||
553 | - <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text> | 263 | + </view> |
264 | + | ||
265 | + <view class='bottom_btn_wrap' hidden="{{additionInfo&&additionInfo.length>0&&cur_status=='support_duty'}}"> | ||
266 | + <view class='btn_blue_radius' bindtap="goadd"> | ||
267 | + <view class='text_white_34'>添加</view> | ||
554 | </view> | 268 | </view> |
555 | </view> | 269 | </view> |
270 | + | ||
556 | </view> | 271 | </view> |
557 | 272 | ||
273 | + | ||
274 | + | ||
558 | <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}"></view> | 275 | <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}"></view> |
559 | <!-- 申报说明 --> | 276 | <!-- 申报说明 --> |
560 | <view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal_img}}"> | 277 | <view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal_img}}"> |
@@ -581,9 +298,9 @@ | @@ -581,9 +298,9 @@ | ||
581 | <view class='divide_line_f5f5f5'></view> | 298 | <view class='divide_line_f5f5f5'></view> |
582 | 299 | ||
583 | <view style='width:100%;display: flex;'> | 300 | <view style='width:100%;display: flex;'> |
584 | - <text class='text_cancel' bindtap='reduce_modalCancel'>取消</text> | 301 | + <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text> |
585 | <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view> | 302 | <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view> |
586 | - <text class='text_confirm' bindtap='reduce_modalConfirm'>确认</text> | 303 | + <text class='text_confirm' bindtap='reduce_modalRight'>确认</text> |
587 | </view> | 304 | </view> |
588 | </view> | 305 | </view> |
589 | 306 | ||
@@ -605,8 +322,8 @@ | @@ -605,8 +322,8 @@ | ||
605 | </view> | 322 | </view> |
606 | <view class='divide_line_f5f5f5'></view> | 323 | <view class='divide_line_f5f5f5'></view> |
607 | <view style='width:100%;display: flex;'> | 324 | <view style='width:100%;display: flex;'> |
608 | - <text class='text_cancel01' bindtap='modalCancel'>{{modalData.canceltext}}</text> | 325 | + <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text> |
609 | <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view> | 326 | <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view> |
610 | - <text class='text_confirm01' bindtap='modalConfirm'>{{modalData.confirmtext}}</text> | 327 | + <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text> |
611 | </view> | 328 | </view> |
612 | </view> | 329 | </view> |
@@ -21,6 +21,13 @@ | @@ -21,6 +21,13 @@ | ||
21 | text-align: center; | 21 | text-align: center; |
22 | } | 22 | } |
23 | 23 | ||
24 | +.btn_blue_radius{ | ||
25 | + margin: 26rpx 30rpx; | ||
26 | + background: #357AEB; | ||
27 | + border-radius: 5px; | ||
28 | + height: 84rpx; | ||
29 | +} | ||
30 | + | ||
24 | .icon_wrap { | 31 | .icon_wrap { |
25 | width: 8rpx; | 32 | width: 8rpx; |
26 | height: 28rpx; | 33 | height: 28rpx; |
@@ -94,6 +101,23 @@ | @@ -94,6 +101,23 @@ | ||
94 | border-radius: 4px; | 101 | border-radius: 4px; |
95 | } | 102 | } |
96 | 103 | ||
104 | +.text_white_34 { | ||
105 | + font-family: PingFangSC-Regular; | ||
106 | + font-size: 17px; | ||
107 | + color: #FFFFFF; | ||
108 | + text-align: center; | ||
109 | + line-height: 42px; | ||
110 | +} | ||
111 | + | ||
112 | +.bottom_btn_wrap{ | ||
113 | + background: #FFFFFF; | ||
114 | + box-shadow: 0 -2px 8px 0 rgba(208,208,208,0.30); | ||
115 | + height: 136rpx; | ||
116 | + width: 100%; | ||
117 | + position: fixed; | ||
118 | + bottom: 0; | ||
119 | +} | ||
120 | + | ||
97 | /* 遮罩层 */ | 121 | /* 遮罩层 */ |
98 | 122 | ||
99 | .mask { | 123 | .mask { |
@@ -226,3 +250,4 @@ | @@ -226,3 +250,4 @@ | ||
226 | line-height: 48rpx; | 250 | line-height: 48rpx; |
227 | margin-top: 30rpx; | 251 | margin-top: 30rpx; |
228 | } | 252 | } |
253 | + |
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | 6 | ||
7 | <image class='bgimg' src='/images/guide_bg.png'></image> | 7 | <image class='bgimg' src='/images/guide_bg.png'></image> |
8 | 8 | ||
9 | - <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'> | 9 | + <view class='card_rectangle_bg_row' style='margin-top:310rpx;padding:30rpx' bindtap='gotaxPerson'> |
10 | <image class="icon_wrap" src="/images/tax_person.jpg"></image> | 10 | <image class="icon_wrap" src="/images/tax_person.jpg"></image> |
11 | <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view> | 11 | <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view> |
12 | <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'> | 12 | <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'> |
请
注册
或
登录
后发表评论