Merge branch '机器人dev' of http://192.144.137.25:8888/wangyu/naturalPersonTax into 机器人dev

@@ -110,7 +110,7 @@ Page({
       selected: '',
       isrequre: true,
       isblack: 'true',
-      values: ["0%", "50%", "100%"],
+      values: ["50%", "100%"],
       placeholder: '请选择分配比例',
       onChange: 'onPickerSelect'
     },
@@ -481,7 +481,7 @@ Page({
       label: '就读国家(地区)',
       bindtype: 'school_country',
       isrequre: true,
-      // selected: '中国',
+      selected: '',
       // isblack: 'true',
       values: [],
       placeholder: '请选择就读国家(地区)',
@@ -492,7 +492,7 @@ Page({
       bindtype: 'country',
       isrequre: true,
       // disabled: true,
-      selected: '中国',
+      selected: '',
       // range_key:'name',
       placeholder: '请选择国籍',
       onChange: 'onPickerSelect',
@@ -501,7 +501,7 @@ Page({
       label: '国籍',
       bindtype: 'lover_country',
       // isrequre: true,
-      selected: '中国',
+      selected: '',
       placeholder: '请选择国籍',
       onChange: 'onPickerSelect',
     },
@@ -509,7 +509,7 @@ Page({
       label: '被赡养人国籍',
       bindtype: 'older_country',
       isrequre: true,
-      selected: '中国',
+      selected: '',
       placeholder: '请选择国籍',
       onChange: 'onPickerSelect',
     },

@@ -70,9 +70,13 @@
       <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...schoolCountryData}}" />
       <view class='divide_line_30'></view>
-      <view style='height:90rpx'>
-        <text wx:if="{{!child_edu_pre}}" class='red_star_right_10'>*</text>
-        <text class="text_777_30 float_left {{child_edu_pre==true?'head_in':''}}">就读学校名称</text>
+      <view wx:if="{{child_edu_pre}}" style='height:90rpx'>
+        <text class="text_777_30 float_left head_in}}">就读学校名称</text>
+        <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入就读学校' name='school_name' value='{{school_name}}'></input>
+      </view>
+      <view wx:if="{{!child_edu_pre}}" style='height:90rpx'>
+        <text class='red_star_right_10'>*</text>
+        <text class="text_777_30 float_left}">就读学校名称</text>
         <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入就读学校' name='school_name' value='{{school_name}}'></input>
       </view>
     </view>