优化

wangyu
app.js
pages/main/addinfo/addinfo.js
pages/main/addinfo/addinfo.wxml
pages/main/editinfo/editinfo.js
pages/main/editinfo/editinfo.wxml
pages/main/home/home.js
pages/main/home/home.wxml
--- a/app.js
查看文件 @4dae7dc
+++ b/app.js
查看文件 @4dae7dc
@@ -62,7 +62,6 @@ App({
           if (relaunch) {
             wx.reLaunch({ //重新加载
               url: '../home/home'
-              // url: '../../getPhone/getPhone'
             })
           }
         }
--- a/pages/main/addinfo/addinfo.js
查看文件 @4dae7dc
+++ b/pages/main/addinfo/addinfo.js
查看文件 @4dae7dc
@@ -36,7 +36,7 @@ Page({
       bindtype: 'personstatus',
       selected: '',
       placeholder: '请选择纳税人状态',
-      values: ["正常(在职)", "非正常"],
+      values: ["正常", "非正常"],
       onChange: 'onPickerSelect'
     },
     cardtypeData: {
@@ -349,7 +349,7 @@ Page({
       key: 'id_info',
       success: function(res) {
         console.log('id_info', res.data)
-        if (res.data && res.data.id_card_number) {
+        if (res.data && res.data.length>0) {
           var id_info = JSON.parse(res.data)
           var birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day;
@@ -357,13 +357,27 @@ Page({
           cardtype_Data.selected = '居民身份证'
           var gender_Data = that.data.genderData
           gender_Data.selected = id_info.gender
+
+          that.data.birthDate.selected = birth_day
+          
+          if (that.data.name.length > 0 && id_info.name != that.data.name){
+            that.showtoast("证照与所填姓名冲突")
+            return
+          }
+          if (that.data.card_number.length > 0 && id_info.card_number != that.data.id_card_no) {
+            that.showtoast("证照与所填证照号码冲突")
+            return
+          }
           that.setData({
             name: id_info.name,
             birthday: birth_day,
             cardtypeData: cardtype_Data,
             genderData: gender_Data,
+            birthDate: that.data.birthDate,
             card_number: id_info.id_card_number
           })
+          console.log('-cardtypeData--', that.data.cardtypeData)
+          
         }
       },
     })
--- a/pages/main/addinfo/addinfo.wxml
查看文件 @4dae7dc
+++ b/pages/main/addinfo/addinfo.wxml
查看文件 @4dae7dc
@@ -30,7 +30,8 @@
     <!-- 基本信息 -->
     <view class='head_wrap' bindtap='span' id='1'>
       <text class='head_text_wrap1'>基本信息</text>
-      <text class='head_text_wrap2'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap2' hidden='{{!isshow01}}'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap2' hidden='{{isshow01}}'>（点击展开非必填选项）</text>
       <view style='float:right' wx:if='{{isshow01}}'>
         <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
       </view>
@@ -52,7 +53,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' value='中国'></input>
+         <text class='text_999_28 float_right' >中国</text>
         </view>
         <view class="divide_line"></view>
@@ -82,7 +83,7 @@
             <text class='text_333_28 float_right'>{{card_number}}</text>
           </view>
           <view wx:else>
-            <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_999_28' name='id_card_no'></input>
+            <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_999_28' name='id_card_no' maxlength='24'></input>
           </view>
         </view>
         <view class="divide_line"></view>
@@ -128,7 +129,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='taxpayer_no' type='number'  placeholder-class='text_999_28' placeholder='请输入纳税人识别号'></input>
+            <input class='input_wrap float_right' name='taxpayer_no' type='number'  placeholder-class='text_999_28' placeholder='请输入纳税人识别号' maxlength='24'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -137,10 +138,10 @@
             <text class='text_333_28 float_right'></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...disabilityInfo}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
+          <view class="divide_line" hidden="{{disabilityInfo.selected!='是'}}"></view>
+          <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}">
             <text class='text_666_28 float_left'>残疾证号</text>
-            <input class='input_wrap float_right' name='disability_no' type='number'  placeholder-class='text_999_28' placeholder='请输入残疾证号'></input>
+            <input class='input_wrap float_right' name='disability_no' type='number'  placeholder-class='text_999_28' placeholder='请输入残疾证号' maxlength='24'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -149,10 +150,10 @@
             <text class='text_333_28 float_right'></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...lieshuInfo}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
+          <view class="divide_line" hidden="{{lieshuInfo.selected!='是'}}"></view>
+          <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}">
             <text class='text_666_28 float_left'>烈属证号</text>
-            <input class='input_wrap float_right' name='martyr_family_no' type='number'  placeholder-class='text_999_28' placeholder='请输入烈属证号'></input>
+            <input class='input_wrap float_right' name='martyr_family_no' type='number'  placeholder-class='text_999_28' placeholder='请输入烈属证号' maxlength='24'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -161,6 +162,11 @@
             <text class='text_333_28 float_right'></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...lonelyolderInfo}}" />
+          <view class="divide_line"></view>
+          <view class='item_body'>
+            <text class='text_666_28 float_left'>备注</text>
+            <input class='extra_input float_right' type='number' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注' ></input>
+          </view>
         </view>
       </view>
     </view>
@@ -168,7 +174,8 @@
     <!-- 联系方式 -->
     <view class='head_wrap' style='margin-top:20rpx' bindtap='span' id='2'>
       <text class='head_text_wrap1'>联系方式</text>
-      <text class='head_text_wrap2'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap2' hidden='{{!isshow02}}'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap2' hidden='{{isshow02}}'>（点击展开非必填选项）</text>
       <view style='float:right' wx:if='{{isshow02}}'>
         <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
       </view>
@@ -182,7 +189,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='请填写电话' value='{{taxInfo.mobile}}' name='mobile' type='number'  placeholder-class='text_999_28'></input>
+          <input class='input_wrap float_right' placeholder='请输入手机号' value='{{taxInfo.mobile}}' name='mobile' type='number'  placeholder-class='text_999_28' maxlength='11'></input>
         </view>
         <!-- 非必填部分02 -->
         <view hidden='{{!isshow02}}'>
@@ -208,7 +215,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='bank_account'  placeholder-class='text_999_28' placeholder='请输入银行账号'></input>
+            <input class='input_wrap float_right' name='bank_account'  placeholder-class='text_999_28' placeholder='请输入银行账号' maxlength='24'></input>
           </view>
           <view class="divide_line"></view>
           <view class='item_body'>
@@ -247,8 +254,9 @@
     <!-- 任职雇佣信息 -->
     <view class='head_wrap' style='margin-top:20rpx' bindtap='span' id='3'>
-      <text class='head_text_wrap1'>任职雇佣信息</text>
-      <text class='head_text_wrap2'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap1'>任职受雇信息</text>
+      <text class='head_text_wrap2' hidden='{{!isshow03}}'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap2' hidden='{{isshow03}}'>（点击展开非必填选项）</text>
       <view style='float:right' wx:if='{{isshow03}}'>
         <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
       </view>
@@ -285,7 +293,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='company_equity_total' type='digit'  placeholder-class='text_999_28' placeholder='请输入公司股本总额'></input>
+            <input class='input_wrap float_right' name='company_equity_total' type='digit'  placeholder-class='text_999_28' placeholder='请输入公司股本总额' maxlength='20'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -305,7 +313,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='employee_no' type='number'  placeholder-class='text_999_28' placeholder='请输入工号'></input>
+            <input class='input_wrap float_right' name='employee_no' type='number'  placeholder-class='text_999_28' placeholder='请输入工号' maxlength='24'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -314,19 +322,19 @@
             <text class='text_333_28 float_right'></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
+          <view class="divide_line" hidden="{{investpersonalInfo.selected!='是'}}"></view>
+          <view class='item_body' hidden="{{investpersonalInfo.selected!='是'}}">
             <text class='text_666_28 float_left'>个人投资总额</text>
-            <input class='input_wrap float_right' name='personal_equity_total' type='digit'  placeholder-class='text_999_28' placeholder='请输入个人投资总额'></input>
+            <input class='input_wrap float_right' name='personal_equity_total' type='digit'  placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input>
           </view>
           <view class="divide_line"></view>
         </view>
-
+<!-- 
         <view style='width:100%'>
           <text class='text_666_28 float_left'>备注</text>
           <input class='extra_input float_right' value='' name='comment'></input>
-        </view>
+        </view> -->
       </view>
     </view>
--- a/pages/main/editinfo/editinfo.js
查看文件 @4dae7dc
+++ b/pages/main/editinfo/editinfo.js
查看文件 @4dae7dc
@@ -16,12 +16,12 @@ Page({
     banklist: {},
     cur_id: '',
     isself: true,
-    isIdCard:true,
-    profession_haschanges:false,
+    isIdCard: true,
+    profession_haschanges: false,
     name: '',
-    mobile:'',
+    mobile: '',
     card_number: '',
-    long_birth_date:0,
+    long_birth_date: 0,
     long_start_date: 0,
     long_end_date: 0,
     relativeData: {
@@ -40,7 +40,7 @@ Page({
       bindtype: 'personstatus',
       placeholder: '请选择纳税人状态',
       selected: '',
-      values: ["正常(在职)", "非正常"],
+      values: ["正常", "非正常"],
       onChange: 'onPickerSelect'
     },
     cardtypeData: {
@@ -85,7 +85,7 @@ Page({
       multiIndex: [0, 0, 0],
       placeholder: '请选择职业',
       selected: '',
-      range_key:'label',
+      range_key: 'label',
       onChange: 'onPickerSelect'
     },
     degreeData: {
@@ -210,7 +210,7 @@ Page({
       placeholder: '请选择户籍所在地',
       onChange: 'birthAddressSelect'
     },
-    title:'',
+    title: '',
     condition: false
   },
@@ -224,7 +224,7 @@ Page({
         cur_id: options.id
       })
       this.getpersonalTax(options.id)
-    } 
+    }
     this.getproffessiondata()
     this.getbanklist()
   },
@@ -240,7 +240,7 @@ Page({
         "Authorization": Authorization
       },
       success: function(res) {
-        console.log('taxInfo',res)
+        console.log('taxInfo', res)
         that.setData({
           taxInfo: res.data,
           isself: res.data.family_ties ? false : true
@@ -252,9 +252,9 @@ Page({
       }
     })
   },
-  
+
   //对各参数初始赋值
-  handleDatas:function(){
+  handleDatas: function() {
     var tax_info = this.data.taxInfo
     this.data.name = tax_info.name
     this.data.relativeData.selected = tax_info.family_ties
@@ -276,22 +276,22 @@ Page({
     this.data.lieshuInfo.selected = tax_info.is_martyr_family
     this.data.lonelyolderInfo.selected = tax_info.is_lonely_man
     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.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.employeeInfo.selected = tax_info.is_employee
     this.data.investpersonalInfo.selected = tax_info.is_business_angel
     this.setData({
       relativeData: this.data.relativeData,
-      name:this.data.name,
+      name: this.data.name,
       personstatusData: this.data.personstatusData,
       cardtypeData: this.data.cardtypeData,
       mobile: this.data.mobile,
       investInfo: this.data.investInfo,
       specificIndustryInfo: this.data.specificIndustryInfo,
       genderData: this.data.genderData,
-      
-      professionData:this.data.professionData,
+
+      professionData: this.data.professionData,
       degreeData: this.data.degreeData,
       disabilityInfo: this.data.disabilityInfo,
       lieshuInfo: this.data.lieshuInfo,
@@ -299,7 +299,7 @@ Page({
       contactaddressInfo: this.data.contactaddressInfo,
       currentaddressInfo: this.data.currentaddressInfo,
       birthaddressInfo: this.data.birthaddressInfo,
-      employeeInfo:this.data.employeeInfo,
+      employeeInfo: this.data.employeeInfo,
       investpersonalInfo: this.data.investpersonalInfo,
       long_birth_date: tax_info.birth_date,
@@ -308,12 +308,13 @@ Page({
       startDate: this.data.startDate,
       long_end_date: tax_info.separate_date,
       endDate: this.data.endDate,
+      isIdCard: '居民身份证' == tax_info.id_card_type?true:false,
       card_number: this.data.card_number
     })
   },
-  getproffessiondata: function () {
+  getproffessiondata: function() {
     var that = this
     var Authorization = app.globalData.Authorization;
     var proffession_info = that.data.professionData
@@ -324,7 +325,7 @@ Page({
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      success: function (res) {
+      success: function(res) {
         proffession_info.values = that.handleProfession(res.data.items)
         console.log('proffession_info------', proffession_info)
         that.setData({
@@ -338,7 +339,7 @@ Page({
     })
   },
-  handleProfession: function (items) {
+  handleProfession: function(items) {
     var new_profession_data = []
     var list = [],
       tempTwo = {},
@@ -491,13 +492,13 @@ Page({
         var is_idcard = this.data.isIdCard
         var cardtype_data = this.data.cardtypeData
         cardtype_data.selected = cardtype_data.values[e.detail.value]
-        if (0 == e.detail.value){
+        if (0 == e.detail.value) {
           is_idcard = true
-        }else{
+        } else {
           is_idcard = false
         }
         this.setData({
-          isIdCard:is_idcard,
+          isIdCard: is_idcard,
           cardtypeData: cardtype_data
         })
         break;
@@ -528,7 +529,7 @@ Page({
         var profession_name = profession_data.values[e.detail.value[e.detail.value[0]]][0].children[e.detail.value[1]].children[e.detail.value[2]].label
         profession_data.selected = profession_name
         this.setData({
-          profession_haschanges:true,
+          profession_haschanges: true,
           profession_index: e.detail.value,
           professionData: profession_data
         })
@@ -594,7 +595,7 @@ Page({
   },
   // =============日期picker选中处理==============
-  birthdayChange: function (e) {
+  birthdayChange: function(e) {
     var birth_date = this.data.birthDate;
     birth_date.selected = e.detail.value
     console.log('birthdayChange', Date.parse(new Date(e.detail.value)))
@@ -605,7 +606,7 @@ Page({
     })
   },
-  startChange: function (e) {
+  startChange: function(e) {
     var start_date = this.data.startDate;
     start_date.selected = e.detail.value
     this.setData({
@@ -613,7 +614,7 @@ Page({
     })
   },
-  endChange: function (e) {
+  endChange: function(e) {
     var end_date = this.data.endDate;
     end_date.selected = e.detail.value
     this.setData({
@@ -623,7 +624,7 @@ Page({
   // =============地区picker选中处理==============
-  contactAddressSelect: function (e) {
+  contactAddressSelect: function(e) {
     // console.log('contactAddressSelect', e)
     var contact_address = this.data.contactaddressInfo;
     contact_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
@@ -635,10 +636,10 @@ Page({
     console.log('contactaddressInfo', this.data.contactaddressInfo)
   },
-  currentAddressSelect: function (e) {
+  currentAddressSelect: function(e) {
     // console.log('currentAddressSelect', e)
     var current_address = this.data.currentaddressInfo;
-    current_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2] 
+    current_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
     current_address.address_value = e.detail.value
     current_address.address_code = e.detail.code
     this.setData({
@@ -646,7 +647,7 @@ Page({
     })
   },
-  birthAddressSelect: function (e) {
+  birthAddressSelect: function(e) {
     // console.log('birthAddressSelect', e)
     var birth_address = this.data.birthaddressInfo;
     birth_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
@@ -662,24 +663,24 @@ Page({
   getIdInfo: function(e) {
-    if(this.data.isIdCard){
+    if (this.data.isIdCard) {
       wx.navigateTo({
         url: '../idinfo/idinfo',
-        success: function (res) { },
+        success: function(res) {},
       })
     }
   },
-  formSubmit: function (e) {
+  formSubmit: function(e) {
     console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
     var formdata = e.detail.value;
     console.log("formdata", formdata)
     console.log("card_number", this.data.card_number)
-    if (formdata.name.length < 1) {
+    if (this.data.name&&this.data.name.length < 1 && formdata.name.length < 1) {
       this.showtoast('请输入姓名');
       return
-    } else if (!this.data.isself&&this.data.relativeData.selected.length < 1) {
+    } else if (!this.data.isself && this.data.relativeData.selected.length < 1) {
       this.showtoast('请选择成员关系');
       return
     } else if (this.data.personstatusData.selected.length < 1) {
@@ -717,14 +718,14 @@ Page({
     this.goCommit(formdata);
   },
-  goCommit: function (data) {
+  goCommit: function(data) {
     var that = this
     var formdata = data
     console.log("form_data", formdata);
     var request_profession = that.getProfessionRequest()
     var Authorization = app.globalData.Authorization;
     wx.request({
-      url: baseUrl + 'persontax/v1/personal-taxes/'+that.data.cur_id,
+      url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
       method: "PUT",
       data: {
         "name": that.data.name.length > 0 ? that.data.name : form_data.name,
@@ -790,7 +791,7 @@ Page({
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      success: function (res) {
+      success: function(res) {
         console.log(res)
         wx.redirectTo({
           url: '../home/home',
@@ -802,10 +803,10 @@ Page({
     })
   },
-  getProfessionRequest:function(){
+  getProfessionRequest: function() {
     var that = this
     var pro_index = that.data.profession_index
-    if (that.data.profession_haschanges&&pro_index.length==3){
+    if (that.data.profession_haschanges && 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 {
@@ -816,14 +817,14 @@ Page({
         "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  that.data.taxInfo.profession
+    } else {
+      return that.data.taxInfo.profession
     }
   },
-  showtoast: function (title) {
+  showtoast: function(str) {
     wx.showToast({
-      title: title,
+      title: str,
     })
   },
--- a/pages/main/editinfo/editinfo.wxml
查看文件 @4dae7dc
+++ b/pages/main/editinfo/editinfo.wxml
查看文件 @4dae7dc
@@ -30,7 +30,8 @@
     <!-- 基本信息 -->
     <view class='head_wrap' bindtap='span' id='1'>
       <text class='head_text_wrap1'>基本信息</text>
-      <text class='head_text_wrap2'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap2' hidden='{{!isshow01}}'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap2' hidden='{{isshow01}}'>（点击展开非必填选项）</text>
       <view style='float:right' wx:if='{{isshow01}}'>
         <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
       </view>
@@ -52,7 +53,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' value='中国'></input>
+          <text class='text_999_28 float_right'>中国</text>
         </view>
         <view class="divide_line"></view>
@@ -82,7 +83,7 @@
             <text class='text_333_28 float_right'>{{card_number}}</text>
           </view>
           <view wx:else>
-            <input class='input_wrap float_right' placeholder='请输入证件号码' value='{{card_number}}' name='id_card_no' ></input>
+            <input class='input_wrap float_right' placeholder='请输入证件号码' value='{{card_number}}' name='id_card_no' maxlength='24'></input>
           </view>
         </view>
         <view class="divide_line"></view>
@@ -128,7 +129,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='taxpayer_no' type='number' value='{{taxInfo.taxpayer_no}}'  placeholder-class='text_999_28' placeholder='请输入纳税人识别号'></input>
+            <input class='input_wrap float_right' name='taxpayer_no' type='number' value='{{taxInfo.taxpayer_no}}' placeholder-class='text_999_28' placeholder='请输入纳税人识别号' maxlength='24'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -137,10 +138,10 @@
             <text class='text_333_28 float_right'></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...disabilityInfo}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
+          <view class="divide_line" hidden="{{disabilityInfo.selected!='是'}}"></view>
+          <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}">
             <text class='text_666_28 float_left'>残疾证号</text>
-            <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}'  placeholder-class='text_999_28' placeholder='请输入残疾证号'></input>
+            <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_28' placeholder='请输入残疾证号' maxlength='24'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -149,10 +150,10 @@
             <text class='text_333_28 float_right'></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...lieshuInfo}}" />
-          <view class="divide_line"></view>
-          <view class='item_body'>
+          <view class="divide_line" hidden="{{lieshuInfo.selected!='是'}}"></view>
+          <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}">
             <text class='text_666_28 float_left'>烈属证号</text>
-            <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}'  placeholder-class='text_999_28' placeholder='请输入烈属证号'></input>
+            <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}' placeholder-class='text_999_28' placeholder='请输入烈属证号' maxlength='24'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -161,6 +162,11 @@
             <text class='text_333_28 float_right'></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...lonelyolderInfo}}" />
+          <view class="divide_line"></view>
+          <view class='item_body'>
+            <text class='text_666_28 float_left'>备注</text>
+            <input class='extra_input float_right' type='number' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注' ></input>
+          </view>
         </view>
       </view>
     </view>
@@ -168,7 +174,8 @@
     <!-- 联系方式 -->
     <view class='head_wrap' style='margin-top:20rpx' bindtap='span' id='2'>
       <text class='head_text_wrap1'>联系方式</text>
-      <text class='head_text_wrap2'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap2' hidden='{{!isshow02}}'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap2' hidden='{{isshow02}}'>（点击展开非必填选项）</text>
       <view style='float:right' wx:if='{{isshow02}}'>
         <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
       </view>
@@ -182,7 +189,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='请填写电话' value='{{mobile}}' name='mobile' type='number' disabled='{{disabled}}'></input>
+          <input class='input_wrap float_right' placeholder='请填写电话' value='{{mobile}}' name='mobile' type='number' disabled='true' maxlength='11'></input>
         </view>
         <!-- 非必填部分02 -->
         <view hidden='{{!isshow02}}'>
@@ -208,12 +215,12 @@
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_666_28 float_left'>银行账号</text>
-            <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}'  placeholder-class='text_999_28' placeholder='请输入银行账号'></input>
+            <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_28' placeholder='请输入银行账号' maxlength='24'></input>
           </view>
           <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'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class=' item_body '>
@@ -225,7 +232,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 '>
@@ -247,8 +254,9 @@
     <!-- 任职雇佣信息 -->
     <view class='head_wrap ' style='margin-top:20rpx ' bindtap='span' id='3'>
-      <text class='head_text_wrap1 '>任职雇佣信息</text>
-      <text class='head_text_wrap2 '>（点击收起非必填选项）</text>
+      <text class='head_text_wrap1 '>任职受雇信息</text>
+      <text class='head_text_wrap2' hidden='{{!isshow03}}'>（点击收起非必填选项）</text>
+      <text class='head_text_wrap2' hidden='{{isshow03}}'>（点击展开非必填选项）</text>
       <view style='float:right ' hidden='{{!isshow03}}'>
         <image class='head_image_wrap_up ' src='/images/arrow_up.png '></image>
       </view>
@@ -285,7 +293,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='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}'  placeholder-class='text_999_28' placeholder='请输入股本总额'></input>
+            <input class='input_wrap float_right ' name='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}' placeholder-class='text_999_28' placeholder='请输入股本总额' maxlength='20'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body '>
@@ -306,7 +314,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='employee_no' type='number' value='{{taxInfo.employee_no}}'  placeholder-class='text_999_28' placeholder='请输入工号'></input>
+            <input class='input_wrap float_right ' name='employee_no' type='number' value='{{taxInfo.employee_no}}' placeholder-class='text_999_28' placeholder='请输入工号' maxlength='20'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body '>
@@ -315,19 +323,19 @@
             <text class='text_333_28 float_right '></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
-          <view class="divide_line"></view>
-          <view class='item_body '>
+          <view class="divide_line" hidden="{{investpersonalInfo.selected!='是'}}"></view>
+          <view class='item_body ' hidden="{{investpersonalInfo.selected!='是'}}">
             <text class='text_666_28 float_left '>个人投资总额</text>
-            <input class='input_wrap float_right ' name='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}'  placeholder-class='text_999_28' placeholder='请输入个人投资总额'></input>
+            <input class='input_wrap float_right ' name='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}' placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input>
           </view>
           <view class="divide_line"></view>
         </view>
-        <view style='width:100% '>
+        <!-- <view style='width:100% '>
           <text class='text_666_28 float_left '>备注</text>
-          <input class='extra_input' style='text-aligh: right' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注'></input>
-        </view>
+          <input class='extra_input' style='text-aligh: right' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注'></input>
+        </view> -->
       </view>
     </view>
@@ -335,7 +343,7 @@
     <view class="btn_bottom">
       <button class="btn_bottom" formType="submit"> 保存</button>
     </view>
-   
+
   </form>
 </view>
--- a/pages/main/home/home.js
查看文件 @4dae7dc
+++ b/pages/main/home/home.js
查看文件 @4dae7dc
@@ -7,36 +7,37 @@ Page({
    * 页面的初始数据
    */
   data: {
-    taxlist:['']
+    text_tip: "去完善",
+    taxlist: ['']
   },
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-    
+  onLoad: function(options) {
+
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
-  
+  onReady: function() {
+
   },
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
+  onShow: function() {
     this.getTaxList()
   },
-  getTaxList:function(){
+  getTaxList: function() {
     var that = this;
     var Authorization = app.globalData.Authorization;
-    console.log('Authorization',Authorization)
-    if(!Authorization||Authorization.length<10){
-      return 
+    console.log('Authorization', Authorization)
+    if (!Authorization || Authorization.length < 10) {
+      return
     }
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes',
@@ -45,14 +46,17 @@ Page({
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      data:{
-        'all':true
+      data: {
+        'all': true
       },
-      success: function (res) {
+      success: function(res) {
         console.log(res.data)
         that.setData({
-          taxlist:res.data.items
+          taxlist: res.data.items
         })
+        if (res.data.items && res.data.items.length > 0) {
+          that.getStatus(res.data.items)
+        }
       },
       fail(res) {
         console.log(res.data)
@@ -60,14 +64,27 @@ Page({
     })
   },
-  goadd:function(e){
+  getStatus: function(data) {
+    console.log('data', data )
+    if (data[0].family_ties.length < 1 && data[0].name.length > 0 && data[0].taxpayer_status.length > 0 && data[0].id_card_type.length > 0 && data[0].id_card_no.length > 0 && data[0].mobile.length > 0 && data[0].is_investor.length > 0 && data[0].is_specific_profession.length > 0) {
+      this.setData({
+        text_tip: '去查看'
+      })
+    } else {
+      this.setData({
+        text_tip: '去完善'
+      })
+    }
+  },
+
+  goadd: function(e) {
     console.log(e)
     wx.navigateTo({
       url: '../addinfo/addinfo',
     })
   },
-  goedit: function (e) {
+  goedit: function(e) {
     console.log(e)
     wx.navigateTo({
       url: '../editinfo/editinfo?id=' + e.currentTarget.id,
@@ -77,35 +94,35 @@ Page({
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {
-  
+  onHide: function() {
+
   },
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
-  
+  onUnload: function() {
+
   },
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {
-  
+  onPullDownRefresh: function() {
+
   },
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
-  
+  onReachBottom: function() {
+
   },
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-  
+  onShareAppMessage: function() {
+
   }
 })
--- a/pages/main/home/home.wxml
查看文件 @4dae7dc
+++ b/pages/main/home/home.wxml
查看文件 @4dae7dc
@@ -34,7 +34,7 @@
       <view class='rectangle_solid_bg' bindtap='goedit' id='{{item.id}}'>
         <view style='padding: 0 15px '>
           <image class='arrow_wrap' src='/images/arrow_right.png'> </image>
-          <text class='text_999_28'>去完善</text>
+          <text class='text_999_28' >{{text_tip}}</text>
         </view>
       </view>