优化关于拍照之后认证字段相关问题

wangyu
pages/main/addinfo/addinfo.js
pages/main/editinfo/editinfo.js
--- a/pages/main/addinfo/addinfo.js
查看文件 @a044f30
+++ b/pages/main/addinfo/addinfo.js
查看文件 @a044f30
@@ -19,9 +19,8 @@ Page({
     card_number: '',
     birthday: '',
     requestBody: {},
-    is_certified:'',
-    idInfoData:'',
-    profession_index:[0,0,0],
+    idInfoData: '',
+    profession_index: [0, 0, 0],
     relativeData: {
       isrequre: true,
@@ -224,9 +223,9 @@ Page({
     this.getbanklist()
   },
-  handleData:function(){
+  handleData: function() {
     var curdate = format.curDateTime()
-    console.log('curdate', curdate) 
+    console.log('curdate', curdate)
     this.data.birthDate.end = curdate
     this.data.startDate.end = curdate
     this.data.endDate.end = curdate
@@ -308,7 +307,7 @@ Page({
     new_profession_data = [list, list[0].children, list[0].children[0].children]
     console.log('new_profession_data', new_profession_data)
     return new_profession_data;
-    
+
   },
   getbanklist: function() {
@@ -364,7 +363,7 @@ Page({
       key: 'id_info',
       success: function(res) {
         console.log('id_info', res.data)
-        if (res.data && res.data.length>0) {
+        if (res.data && res.data.length > 0) {
           var id_info = JSON.parse(res.data)
           var birth_day
@@ -383,8 +382,8 @@ Page({
           gender_Data.selected = id_info.gender
           that.data.birthDate.selected = birth_day
-          
-          if (that.data.name.length > 0 && id_info.name != that.data.name){
+
+          if (that.data.name.length > 0 && id_info.name != that.data.name) {
             that.showtoast("姓名冲突")
             return
           }
@@ -393,7 +392,6 @@ Page({
             return
           }
           that.setData({
-            is_certified:'active',
             idInfoData: id_info,
             name: id_info.name,
             birthday: birth_day,
@@ -403,7 +401,7 @@ Page({
             birthDate: that.data.birthDate,
             card_number: id_info.id_card_number
           })
-          
+
         }
       },
     })
@@ -560,7 +558,7 @@ Page({
     var birth_date = this.data.birthDate;
     birth_date.selected = e.detail.value
     this.setData({
-      birthday: e.detail.value,
+      long_birth_date: Date.parse(new Date(e.detail.value)) / 1000,
       birthDate: birth_date
     })
   },
@@ -636,7 +634,7 @@ Page({
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$");
     var formdata = e.detail.value;
     console.log("formdata", formdata);
-    console.log('idnum', this.data.card_number.length < 1&&!format.isIDCardNum(formdata.id_card_no))
+    console.log('idnum', this.data.card_number.length < 1 && !format.isIDCardNum(formdata.id_card_no))
     if (formdata.name.length < 1) {
       this.showtoast('有必填项未填写');
       return
@@ -655,16 +653,16 @@ Page({
     } else if (this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
       this.showtoast('有必填项未填写');
       return
-    } else if (this.data.isIdCard &&!format.isIDCardNum(formdata.id_card_no)) {
+    } else if (this.data.isIdCard && !format.isIDCardNum(formdata.id_card_no)) {
       this.showtoast('证件号码有误');
       return
-    }else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
+    } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
       this.showtoast('有必填项未填写');
       return
     } else if (formdata.mobile.length < 1) {
       this.showtoast('有必填项未填写');
       return
-    } else if (!regMobile.test(formdata.mobile)){
+    } else if (!regMobile.test(formdata.mobile)) {
       this.showtoast('请输入正确手机号');
       return
     } else if (this.data.investInfo.selected.length < 1) {
@@ -673,7 +671,7 @@ Page({
     } else if (this.data.specificIndustryInfo.selected.length < 1) {
       this.showtoast('有必填项未填写');
       return
-    } else if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)){
+    } else if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
       this.showtoast('请输入正确邮箱');
       return
     } else if (formdata.company_equity_total && formdata.company_equity_total.length > 0 && !regMoney.test(formdata.company_equity_total)) {
@@ -692,7 +690,7 @@ Page({
         new_card_num = formdata.id_card_no
       }
     }
-    
+
     if (!this.data.isIdCard && formdata.id_card_no && formdata.id_card_no.length > 0) {
       new_card_num = formdata.id_card_no
     }
@@ -706,22 +704,22 @@ Page({
     var that = this
     var formdata = data
     console.log("form_data", formdata);
+    var Authorization = app.globalData.Authorization;
     var pro_index = that.data.profession_index
     var profession_data_info = that.data.professionData.values[pro_index[pro_index[0]]][0]
     console.log('profession_datas', profession_data_info)
-    var Authorization = app.globalData.Authorization;
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes',
       method: "POST",
       data: {
-        'certification_status':'',
+        'certification_status': that.getCertifyStatus(formdata),
         "name": that.data.name.length > 0 ? that.data.name : formdata.name,
         "family_ties": that.data.relativeData.selected,
         "native": "中国",
         "id_card_type": that.data.cardtypeData.selected,
         "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
         "gender": that.data.genderData.selected,
-        "birth_date": that.data.long_birth_date > 1000 ? that.data.long_birth_date:null,
+        "birth_date": that.data.long_birth_date > 1000 ? that.data.long_birth_date : null,
         "profession": {
           "one_level_code": profession_data_info.value,
           "one_level_name": profession_data_info.label,
@@ -787,7 +785,7 @@ Page({
       },
       success: function(res) {
         console.log(res)
-        if(res.statusCode==200){
+        if (res.statusCode == 200) {
           wx.redirectTo({
             url: '../home/home',
           })
@@ -797,7 +795,7 @@ Page({
             content: '',
           })
         }
-        
+
       },
       fail(res) {
         console.log(res)
@@ -805,10 +803,24 @@ Page({
     })
   },
+  getCertifyStatus: function(formdata) {
+    var iddata = this.data.idInfoData;
+    var name = this.data.name.length > 0 ? this.data.name : formdata.name;
+    var cardtype = this.data.cardtypeData.selected;
+    var card_no = formdata.id_card_no ? formdata.id_card_no : this.data.card_number;
+    var gender = this.data.genderData.selected;
+    var birth_day = this.data.birthDate.selected;
+    if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && birth_day == this.data.birthday) {
+      return 'active'
+    } else {
+      return ''
+    }
+  },
+
   showtoast: function(title) {
     wx.showToast({
       title: title,
-      duration:2000,
+      duration: 2000,
       image: '/images/error.png'
     })
   },
--- a/pages/main/editinfo/editinfo.js
查看文件 @a044f30
+++ b/pages/main/editinfo/editinfo.js
查看文件 @a044f30
@@ -17,11 +17,11 @@ Page({
     cur_id: '',
     isself: true,
     isIdCard: true,
-    is_certified:'',
     profession_haschanges: false,
     name: '',
     mobile: '',
     birthday: '',
+    idInfoData: '',
     id_error: false,
     curAddress_haschanged: false,
     birthAddress_haschanged: false,
@@ -529,7 +529,7 @@ Page({
             return
           }
           that.setData({
-            is_certified: 'active',
+            idInfoData: id_info,
             name: id_info.name,
             birthday: birth_day,
             cardtypeData: cardtype_Data,
@@ -698,7 +698,6 @@ Page({
     birth_date.selected = e.detail.value
     console.log('birthdayChange', Date.parse(new Date(e.detail.value)))
     this.setData({
-      birthday: e.detail.value,
       long_birth_date: Date.parse(new Date(e.detail.value)) / 1000,
       birthDate: birth_date
     })
@@ -850,7 +849,7 @@ Page({
       url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
       method: "PUT",
       data: {
-        'certification_status': '',
+        'certification_status': that.getCertifyStatus(formdata),
         "name": formdata.name.length > 0 ? formdata.name : that.data.name,
         "family_ties": that.data.relativeData.selected,
         "native": "中国",
@@ -987,6 +986,20 @@ Page({
     })
   },
+  getCertifyStatus: function (formdata) {
+    var iddata = this.data.idInfoData;
+    var name = this.data.name.length > 0 ? this.data.name : formdata.name;
+    var cardtype = this.data.cardtypeData.selected;
+    var card_no = formdata.id_card_no ? formdata.id_card_no : this.data.card_number;
+    var gender = this.data.genderData.selected;
+    var birth_day = this.data.birthDate.selected;
+    if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && birth_day == this.data.birthday) {
+      return 'active'
+    } else {
+      return ''
+    }
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */