优化

@@ -34,7 +34,7 @@
 
 
 .text_black_28 {
 .text_black_28 {
   font-family: PingFangSC-Regular;
   font-family: PingFangSC-Regular;
-  font-size: 28rpx;
+  font-size: 26rpx;
   color: #000;
   color: #000;
   line-height: 80rpx;
   line-height: 80rpx;
 }
 }

@@ -23,6 +23,7 @@ Page({
     birthday: '',
     birthday: '',
     idInfoData: '',
     idInfoData: '',
     id_error: false,
     id_error: false,
+    has_certify:false,
     curAddress_haschanged: false,
     curAddress_haschanged: false,
     birthAddress_haschanged: false,
     birthAddress_haschanged: false,
     contactAddress_haschanged: false,
     contactAddress_haschanged: false,
@@ -305,15 +306,17 @@ Page({
     if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
     if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
       this.data.birthDate.selected = ''
       this.data.birthDate.selected = ''
     } else {
     } else {
-      this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
+      // this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
+      this.data.birthDate.selected = format.formatTime_date(tax_info.birth_date) 
     }
     }
 
 
     console.log('this.data.birthDate', new Date(tax_info.birth_date).toLocaleDateString())
     console.log('this.data.birthDate', new Date(tax_info.birth_date).toLocaleDateString())
     if (tax_info.join_date > 1000) {
     if (tax_info.join_date > 1000) {
-      this.data.startDate.selected = format.yearFormString(tax_info.join_date) + '-' + format.monthFormString(tax_info.join_date) + '-' + format.dayFormString(tax_info.join_date)
+      // this.data.startDate.selected = format.yearFormString(tax_info.join_date) + '-' + format.monthFormString(tax_info.join_date) + '-' + format.dayFormString(tax_info.join_date)
+      this.data.startDate.selected = format.formatTime_date(tax_info.join_date) 
     }
     }
     if (tax_info.separate_date > 1000) {
     if (tax_info.separate_date > 1000) {
-      this.data.endDate.selected = format.yearFormString(tax_info.separate_date) + '-' + format.monthFormString(tax_info.separate_date) + '-' + format.dayFormString(tax_info.separate_date)
+      this.data.endDate.selected = format.formatTime_date(tax_info.separate_date) 
     }
     }
 
 
     this.data.professionData.selected = tax_info.profession.three_level_name
     this.data.professionData.selected = tax_info.profession.three_level_name
@@ -536,6 +539,7 @@ Page({
             return
             return
           }
           }
           that.setData({
           that.setData({
+            has_certify:true,
             idInfoData: id_info,
             idInfoData: id_info,
             name: id_info.name,
             name: id_info.name,
             birthday: birth_day,
             birthday: birth_day,
@@ -919,8 +923,8 @@ Page({
         "email": formdata.email.length > 0 ? formdata.email : that.data.taxInfo.email,
         "email": formdata.email.length > 0 ? formdata.email : that.data.taxInfo.email,
         "bank": that.data.bankInfo.selected,
         "bank": that.data.bankInfo.selected,
         "bank_account": formdata.bank_account.length > 0 ? formdata.bank_account : that.data.taxInfo.bank_account,
         "bank_account": formdata.bank_account.length > 0 ? formdata.bank_account : that.data.taxInfo.bank_account,
-        "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : 0,
-        "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : 0,
+        "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : this.data.taxInfo.join_date,
+        "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : this.data.taxInfo.separate_date,
         "is_employee": that.data.employeeInfo.selected,
         "is_employee": that.data.employeeInfo.selected,
         "is_specific_profession": that.data.specificIndustryInfo.selected,
         "is_specific_profession": that.data.specificIndustryInfo.selected,
         "is_investor": that.data.investInfo.selected,
         "is_investor": that.data.investInfo.selected,
@@ -1033,8 +1037,9 @@ Page({
     var cardtype = this.data.cardtypeData.selected;
     var cardtype = this.data.cardtypeData.selected;
     var card_no = formdata.id_card_no ? formdata.id_card_no : this.data.card_number;
     var card_no = formdata.id_card_no ? formdata.id_card_no : this.data.card_number;
     var gender = this.data.genderData.selected;
     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) {
+    var long_birth_date = Date.parse(new Date(this.data.birthDate.selected)) / 1000;
+    console.log("birth_day", long_birth_date + "---" + this.data.long_birth_date)
+    if (this.data.taxInfo.certification_status == 'active'||(this.data.has_certify&&name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && long_birth_date == this.data.long_birth_date)) {
       return 'active'
       return 'active'
     } else {
     } else {
       return ''
       return ''

@@ -71,7 +71,7 @@
 
 
 .text_666_28 {
 .text_666_28 {
   font-family: PingFangSC-Regular;
   font-family: PingFangSC-Regular;
-  font-size: 28rpx;
+  font-size: 26rpx;
   color: #666;
   color: #666;
   text-align: right;
   text-align: right;
   line-height: 80rpx;
   line-height: 80rpx;

@@ -10,6 +10,13 @@ function formatTime(date) {
   return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute].map(formatNumber).join(':')
   return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute].map(formatNumber).join(':')
 }
 }
 
 
+function formatTime_date(date) {
+  var year = yearFormString(date)
+  var month = monthFormString(date) 
+  var day = dayFormString(date)
+  return [year, month, day].map(formatNumber).join('-') 
+}
+
 function formatNumber(n) {
 function formatNumber(n) {
   n = n.toString()
   n = n.toString()
   return n[1] ? n : '0' + n
   return n[1] ? n : '0' + n
@@ -89,6 +96,7 @@ function isIDCardNum(idCardNo) {
 
 
 module.exports = {
 module.exports = {
   formatTime: formatTime,
   formatTime: formatTime,
+  formatTime_date: formatTime_date,  
   formatDateString: formatDateString,
   formatDateString: formatDateString,
   yearFormString: yearFormString,
   yearFormString: yearFormString,
   monthFormString: monthFormString,
   monthFormString: monthFormString,