正在显示
11 个修改的文件
包含
224 行增加
和
136 行删除
images/openmodal_img.png
0 → 100644
19.6 KB
... | ... | @@ -89,22 +89,31 @@ Page({ |
89 | 89 | }, |
90 | 90 | edutypeData: { |
91 | 91 | label: '教育类别', |
92 | - bindtype: 'edu_style', | |
92 | + bindtype: 'edu_type', | |
93 | 93 | selected: '', |
94 | 94 | isblack: 'true', |
95 | 95 | values: ["职业能力", "专业能力"], |
96 | 96 | placeholder: '请选择教育类别', |
97 | 97 | onChange: 'onPickerSelect' |
98 | 98 | }, |
99 | - edutypeData: { | |
99 | + edustyleData: { | |
100 | 100 | label: '教育类型', |
101 | - bindtype: 'edu_type', | |
101 | + bindtype: 'edu_style', | |
102 | 102 | selected: '', |
103 | 103 | isblack: 'true', |
104 | 104 | values: ["学历教育", "非学历教育"], |
105 | 105 | placeholder: '请选择教育类型', |
106 | 106 | onChange: 'onPickerSelect' |
107 | 107 | }, |
108 | + edulevelData: { | |
109 | + label: '学历教育阶段', | |
110 | + bindtype: 'edu_level', | |
111 | + selected: '', | |
112 | + isblack: 'true', | |
113 | + values: ["专科", "本科","硕士研究生","博士研究生","其他"], | |
114 | + placeholder: '请选择学历教育阶段', | |
115 | + onChange: 'onPickerSelect' | |
116 | + }, | |
108 | 117 | supporttypeData: { |
109 | 118 | label: '赡养类型', |
110 | 119 | bindtype: 'support_type', |
... | ... | @@ -437,8 +446,8 @@ Page({ |
437 | 446 | newdata.edu_type_lable = '0' |
438 | 447 | newdata.study_startdate = this.data.studystartdate.selected |
439 | 448 | newdata.study_enddate = this.data.studyenddate.selected |
440 | - if (!formdata.degree_level || formdata.degree_level.length < 1) { | |
441 | - this.showToast('请选择教育阶段') | |
449 | + if (this.data.edulevelData.selected.length < 1) { | |
450 | + this.showToast('请选择学历教育阶段') | |
442 | 451 | return |
443 | 452 | } |
444 | 453 | if (this.data.studystartdate.selected.length < 1) { |
... | ... | @@ -449,23 +458,31 @@ Page({ |
449 | 458 | this.showToast('请选择受教育日期') |
450 | 459 | return |
451 | 460 | } |
461 | + newdata.education_period = this.data.edulevelData.selected | |
452 | 462 | } else if (this.data.edutypeData.edu_lable == 'tech') { |
453 | - newdata.edu_type_lable = '1' | |
454 | - newdata.license_unit = formdata.license_unit | |
463 | + if (this.data.edustyleData.selected.length < 1) { | |
464 | + this.showToast('请选择教育类型') | |
465 | + return | |
466 | + } | |
455 | 467 | if (!formdata.occupational_qualifiy_name || formdata.occupational_qualifiy_name.length < 1) { |
456 | 468 | this.showToast('请填写证书名称') |
457 | 469 | return |
458 | 470 | } |
459 | - if (!formdata.occupational_qualifiy_no || formdata.occupational_qualifiy_no.length < 1) { | |
471 | + if (!formdata.certification_no || formdata.certification_no.length < 1) { | |
460 | 472 | this.showToast('请填写证书编号') |
461 | 473 | return |
462 | 474 | } |
463 | - if (!formdata.license_unit || formdata.license_unit.length < 1) { | |
475 | + if (!formdata.certification_autority || formdata.certification_autority.length < 1) { | |
464 | 476 | this.showToast('请填写发证机关') |
465 | 477 | return |
466 | 478 | } |
479 | + //新增教育类型(区别教育类别) | |
480 | + newdata.education_style = this.data.edustyleData.selected | |
481 | + newdata.edu_type_lable = '1' | |
467 | 482 | } |
468 | - newdata.edu_type = this.data.edutypeData.selected | |
483 | + newdata.education_type = this.data.edutypeData.selected | |
484 | + newdata.education_end = this.data.studystartdate.datelong | |
485 | + newdata.education_start = this.data.studyenddate.datelong | |
469 | 486 | break; |
470 | 487 | case '2': |
471 | 488 | if (this.data.supporttypeData.selected.length < 1) { |
... | ... | @@ -744,6 +761,20 @@ Page({ |
744 | 761 | edutypeData: edutypee_data |
745 | 762 | }) |
746 | 763 | break; |
764 | + case 'edu_style': | |
765 | + var edustyle_data = this.data.edustyleData | |
766 | + edustyle_data.selected = edustyle_data.values[e.detail.value] | |
767 | + this.setData({ | |
768 | + edustyleData: edustyle_data | |
769 | + }) | |
770 | + break; | |
771 | + case 'edu_level': | |
772 | + var edulevel_data = this.data.edulevelData | |
773 | + edulevel_data.selected = edulevel_data.values[e.detail.value] | |
774 | + this.setData({ | |
775 | + edulevelData: edulevel_data | |
776 | + }) | |
777 | + break; | |
747 | 778 | case 'cardtype': |
748 | 779 | var cardtype_Data = this.data.cardtypeData |
749 | 780 | cardtype_Data.selected = cardtype_Data.values[e.detail.value] | ... | ... |
... | ... | @@ -27,9 +27,9 @@ |
27 | 27 | <template is="picker_cell_normal" data="{{...childrenbirthDate}}" /> |
28 | 28 | <view class='divide_line_f5f5f5'></view> |
29 | 29 | <view style='height:90rpx'> |
30 | - <text class='text_black_30 float_left'>国籍</text> | |
31 | - <image class='arrow_wrap' src='/images/arrow_right.png'></image> | |
32 | - <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text> | |
30 | + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> | |
31 | + <text class='text_black_30 float_left'>国籍(地区)</text> | |
32 | + <text class='text_333_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text> | |
33 | 33 | </view> |
34 | 34 | <view class='divide_line_f5f5f5'></view> |
35 | 35 | |
... | ... | @@ -62,10 +62,11 @@ |
62 | 62 | <template is="picker_cell_normal" data="{{...edutypeData}}" /> |
63 | 63 | <view class='divide_line_f5f5f5'></view> |
64 | 64 | <view wx:if="{{edu_lable=='school'}}"> |
65 | - <view style='height:90rpx'> | |
65 | + <!-- <view style='height:90rpx'> | |
66 | 66 | <text class='text_black_30 float_left'>学历教育阶段</text> |
67 | - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入学历教育阶段' name='degree_level'></input> | |
68 | - </view> | |
67 | + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入学历教育阶段' name='education_period'></input> | |
68 | + </view> --> | |
69 | + <template is="picker_cell_normal" data="{{...edulevelData}}" /> | |
69 | 70 | <view class='divide_line_f5f5f5'></view> |
70 | 71 | <template is="picker_cell_normal" data="{{...studystartdate}}" /> |
71 | 72 | <view class='divide_line_f5f5f5'></view> |
... | ... | @@ -73,19 +74,21 @@ |
73 | 74 | |
74 | 75 | </view> |
75 | 76 | <view wx:elif="{{edu_lable=='tech'}}"> |
77 | + <template is="picker_cell_normal" data="{{...edustyleData}}" /> | |
78 | + <view class='divide_line_f5f5f5'></view> | |
76 | 79 | <view style='height:90rpx'> |
77 | - <text class='text_black_30 float_left'>职业资格名称</text> | |
78 | - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入职业资格名称' name='occupational_qualifiy_name'></input> | |
80 | + <text class='text_black_30 float_left'>证书名称</text> | |
81 | + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书名称' name='occupational_qualifiy_name'></input> | |
79 | 82 | </view> |
80 | 83 | <view class='divide_line_f5f5f5'></view> |
81 | 84 | <view style='height:90rpx'> |
82 | - <text class='text_black_30 float_left'>职业资格编号</text> | |
83 | - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入职业资格编号' name='occupational_qualifiy_no'></input> | |
85 | + <text class='text_black_30 float_left'>证书编号</text> | |
86 | + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书编号' name='certification_no'></input> | |
84 | 87 | </view> |
85 | 88 | <view class='divide_line_f5f5f5'></view> |
86 | 89 | <view style='height:90rpx'> |
87 | 90 | <text class='text_black_30 float_left'>发证机关</text> |
88 | - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入发证机关' name='license_unit'></input> | |
91 | + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入发证机关' name='certification_autority'></input> | |
89 | 92 | </view> |
90 | 93 | </view> |
91 | 94 | |
... | ... | @@ -105,19 +108,17 @@ |
105 | 108 | <text class='text_black_30 float_left'>被赡养人证件号码</text> |
106 | 109 | <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证件号码' type='idcard' name='older_idno'></input> |
107 | 110 | </view> |
108 | - <view wx:if="{{oldersupport_lable=='single'}}"> | |
109 | - <view class='divide_line_f5f5f5'></view> | |
110 | - <template is="picker_cell_normal" data="{{...olderbirthDate}}" /> | |
111 | - <view class='divide_line_f5f5f5'></view> | |
112 | - <view style='height:90rpx'> | |
113 | - <text class='text_black_30 float_left'>国籍(地区)</text> | |
114 | - <image class='arrow_wrap' src='/images/arrow_right.png'></image> | |
115 | - <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right' name='older_country'>中国</text> | |
116 | - </view> | |
117 | - <view class='divide_line_f5f5f5'></view> | |
118 | - | |
119 | - <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" /> | |
111 | + <view class='divide_line_f5f5f5'></view> | |
112 | + <template is="picker_cell_normal" data="{{...olderbirthDate}}" /> | |
113 | + <view class='divide_line_f5f5f5'></view> | |
114 | + <view style='height:90rpx'> | |
115 | + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> | |
116 | + <text class='text_black_30 float_left'>国籍(地区)</text> | |
117 | + <text class='text_333_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text> | |
120 | 118 | </view> |
119 | + <view class='divide_line_f5f5f5'></view> | |
120 | + | |
121 | + <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" /> | |
121 | 122 | |
122 | 123 | <!-- <view class='divide_line_f5f5f5'></view> |
123 | 124 | <view style='height:90rpx'> |
... | ... | @@ -241,7 +242,7 @@ |
241 | 242 | <text class='text_999_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text> |
242 | 243 | </view> |
243 | 244 | </view> |
244 | - | |
245 | + | |
245 | 246 | <!-- <view class='divide_line_f5f5f5'></view> |
246 | 247 | <view class='text_black_30 float_left'>上传材料</view> --> |
247 | 248 | </view> | ... | ... |
... | ... | @@ -7,7 +7,7 @@ Page({ |
7 | 7 | * Page initial data |
8 | 8 | */ |
9 | 9 | data: { |
10 | - datas: [""], | |
10 | + datas: ["",""], | |
11 | 11 | is_declared: false, |
12 | 12 | datas02: ["子女教育", "继续教育", "赡养老人", "大病医疗", "住房贷款利息"] |
13 | 13 | }, |
... | ... | @@ -51,26 +51,6 @@ Page({ |
51 | 51 | onShow: function() { |
52 | 52 | console.log("onShow"); |
53 | 53 | var that = this |
54 | - // wx.clearStorage() | |
55 | - wx.getStorage({ | |
56 | - key: 'is_declared', | |
57 | - success: function(res) { | |
58 | - console.log("is_declared", res.data) | |
59 | - that.setData({ | |
60 | - is_declared: res.data | |
61 | - }) | |
62 | - }, | |
63 | - }) | |
64 | - | |
65 | - wx.getStorage({ | |
66 | - key: 'selectitems', | |
67 | - success: function(res) { | |
68 | - console.log("selectitems", res.data) | |
69 | - that.setData({ | |
70 | - datas02: res.data | |
71 | - }) | |
72 | - }, | |
73 | - }) | |
74 | 54 | this.getAdditionList() |
75 | 55 | }, |
76 | 56 | ... | ... |
1 | 1 | <!--pages/main/addtionalreduce/home.wxml--> |
2 | 2 | <view class='page'> |
3 | 3 | |
4 | - <view style='margin-bottom:30rpx'> | |
5 | - <block wx:for="{{datas}}" wx:key=""> | |
6 | - <view class='card_rectangle_bg_column' style="margin-top:30rpx"> | |
7 | - <view style='position:absolute' style='padding:44rpx 30rpx;'> | |
8 | - <view hidden='{{is_declared}}' style='float:left;margin-top:4rpx'> | |
9 | - <text class='text_999_32'>北京小爱智能科技</text> | |
10 | - </view> | |
11 | - <view hidden='{{!is_declared}}' style='float:left;margin-top:4rpx'> | |
12 | - <text class='text_black_32'>北京小爱智能科技</text> | |
13 | - </view> | |
14 | - | |
15 | - <image hidden='{{is_declared}}' class='declare_image_wrap' style='margin-top:12rpx;' src='/images/not_declare.png'></image> | |
16 | - <image hidden='{{!is_declared}}' class='declare_image_wrap' style='margin-top:12rpx;' src='/images/already_declare.png'></image> | |
17 | - <view style='float:right' hidden='{{is_declared}}' bindtap='godeclare'> | |
18 | - <text class='text_blue_28'>去申报</text> | |
19 | - <image class='arrow_img_wrap' src='/images/arrow_right.png'></image> | |
20 | - </view> | |
21 | - <view style='float:right' hidden='{{!is_declared}}' bindtap='godeclare'> | |
22 | - <text class='text_blue_28'>调整使用项</text> | |
23 | - <image class='arrow_img_wrap' src='/images/arrow_right.png'></image> | |
24 | - </view> | |
25 | - | |
4 | + <view style='margin-bottom:30rpxbackground:#fff'> | |
5 | + <view wx:for="{{datas}}" wx:key="" style='display:flex;flex-direction:column'> | |
6 | + <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'> | |
7 | + <text class=' text_333_40 float_left'>北京小爱智能科技</text> | |
8 | + <view wx:if="{{!true}}" class='view_godeclare_wrap '> | |
9 | + <text class='text_godeclare_wrap '>立即申报</text> | |
26 | 10 | </view> |
27 | - | |
28 | - <view wx:if="{{is_declared}}" style=''> | |
29 | - <block wx:for="{{datas02}}" wx:key=""> | |
30 | - <view hidden="{{!datas02[index].sureid}}"> | |
31 | - <view class='divide_line'></view> | |
32 | - <view style='padding:44rpx 30rpx;display:flex;flex-direction:column'> | |
33 | - <view> | |
34 | - <text class='text_666_30 float_left' wx:if="datas02[index].message!='住房'">{{datas02[index].message}}</text> | |
35 | - <text class='text_666_30 float_left' wx:if="datas02[index].message=='住房'">{{datas02[index].extra_message}}</text> | |
36 | - <text wx:if="{{datas02[index].message!='大病医疗'}}" class='text_blue_28 float_right' bindtap='lookandadd' id='{{index}}'>查看并调整</text> | |
37 | - <text wx:else class='text_blue_28 float_right' bindtap='lookandadd' id='{{index}}'>提交抵扣凭据</text> | |
11 | + </view> | |
12 | + <view wx:if="{{true}}"> | |
13 | + <block wx:for="{{datas02}}" wx:key=""> | |
14 | + <view hidden="{{false}}"> | |
15 | + <view class='divide_line' style='margin:0 50rpx'></view> | |
16 | + <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '> | |
17 | + <view style='height:40rpx'> | |
18 | + <text class='text_333_32 float_left' wx:if="true">子女教育</text> | |
19 | + <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 | + </view> | |
22 | + <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '> | |
23 | + <view class='float_left' style='flex:1'> | |
24 | + <text class='text_999_24 '>扣除方式</text> | |
25 | + <text class='text_gray_28' style='margin-left:20rpx'>月度</text> | |
38 | 26 | </view> |
39 | - <view style='margin-top:20rpx'> | |
40 | - <text class='text_gray_22 float_left'>累计已使用额度:4890.00</text> | |
41 | - <text class='text_gray_22 float_right'>本月可用额度:12810.00</text> | |
27 | + <view class='float_right' style='flex:1'> | |
28 | + <text class='text_999_24 '>可扣除金额</text> | |
29 | + <text class='text_orange_28 ' style='margin-left:20rpx'>¥1000/月</text> | |
42 | 30 | </view> |
43 | 31 | </view> |
32 | + | |
33 | + <!-- <view> | |
34 | + <text class='text_666_30 float_left ' wx:if="datas02[index].message!='住房 '">{{datas02[index].message}}</text> | |
35 | + <text class='text_666_30 float_left ' wx:if="datas02[index].message=='住房 '">{{datas02[index].extra_message}}</text> | |
36 | + <text wx:if="{{datas02[index].message!='大病医疗 '}}" class='text_blue_28 float_right ' bindtap='lookandadd ' id='{{index}} '>查看并调整</text> | |
37 | + <text wx:else class='text_blue_28 float_right ' bindtap='lookandadd ' id='{{index}} '>提交抵扣凭据</text> | |
38 | + </view> | |
39 | + <view style='margin-top:20rpx '> | |
40 | + <text class='text_gray_22 float_left '>累计已使用额度:4890.00</text> | |
41 | + <text class='text_gray_22 float_right '>本月可用额度:12810.00</text> | |
42 | + </view> --> | |
44 | 43 | </view> |
45 | - </block> | |
46 | - </view> | |
44 | + </view> | |
45 | + </block> | |
47 | 46 | </view> |
48 | - </block> | |
47 | + <view style='width:100%;height:20rpx;background:#F5F5F5'></view> | |
48 | + </view> | |
49 | 49 | </view> |
50 | 50 | |
51 | 51 | ... | ... |
1 | 1 | /* pages/main/addtionalreduce/home.wxss */ |
2 | 2 | |
3 | -.page{ | |
3 | +.page { | |
4 | 4 | background-color: #fcfcfc; |
5 | 5 | } |
6 | 6 | |
... | ... | @@ -11,6 +11,20 @@ |
11 | 11 | font-weight: bold; |
12 | 12 | } |
13 | 13 | |
14 | +.text_333_40 { | |
15 | + font-size: 40rpx; | |
16 | + color: #333; | |
17 | + line-height: 48rpx; | |
18 | + font-weight: bold; | |
19 | +} | |
20 | + | |
21 | +.text_333_32 { | |
22 | + font-family: PingFangSC-Semibold; | |
23 | + font-size: 32rpx; | |
24 | + color: #333; | |
25 | + line-height: 40rpx; | |
26 | +} | |
27 | + | |
14 | 28 | .text_999_32 { |
15 | 29 | font-size: 32rpx; |
16 | 30 | color: #999; |
... | ... | @@ -30,9 +44,31 @@ |
30 | 44 | text-align: right; |
31 | 45 | } |
32 | 46 | |
33 | -.text_gray_22 { | |
34 | - font-size: 22rpx; | |
35 | - color: #9DA7B3; | |
47 | +.text_999_28 { | |
48 | + font-family: PingFangSC-Regular; | |
49 | + font-size: 28rpx; | |
50 | + color: #999; | |
51 | + line-height: 40rpx; | |
52 | +} | |
53 | + | |
54 | +.text_999_24 { | |
55 | + font-size: 24rpx; | |
56 | + color: #999; | |
57 | +} | |
58 | + | |
59 | +.text_gray_28{ | |
60 | + font-family: PingFangSC-Semibold; | |
61 | +font-size: 14px; | |
62 | +color: #2B2B2B; | |
63 | +line-height: 17px; | |
64 | +} | |
65 | + | |
66 | +.text_orange_28{ | |
67 | +font-family: PingFangSC-Semibold; | |
68 | +font-size: 14px; | |
69 | +color: #FF9F00; | |
70 | +text-align: right; | |
71 | +line-height: 17px; | |
36 | 72 | } |
37 | 73 | |
38 | 74 | .rectangle_lightorange_bg { |
... | ... | @@ -40,10 +76,10 @@ |
40 | 76 | height: 40rpx; |
41 | 77 | background-color: #fff5dc; |
42 | 78 | border-radius: 0 0 4px 4px; |
43 | - border: 1px solid ; | |
79 | + border: 1px solid; | |
44 | 80 | } |
45 | 81 | |
46 | -.declare_image_wrap{ | |
82 | +.declare_image_wrap { | |
47 | 83 | width: 90rpx; |
48 | 84 | height: 40rpx; |
49 | 85 | margin-left: 10rpx; |
... | ... | @@ -54,6 +90,23 @@ |
54 | 90 | height: 40rpx; |
55 | 91 | align-items: center; |
56 | 92 | float: right; |
57 | - margin-top:10rpx; | |
93 | + margin-bottom: 8rpx | |
94 | +} | |
95 | + | |
96 | +.view_godeclare_wrap { | |
97 | + float: left; | |
98 | + width: 160rpx; | |
99 | + background: #fff; | |
100 | + border: 1px solid #357aeb; | |
101 | + border-radius: 15px; | |
102 | + margin-top: 20rpx; | |
103 | +} | |
58 | 104 | |
105 | +.text_godeclare_wrap { | |
106 | + font-family: PingFangSC-Regular; | |
107 | + font-size: 13px; | |
108 | + color: #357aeb; | |
109 | + text-align: center; | |
110 | + line-height: 13px; | |
111 | + padding: 10rpx 30rpx; | |
59 | 112 | } | ... | ... |
... | ... | @@ -2,30 +2,16 @@ |
2 | 2 | |
3 | 3 | <view class='page'> |
4 | 4 | <view style='display:flex;flex-direction:column' hidden="{{showModal}}"> |
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='showdeclare'> | |
22 | - <image class='icon_declare_wrap' src="/images/icon_declare.png"></image> | |
23 | - <text style='padding-left:15rpx;' class='text_blue_28'>申报说明</text> | |
5 | + <image class='openmodal_img' src="/images/openmodal_img.png"></image> | |
6 | + <view style='height:100rpx;margin:0 30rpx' bindtap='reducetype'> | |
7 | + <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text> | |
8 | + <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image> | |
9 | + <text class='text_999_30 float_right' style='line-height:100rpx'>月度</text> | |
24 | 10 | </view> |
25 | 11 | <view wx:if='{{new_data&&new_data!=null}}' style='margin:30rpx;' class='card_rectangle_bg_column'> |
26 | 12 | <!-- 子女教育 --> |
27 | 13 | <view wx:if="{{cur_index==0}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'> |
28 | - <view style='height:40rpx'> | |
14 | + <view style='height:40rpx '> | |
29 | 15 | <text class='text_999_28 float_left'>配偶姓名</text> |
30 | 16 | <text class='text_333_28 float_right'>{{new_data.lover_name}}</text> |
31 | 17 | </view> |
... | ... | @@ -250,7 +236,7 @@ |
250 | 236 | <text class='text_333_28 float_right'>{{new_data.loan_datelong}}</text> |
251 | 237 | </view> |
252 | 238 | </view> |
253 | - <view wx:if="{{title=='住房租金'}}" style='display:flex;flex-direction:column'> | |
239 | + <view wx:if="{{title=='住房租金'}}" style='display:flex;flex-direction:column'> | |
254 | 240 | <view style='height:40rpx'> |
255 | 241 | <text class='text_999_28 float_left'>租赁房屋坐落地址</text> |
256 | 242 | <text class='text_333_28 float_right'>{{new_data.house_location}}</text> |
... | ... | @@ -304,21 +290,18 @@ |
304 | 290 | <text class='text_333_28 float_right'>{{new_data.reduce_date}}</text> |
305 | 291 | </view> --> |
306 | 292 | |
307 | - <view class='divide_line_f5f5f5' style='margin-top:20rpx'></view> | |
308 | - <view class='text_blue_28' style='line-height:80rpx' bindtap='lookimg'>查看材料</view> | |
293 | + <!-- <view class='divide_line_f5f5f5' style='margin-top:20rpx'></view> | |
294 | + <view class='text_blue_28' style='line-height:80rpx' bindtap='lookimg'>查看材料</view> --> | |
309 | 295 | </view> |
310 | 296 | |
311 | - <view class='rectangle_dashed_bg' bindtap='goadd'> | |
312 | - <view class='text_blue_28' style='line-height:90rpx;text-align:center'> | |
313 | - 十 添加{{title}} | |
314 | - </view> | |
297 | + <view style='margin:40rpx 30rpx;line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' bindtap='goadd'> | |
298 | + 添加 | |
315 | 299 | </view> |
316 | 300 | </view> |
317 | 301 | </view> |
318 | 302 | |
319 | - <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view> | |
320 | - <view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal}}"> | |
321 | - <image class='modal_img' src="{{modal_images[cur_index]}}" ></image> | |
322 | - <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModal'>x</text> | |
323 | - </view> | |
324 | - | |
303 | +<view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view> | |
304 | +<view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal}}"> | |
305 | + <image class='modal_img' src="{{modal_images[cur_index]}}"></image> | |
306 | + <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModal'>x</text> | |
307 | +</view> | |
\ No newline at end of file | ... | ... |
... | ... | @@ -26,6 +26,15 @@ |
26 | 26 | height: 28rpx; |
27 | 27 | } |
28 | 28 | |
29 | +.arrow_img { | |
30 | + width: 40rpx; | |
31 | + height: 40rpx; | |
32 | + align-items: center; | |
33 | + float: right; | |
34 | + margin-bottom: 8rpx | |
35 | +} | |
36 | + | |
37 | + | |
29 | 38 | .icon_declare_wrap { |
30 | 39 | width: 23rpx; |
31 | 40 | height: 26rpx; |
... | ... | @@ -44,6 +53,13 @@ |
44 | 53 | text-align: right; |
45 | 54 | } |
46 | 55 | |
56 | +.text_999_30 { | |
57 | + font-family: PingFangSC-Regular; | |
58 | + font-size: 30rpx; | |
59 | + color: #999; | |
60 | + text-align: right; | |
61 | +} | |
62 | + | |
47 | 63 | .text_333_28 { |
48 | 64 | font-family: PingFangSC-Regular; |
49 | 65 | font-size: 28rpx; |
... | ... | @@ -85,4 +101,11 @@ |
85 | 101 | margin:0 auto; |
86 | 102 | display:block; |
87 | 103 | |
104 | +} | |
105 | + | |
106 | +.openmodal_img{ | |
107 | + width: 92%; | |
108 | + height: 132rpx; | |
109 | + margin: 30rpx; | |
110 | + align-items: center | |
88 | 111 | } |
\ No newline at end of file | ... | ... |
... | ... | @@ -13,7 +13,20 @@ Page({ |
13 | 13 | * 生命周期函数--监听页面加载 |
14 | 14 | */ |
15 | 15 | onLoad: function (options) { |
16 | - | |
16 | + if(false){ | |
17 | + wx.showModal({ | |
18 | + title: '温馨提示', | |
19 | + content: '您的自然人基础信息尚未完善,请先完善基础信息', | |
20 | + confirmText:'立即完善', | |
21 | + showCancel: false, | |
22 | + confirmColor:'#357aeb', | |
23 | + success(res){ | |
24 | + wx.navigateTo({ | |
25 | + url: '../taxperson/editinfo/editinfo', | |
26 | + }) | |
27 | + } | |
28 | + }) | |
29 | + } | |
17 | 30 | }, |
18 | 31 | |
19 | 32 | /** | ... | ... |
请
注册
或
登录
后发表评论