Merge branch 'dev_py' into dev2.0

@@ -170,4 +170,10 @@
 }
 .head_in{
   margin-left: 26rpx;
+}
+/*---------行数控制，溢出部分显示‘...’-------*/
+.text-single{
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space:nowrap; 
 }
\ No newline at end of file

@@ -14,8 +14,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}}'>
-        <text wx:if="{{selected&&disabled}}" class="text_black_30 float_right" style='line-height: 90rpx;'>{{selected}}</text>
-        <text wx:elif="{{selected}}" class="text_black_30 float_right " style='line-height: 90rpx;'>{{selected}}</text>
+        <text wx:if="{{selected&&disabled}}" class="text_black_30 float_right text-single" style='line-height: 90rpx;text-align:right;max-width:{{maxWidth}}rpx;'>{{selected}}</text>
+        <text wx:elif="{{selected}}" class="text_black_30 float_right text-single" style="line-height: 90rpx;text-align:right;max-width:{{maxWidth}}rpx;">{{selected}}</text>
         <text wx:else class="text_999_30 float_right " style='line-height: 90rpx;'>{{placeholder}}</text>
       </picker>
     </view>

@@ -377,7 +377,7 @@ Page({
       label: '租赁房屋坐落地址',
       mode: 'region',
       isrequre: true,
-      isrequre: true,
+      maxWidth: 375,
       bindtype: 'rent_house_locate',
       isblack: 'true',
       address_code: ['', '', ''],

@@ -65,6 +65,7 @@ Page({
     bankInfo: {
       label: '开户银行',
       bindtype: 'bank',
+      maxWidth:490,
       placeholder: '请选择开户银行',
       selected: '',
       onChange: 'onPickerSelect'
@@ -197,6 +198,7 @@ Page({
     },
     currentaddressInfo: {
       label: '经常居住地址',
+      maxWidth: 430,
       mode: 'region',
       address_code: ['', '', ''],
       address_value: ['', '', ''],
@@ -207,6 +209,7 @@ Page({
     birthaddressInfo: {
       label: '户籍地址',
       mode: 'region',
+      maxWidth: 490,
       address_code: ['', '', ''],
       address_value: ['', '', ''],
       selected: '',

@@ -153,7 +153,7 @@
           <template is="picker_cell_normal" data="{{...disabilityInfo}}" />
           <view class="divide_line_30" hidden="{{disabilityInfo.selected!='是'}}"></view>
           <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}">
-            <text class='text_666_30 float_left'>残疾证号</text>
+            <text class='text_666_30 float_left head_in'  style='line-height: 90rpx'>残疾证号</text>
             <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_30' placeholder='请输入残疾证号' maxlength='24'></input>
           </view>
           <view class="divide_line_30"></view>
@@ -161,7 +161,7 @@
           <template is="picker_cell_normal" data="{{...lieshuInfo}}" />
           <view class="divide_line_30" hidden="{{lieshuInfo.selected!='是'}}"></view>
           <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}">
-            <text class='text_666_30 float_left'>烈属证号</text>
+            <text class='text_666_30 float_left head_in'  style='line-height: 90rpx'>烈属证号</text>
             <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}' placeholder-class='text_999_30' placeholder='请输入烈属证号' maxlength='24'></input>
           </view>
           <view class="divide_line_30"></view>