Merge branch 'dev2.0' into dev_wy

wangyu
app.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/taxperson/addinfo/addinfo.js
utils/util.js
--- a/app.js
查看文件 @172c2d9
+++ b/app.js
查看文件 @172c2d9
@@ -32,7 +32,7 @@ App({
     }
   },
-  getTokenByCode: function (code) {
+  getTokenByCode: function (code, relaunch) {
     var that = this;
     var baseUrl = that.globalData.baseUrl;
     wx.request({
@@ -63,6 +63,11 @@ App({
           })
         } else if (user && user.type == "1") {//注册用户
           that.configOssUrl()
+          if (relaunch) {
+            wx.reLaunch({
+              url: '../guide/guide'
+            })
+          }
         }
       },
       fail: function (res) {
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @172c2d9
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @172c2d9
@@ -21,6 +21,7 @@ const Deduce_amounts_month = {
 const Deduce_amounts_year = {
   'children_education': 12000,
   'continuing_education': 4800,
+  'continuing_education_non': 3600,
   'support_duty': 24000,
   'medical_fund': 0,
   'house_fund': 0
@@ -40,7 +41,7 @@ Page({
     loanAddress_haschanged: false,
     rentAddress_haschanged: false,
     extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
-    cur_index: 'support_duty',
+    cur_index: 'continuing_education',
     lovercardtypeData: {
       label: '配偶证照类型',
       bindtype: 'lovercardtype',
@@ -858,6 +859,18 @@ Page({
               spouse_name: id_info.name,
               loverbirthDate: this.data.loverbirthDate
             }
+          } else if (this.idcard_belong == 'older_id_card_no') {
+            this.data.olderbirthDate.selected = birth_day
+            data = {
+              id_card_no: id_info.id_card_number,
+              supported_name: id_info.name,
+              olderbirthDate: this.data.olderbirthDate
+            }
+          } else if (this.idcard_belong == 'owner_id_cartd_no') {
+            this.data.olderbirthDate.selected = birth_day
+            data = {
+              owner_id_cartd_no: id_info.id_card_number,
+            }
           }
           this.setData(data)
           console.log('-cardtypeData--', that.data.cardtypeData)
@@ -1251,6 +1264,10 @@ Page({
                 wx.navigateBack({
                   delta: 1
                 })
+              }else{
+                wx.showToast({
+                  title: res.message
+                })
               }
             }
           })
@@ -1268,7 +1285,66 @@ Page({
       })
     }
   },
-
+  idChange: function (e) {
+    console.log('idCardNoChange',e, e.detail.value)
+    var idCardNo = e.detail.value
+    if (e.detail.value.length == 18) {
+      if (!format.isIDCardNum(idCardNo)) {
+        wx.showToast({
+          image: "../../../../images/warn.png",
+          title: '身份证格式有误'
+        })
+        return;
+      }
+      this.dealIdInfo(idCardNo, e.currentTarget.id)
+    }
+  },
+  //根据身份证号码，获取相关信息
+  dealIdInfo: function (idCardNum, idcard_belong) {
+    var info = format.analyzeIDCard(idCardNum)
+    console.log('info', info.age, info.sex, info.birthDay, (Date.parse(new Date(info.birthDay)) / 1000))
+    var data
+    if (idcard_belong == 'children_id_card_no_input') {
+      this.data.commonbirthDate.selected = info.birthDay
+      this.data.commonbirthDate.datelong = (Date.parse(new Date(info.birthDay)) / 1000)
+      data = {
+        commonbirthDate: this.data.commonbirthDate
+      }
+    } else if (idcard_belong == 'spouse_id_card_no_input') {
+      this.data.loverbirthDate.selected = info.birthDay
+      this.data.loverbirthDate.datelong = (Date.parse(new Date(info.birthDay)) / 1000)
+      data = {
+        loverbirthDate: this.data.loverbirthDate
+      }
+    } else if (idcard_belong == 'medical_id_card_no_input') {
+      this.data.commonbirthDate.selected = info.birthDay
+      this.data.commonbirthDate.datelong = (Date.parse(new Date(info.birthDay)) / 1000)
+      data = {
+        commonbirthDate: this.data.commonbirthDate
+      }
+    } else if (idcard_belong == 'older_id_card_no_input') {
+      this.data.olderbirthDate.selected = info.birthDay
+      this.data.olderbirthDate.datelong = (Date.parse(new Date(info.birthDay)) / 1000)
+      data = {
+        olderbirthDate: this.data.olderbirthDate
+      }
+    } else if (idcard_belong == 'owner_id_cartd_no_input') {
+      // this.data.olderbirthDate.selected = info.birthDay
+      // this.data.olderbirthDate.datelong = (Date.parse(new Date(info.birthDay)) / 1000)
+      // data = {
+      //   owner_id_cartd_no: idCardNum,
+      // }
+    }
+    if (info.age) {
+      // data.age = info.age
+    }
+    if (info.sex) {
+      // var gender_data = this.data.genderData
+      // gender_data.selected = info.sex
+      // data.genderData = gender_data
+    }
+    this.setData(data)
+  },
   onPickerSelect: function(e) {
     console.log('picker发送选择改变，携带值为', e)
     switch (e.currentTarget.id) {
@@ -1390,7 +1466,7 @@ Page({
         if (e.detail.value == '0') {
           deduction_amount = Deduce_amounts_month[this.data.cur_index]
         } else {
-          deduction_amount = Deduce_amounts_year[this.data.cur_indexfan]
+          deduction_amount = Deduce_amounts_year[this.data.cur_index]
         }
         reduce_typeData.selected = reduce_typeData.values[e.detail.value]
         this.setData({
@@ -1401,9 +1477,22 @@ Page({
       case 'edu_type':
         var edutypee_data = this.data.edutypeData
         edutypee_data.selected = edutypee_data.values[e.detail.value]
+        var reducetypeData = this.data.reducetypeData
+        var deduction_amount
+        if (e.detail.value == '1') {//非学历教育
+          reducetypeData.selected = '年度'
+          reducetypeData.disabled = true 
+          deduction_amount = Deduce_amounts_year['continuing_education_non']
+        }else {
+          reducetypeData.disabled = false 
+          reducetypeData.selected = '月度'
+          deduction_amount = Deduce_amounts_month['continuing_education']
+        }
         this.setData({
           edu_lable: e.detail.value == 0 ? 'school' : 'tech',
-          edutypeData: edutypee_data
+          edutypeData: edutypee_data,
+          reducetypeData: reducetypeData,
+          deduction_amount: deduction_amount
         })
         break;
       case 'edu_style':
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @172c2d9
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @172c2d9
@@ -13,7 +13,7 @@
           <text class='text_black_30 float_left' style='line-height: 90rpx'>子女证件号码</text>
           <view wx:if="{{isIdCard}}">
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image>
-            <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}'></input>
+            <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}' bindinput="idChange" id='children_id_card_no_input'></input>
           </view>
           <!-- <view wx:else>
               <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}'></input>
@@ -129,7 +129,10 @@
   <view style='height:90rpx'>
     <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
     <text class='text_black_30 float_left'>被赡养人证照号码</text>
-    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:420rpx;' placeholder='请输入证件号码' type='idcard' name='id_card_no' value='{{id_card_no}}'></input>
+    <view wx:if="{{isIdCard}}">
+      <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="older_id_card_no"></image>
+      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证件号码' maxlength='18' type='idcard' name='id_card_no' value='{{id_card_no}}' bindinput="idChange" id="older_id_card_no_input"></input>
+    </view>
   </view>
   <view class='divide_line_f5f5f5'></view>
   <template is="picker_cell_normal" data="{{...olderbirthDate}}" />
@@ -170,7 +173,7 @@
   <view style='height:90rpx'>
     <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
     <text class='text_black_30 float_left'>病人证照号码</text>
-    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证照号码' name='id_card_no' type='idcard' value='{{id_card_no}}'></input>
+    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证照号码' name='id_card_no' type='idcard' value='{{id_card_no}}' bindinput="idChange" id="medical_id_card_no_input"></input>
   </view>
   <view class='divide_line_f5f5f5'></view>
   <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
@@ -264,7 +267,10 @@
       <view style='height:90rpx'>
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
         <text class='text_black_30 float_left'>证件号码</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证件号码' name='owner_id_cartd_no'></input>
+        <view wx:if="{{isIdCard}}">
+          <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_id_cartd_no"></image>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证件号码' maxlength='18' type='idcard'  name='owner_id_cartd_no' value='{{owner_id_cartd_no}}' bindinput="idChange" id='owner_id_cartd_no_input'></input>
+        </view>
       </view>
     </view>
     <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
@@ -320,7 +326,7 @@
       <text class='text_black_30 float_left'>配偶证件号码</text>
       <view wx:if="{{isIdCard}}">
         <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
-        <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}'></input>
+        <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input'></input>
       </view>
     </view>
     <view class='divide_line_f5f5f5'></view>
@@ -345,7 +351,7 @@
       <text class='text_black_30 float_left'>配偶证件号码</text>
       <view wx:if="{{isIdCard}}">
         <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
-        <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='lover_idno' maxlength='18' type='idcard' value='{{lover_idno}}'></input>
+        <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='lover_idno' maxlength='18' type='idcard' value='{{lover_idno}}' bindinput="idChange" id='spouse_id_card_no_input'></input>
       </view>
     </view>
     <view class='divide_line_f5f5f5'></view>
--- a/pages/main/taxperson/addinfo/addinfo.js
查看文件 @172c2d9
+++ b/pages/main/taxperson/addinfo/addinfo.js
查看文件 @172c2d9
@@ -372,7 +372,7 @@ Page({
   },
   dealIdInfo: function (idCardNum) {
-    var info = this.analyzeIDCard(idCardNum)
+    var info = format.analyzeIDCard(idCardNum)
     console.log('info', info.age, info.sex)
     if (info.age) {
       this.setData({
@@ -422,39 +422,6 @@ Page({
   },
-  analyzeIDCard: function(IDCard){
-    var sexAndAge = {}
-    //获取用户身份证号码
-    var userCard = IDCard;
-    //如果身份证号码为undefind则返回空
-    if(!userCard) {
-      return sexAndAge;
-    }
-      //获取性别
-      if(parseInt(userCard.substr(16, 1)) % 2 == 1){
-      sexAndAge.sex = '男'
-    }else {
-      sexAndAge.sex = '女'
-    }
-    //获取出生年月日
-    //userCard.substring(6,10) + "-" + userCard.substring(10,12) + "-" + userCard.substring(12,14);
-    var yearBirth = userCard.substring(6, 10);
-    var monthBirth = userCard.substring(10, 12);
-    var dayBirth = userCard.substring(12, 14);
-    //获取当前年月日并计算年龄
-    var myDate = new Date();
-    var monthNow = myDate.getMonth() + 1;
-    var dayNow = myDate.getDay();
-    var age = myDate.getFullYear() - yearBirth;
-    if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
-      age--;
-    }
-    //得到年龄
-    sexAndAge.age = age;
-    //返回性别和年龄
-    return sexAndAge;
-},
-
   /**
    * 生命周期函数--监听页面隐藏
    */
--- a/utils/util.js
查看文件 @172c2d9
+++ b/utils/util.js
查看文件 @172c2d9
@@ -100,6 +100,41 @@ function isIDCardNum(idCardNo) {
     return false;
   }
 }
+function analyzeIDCard(IDCard){
+  var sexAndAge = {}
+  //获取用户身份证号码
+  var userCard = IDCard;
+  //如果身份证号码为undefind则返回空
+  if (!userCard) {
+    return sexAndAge;
+  }
+  //获取性别
+  if (parseInt(userCard.substr(16, 1)) % 2 == 1) {
+    sexAndAge.sex = '男'
+  } else {
+    sexAndAge.sex = '女'
+  }
+  //获取出生年月日
+  //userCard.substring(6,10) + "-" + userCard.substring(10,12) + "-" + userCard.substring(12,14);
+  var yearBirth = userCard.substring(6, 10);
+  var monthBirth = userCard.substring(10, 12);
+  var dayBirth = userCard.substring(12, 14);
+  //出生日期
+  sexAndAge.birthDay = yearBirth + '-' + monthBirth + '-' + dayBirth;
+
+  //获取当前年月日并计算年龄
+  var myDate = new Date();
+  var monthNow = myDate.getMonth() + 1;
+  var dayNow = myDate.getDay();
+  var age = myDate.getFullYear() - yearBirth;
+  if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+    age--;
+  }
+  //得到年龄
+  sexAndAge.age = age;
+  //返回性别和年龄
+  return sexAndAge;
+}
 module.exports = {
   formatTime: formatTime,
@@ -110,5 +145,6 @@ module.exports = {
   monthFormString: monthFormString,
   dayFormString: dayFormString,
   isIDCardNum: isIDCardNum,
-  curDateTime: curDateTime
+  curDateTime: curDateTime,
+  analyzeIDCard: analyzeIDCard
 }