优化细节

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/taxperson/addinfo/addinfo.js
pages/main/taxperson/addinfo/addinfo.wxml
pages/main/taxperson/editinfo/editinfo.js
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @4128596
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @4128596
@@ -74,6 +74,7 @@ Page({
       label: '出生日期',
       bindtype: 'loverbirthday',
       selected: '',
+      disabled: true,
       placeholder: '请选择出生日期',
       mode: "date",
       fields: "day",
@@ -1119,6 +1120,8 @@ Page({
             this.showToast('请选择配偶出生日期')
             return
           }
+          newdata.spouse_id_card_type = '1' //this.data.lovercardtypeData.selected
+          newdata.spouse_birthday = this.data.loverbirthDate.datelong
         }
         newdata.has_spouse = this.data.hasLover?'y':'n'
         newdata.relationship = this.data.taxperson_relativeData.selected
@@ -1130,8 +1133,6 @@ Page({
         newdata.education_period = this.data.childedudegreeData.selected
         newdata.school_country = this.data.schoolCountryData.selected
         newdata.children_nation = "中国"
-        newdata.spouse_id_card_type = '1' //this.data.lovercardtypeData.selected
-        newdata.spouse_birthday = this.data.loverbirthDate.datelong
         newdata.nation = "中国"
         break;
       case 'continuing_education':
@@ -1408,11 +1409,11 @@ Page({
             this.showToast('请填写租赁合同编号')
             return
           } else if (this.data.leasestartDate.selected.length < 1) {
-            this.showToast('请选择日期')
+            this.showToast('请选择租赁起始日期')
             return
           }
           if (this.data.leaseendDate.selected.length < 1) {
-            this.showToast('请选择日期')
+            this.showToast('请选择租赁终止日期')
             return
           } else {
             var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)
@@ -1451,11 +1452,11 @@ Page({
             this.showToast('请选择配偶出生日期')
             return
           }
+          newdata.id_card_no = newdata.spouse_id_card_no ? newdata.spouse_id_card_no : ''
+          newdata.id_card_type = '1' //this.data.lovercardtypeData.selected
+          newdata.birthday = this.data.loverbirthDate.datelong
         }
         newdata.has_spouse = this.data.hasLover ? 'y' : 'n'
-        newdata.id_card_no = newdata.spouse_id_card_no ? newdata.spouse_id_card_no:''
-        newdata.id_card_type = '1' //this.data.lovercardtypeData.selected
-        newdata.birthday = this.data.loverbirthDate.datelong
         break;
     }
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @4128596
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @4128596
@@ -158,7 +158,7 @@
   <view style='height:90rpx'>
     <text class='red_star_right_10'>*</text>
     <text class='text_777_30 float_left'>病人姓名</text>
-    <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入姓名' name='name' value='{{name}}'></input>
+    <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入病人姓名' name='name' value='{{name}}'></input>
   </view>
   <view class='divide_line_30'></view>
@@ -326,7 +326,6 @@
     <text wx:if="{{reducetypeData.selected=='年度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;font-family: PingFangSC-Semibold;'>¥{{deduction_amount}}/年</text>
     <!-- <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> -->
   </view>
-  <view class='divide_line_30'></view>
 </view>
@@ -336,9 +335,9 @@
   <view wx:if="{{cur_index=='children_education' || cur_index=='house_fund'}}">
     <template is="picker_cell_normal" data="{{...hasLoverData}}" />
-    <view class='divide_line_30'></view>
   </view>
   <view wx:if="{{hasLover}}">
+    <view class='divide_line_30'></view>
     <view style='height:90rpx'>
       <text class='text_777_30 float_left head_in'>配偶姓名</text>
       <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>
--- a/pages/main/taxperson/addinfo/addinfo.js
查看文件 @4128596
+++ b/pages/main/taxperson/addinfo/addinfo.js
查看文件 @4128596
@@ -236,13 +236,14 @@ Page({
   },
   bindinputmobile: function (e) {
-    console.log('bindinputmobile', e)
+    if (e.detail.value.length == 11 && !format.isMobile(e.detail.value)){
+      this.showtoast("手机号码有误")
+    }
     this.setData({
       mobile: e.detail.value
     })
   },
   nameInput: function (e) {
-    console.log('bindinputname', e)
     this.setData({
       name: e.detail.value
     })
--- a/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @4128596
+++ b/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @4128596
@@ -55,16 +55,16 @@
         </view>
         <view class="divide_line_30"></view>
         <view class='item_body'>
-          <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>手机号码</text>
-          <input class='input_wrap' placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' maxlength='11' bindblur='bindinputmobile' type='number'></input>
+          <text class='red_star_right_10'>*</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>
+        <!-- <template is="picker_cell_normal" data="{{...forignerInfo}}" /> -->
         <view class="divide_line_30"></view>
         <view class='item_body'>
-          <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>是否境外人员</text>
-          <text class='text_black_30 float_right' style='line-height: 90rpx' >否</text>
+          <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>联系电话</text>
+          <input class='input_wrap' placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' maxlength='11' bindblur='bindinputmobile' type='number'></input>
         </view>
-        <!-- <template is="picker_cell_normal" data="{{...forignerInfo}}" /> -->
-
       </view>
     </view>
--- a/pages/main/taxperson/editinfo/editinfo.js
查看文件 @4128596
+++ b/pages/main/taxperson/editinfo/editinfo.js
查看文件 @4128596
@@ -773,14 +773,15 @@ Page({
   },
   bindinputmobile: function(e) {
-    console.log('bindinputmobile', e)
+    if (e.detail.value.length == 11 && !format.isMobile(e.detail.value)) {
+      this.showtoast("手机号码有误")
+    }
     this.setData({
       mobile: e.detail.value
     })
   },
   bindinputname: function(e) {
-    console.log('bindinputname', e)
     this.setData({
       name: e.detail.value
     })