优化

wangyu
app.wxss
images/tax_calculate.png
images/tax_person.png
images/taxcalculate.png
images/taxperson.png
pages/common/picker_cell.wxml
pages/main/addinfo/addinfo.js
pages/main/addinfo/addinfo.wxml
pages/main/editinfo/editinfo.js
pages/main/editinfo/editinfo.wxml
pages/main/guide/guide.wxml
pages/main/guide/guide.wxss
pages/main/home/home.js
pages/main/home/home.wxml
pages/main/home/home.wxss
--- a/app.wxss
查看文件 @bacd54c
+++ b/app.wxss
查看文件 @bacd54c
@@ -24,6 +24,14 @@
   height: 80rpx;
 }
+.text_wrap{
+  /* width: 500rpx;
+   overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  float: right; */
+}
+
 .text_black_28 {
   font-family: PingFangSC-Regular;
   font-size: 28rpx;
--- a/images/tax_calculate.png
查看文件 @bacd54c
+++ b/images/tax_calculate.png
查看文件 @bacd54c
--- a/images/tax_person.png
查看文件 @bacd54c
+++ b/images/tax_person.png
查看文件 @bacd54c
--- a/images/taxcalculate.png 已删除 100644 → 0
查看文件 @a044f30
+++ b/images/taxcalculate.png 已删除 100644 → 0
查看文件 @a044f30
--- a/images/taxperson.png 已删除 100644 → 0
查看文件 @a044f30
+++ b/images/taxperson.png 已删除 100644 → 0
查看文件 @a044f30
--- a/pages/common/picker_cell.wxml
查看文件 @bacd54c
+++ b/pages/common/picker_cell.wxml
查看文件 @bacd54c
@@ -12,8 +12,8 @@
     <view class="weui-cell__bd">
       <picker mode="{{mode?mode:'selector'}}" range-key="{{range_key}}" range="{{values}}" fields="{{fields}}" start="{{start}}" end="{{end}}" bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}" id='{{bindtype}}'>
         <view wx:if="{{selected&&disabled&&disabled=='true'}}" class="text_999_28 float_right">{{selected}}</view>
-        <view wx:elif="{{selected}}" class="text_333_28 float_right">{{selected}}</view>
-        <view wx:else class="text_999_28 float_right">{{placeholder}}</view>
+        <view wx:elif="{{selected}}" class="text_333_28 float_right ">{{selected}}</view>
+        <view wx:else class="text_999_28 float_right ">{{placeholder}}</view>
       </picker>
     </view>
   </view>
--- a/pages/main/addinfo/addinfo.js
查看文件 @bacd54c
+++ b/pages/main/addinfo/addinfo.js
查看文件 @bacd54c
@@ -20,7 +20,7 @@ Page({
     birthday: '',
     requestBody: {},
     idInfoData: '',
-    profession_index: [0, 0, 0],
+    profession_index: [],
     relativeData: {
       isrequre: true,
@@ -47,8 +47,8 @@ Page({
       bindtype: 'cardtype',
       selected: '',
       placeholder: '请选择证照类型',
-      values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往大陆通行证', '外交官证', '中国护照',
-        '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '外国人永久居留证'
+      values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
+        '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
       ],
       onChange: 'onPickerSelect'
     },
@@ -368,12 +368,12 @@ Page({
           var birth_day
           if (id_info.birthday.month > 9 && id_info.birthday.day > 9) {
-            birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
+            birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day;
           } else if (id_info.birthday.month > 9 && id_info.birthday.day < 10) {
+            birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-0' + id_info.birthday.day;
+          } else if (id_info.birthday.month < 10 && id_info.birthday.day > 9) {
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-' + id_info.birthday.day;
-          } else if (id_info.birthday.month < 9 && id_info.birthday.day > 10) {
-            birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
-          } else if (id_info.birthday.month < 9 && id_info.birthday.day < 10) {
+          } else if (id_info.birthday.month < 10 && id_info.birthday.day < 10) {
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
           }
           var cardtype_Data = that.data.cardtypeData
@@ -557,8 +557,9 @@ Page({
   birthdayChange: function(e) {
     var birth_date = this.data.birthDate;
     birth_date.selected = e.detail.value
+    console.log('long_birth_date', Date.parse(new Date(e.detail.value)) / 1000)
     this.setData({
-      long_birth_date: Date.parse(new Date(e.detail.value)) / 1000,
+      long_birth_date: (Date.parse(new Date(e.detail.value))/1000),
       birthDate: birth_date
     })
   },
@@ -624,14 +625,10 @@ Page({
   formSubmit: function(e) {
     console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
-    // var pro_index = this.data.profession_index
-    // var profession_datas = this.data.professionData.values[pro_index[pro_index[0]]][0]
-    // console.log('profession_datas', profession_datas)
-    // var regMoney = /^[0-9]*(/.[0-9]{1,2})?$/;
     var regMoney = /^[0-9]*(\.[0,10]{1,2})?$/;
     var regMobile = /^1[3|4|5|7|8][0-9]{9}$/;
-    var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
-    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 regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,}$/;
+    var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[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))
@@ -705,9 +702,7 @@ Page({
     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 request_profession = that.getProfessionRequest()
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes',
       method: "POST",
@@ -719,22 +714,15 @@ Page({
         "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,
-        "profession": {
-          "one_level_code": profession_data_info.value,
-          "one_level_name": profession_data_info.label,
-          "two_level_code": profession_data_info.children[pro_index[1]].value,
-          "two_level_name": profession_data_info.children[pro_index[1]].label,
-          "three_level_code": profession_data_info.children[pro_index[1]].children[pro_index[2]].value,
-          "three_level_name": profession_data_info.children[pro_index[1]].children[pro_index[2]].label
-        },
+        "birth_date": that.data.long_birth_date ,
+        "profession": request_profession,
         "education": that.data.degreeData.selected,
         "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : '',
         "taxpayer_status": that.data.personstatusData.selected,
         "is_martyr_family": that.data.lieshuInfo.selected,
-        "martyr_family_no": formdata.martyr_family_no,
+        "martyr_family_no": that.data.lieshuInfo.selected=='否'?'':formdata.martyr_family_no,
         "is_disability": that.data.disabilityInfo.selected,
-        "disability_no": formdata.disability_no,
+        "disability_no": that.data.disabilityInfo.selected=='否'?'':formdata.disability_no,
         "is_lonely_man": that.data.lonelyolderInfo.selected,
         "is_overseas_personnel": "否",
         "comment": formdata.comment,
@@ -755,7 +743,7 @@ Page({
           "district_code": that.data.birthaddressInfo.address_code[2],
           "district": that.data.birthaddressInfo.address_value[2]
         },
-        "huji_address_detail": formdata.huji_address_detail,
+        "huji_address_detail": formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
         "mobile": formdata.mobile,
         "contact_address": {
           "province_code": that.data.contactaddressInfo.address_code[0],
@@ -803,6 +791,33 @@ Page({
     })
   },
+  getProfessionRequest: function () {
+    var that = this
+    var pro_index = that.data.profession_index
+
+    if (pro_index.length == 3) {
+      var profession_data_info = that.data.professionData.values[pro_index[pro_index[0]]][0]
+      console.log('profession_datas', profession_data_info)
+      return {
+        "one_level_code": profession_data_info.value,
+        "one_level_name": profession_data_info.label,
+        "two_level_code": profession_data_info.children[pro_index[1]].value,
+        "two_level_name": profession_data_info.children[pro_index[1]].label,
+        "three_level_code": profession_data_info.children[pro_index[1]].children[pro_index[2]].value,
+        "three_level_name": profession_data_info.children[pro_index[1]].children[pro_index[2]].label
+      }
+    } else {
+      return {
+        "one_level_code": '',
+        "one_level_name": '',
+        "two_level_code": '',
+        "two_level_name": '',
+        "three_level_code": '',
+        "three_level_name": ''
+      }
+    }
+  },
+
   getCertifyStatus: function(formdata) {
     var iddata = this.data.idInfoData;
     var name = this.data.name.length > 0 ? this.data.name : formdata.name;
--- a/pages/main/addinfo/addinfo.wxml
查看文件 @bacd54c
+++ b/pages/main/addinfo/addinfo.wxml
查看文件 @bacd54c
@@ -13,7 +13,7 @@
         <view class='item_body'>
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>姓名</text>
-          <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' placeholder-class='text_999_28' ></input>
+          <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' placeholder-class='text_999_28' maxlength='15'></input>
         </view>
         <view class="divide_line"></view>
         <!-- <view class='item_body' bindtap='openpicker'>
@@ -46,7 +46,7 @@
         <view class='item_body' hidden="{{!isself}}">
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>姓名</text>
-          <input class='input_wrap float_right' placeholder='请填写姓名' value=''   placeholder-class='text_999_28'></input>
+          <input class='input_wrap float_right' placeholder='请填写姓名' value=''   placeholder-class='text_999_28' maxlength='15'></input>
         </view>
         <view class="divide_line"></view>
@@ -166,7 +166,7 @@
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_666_28 float_left'>备注</text>
-            <input class='input_wrap float_right' type='number' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注' ></input>
+            <input class='input_wrap float_right' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注' ></input>
           </view>
         </view>
       </view>
@@ -221,7 +221,7 @@
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_666_28 float_left'>电子邮箱</text>
-            <input class='input_wrap float_right' name='email'  placeholder-class='text_999_28' placeholder='请输入电子邮箱' maxlength='24'></input>
+            <input class='input_wrap float_right' name='email'  placeholder-class='text_999_28' placeholder='请输入电子邮箱' maxlength='20'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
--- a/pages/main/editinfo/editinfo.js
查看文件 @bacd54c
+++ b/pages/main/editinfo/editinfo.js
查看文件 @bacd54c
@@ -30,6 +30,7 @@ Page({
     long_birth_date: 0,
     long_start_date: 0,
     long_end_date: 0,
+    huji_address_detail: '',
     relativeData: {
       isrequre: true,
       label: '关系',
@@ -54,8 +55,8 @@ Page({
       bindtype: 'cardtype',
       placeholder: '居民身份证',
       selected: '',
-      values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往大陆通行证', '外交官证', '中国护照',
-        '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '外国人永久居留证'
+      values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
+        '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
       ],
       onChange: 'onPickerSelect'
     },
@@ -300,9 +301,13 @@ Page({
     this.data.specificIndustryInfo.selected = tax_info.is_specific_profession
     //非必填
     this.data.genderData.selected = tax_info.gender
-    if (tax_info.birth_date > 1000) {
+    if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
+      this.data.birthDate.selected = ''
+    } else {
       this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
     }
+
+    console.log('this.data.birthDate', new Date(tax_info.birth_date).toLocaleDateString())
     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)
     }
@@ -322,10 +327,11 @@ Page({
     this.data.bankInfo.selected = tax_info.bank
     this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
     this.data.currentaddressInfo.selected = tax_info.current_address.province + tax_info.current_address.city + tax_info.current_address.district
-    this.data.birthaddressInfo.selected = tax_info.huji_address.province + tax_info.huji_address.city + tax_info.huji_address.district
+    this.data.birthaddressInfo.selected = (tax_info.huji_address.province + tax_info.huji_address.city + tax_info.huji_address.district).replace(/(^\s*)|(\s*$)/g, "")
     this.data.employeeInfo.selected = tax_info.is_employee
     this.data.investpersonalInfo.selected = tax_info.is_business_angel
     this.setData({
+      huji_address_detail: tax_info.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
       relativeData: this.data.relativeData,
       name: this.data.name,
       personstatusData: this.data.personstatusData,
@@ -500,16 +506,16 @@ Page({
         if (res.data && res.data.length > 0) {
           var id_info = JSON.parse(res.data)
           var birth_day
-          if (id_info.birthday.month > 9 && id_info.birthday.day>9){
-            birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
-          } else if(id_info.birthday.month > 9 && id_info.birthday.day<10){
+          if (id_info.birthday.month > 9 && id_info.birthday.day > 9) {
+            birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day;
+          } else if (id_info.birthday.month > 9 && id_info.birthday.day < 10) {
+            birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-0' + id_info.birthday.day;
+          } else if (id_info.birthday.month < 10 && id_info.birthday.day > 9) {
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-' + id_info.birthday.day;
-          } else if (id_info.birthday.month < 9 && id_info.birthday.day > 10) {
-            birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
-          } else if (id_info.birthday.month < 9 && id_info.birthday.day < 10) {
+          } else if (id_info.birthday.month < 10 && id_info.birthday.day < 10) {
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
           }
-          
+
           var cardtype_Data = that.data.cardtypeData
           cardtype_Data.selected = '居民身份证'
           var gender_Data = that.data.genderData
@@ -771,19 +777,41 @@ Page({
     }
   },
+  bindinputmobile: function(e) {
+    console.log('bindinputmobile', e)
+    this.setData({
+      mobile: e.detail.value
+    })
+  },
+
+  bindinputname: function(e) {
+    console.log('bindinputname', e)
+    this.setData({
+      name: e.detail.value
+    })
+  },
+
+  bindinputcardnum: function(e) {
+    console.log('bindinputcardnum', e)
+    this.setData({
+      card_number: e.detail.value
+    })
+  },
+
   formSubmit: function(e) {
     console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
-    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 regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
+    var regMobile = /^1[3|4|5|7|8][0-9]{9}$/;
     var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
     // var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/;
     var regMoney = /^([1-9][\d]{0,10}|0)(\.[\d]{1,2})?$/
     var formdata = e.detail.value;
     console.log("formdata", formdata)
     console.log("card_number", this.data.card_number)
-    if (this.data.name && this.data.name.length < 1 && formdata.name.length < 1) {
+    if (this.data.name.length < 1 ) {
       this.showtoast('有必填项未填写');
       return
-    } else if (!regname.test(formdata.name)) {
+    } else if (this.data.name.length > 0 && !regname.test(this.data.name)) {
       this.showtoast('请输入正确姓名');
       return
     } else if (!this.data.isself && this.data.relativeData.selected.length < 1) {
@@ -795,17 +823,22 @@ Page({
     } else if (this.data.cardtypeData.selected.length < 1) {
       this.showtoast('有必填项未填写');
       return
-    } else if (this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
+    } else if (this.data.card_number.length < 1) {
       this.showtoast('有必填项未填写');
       return
-    } else if (this.data.isIdCard && !format.isIDCardNum(formdata.id_card_no)) {
+    } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
       this.showtoast('证件号码有误');
       return
-    } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
+    }
+    // else if (!this.data.isIdCard && (this.data.card_number.length < 1 &&  formdata.id_card_no.length < 1)) {
+    //   this.showtoast('有必填项未填写');
+    //   return
+    // } 
+    else if (this.data.mobile.length < 1 ) {
       this.showtoast('有必填项未填写');
       return
-    } else if (formdata.mobile.length < 1) {
-      this.showtoast('有必填项未填写');
+    } else if (this.data.mobile.length > 0 && !regMobile.test(this.data.mobile)) {
+      this.showtoast('手机号码有误');
       return
     } else if (this.data.investInfo.selected.length < 1) {
       this.showtoast('有必填项未填写');
@@ -823,16 +856,16 @@ Page({
       this.showtoast('请输入正确金额');
       return
     }
-    var new_ard_num = ''
-    if (this.data.isIdCard && this.data.card_number.length > 0) {
-      new_ard_num = this.data.card_number
-    }
-    if (!this.data.isIdCard && formdata.id_card_no && formdata.id_card_no.length > 0) {
-      new_ard_num = formdata.id_card_no
-    }
-    this.setData({
-      card_number: new_ard_num,
-    })
+    // var new_ard_num = ''
+    // if (this.data.isIdCard && this.data.card_number.length > 0) {
+    //   new_ard_num = this.data.card_number
+    // }
+    // if (!this.data.isIdCard && formdata.id_card_no && formdata.id_card_no.length > 0) {
+    //   new_ard_num = formdata.id_card_no
+    // }
+    // this.setData({
+    //   card_number: new_ard_num,
+    // })
     this.goCommit(formdata);
   },
@@ -845,48 +878,50 @@ Page({
     var request_current_address = that.getCurrentAddressRequest()
     var request_birth_address = that.getBirthAddressRequest()
     var Authorization = app.globalData.Authorization;
+    console.log('long_birth_date', that.data.long_birth_date)
+
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
       method: "PUT",
       data: {
         'certification_status': that.getCertifyStatus(formdata),
-        "name": formdata.name.length > 0 ? formdata.name : that.data.name,
+        "name": that.data.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,
+        "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,
         "profession": request_profession,
         "education": that.data.degreeData.selected,
         "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no,
         "taxpayer_status": that.data.personstatusData.selected,
         "is_martyr_family": that.data.lieshuInfo.selected,
-        "martyr_family_no": formdata.martyr_family_no,
+        "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : (formdata.martyr_family_no.length > 0 ? formdata.martyr_family_no : that.data.taxInfo.martyr_family_no),
         "is_disability": that.data.disabilityInfo.selected,
-        "disability_no": formdata.disability_no,
+        "disability_no": that.data.disabilityInfo.selected == '否' ? '' : (formdata.disability_no.length > 0 ? formdata.disability_no : that.data.taxInfo.disability_no),
         "is_lonely_man": that.data.lonelyolderInfo.selected,
         "is_overseas_personnel": "否",
-        "comment": formdata.comment,
+        "comment": formdata.comment.length > 0 ? formdata.comment : that.data.taxInfo.comment,
         "current_address": request_current_address,
         "current_address_detail": formdata.current_address_detail ? formdata.current_address_detail : that.data.taxInfo.current_address_detail,
         "huji_address": request_birth_address,
-        "huji_address_detail": formdata.huji_address_detail ? formdata.huji_address_detail : that.data.taxInfo.huji_address_detail,
-        "mobile": formdata.mobile,
+        "huji_address_detail": formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, "").length > 0 ? formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, "") : that.data.huji_address_detail,
+        "mobile": that.data.mobile,
         "contact_address": request_contact_address ? request_contact_address : that.data.taxInfo.contact_address_detail,
-        "contact_address_detail": formdata.contact_address_detail,
-        "email": formdata.email,
+        "contact_address_detail": formdata.contact_address_detail.length > 0 ? formdata.contact_address_detail : that.data.taxInfo.contact_address_detail,
+        "email": formdata.email.length > 0 ? formdata.email : that.data.taxInfo.email,
         "bank": that.data.bankInfo.selected,
-        "bank_account": formdata.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,
         "is_employee": that.data.employeeInfo.selected,
         "is_specific_profession": that.data.specificIndustryInfo.selected,
         "is_investor": that.data.investInfo.selected,
         "is_business_angel": that.data.investpersonalInfo.selected,
-        "company_equity_total": parseFloat(formdata.company_equity_total),
-        "personal_equity_total": parseFloat(formdata.personal_equity_total),
-        "employee_no": formdata.employee_no
+        "company_equity_total": parseFloat(formdata.company_equity_total) > 0 ? parseFloat(formdata.company_equity_total) : that.data.taxInfo.company_equity_total,
+        "personal_equity_total": parseFloat(formdata.personal_equity_total) > 0 ? parseFloat(formdata.personal_equity_total) : that.data.taxInfo.personal_equity_total,
+        "employee_no": formdata.employee_no.length > 0 ? formdata.employee_no : that.data.taxInfo.employee_no,
       },
       header: {
         'content-type': 'application/json', // 默认值
@@ -986,7 +1021,7 @@ Page({
     })
   },
-  getCertifyStatus: function (formdata) {
+  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;
--- a/pages/main/editinfo/editinfo.wxml
查看文件 @bacd54c
+++ b/pages/main/editinfo/editinfo.wxml
查看文件 @bacd54c
@@ -15,8 +15,8 @@
           <text class='text_black_28 float_left'>姓名</text>
           <!-- <input class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'&&name?name:'请输入姓名'}}" name='name' disabled="{{taxInfo.certification_status=='active'}}"></input> -->
-          <input class='input_wrap float_right' hidden="{{taxInfo.certification_status==' active'}}" placeholder="请输入姓名" value='{{name}}' name='name' disabled="{{taxInfo.certification_status=='active'}}" ></input>
-          <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||name?name:'请输入姓名'}}" name='name' disabled="{{taxInfo.certification_status=='active'}}"></input>
+          <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入姓名" value='{{name}}' name='name' disabled="{{taxInfo.certification_status=='active'}}" maxlength='15' bindblur='bindinputname'></input>
+          <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||name?name:'请输入姓名'}}" name='name' disabled="{{taxInfo.certification_status=='active'}}" maxlength='15' bindblur='bindinputname'></input>
         </view>
         <view class="divide_line"></view>
         <!-- <view class='item_body' bindtap='openpicker'>
@@ -51,8 +51,8 @@
           <text class='text_black_28 float_left'>姓名</text>
           <!-- <input class='input_wrap float_right' placeholder-class='text_999_28' placeholder="{{taxInfo.certification_status=='active'&&name?name:'请输入姓名'}}" disabled="{{taxInfo.certification_status=='active'}}"></input> -->
-          <input class='input_wrap float_right' hidden="{{taxInfo.certification_status==' active'}}" placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active'}}" ></input>
-          <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||name?name:'请输入姓名'}}"  disabled="{{taxInfo.certification_status=='active'}}"></input>
+          <input class='input_wrap float_right' hidden="{{taxInfo.certification_status==' active'}}" placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname'></input>
+          <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||name?name:'请输入姓名'}}" disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname'></input>
         </view>
         <view class="divide_line"></view>
@@ -88,15 +88,13 @@
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
             <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
             <!-- <input class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'&&card_number?card_number:'请输入证件号码'}}" placeholder-class='text_999_28' name='id_card_no' maxlength='24' disabled="{{taxInfo.certification_status=='active'}}"></input> -->
-<input class='input_wrap float_right' hidden="{{taxInfo.certification_status==' active'}}" placeholder="请输入证件号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24'></input>
-          <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证件号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}"
-            maxlength='24'></input>
+            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证件号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24' bindblur='bindinputcardnum'></input>
+            <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证件号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}"maxlength='24' bindblur='bindinputcardnum'></input>
           </view>
           <view wx:else>
-            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status==' active'}}" placeholder="请输入证件号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24'></input>
-          <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证件号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}"
-            maxlength='24'></input>
+            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证件号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24' bindblur='bindinputcardnum'></input>
+            <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证件号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputcardnum' maxlength='24'></input>
           </view>
         </view>
         <view class="divide_line"></view>
@@ -178,7 +176,7 @@
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_666_28 float_left'>备注</text>
-            <input class='input_wrap float_right' type='number' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注'></input>
+            <input class='input_wrap float_right' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注'></input>
           </view>
         </view>
       </view>
@@ -202,9 +200,10 @@
         <view class='item_body'>
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>联系电话</text>
-          <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入电话" value='{{mobile}}' name='mobile' type='number' disabled="{{taxInfo.certification_status=='active'}}" maxlength='11'></input>
-          <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||mobile?mobile:'请输入电话'}}" name='mobile' type='number' disabled="{{taxInfo.certification_status=='active'}}"
-            maxlength='11'></input>
+          <input class='input_wrap float_right' hidden="{{isself||taxInfo.certification_status=='active'}}" placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' disabled="{{taxInfo.certification_status=='active'||isself}}" maxlength='11' bindblur='bindinputmobile'></input>
+
+          <input hidden="{{taxInfo.certification_status!='active'&&!isself}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||mobile?mobile:'请输入手机号'}}" name='mobile' type='number' disabled="{{taxInfo.certification_status=='active'||isself}}"
+            maxlength='11' bindblur='bindinputmobile'></input>
         </view>
         <!-- 非必填部分02 -->
         <view hidden='{{!isshow02}}'>
@@ -235,7 +234,7 @@
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_666_28 float_left'>电子邮箱</text>
-            <input class='input_wrap float_right' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_28'></input>
+            <input class='input_wrap float_right' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_28' maxlength='20'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class=' item_body '>
@@ -247,7 +246,7 @@
           <view class="divide_line"></view>
           <view class='item_body '>
             <text class='text_666_28 float_left '>详细地址</text>
-            <input class='input_wrap float_right ' name='current_address_detail' value='{{taxInfo.current_address_detail}}' placeholder-class='text_999_28' placeholder='请输入详细居住地址'></input>
+            <input class='input_wrap float_right ' name='current_address_detail' value="{{taxInfo.current_address_detail}}" placeholder-class='text_999_28' placeholder='请输入详细居住地址'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body '>
@@ -259,7 +258,7 @@
           <view class="divide_line"></view>
           <view class='item_body '>
             <text class='text_666_28 float_left '>详细地址</text>
-            <input class='input_wrap float_right ' name='huji_address_detail' value='{{taxInfo.huji_address_detail}} ' placeholder-class='text_999_28' placeholder='请输入详细户籍地址'></input>
+            <input class='input_wrap float_right ' name='huji_address_detail' placeholder-class='text_999_28' placeholder='请输入详细户籍地址' value='{{huji_address_detail}}'></input>
           </view>
           <view class="divide_line"></view>
         </view>
--- a/pages/main/guide/guide.wxml
查看文件 @bacd54c
+++ b/pages/main/guide/guide.wxml
查看文件 @bacd54c
 <!--pages/main/guide/guide.wxml-->
 <view class='page'>
-  <!-- <image src='/images/tax_person.png' style='height:460rpx;width:690rpx;margin:30rpx ;align-items:center' bindtap='gotaxPerson'>
-  </image>
-  <image src='/images/tax_calculate.png' style='height:460rpx;width:690rpx;margin:0 30rpx ;align-items:center' bindtap='gotaxCalculate'>
-  </image> -->
   <view class="bg_wrap">
     <image class='bgimg' src='/images/guide_bg.png'></image>
-  </view>
-  <view class='card_rectangle_bg' style='margin-top:360rpx;padding:30rpx' bindtap='gotaxPerson'>
-    <image class="icon_wrap" src="/images/taxperson.png"></image>
-    <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-    <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
-      <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>
-      <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>采集本人和家庭成员的基本信息</text>
+    <view class='card_rectangle_bg' style='margin-top:360rpx;padding:30rpx' bindtap='gotaxPerson'>
+      <image class="icon_wrap" src="/images/tax_person.png"></image>
+      <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
+      <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
+        <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>
+        <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>采集本人和家庭成员的基本信息</text>
+      </view>
+      <image class='arrow_wrap' src='/images/arrow_right.png'></image>
     </view>
-    <image class='arrow_wrap'src='/images/arrow_right.png'></image>
-  </view>
-  <view class='card_rectangle_bg' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
-    <image class="icon_wrap" src="/images/taxcalculate.png"></image>
-    <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
-    <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
-      <text style='font-size: 36rpx;color: #666;'>个税计算器</text>
-      <text style='font-size:28rpx;color: #999;margin-top:6rpx'>正在开发中</text>
+    <view class='card_rectangle_bg' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
+      <image class="icon_wrap" src="/images/tax_calculate.png"></image>
+      <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
+      <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
+        <text style='font-size: 36rpx;color: #666;'>个税计算器</text>
+        <text style='font-size:28rpx;color: #999;margin-top:6rpx'>正在开发中</text>
+      </view>
+      <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
     </view>
-    <image class='arrow_wrap float_right'src='/images/arrow_right.png'></image>
   </view>
 </view>
--- a/pages/main/guide/guide.wxss
查看文件 @bacd54c
+++ b/pages/main/guide/guide.wxss
查看文件 @bacd54c
 /* pages/main/guide/guide.wxss */
-img_wrap {
-  width: 100%;
-  height: 460rpx;
-  align-items: center;
-  margin-left: 30rpx;
-  margin-right: 30rpx;
-  border-radius: 8rpx;
-}
-
-.text_wrap1 {
-  position: relative;
-  font-family: PingFangSC-Semibold;
-  font-size: 30px;
-  color: #fff;
-  letter-spacing: 0;
-  margin-left: 90rpx;
-  margin-top: 20rpx;
-}
-
-text_wrap2 {
-  font-family: PingFang-SC-Medium;
-  font-size: 16px;
-  color: #fff;
-  letter-spacing: 0;
-}
-
 .bgimg {
   position: absolute;
   height: 400rpx;
@@ -46,7 +20,6 @@ text_wrap2 {
 }
 .bg_wrap {
-  position: relative;
   display: flex;
   flex-direction: column;
   background-color: #fff;
--- a/pages/main/home/home.js
查看文件 @bacd54c
+++ b/pages/main/home/home.js
查看文件 @bacd54c
@@ -97,6 +97,11 @@ Page({
       for (var i = 0; i < data.items.length; i++) {
         data.items[i].newmobile = this.formatMobile(data.items[i].mobile)
         data.items[i].newidnum = this.formatIdNum(data.items[i].id_card_no)
+        if (i==0){
+          data.items[i].relative = "本人"
+        }else{
+          data.items[i].relative = data.items[i].family_ties
+        }
         datalist.push(data.items[i])
       }
       this.setData({
--- a/pages/main/home/home.wxml
查看文件 @bacd54c
+++ b/pages/main/home/home.wxml
查看文件 @bacd54c
-<view class='page' >
+<view class='page'>
   <view wx:if="{{taxlist.length>0}}" hidden='{{!load_finish}}'>
     <block wx:for="{{taxlist}}" wx:key="" indx='index'>
@@ -18,31 +18,33 @@
           <text class='text_999_22'>{{item.id_card_no}}</text>
         </view>
       </view> -->
-      <view class='rectangle_solid_blue_bg' bindtap='goedit' id='{{item.id}}'>
-        <view style='padding:11px 15px'>
-          <text class='text_white_32'>{{item.name}}</text>
-          <text class='text_gray_bg text_blue_20' hidden="{{item.family_ties?false:true}}">{{item.family_ties}}</text>
+      <view bindtap='goedit' id='{{item.id}}' indx='{{index}}'>
+        <view class='rectangle_solid_blue_bg'>
+          <view style='padding:11px 15px'>
+            <text class='text_white_32'>{{item.name}}</text>
+            <text class='text_gray_bg text_blue_20' hidden="{{'本人'==item.relative}}">{{item.relative}}</text>
+            <text class='text_white_bg text_blue_20' hidden="{{'本人'!=item.relative}}">{{item.relative}}</text>
+          </view>
+          <view style='padding:0 15px'>
+            <image class='phone_image_wrap' src='/images/phone.png'></image>
+            <text class='text_white_22'>{{item.newmobile&&item.newmobile.length>0?item.newmobile:"未录入手机号码"}}</text>
+            <text style='margin:0rpx 20rpx;color:#fff;font-size: 20rpx;'>|</text>
+            <image class='id_image_wrap' src='/images/id.png'></image>
+            <text class='text_white_22'>{{item.newidnum&&item.newidnum.length>0?item.newidnum:"未录入证件号码  "}}</text>
+          </view>
         </view>
-        <view style='padding:0 15px'>
-          <image class='phone_image_wrap' src='/images/phone.png'></image>
-          <text class='text_white_22'>{{item.newmobile&&item.newmobile.length>0?item.newmobile:"未录入手机号码"}}</text>
-          <text style='margin:0rpx 20rpx;color:#fff;font-size: 20rpx;'>|</text>
-          <image class='id_image_wrap' src='/images/id.png'></image>
-          <text class='text_white_22'>{{item.newidnum&&item.newidnum.length>0?item.newidnum:"未录入证件号码  "}}</text>
-        </view>
-      </view>
-      <view class='rectangle_solid_bg'  >
-        <view style='padding: 0 15px '>
-          <image class='arrow_wrap' src='/images/arrow_right.png'> </image>
-          <text class='text_999_28' >{{text_tip}}</text>
+        <view class='rectangle_solid_bg'>
+          <view style='padding: 0 15px '>
+            <image class='arrow_wrap' src='/images/arrow_right.png'> </image>
+            <text class='text_999_28'>{{text_tip}}</text>
+          </view>
         </view>
-
       </view>
     </block>
   </view>
-  <view class='rectangle_dashed_bg' bindtap="goadd" >
+  <view class='rectangle_dashed_bg' bindtap="goadd">
     <view class='text_blue_28' style='text-align:center'>
       十 添加家庭成员
     </view>
--- a/pages/main/home/home.wxss
查看文件 @bacd54c
+++ b/pages/main/home/home.wxss
查看文件 @bacd54c
@@ -33,8 +33,14 @@
 .text_gray_bg {
   height: 32rpx;
   margin: 0rpx 20rpx;
-  opacity: 0.5;
-  background: #DFECFE;
+  background-color: #DFECFE;
+  border-radius: 16px;
+}
+
+.text_white_bg {
+  height: 32rpx;
+  margin: 0rpx 20rpx;
+  background: #fff;
   border-radius: 16px;
 }