yh

@@ -11,30 +11,9 @@
 
     <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}}" class="text_333_28 float_right">{{selected}}</view>
-        <view wx:elif="{{placeholder}}" class="text_999_28 float_right">{{placeholder}}</view>
+        <view wx:if="{{selected&&!disabled}}" class="text_333_28 float_right">{{selected}}</view>
+        <view wx:else class="text_999_28 float_right">{{selected?selected:placeholder}}</view>
       </picker>
     </view>
   </view>
 </template>
-
-<template name="picker_cell_muti">
-  <view class='item_body'>
-    <text hidden='{{!isrequre}}' style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
-    <view wx:if='{{isrequre}}'>
-      <text class='text_black_28 float_left'>{{label}}</text>
-    </view>
-    <view wx:else>
-      <text class='text_666_28 float_left'>{{label}}</text>
-    </view>
-    <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-
-    <view class="weui-cell__bd">
-      <picker mode="{{mode?mode:'multiSelector'}}" range-key="{{range_key}}" range="{{values}}" bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}" id='{{bindtype}}'>
-        <view wx:if="{{true}}" class="text_333_28 float_right">{{selected}}</view>
-        <view wx:elif="{{placeholder}}" class="text_333_28 float_right">{{placeholder}}</view>
-      </picker>
-    </view>
-
-  </view>
-</template>
\ No newline at end of file

@@ -279,7 +279,7 @@ Page({
     this.data.name = tax_info.name
     if (this.data.isself) {
       this.data.relativeData.disabled = true
-      this.data.relativeData.placeholder = tax_info.family_ties
+      this.data.relativeData.selected = tax_info.family_ties
     } else {
       this.data.relativeData.disabled = false
       this.data.relativeData.selected = tax_info.family_ties
@@ -287,6 +287,7 @@ Page({
     if (tax_info.real_auth_status == 'active') {
       this.data.genderData.disabled = true
       this.data.birthDate.disabled = true
+      this.data.cardtypeData.disabled = true
     }
 
     this.data.personstatusData.selected = tax_info.taxpayer_status
@@ -784,7 +785,7 @@ Page({
     } else if (!regname.test(formdata.name)) {
       this.showtoast('请输入正确姓名');
       return
-    } else if (!this.data.isself && this.data.relativeData.placeholder.length < 1) {
+    } else if (!this.data.isself && this.data.relativeData.selected.length < 1) {
       this.showtoast('有必填项未填写');
       return
     } else if (this.data.personstatusData.selected.length < 1) {

@@ -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'  disabled="{{taxInfo.real_auth_status=='active'}}" value='{{name}}'></input>
+          <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&name?name:'请输入姓名'}}" name='name'  disabled="{{taxInfo.real_auth_status=='active'}}" ></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-class='text_999_28' placeholder="{{name?name:'请填写姓名'}}" disabled="{{taxInfo.real_auth_status=='active'}}" ></input>
+          <input class='input_wrap float_right'  placeholder-class='text_999_28' placeholder="{{taxInfo.real_auth_status=='active'&&name?name:'请输入姓名'}}"   disabled="{{taxInfo.real_auth_status=='active'}}" ></input>
         </view>
         <view class="divide_line"></view>
 
@@ -81,10 +81,10 @@
           <view wx:if="{{isIdCard}}"   >
             <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='请输入证件号码'  placeholder-class='text_999_28' name='id_card_no' maxlength='24' value='{{card_number}}' disabled="{{taxInfo.real_auth_status=='active'}}"></input>
+             <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&card_number?card_number:'请输入证件号码'}}"  placeholder-class='text_999_28' name='id_card_no' maxlength='24'  disabled="{{taxInfo.real_auth_status=='active'}}"></input>
           </view>
           <view wx:else>
-            <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_999_28' name='id_card_no' maxlength='24' value='{{card_number}}' disabled="{{taxInfo.real_auth_status=='active'}}"></input>
+            <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&card_number?card_number:'请输入证件号码'}}"placeholder-class='text_999_28' name='id_card_no' maxlength='24' disabled="{{taxInfo.real_auth_status=='active'}}"></input>
           </view>
         </view>
         <view class="divide_line"></view>
@@ -190,7 +190,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='{{isself}}' maxlength='11'></input>
+          <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&mobile?mobile:'请输入电话'}}"name='mobile' type='number' disabled='{{isself}}' maxlength='11'></input>
         </view>
         <!-- 非必填部分02 -->
         <view hidden='{{!isshow02}}'>