改写文案

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/taxperson/editinfo/editinfo.js
pages/main/taxperson/editinfo/editinfo.json
pages/main/taxperson/editinfo/editinfo.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @39107dc
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @39107dc
@@ -7,9 +7,9 @@ var baseUrl = app.globalData.baseUrl;
 const AddTypeNames = {
   'children_education': '子女教育',
   'continuing_education': '继续教育',
-  'support_duty': '赡养老人',
-  'medical_fund': '大病医疗',
-  'house_fund': '住房'
+  'support_duty': '被赡养老人',
+  'medical_fund': '大病医疗支出',
+  'house_fund': '住房租金'
 }
 const Deduce_amounts_month = {
   'children_education': 1000,
@@ -82,12 +82,12 @@ Page({
       onChange: 'onPickerSelect',
     },
     older_relativeData: {
-      label: '与纳税人的关系',
+      label: '与纳税人关系',
       isrequre: true,
       bindtype: 'older_relative',
       selected: '',
       isblack: 'true',
-      placeholder: '请选择与纳税人的关系',
+      placeholder: '请选择与纳税人关系',
       values: ["父母", "祖父母、外祖父母"],
       onChange: 'onPickerSelect'
     },
@@ -475,6 +475,7 @@ Page({
     console.log('---------frontPage', frontPage.data)
     console.log("options", options);
     const nameKey = options.status
+    var title = AddTypeNames[nameKey]
     this.legal_entity_id = frontPage.data.legal_entity_id
     this.legal_entity = frontPage.data.legal_entity
@@ -519,6 +520,7 @@ Page({
     } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { 
       this.getbanklist()
       house_type = "house_fund_rent"
+      title = '住房租金'
       if (options.reducetype == '月度') {
         reduce_typeData.selected = '月度'
         deduction_amount = Deduce_amounts_month["house_fund_rent"]
@@ -530,6 +532,7 @@ Page({
       this.getbanklist()
       this.getTaxList()
       house_type = "house_fund_loan"
+      title = '住房贷款利息'
       if (options.reducetype == '月度') {
         reduce_typeData.selected = '月度'
         deduction_amount = Deduce_amounts_month["house_fund_loan"]
@@ -538,7 +541,6 @@ Page({
         reduce_typeData.selected = '年度'
       }
     }
-    var title = AddTypeNames[nameKey]
     this.setData({
       title: title,
--- a/pages/main/taxperson/editinfo/editinfo.js
查看文件 @39107dc
+++ b/pages/main/taxperson/editinfo/editinfo.js
查看文件 @39107dc
@@ -838,6 +838,13 @@ Page({
     var formdata = e.detail.value;
     console.log("formdata", formdata)
     console.log("card_number", this.data.card_number)
+    if (this.data.card_number.length < 1) {
+      this.showtoast('请输入身份证号码');
+      return
+    } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
+      this.showtoast('证照号码有误');
+      return
+    }
     if (this.data.name.length < 1) {
       this.showtoast('请输入姓名');
       return
@@ -849,16 +856,10 @@ Page({
     //   this.showtoast('有必填项未填写');
     //   return
     // } 
-    else if (this.data.cardtypeData.selected.length < 1) {
-      this.showtoast('有必填项未填写');
-      return
-    } else if (this.data.card_number.length < 1) {
-      this.showtoast('请输入身份证号码');
-      return
-    } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
-      this.showtoast('证照号码有误');
-      return
-    }
+    // else if (this.data.cardtypeData.selected.length < 1) {
+    //   this.showtoast('有必填项未填写');
+    //   return
+    // } else 
     // else if (!this.data.isIdCard && (this.data.card_number.length < 1 &&  formdata.id_card_no.length < 1)) {
     //   this.showtoast('有必填项未填写');
     //   return
--- a/pages/main/taxperson/editinfo/editinfo.json
查看文件 @39107dc
+++ b/pages/main/taxperson/editinfo/editinfo.json
查看文件 @39107dc
 {
-  "navigationBarTitleText": "纳税人基本信息",
+  "navigationBarTitleText": "自然人基础信息",
   "navigationBarTextStyle": "black",
   "navigationBarBackgroundColor": "#FFFFFF"
 }
--- a/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @39107dc
+++ b/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @39107dc
@@ -6,7 +6,7 @@
     <view class="divide_line"></view>
     <!-- 基本信息 -->
     <view class='head_wrap' bindtap='span' id='1'>
-      <text class='head_text_wrap1'>基本信息</text>
+      <text class='head_text_wrap1'>基础信息</text>
       <text class='head_text_wrap2' hidden='{{!isshow01}}'>（点击收起非必填选项）</text>
       <text class='head_text_wrap2' hidden='{{isshow01}}'>（点击展开非必填选项）</text>
       <view style='float:right' wx:if='{{isshow01}}'>
@@ -21,6 +21,19 @@
     </view>
     <view class='data_list'>
       <view class='data_item'>
+        <template is="picker_cell_normal" data="{{...cardtypeData}}" />
+        <view class="divide_line_30"></view>
+
+        <view class='item_body'>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
+          <view>
+            <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
+            <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>
+            <!-- <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>
+            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status!='active'}}"  placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
+          </view>
+        </view>
         <view class='item_body' hidden="{{!isself}}">
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
@@ -32,7 +45,7 @@
         <view class='item_body'>
           <text class='red_star_right_10'>*</text>
-          <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍（地区）</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx'>中国</text>
         </view>
         <view class="divide_line_30"></view>
@@ -48,19 +61,7 @@
           <text class='text_black_30 float_right' style='line-height: 90rpx'>否</text>
         </view>
         <view class="divide_line_30"></view>
-        <template is="picker_cell_normal" data="{{...cardtypeData}}" />
-        <view class="divide_line_30"></view>
-
-        <view class='item_body'>
-          <text class='red_star_right_10'>*</text>
-          <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
-          <view>
-            <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
-            <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>
-            <!-- <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>
-            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status!='active'}}"  placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
-          </view>
-        </view>
+        
         <view hidden='{{!isshow01}}'>
           <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...genderData}}" />