wangyu / naturalPersonTax · 提交

提交 868fbe48b59fffc4bbb30be6df13dd0cc246b8f5

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

优化

内嵌 并排对比
正在显示 21 个修改的文件 包含 407 行增加 和 213 行删除
... ... @@ -5,7 +5,8 @@ Page({
5 5 * Page initial data
6 6 */
7 7 data: {
8   -
  8 + cur_status:"",
  9 + datas:{}
9 10 },
10 11
11 12 /**
... ... @@ -15,7 +16,8 @@ Page({
15 16 var that = this
16 17 console.log("options", options);
17 18 this.setData({
18   - cur_index: options.index
  19 + cur_status: options.status,
  20 + datas: JSON.parse(options.data)
19 21 })
20 22 },
21 23
... ...
1 1 <!--pages/main/addtionalreduce/additiondetail/additiondetail.wxml-->
2 2 <scroll-view class='page'>
3 3
4   -<!-- 子女教育 -->
5   - <view style='padding:30rpx'>
  4 + <!-- 子女教育 -->
  5 + <view style='padding:30rpx' wx:if="{{cur_status=='children_education'}}">
6 6 <view style='height:90rpx;width:100%'>
7 7 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
8 8 <text class='text_left'>子女身份证件类型：</text>
9   - <text class='text_right_333'>身份证</text>
  9 + <text class='text_right_333'>{{datas.children_id_card_type}}</text>
10 10 </view>
11 11 <view style='height:90rpx;width:100%'>
12 12 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
13 13 <text class='text_left'>子女身份证件号码：</text>
14   - <text class='text_right_333'>92589038539251</text>
  14 + <text class='text_right_333'>{{datas.children_id_card_no}}</text>
15 15 </view>
16 16 <view style='height:90rpx;width:100%'>
17 17 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
18 18 <text class='text_left'>子女姓名</text>
19   - <text class='text_right_333'>哈哈</text>
  19 + <text class='text_right_333'>{{datas.children_name}}</text>
20 20 </view>
21 21 <view style='height:90rpx;width:100%'>
22 22 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
23 23 <text class='text_left'>出生日期</text>
24   - <text class='text_right_333'>2019-01-01</text>
  24 + <text class='text_right_333'>{{datas.children_birthday}}</text>
25 25 </view>
26 26 <view style='height:90rpx;width:100%'>
27 27 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
... ... @@ -32,7 +32,7 @@
32 32 <view style='height:90rpx;width:100%'>
33 33 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
34 34 <text class='text_left'>分配比例</text>
35   - <text class='text_right_333'>10%</text>
  35 + <text class='text_right_333'>{{datas.percent}}%</text>
36 36 </view>
37 37 <view style='height:90rpx;width:100%'>
38 38 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
... ... @@ -42,7 +42,7 @@
42 42 <view style='height:90rpx;width:100%'>
43 43 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
44 44 <text class='text_left'>子女受教育阶段</text>
45   - <text class='text_right_333'>大学</text>
  45 + <text class='text_right_333'>{{datas.education_period}}</text>
46 46 </view>
47 47 <view style='height:90rpx;width:100%'>
48 48 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
... ... @@ -60,24 +60,24 @@
60 60 </view>
61 61 <view style='height:90rpx;width:100%'>
62 62 <text class='text_left'>扣除金额</text>
63   - <text class='text_right_orange'>￥1200/月</text>
  63 + <text class='text_right_orange'>￥{{datas.deduction_amount}}/月</text>
64 64 </view>
65 65 <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
66 66 <view style='height:90rpx;width:100%'>
67 67 <text class='text_left'>配偶姓名</text>
68   - <text class='text_right_333'>西施</text>
  68 + <text class='text_right_333'>{{datas.spouse_name}}</text>
69 69 </view>
70 70 <view style='height:90rpx;width:100%'>
71 71 <text class='text_left'>配偶证件类型</text>
72   - <text class='text_right_333'>结婚证</text>
  72 + <text class='text_right_333'>{{datas.spouse_id_card_type}}</text>
73 73 </view>
74 74 <view style='height:90rpx;width:100%'>
75 75 <text class='text_left'>配偶身份证件号码</text>
76   - <text class='text_right_333'>1101101010110</text>
  76 + <text class='text_right_333'>{{datas.spouse_id_card_no}}</text>
77 77 </view>
78 78 <view style='height:90rpx;width:100%'>
79 79 <text class='text_left'>出生日期</text>
80   - <text class='text_right_333'>2000年10月1日</text>
  80 + <text class='text_right_333'>{{datas.spouse_birthday}}</text>
81 81 </view>
82 82 <view style='height:90rpx;width:100%'>
83 83 <text class='text_left'>国籍</text>
... ... @@ -85,9 +85,9 @@
85 85 </view>
86 86 </view>
87 87
88   -<!-- 赡养老人 -->
89   -<view style='padding:30rpx' hidden='true'>
90   -<view style='height:90rpx;width:100%'>
  88 + <!-- 赡养老人 -->
  89 + <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}">
  90 + <view style='height:90rpx;width:100%'>
91 91 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
92 92 <text class='text_left'>赡养类型：</text>
93 93 <text class='text_right_333'>独立赡养</text>
... ... @@ -127,7 +127,7 @@
127 127 <text class='text_left'>分摊比例：</text>
128 128 <text class='text_right_333'>100%</text>
129 129 </view>
130   - <view style='height:90rpx;width:100%'>
  130 + <view style='height:90rpx;width:100%'>
131 131 <text class='text_left'>扣除方式</text>
132 132 <text class='text_right_333'>月度扣除</text>
133 133 </view>
... ... @@ -135,11 +135,11 @@
135 135 <text class='text_left'>扣除金额</text>
136 136 <text class='text_right_orange'>￥1200/月</text>
137 137 </view>
138   -</view>
  138 + </view>
139 139
140   -<!-- 住房 -->
141   - <view style='padding:30rpx' hidden='true'>
142   - <view style='height:90rpx;width:100%' >
  140 + <!-- 住房 -->
  141 + <view style='padding:30rpx' wx:if="{{cur_status=='house_fund'}}">
  142 + <view style='height:90rpx;width:100%'>
143 143 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
144 144 <text class='text_left'>租赁房屋坐落地址：</text>
145 145 <text class='text_right_333'>北京市 市辖区 朝阳区</text>
... ...
... ... @@ -10,66 +10,48 @@ Page({
10 10 data: {
11 11 flag_housing01: false,
12 12 flag_housing02: false,
  13 + legal_entity_id: '',
  14 + legal_entity: '',
  15 +
13 16 selectIndex: [{
14 17 message: '子女教育',
15 18 disable_change: '',
16   - path: '',
17   - data: {},
  19 + status: "children_education",
18 20 sureid: false
19 21 }, {
20 22 message: '继续教育',
21 23 disable_change: '',
22   - path: '',
23   - data: {},
  24 + status: "continuing_education",
24 25 sureid: false
25 26 }, {
26 27 message: '赡养老人',
27 28 disable_change: '',
28   - path: '',
29   - data: {},
  29 + status: "support_duty",
30 30 sureid: false
31 31 }, {
32 32 message: '大病医疗',
33 33 disable_change: '',
34   - path: '',
35   - data: {},
  34 + status: "medical_fund",
36 35 sureid: false
37 36 }, {
38 37 message: '住房',
39 38 sureid: false,
40   - path: '',
41   - data: {},
42 39 disable_change: '',
  40 + status: "children_education",
43 41 extra_message: ''
44 42 }, ],
45   - // unitData: {
46   - // label: '选择申报单位',
47   - // bindtype: 'unit',
48   - // selected: '北京小爱智能科技',
49   - // values: ["北京小爱智能科技"],
50   - // placeholder: '请选择申报单位',
51   - // onChange: 'onPickerSelect'
52   - // },
53   -
54 43 },
55 44
56 45 /**
57 46 * Lifecycle function--Called when page load
58 47 */
59 48 onLoad: function(options) {
60   - var that = this
61   - // wx.clearStorage()
62   - wx.getStorage({
63   - key: 'selectitems',
64   - success: function(res) {
65   - console.log("selectitems", res.data)
66   - that.setData({
67   - selectIndex: res.data,
68   - flag_housing01: res.data[res.data.length - 1].extra_message == '住房贷款利息',
69   - flag_housing02: res.data[res.data.length - 1].extra_message == '住房租金'
70   - })
71   - },
  49 + console.log("onLoad", options)
  50 + this.setData({
  51 + legal_entity_id: options.legal_entity_id,
  52 + legal_entity: options.legal_entity
72 53 })
  54 +
73 55 },
74 56
75 57 /**
... ... @@ -86,15 +68,6 @@ Page({
86 68
87 69 },
88 70
89   - onPickerSelect: function(e) {
90   - console.log('picker发送选择改变，携带值为', e)
91   - var unit_data = this.data.unitData
92   - unit_data.selected = unit_data.values[e.detail.value]
93   - this.setData({
94   - unitData: unit_data
95   - })
96   - },
97   -
98 71 selectRep: function(e) {
99 72 let index = e.currentTarget.dataset.selectindex;
100 73 let selectIndex = this.data.selectIndex; //取到data里的selectIndex
... ... @@ -147,52 +120,61 @@ Page({
147 120 },
148 121
149 122 gocommit: function() {
150   - if (!this.data.unitData.selected || !this.data.unitData.selected.length > 0) {
151   - wx.showToast({
152   - title: '请选择申报单位',
153   - })
154   - return;
155   - }
156 123 var selectjson = this.data.selectIndex
157   - var flag_count = 0
  124 + if (selectjson[selectjson.length - 1].sureid) {
  125 + if (this.data.flag_housing01 || this.data.flag_housing02) {
  126 + selectjson[selectjson.length - 1].extra_message = this.data.flag_housing01 ? "住房贷款利息" : "住房租金";
  127 + selectjson[selectjson.length - 1].status = this.data.flag_housing01 ? "house_fund_loan" : "house_fund_rent";
  128 + this.setData({
  129 + selectIndex: selectjson
  130 + })
  131 + } else {
  132 + wx.showToast({
  133 + title: '请选择住房类型',
  134 + })
  135 + return;
  136 + }
  137 + }
  138 + var stuatusarray = new Array();
158 139 for (var i = 0; i < selectjson.length; i++) {
159 140 if (this.data.selectIndex[i].sureid) {
160   - selectjson[i].disable_change = true
161   - flag_count++
  141 + stuatusarray.push(this.data.selectIndex[i].status)
162 142 }
163 143 }
164 144 console.log("selectjson01", selectjson)
165   - if (flag_count < 1) {
  145 + if (stuatusarray.length < 1) {
166 146 wx.showToast({
167 147 title: '请选择专项附加扣除',
168 148 })
169 149 return;
170   - } else {
171   - if (selectjson[selectjson.length - 1].sureid) {
172   - if (this.data.flag_housing01 || this.data.flag_housing02) {
173   - selectjson[selectjson.length - 1].extra_message = this.data.flag_housing01 ? "住房贷款利息" : "住房租金";
174   - this.setData({
175   - selectIndex: selectjson
176   - })
177   - } else {
178   - wx.showToast({
179   - title: '请选择住房类型',
  150 + }
  151 + this.goDeclare(stuatusarray)
  152 +
  153 + },
  154 +
  155 + goDeclare: function(array) {
  156 + var that = this;
  157 + var Authorization = getApp().globalData.Authorization;
  158 + wx.request({
  159 + url: baseUrl + 'persontax/v1/additional-settings',
  160 + data: {
  161 + "legal_entity_id": this.data.legal_entity_id,
  162 + "legal_entity": this.data.legal_entity,
  163 + "options": array
  164 + },
  165 + method:"POST",
  166 + header: {
  167 + 'content-type': 'application/json',
  168 + "Authorization": Authorization
  169 + },
  170 + success: function(res) {
  171 + if (res && res.data) {
  172 + console.log("res", res)
  173 + wx.redirectTo({
  174 + url: '../godetail/godetail'
180 175 })
181   - return;
182 176 }
183 177 }
184   - }
185   - wx.setStorage({
186   - key: 'is_declared',
187   - data: true,
188   - })
189   - wx.setStorage({
190   - key: 'selectitems',
191   - data: this.data.selectIndex,
192   - })
193   -
194   - wx.redirectTo({
195   - url: '../godetail/godetail'
196 178 })
197 179 },
198 180
... ...
... ... @@ -3,7 +3,7 @@
3 3
4 4 <view class='page'>
5 5 <view>
6   - <view class='text_gray_30' style='padding:30rpx'>北京小爱智能科技，请选择在该单位申报的专项附加扣除项</view>
  6 + <view class='text_gray_30' style='padding:30rpx'>{{legal_entity}}，请选择在该单位申报的专项附加扣除项</view>
7 7 <!-- <view style='padding:0 30rpx'>
8 8 <view class='divide_line_f5f5f5'></view>
9 9 <template is="picker_cell_normal" data="{{...unitData}}" />
... ...
... ... @@ -8,7 +8,7 @@
8 8 </view>
9 9 <view wx:if="true">
10 10 <view wx:for="{{datas02}}">
11   - <view hidden='{{!datas02[index].sureid}}' class='card_rectangle_bg_column' style='padding:30rpx;margin-top:30rpx'>
  11 + <view hidden='{{false}}' class='card_rectangle_bg_column' style='padding:30rpx;margin-top:30rpx'>
12 12 <text class='text_black_32' wx:if="{{datas02[index].message!='住房'}}">{{datas02[index].message}}</text>
13 13 <text class='text_black_32' wx:if="{{datas02[index].message=='住房'}}">{{datas02[index].extra_message}}</text>
14 14 <view style='margin:20rpx 0'>
... ...
... ... @@ -16,6 +16,21 @@ Page({
16 16 "success": "审核成功",
17 17 "failed": "审核失败"
18 18 },
  19 + additiontitle: {
  20 + "children_education": "子女教育",
  21 + "continuing_education": "继续教育",
  22 + "support_duty": "赡养老人",
  23 + "medical_fund": "大病医疗",
  24 + "house_fund": "住房"
  25 + },
  26 + reducetype:{
  27 + "month":"月度",
  28 + "year":"年度"
  29 + },
  30 + reducetypeunit: {
  31 + "month": "月",
  32 + "year": "年"
  33 + },
19 34 datas02: ["子女教育", "继续教育", "赡养老人", "大病医疗", "住房贷款利息"]
20 35 },
21 36
... ... @@ -26,9 +41,11 @@ Page({
26 41 console.log("onLoad");
27 42 },
28 43
29   - godeclare: function () {
  44 + godeclare: function (e) {
  45 + console.log("godeclare", e);
  46 + var newdata = this.data.additionlist[e.currentTarget.id]
30 47 wx.navigateTo({
31   - url: 'godeclare/godeclare',
  48 + url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity,
32 49 })
33 50 },
34 51
... ... @@ -39,9 +56,12 @@ Page({
39 56 },
40 57
41 58 lookandadd: function (e) {
42   - console.log("lookandadd", e);
  59 + var str = e.currentTarget.id.split('-')
  60 + var data = this.data.additionlist;
  61 + console.log("lookandadd", str);
  62 +
43 63 wx.navigateTo({
44   - url: 'lookandupdate/lookandupdate?index=' + e.currentTarget.id,
  64 + url: 'lookandupdate/lookandupdate?status=' + data[str[0]].addition_items[str[1]].addition_category + "&legal_entity_id=" + data[str[0]].legal_entity_id,
45 65 })
46 66 },
47 67
... ...
... ... @@ -2,31 +2,61 @@
2 2 <view class='page'>
3 3
4 4 <view style='margin-bottom:30rpxbackground:#fff'>
5   - <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column'>
  5 + <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01">
6 6 <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'>
7 7 <text class=' text_333_40 float_left'>{{item.legal_entity}}</text>
8   - <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap '>
  8 + <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}' >
9 9 <text class='text_godeclare_wrap '>立即申报</text>
10 10 </view>
11 11 </view>
12 12 <view wx:if="{{item.addition_items&&item.addition_items.length>0}}">
13   - <block wx:for="{{datas02}}" wx:key="">
  13 + <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">
14 14 <view hidden="{{false}}">
15 15 <view class='divide_line' style='margin:0 50rpx'></view>
16 16 <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
17 17 <view style='height:40rpx'>
18   - <text class='text_333_32 float_left' wx:if="true">住房</text>
  18 + <text class='text_333_32 float_left'>{{additiontitle[itemData.addition_category]}}</text>
  19 + <text class='text_333_32 float_left' hidden="{{(itemData.addition_category=='continuing_education'||itemData.addition_category=='house_fund')||itemData.count<2}}">（{{itemData.count}}）</text>
19 20 <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
20   - <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{index}}'>查看</text>
  21 + <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx01}}-{{idx02}}' >查看</text>
21 22 </view>
22   - <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
  23 + <view wx:if="{{itemData.addition_category=='continuing_education'}}" style='padding:20rpx'>
  24 + <view>
  25 + <text style='font-size:28rpx;color:#666'>学历教育</text>
  26 + <view style='width:100%;display:flex;flex-direction:row '>
  27 + <view class='float_left' style='flex:1'>
  28 + <text class='text_999_24 '>扣除方式</text>
  29 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text>
  30 + </view>
  31 + <view class='float_right' style='flex:1'>
  32 + <text class='text_999_24 '>可扣除金额</text>
  33 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/年</text>
  34 + </view>
  35 + </view>
  36 + </view>
  37 + <view >
  38 + <text style='font-size:28rpx;color:#666'>非学历教育</text>
  39 + <text style='font-size:28rpx;color:#666' hidden='{{itemData.count<2}}' >（{{itemData.count}}）</text>
  40 + <view style='width:100%;display:flex;flex-direction:row '>
  41 + <view class='float_left' style='flex:1'>
  42 + <text class='text_999_24 '>扣除方式</text>
  43 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text>
  44 + </view>
  45 + <view class='float_right' style='flex:1'>
  46 + <text class='text_999_24 '>可扣除金额</text>
  47 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/年</text>
  48 + </view>
  49 + </view>
  50 + </view>
  51 + </view>
  52 + <view wx:else style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
23 53 <view class='float_left' style='flex:1'>
24 54 <text class='text_999_24 '>扣除方式</text>
25   - <text class='text_gray_28' style='margin-left:20rpx'>年度</text>
  55 + <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text>
26 56 </view>
27 57 <view class='float_right' style='flex:1'>
28 58 <text class='text_999_24 '>可扣除金额</text>
29   - <text class='text_orange_28 ' style='margin-left:20rpx'>￥12000/年</text>
  59 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetypeunit[itemData.deduction_type]}}</text>
30 60 </view>
31 61 </view>
32 62
... ...
... ... @@ -8,35 +8,61 @@ Page({
8 8 * Page initial data
9 9 */
10 10 data: {
11   - cur_index: -1,
12   - add_text_arr: ["添加子女", "添加继续教育", "添加老人", "添加大病医疗", "添加住房贷款利息"],
  11 + cur_status: "",
  12 + legal_entity_id: "",
  13 + declareStatus: {
  14 + "to_declare ": "待申报",
  15 + "declaring": "申报中",
  16 + "success": "审核成功",
  17 + "failed": "审核失败"
  18 + },
  19 + additiontitle: {
  20 + "children_education": "子女教育",
  21 + "continuing_education": "继续教育",
  22 + "support_duty": "赡养老人",
  23 + "medical_fund": "大病医疗",
  24 + "house_fund": "住房"
  25 + },
13 26 title: '',
14 27 imgpath: '',
15 28 new_data: null,
16   - modal_images: ["/images/childedu_declare.png", "/images/continueedu_declare.png", "/images/support_older_declare.png", "/images/health_declare.png", "/images/house_declare.png"],
17   - showModal: false,
18   - modalData:{
19   - // title:"请选择父母或祖父母进行申报",
20   - // datas:["哈哈","嘎嘎","哒哒","啦啦"],
21   - // canceltext:"添加被赡养人并申报",
22   - // confirmtext: "确定为该被赡养人申报",
23   -
24   - // title: "请选择扣除方式",
25   - // datas: ["月度", "年度"],
26   - // canceltext: "取消",
27   - // confirmtext: "确认",
28   -
29   - // title: "请选择本人、配偶或子女进行大病支出申报",
30   - // datas: ["周先生", "安女士","小淘气"],
31   - // canceltext: "添加家庭成员并申报",
32   - // confirmtext: "确定为该选择的人申报",
33   -
  29 + modal_images: { "children_education": "/images/childedu_declare.png", "continuing_education": "/images/continueedu_declare.png", "support_duty": "/images/support_older_declare.png", "medical_fund": "/images/health_declare.png", "house_fund":"/images/house_declare.png"},
  30 + showModal_img: false,
  31 + showModal_reducetype: false,
  32 + showModal_addtype: false,
  33 + url_arr: {
  34 + "children_education": "persontax/v1/children-educations/",
  35 + "continuing_education": "persontax/v1/continuing-educations/",
  36 + "support_duty": "support-duties/",
  37 + "medical_fund": "persontax/v1/medical_founds/",
  38 + "house_fund": "persontax/v1/house_founds/"
  39 + },
  40 + reducetype: {
  41 + "month": "月度扣除",
  42 + "year": "年度扣除"
  43 + },
  44 + additionInfo: [],
  45 + reducetypeData: ["月度", "年度"],
  46 + modalData: {},
  47 + children_modalData: {
34 48 title: "请选择子女进行申报",
35   - datas: ["熊大", "熊二"],
  49 + datas: [],
36 50 canceltext: "添加新子女并申报",
37 51 confirmtext: "确定为该子女申报",
38 52 },
39   - datas: ["",""]
  53 + support_older_modalData: {
  54 + title: "请选择父母或祖父母进行申报",
  55 + datas: [],
  56 + canceltext: "添加被赡养人并申报",
  57 + confirmtext: "确定为该被赡养人申报",
  58 + },
  59 + medical_modalData: {
  60 + title: "请选择本人、配偶或子女进行大病支出申报",
  61 + datas: [],
  62 + canceltext: "添加家庭成员并申报",
  63 + confirmtext: "确定为该选择的人申报",
  64 + },
  65 + datas: ["", ""]
40 66 },
41 67
42 68 /**
... ... @@ -46,7 +72,11 @@ Page({
46 72 var that = this
47 73 console.log("options", options);
48 74 this.setData({
49   - cur_index: options.index
  75 + cur_status: options.status,
  76 + legal_entity_id: options.legal_entity_id
  77 + })
  78 + wx.setNavigationBarTitle({
  79 + title: that.data.additiontitle[options.status],
50 80 })
51 81 },
52 82
... ... @@ -62,40 +92,77 @@ Page({
62 92 */
63 93 onShow: function() {
64 94 var that = this
65   - var index = this.data.cur_index
66   - console.log("onShow", index)
  95 + this.getAdditionInfo()
67 96 this.getTaxList()
68 97 },
69 98
70   - lookimg: function() { //查看材料
  99 + getAdditionInfo() {
  100 + var that = this;
  101 + var Authorization = getApp().globalData.Authorization;
  102 + wx.request({
  103 + url: baseUrl + that.data.url_arr[that.data.cur_status] + that.data.legal_entity_id,
  104 + header: {
  105 + 'content-type': 'application/json',
  106 + "Authorization": Authorization
  107 + },
  108 + success: function(res) {
  109 + if (res && res.data) {
  110 + console.log("res", res)
  111 + that.setData({
  112 + additionInfo: res.data.items
  113 + })
  114 + }
  115 + }
  116 + })
  117 + },
71 118
72   - if (this.data.imgpath && this.data.imgpath.length > 0) {
73   - wx.previewImage({
74   - urls: [this.data.imgpath],
75   - })
76   - } else {
77   - wx.showToast({
78   - title: '暂无可查看资料',
  119 + // lookimg: function() { //查看材料
  120 +
  121 + // if (this.data.imgpath && this.data.imgpath.length > 0) {
  122 + // wx.previewImage({
  123 + // urls: [this.data.imgpath],
  124 + // })
  125 + // } else {
  126 + // wx.showToast({
  127 + // title: '暂无可查看资料',
  128 + // })
  129 + // }
  130 +
  131 + // },
  132 +
  133 + showdetail: function(e) {
  134 + console.log("showdetail", e)
  135 + if (this.data.additionInfo && this.data.additionInfo.length > 0) {
  136 + wx.navigateTo({
  137 + url: '../additiondetail/additiondetail?data=' + JSON.stringify(this.data.additionInfo[e.currentTarget.id]) + "&status=" + this.data.cur_status,
79 138 })
80 139 }
81   -
82   - },
83   -
84   - showdetail:function(e){
85   - wx.navigateTo({
86   - url: '../additiondetail/additiondetail?index=' + this.data.cur_index,
87   - })
88 140 },
89 141
90 142 goadd: function(e) { //添加
91 143 var that = this
92   - if(true){
93   -
94   - }
95   - wx.navigateTo({
96   - url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
97   - })
98   -
  144 + var modalinfo
  145 + if (this.data.cur_status == 'continuing_education' || this.data.cur_status == 'house_fund') {
  146 + wx.navigateTo({
  147 + url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
  148 + })
  149 + }else{
  150 + if (this.data.cur_status == 'children_education') { //modalData
  151 + modalinfo = this.data.children_modalData
  152 + } else if (this.data.cur_status == 'support_duty') {
  153 + modalinfo = this.data.support_older_modalData
  154 + } else if (this.data.cur_status == 'medical_fund') {
  155 + modalinfo = this.data.medical_modalData
  156 + }
  157 + console.log("modalinfo", modalinfo)
  158 + if (modalinfo.data.length < 2) {
  159 + wx.navigateTo({
  160 + url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
  161 + })
  162 + } else {
  163 + this.showAddtionmodal(modalinfo)
  164 + }
  165 + }
99 166 },
100 167
101 168 getTaxList: function() {
... ... @@ -120,13 +187,8 @@ Page({
120 187 },
121 188 success: function(res) {
122 189 console.log('succ', res)
123   - if (res.statusCode == 200) {
  190 + if (res.statusCode < 300) {
124 191 that.handleData(res.data);
125   - } else {
126   - wx.showModal({
127   - title: res.data.message,
128   - content: '',
129   - })
130 192 }
131 193 },
132 194 fail(res) {
... ... @@ -142,32 +204,87 @@ Page({
142 204 },
143 205
144 206 handleData: function(data) {
  207 +
145 208 if (data.items && data.items.length > 0) {
146   - var taxlist = []
  209 + var childRelativelist = []
  210 + var medicalRelativelist = []
  211 + var olderRelativelist = []
  212 + var childmodal = this.data.children_modalData
  213 + var oldermodal = this.data.support_older_modalData
  214 + var medicalmodal = this.data.medical_modalData
147 215 for (var i = 0; i < data.items.length; i++) {
148   - if (data.items[i].family_ties == '子女') {
149   - taxlist.push(data.items[i])
  216 + if (data.items[i].family_ties == '子' || data.items[i].family_ties == '女') {
  217 + childRelativelist.push(data.items[i].name)
  218 + } else if (data.items[i].family_ties != '祖父母' && data.items[i].family_ties != '外祖父母') {
  219 + medicalRelativelist.push(data.items[i].name)
  220 + } else if (data.items[i].family_ties == '祖父母' || data.items[i].family_ties == '外祖父母') {
  221 + olderRelativelist.push(data.items[i].name)
150 222 }
151 223 }
  224 + childmodal.data = childRelativelist
  225 + oldermodal.data = olderRelativelist
  226 + medicalmodal.data = medicalRelativelist
  227 + this.setData({
  228 + children_modalData: childmodal,
  229 + support_older_modalData: oldermodal,
  230 + medical_modalData: medicalmodal
  231 + })
152 232 }
153 233 },
154 234
155   - showdeclare: function(e) {
156   - console.log("showdeclare", e)
  235 + showModalImg: function(e) {
  236 + console.log("showModalImg", e)
  237 + this.setData({
  238 + showModal_img: true,
  239 + })
  240 + },
  241 +
  242 + closeModalImg: function(e) {
  243 + console.log("closeModalImg", e)
  244 + this.setData({
  245 + showModal_img: false
  246 + })
  247 + },
  248 +
  249 + // 扣除类型
  250 + showModalReducetype: function(e) {
  251 + console.log("reducetype", e)
  252 + this.setData({
  253 + showModal_img: false,
  254 + showModal_reducetype: true,
  255 + showModal_addtype: false,
  256 + })
  257 + },
  258 +
  259 + showAddtionmodal: function(modalinfo) {
  260 + this.setData({
  261 + modalData: modalinfo,
  262 + showModal_addtype: true,
  263 + })
  264 + },
  265 +
  266 + reduce_modalCancel: function () { //modal取消(扣除类型)
157 267 this.setData({
158   - showModal: true
  268 + showModal_addtype: false
159 269 })
160 270 },
161 271
162   - closeModal: function(e) {
163   - console.log("closeModal", e)
  272 + reduce_modalConfirm: function () { //modal确认(扣除类型)
164 273 this.setData({
165   - showModal: false
  274 + showModal_addtype: false
166 275 })
167 276 },
168 277
169   - reducetype:function(){//选择扣除方式
  278 + modalCancel: function() { //modal取消(添加)
  279 + this.setData({
  280 + showModal_addtype: false
  281 + })
  282 + },
170 283
  284 + modalConfirm: function () { //modal确认(添加)
  285 + this.setData({
  286 + showModal_addtype: false
  287 + })
171 288 },
172 289
173 290 /**
... ...
... ... @@ -18,15 +18,15 @@
18 18 </view>
19 19 <view style='width:100%;height:20rpx;background:#f5f5f5'></view> -->
20 20
21   - <!-- <view style='padding-left:30rpx;background:#ffffff;padding-top:30rpx' bindtap='showdeclare'>
  21 + <!-- <view style='padding-left:30rpx;background:#ffffff;padding-top:30rpx' bindtap='showmodal'>
22 22 <image class='icon_declare_wrap' src="/images/icon_declare.png"></image>
23 23 <text style='padding-left:15rpx;' class='text_blue_28'>申报说明</text>
24 24 </view> -->
25   - <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showdeclare'></image>
  25 + <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showModalImg'></image>
26 26
27 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 28
29   - <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
  29 + <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='showModalReducetype' hidden="{{cur_status=='continuing_education'}}">
30 30 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
31 31 <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image>
32 32 <text class='text_999_30 float_right' style='line-height:100rpx'>月度</text>
... ... @@ -312,12 +312,12 @@
312 312 <!-- </view> -->
313 313
314 314
315   - <view wx:if="true">
316   - <view wx:for="{{datas}}">
  315 + <view wx:if="{{cur_status=='children_education'}}">
  316 + <view wx:for="{{additionInfo}}">
317 317 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
318 318 <view style='height:110rpx'>
319   - <text class='text_gray_36 float_left' style='line-height:110rpx'>张飞</text>
320   - <view class='declare_style float_right'> 申报中</view>
  319 + <text class='text_gray_36 float_left' style='line-height:110rpx'>{{C.children_name}}</text>
  320 + <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
321 321 </view>
322 322 <view style='padding-right: 30rpx'>
323 323 <view class='divide_line_f5f5f5'></view>
... ... @@ -327,24 +327,28 @@
327 327 </view>
328 328 <view style='height:70rpx'>
329 329 <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
330   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
  330 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
331 331 </view>
332 332 <view style='height:70rpx'>
333 333 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
334   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
  334 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
335 335 </view>
336 336 <view style='height:70rpx'>
337 337 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
338   - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
  338 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}元</text>
339 339 </view>
340 340 <view class='divide_line_f5f5f5'></view>
341   - <text class='text_blue_28 float_right' style='line-height:90rpx' bindtap='showdetail'>查看</text>
  341 + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
  342 + <view class='float_right' wx:if="{{item.status=='failed'}}">
  343 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>
  344 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>
  345 + </view>
342 346 </view>
343 347 </view>
344 348 </view>
345 349 </view>
346 350
347   - <view>
  351 + <view wx:if="{{cur_status=='continuing_education'}}">
348 352 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
349 353 <view style='height:110rpx'>
350 354 <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
... ... @@ -416,9 +420,13 @@
416 420 </view>
417 421
418 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='showdetail'>删除</text>
  425 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>
  426 + </view>
419 427 </view>
420 428
421   - <view>
  429 + <view wx:if="{{cur_status=='support_duty'}}">
422 430 <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
423 431 <view style='height:110rpx'>
424 432 <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
... ... @@ -443,13 +451,17 @@
443 451 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
444 452 </view>
445 453 <view class='divide_line_f5f5f5'></view>
446   - <text class='text_blue_28 float_right' style='line-height:90rpx' bindtap='showdetail'>查看</text>
  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='showdetail'>删除</text>
  457 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>
  458 + </view>
447 459 </view>
448 460
449 461 </view>
450 462 </view>
451 463
452   - <view>
  464 + <view wx:if="{{cur_status=='medical_fund'}}">
453 465 <view class='divide_line_f5f5f5'></view>
454 466 <view style='height:100rpx;margin:0 30rpx' bindtap='reducetype'>
455 467 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>个人负担总金额</text>
... ... @@ -492,11 +504,15 @@
492 504 <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
493 505 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥2345元</text>
494 506 </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='showdetail'>删除</text>
  509 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>
  510 + </view>
495 511 </view>
496 512 </view>
497 513 </view>
498 514
499   - <view>
  515 + <view wx:if="{{cur_status=='house_fund'}}">
500 516 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
501 517 <view style='height:110rpx'>
502 518 <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text>
... ... @@ -518,7 +534,11 @@
518 534 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
519 535 </view>
520 536 <view class='divide_line_f5f5f5'></view>
521   - <text class='text_blue_28 float_right' style='line-height:90rpx' bindtap='showdetail'>查看</text>
  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='showdetail'>删除</text>
  540 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>
  541 + </view>
522 542 </view>
523 543 </view>
524 544 </view>
... ... @@ -531,23 +551,26 @@
531 551 </view>
532 552 </view>
533 553
534   - <view style='margin-left:30rpx'>
  554 + <view style='margin-left:30rpx' wx:if="{{cur_status=='support_duty'}}">
535 555 <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
536 556 <text class='text_blue_28' bindtap='goadd'>请添加</text>
537 557 </view>
538 558 </view>
539 559 </view>
540 560
541   -<view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
542   -<!-- <view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal}}">
543   - <image class='modal_img' src="{{modal_images[cur_index]}}" bindtap='closeModal'></image>
544   - <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModal'>x</text>
545   -</view> -->
546   -<view class='modal_lg' style='' hidden="{{!showModal}}">
547   - <text class='text_modal_title' >{{modalData.title}}</text>
  561 +<view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}"></view>
  562 +<!-- 申报说明 -->
  563 +<view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal_img}}">
  564 + <image class='modal_img' src="{{modal_images[cur_status]}}" bindtap='closeModalImg'></image>
  565 + <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text>
  566 +</view>
  567 +
  568 +<!-- 扣除类型 -->
  569 +<view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
  570 + <text class='text_modal_title'>请选择扣除方式</text>
548 571 <view class='divide_line_f5f5f5'></view>
549 572 <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
550   - <block wx:for="{{modalData.datas}}" wx:for-index="idx">
  573 + <block wx:for="{{reducetypeData}}" wx:for-index="idx">
551 574 <view wx:if="{{idx!=1}}">
552 575 <text class='text_item_black float_left'>{{item}}</text>
553 576 </view>
... ... @@ -559,15 +582,34 @@
559 582 </block>
560 583 </view>
561 584 <view class='divide_line_f5f5f5'></view>
562   - <!-- <view style='width:100%;display: flex;'>
563   - <text class='text_cancel' bindtap='showdeclare'>{{modalData.canceltext}}</text>
  585 +
  586 + <view style='width:100%;display: flex;'>
  587 + <text class='text_cancel' bindtap='reduce_modalCancel'>取消</text>
564 588 <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
565   - <text class='text_confirm' bindtap='closeModal'>{{modalData.confirmtext}}</text>
566   - </view> -->
  589 + <text class='text_confirm' bindtap='reduce_modalConfirm'>确认</text>
  590 + </view>
  591 +</view>
567 592
  593 +<!-- 添加子女 老人 大病-->
  594 +<view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
  595 + <text class='text_modal_title'>{{modalData.title}}</text>
  596 + <view class='divide_line_f5f5f5'></view>
  597 + <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
  598 + <block wx:for="{{modalData.data}}" wx:for-index="idx">
  599 + <view wx:if="{{idx!=1}}">
  600 + <text class='text_item_black float_left'>{{item}}</text>
  601 + </view>
  602 + <view wx:else>
  603 + <text class='text_item_blue float_left'>{{item}}</text>
  604 + <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
  605 + </view>
  606 + <view class='divide_line_f5f5f5'></view>
  607 + </block>
  608 + </view>
  609 + <view class='divide_line_f5f5f5'></view>
568 610 <view style='width:100%;display: flex;'>
569   - <text class='text_cancel01' bindtap='cancelhandle'>{{modalData.canceltext}}</text>
  611 + <text class='text_cancel01' bindtap='modalCancel'>{{modalData.canceltext}}</text>
570 612 <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
571   - <text class='text_confirm01' bindtap='confirmhandle'>{{modalData.confirmtext}}</text>
  613 + <text class='text_confirm01' bindtap='modalConfirm'>{{modalData.confirmtext}}</text>
572 614 </view>
573 615 </view>
\ No newline at end of file
... ...
... ... @@ -143,6 +143,7 @@
143 143 text-align: center;
144 144 line-height: 45rpx;
145 145 margin: 40rpx 0;
  146 + padding: 0 20rpx;
146 147 }
147 148
148 149 .text_cancel {
... ...
... ... @@ -60,11 +60,11 @@ Page({
60 60 confirmColor: '#357aeb',
61 61 success(res) {
62 62 if (res.confirm) {
63   - if (data.status == '1' && data.id) {
  63 + if (data.status == '1' && data.id) {//未完善
64 64 wx.navigateTo({
65 65 url: '../taxperson/editinfo/editinfo?id=' + data.id,
66 66 })
67   - } else if (data.status == '1') {
  67 + } else if (data.status == '1') {//未创建
68 68 wx.navigateTo({
69 69 url: '../taxperson/taxperson/addinfo/addinfo',
70 70 })
... ...
... ... @@ -7,7 +7,7 @@
7 7 <image class='bgimg' src='/images/guide_bg.png'></image>
8 8
9 9 <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'>
10   - <image class="icon_wrap" src="/images/tax_person.png"></image>
  10 + <image class="icon_wrap" src="/images/tax_person.jpg"></image>
11 11 <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
12 12 <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
13 13 <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>
... ... @@ -17,7 +17,7 @@
17 17 </view>
18 18
19 19 <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdditionalDiduction'>
20   - <image class="icon_wrap" src="/images/additional_deduction.png"></image>
  20 + <image class="icon_wrap" src="/images/additional_deduction.jpg"></image>
21 21 <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
22 22 <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
23 23 <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>
... ... @@ -27,7 +27,7 @@
27 27 </view>
28 28
29 29 <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdvancePayment'>
30   - <image class="icon_wrap" src="/images/advance_payment.png"></image>
  30 + <image class="icon_wrap" src="/images/advance_payment.jpg"></image>
31 31 <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
32 32 <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
33 33 <text style='font-size: 36rpx;color: #000;font-weight:bold;'>预扣预缴</text>
... ... @@ -37,7 +37,7 @@
37 37 </view>
38 38
39 39 <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
40   - <image class="icon_wrap" src="/images/final_payment.png"></image>
  40 + <image class="icon_wrap" src="/images/final_payment.jpg"></image>
41 41 <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
42 42 <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
43 43 <text style='font-size: 36rpx;color: #000;font-weight:bold;'>汇算清缴</text>
... ...
... ... @@ -32,8 +32,8 @@
32 32 }
33 33
34 34 .icon_wrap{
35   - width: 100rpx;
36   - height: 100rpx;
  35 + width: 104rpx;
  36 + height: 102rpx;
37 37 align-self: center
38 38 }
39 39
... ...
请 注册 或 登录 后发表评论