wangyu / naturalPersonTax · 提交

提交 39107dc0a7422ba32efedf1a10174dd696814d15

作者 pangy
1 个父辈 806c229c

改写 文案

内嵌 并排对比
正在显示 4 个修改的文件 包含 36 行增加 和 32 行删除
... ... @@ -7,9 +7,9 @@ var baseUrl = app.globalData.baseUrl;
7 7 const AddTypeNames = {
8 8 'children_education': '子女教育',
9 9 'continuing_education': '继续教育',
10   - 'support_duty': '赡养老人',
11   - 'medical_fund': '大病医疗',
12   - 'house_fund': '住房'
  10 + 'support_duty': '被赡养老人',
  11 + 'medical_fund': '大病医疗支出',
  12 + 'house_fund': '住房租金'
13 13 }
14 14 const Deduce_amounts_month = {
15 15 'children_education': 1000,
... ... @@ -82,12 +82,12 @@ Page({
82 82 onChange: 'onPickerSelect',
83 83 },
84 84 older_relativeData: {
85   - label: '与纳税人的关系',
  85 + label: '与纳税人关系',
86 86 isrequre: true,
87 87 bindtype: 'older_relative',
88 88 selected: '',
89 89 isblack: 'true',
90   - placeholder: '请选择与纳税人的关系',
  90 + placeholder: '请选择与纳税人关系',
91 91 values: ["父母", "祖父母、外祖父母"],
92 92 onChange: 'onPickerSelect'
93 93 },
... ... @@ -475,6 +475,7 @@ Page({
475 475 console.log('---------frontPage', frontPage.data)
476 476 console.log("options", options);
477 477 const nameKey = options.status
  478 + var title = AddTypeNames[nameKey]
478 479
479 480 this.legal_entity_id = frontPage.data.legal_entity_id
480 481 this.legal_entity = frontPage.data.legal_entity
... ... @@ -519,6 +520,7 @@ Page({
519 520 } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") {
520 521 this.getbanklist()
521 522 house_type = "house_fund_rent"
  523 + title = '住房租金'
522 524 if (options.reducetype == '月度') {
523 525 reduce_typeData.selected = '月度'
524 526 deduction_amount = Deduce_amounts_month["house_fund_rent"]
... ... @@ -530,6 +532,7 @@ Page({
530 532 this.getbanklist()
531 533 this.getTaxList()
532 534 house_type = "house_fund_loan"
  535 + title = '住房贷款利息'
533 536 if (options.reducetype == '月度') {
534 537 reduce_typeData.selected = '月度'
535 538 deduction_amount = Deduce_amounts_month["house_fund_loan"]
... ... @@ -538,7 +541,6 @@ Page({
538 541 reduce_typeData.selected = '年度'
539 542 }
540 543 }
541   - var title = AddTypeNames[nameKey]
542 544
543 545 this.setData({
544 546 title: title,
... ...
... ... @@ -838,6 +838,13 @@ Page({
838 838 var formdata = e.detail.value;
839 839 console.log("formdata", formdata)
840 840 console.log("card_number", this.data.card_number)
  841 + if (this.data.card_number.length < 1) {
  842 + this.showtoast('请输入身份证号码');
  843 + return
  844 + } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
  845 + this.showtoast('证照号码有误');
  846 + return
  847 + }
841 848 if (this.data.name.length < 1) {
842 849 this.showtoast('请输入姓名');
843 850 return
... ... @@ -849,16 +856,10 @@ Page({
849 856 // this.showtoast('有必填项未填写');
850 857 // return
851 858 // }
852   - else if (this.data.cardtypeData.selected.length < 1) {
853   - this.showtoast('有必填项未填写');
854   - return
855   - } else if (this.data.card_number.length < 1) {
856   - this.showtoast('请输入身份证号码');
857   - return
858   - } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
859   - this.showtoast('证照号码有误');
860   - return
861   - }
  859 + // else if (this.data.cardtypeData.selected.length < 1) {
  860 + // this.showtoast('有必填项未填写');
  861 + // return
  862 + // } else
862 863 // else if (!this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
863 864 // this.showtoast('有必填项未填写');
864 865 // return
... ...
1 1 {
2   - "navigationBarTitleText": "纳税人基本信息",
  2 + "navigationBarTitleText": "自然人基础信息",
3 3 "navigationBarTextStyle": "black",
4 4 "navigationBarBackgroundColor": "#FFFFFF"
5 5 }
\ No newline at end of file
... ...
... ... @@ -6,7 +6,7 @@
6 6 <view class="divide_line"></view>
7 7 <!-- 基本信息 -->
8 8 <view class='head_wrap' bindtap='span' id='1'>
9   - <text class='head_text_wrap1'>基本信息</text>
  9 + <text class='head_text_wrap1'>基础信息</text>
10 10 <text class='head_text_wrap2' hidden='{{!isshow01}}'>（点击收起非必填选项）</text>
11 11 <text class='head_text_wrap2' hidden='{{isshow01}}'>（点击展开非必填选项）</text>
12 12 <view style='float:right' wx:if='{{isshow01}}'>
... ... @@ -21,6 +21,19 @@
21 21 </view>
22 22 <view class='data_list'>
23 23 <view class='data_item'>
  24 + <template is="picker_cell_normal" data="{{...cardtypeData}}" />
  25 + <view class="divide_line_30"></view>
  26 +
  27 + <view class='item_body'>
  28 + <text class='red_star_right_10'>*</text>
  29 + <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
  30 + <view>
  31 + <image wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
  32 + <input class='input_wrap float_right' disabled="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
  33 + <!-- <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
  34 + <input class='input_wrap float_right' hidden="{{taxInfo.certification_status!='active'}}" placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
  35 + </view>
  36 + </view>
24 37 <view class='item_body' hidden="{{!isself}}">
25 38 <text class='red_star_right_10'>*</text>
26 39 <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
... ... @@ -32,7 +45,7 @@
32 45
33 46 <view class='item_body'>
34 47 <text class='red_star_right_10'>*</text>
35   - <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍（地区）</text>
  48 + <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍</text>
36 49 <text class='text_black_30 float_right' style='line-height: 90rpx'>中国</text>
37 50 </view>
38 51 <view class="divide_line_30"></view>
... ... @@ -48,19 +61,7 @@
48 61 <text class='text_black_30 float_right' style='line-height: 90rpx'>否</text>
49 62 </view>
50 63 <view class="divide_line_30"></view>
51   - <template is="picker_cell_normal" data="{{...cardtypeData}}" />
52   - <view class="divide_line_30"></view>
53   -
54   - <view class='item_body'>
55   - <text class='red_star_right_10'>*</text>
56   - <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
57   - <view>
58   - <image wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
59   - <input class='input_wrap float_right' disabled="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
60   - <!-- <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
61   - <input class='input_wrap float_right' hidden="{{taxInfo.certification_status!='active'}}" placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
62   - </view>
63   - </view>
  64 +
64 65 <view hidden='{{!isshow01}}'>
65 66 <view class="divide_line_30"></view>
66 67 <template is="picker_cell_normal" data="{{...genderData}}" />
... ...
请 注册 或 登录 后发表评论