wangyu / naturalPersonTax · 提交

提交 36a6cfd85aa0b60b0232a66171e1dbec0cad4c5a

作者 pangy
2 个父辈 eec03cd1 674d483f
构建： 未知

Merge branch 'dev_py' into dev2.0

内嵌 并排对比
正在显示 5 个修改的文件 包含 14 行增加 和 5 行删除
@@ -170,4 +170,10 @@ @@ -170,4 +170,10 @@
170 } 170 }
171 .head_in{ 171 .head_in{
172 margin-left: 26rpx; 172 margin-left: 26rpx;
  173 +}
  174 +/*---------行数控制，溢出部分显示‘...’-------*/
  175 +.text-single{
  176 + overflow: hidden;
  177 + text-overflow:ellipsis;
  178 + white-space:nowrap;
173 } 179 }
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
14 14
15 <view class="weui-cell__bd"> 15 <view class="weui-cell__bd">
16 <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}}'> 16 <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}}'>
17 - <text wx:if="{{selected&&disabled}}" class="text_black_30 float_right" style='line-height: 90rpx;'>{{selected}}</text>  
18 - <text wx:elif="{{selected}}" class="text_black_30 float_right " style='line-height: 90rpx;'>{{selected}}</text> 17 + <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>
  18 + <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>
19 <text wx:else class="text_999_30 float_right " style='line-height: 90rpx;'>{{placeholder}}</text> 19 <text wx:else class="text_999_30 float_right " style='line-height: 90rpx;'>{{placeholder}}</text>
20 </picker> 20 </picker>
21 </view> 21 </view>
@@ -377,7 +377,7 @@ Page({ @@ -377,7 +377,7 @@ Page({
377 label: '租赁房屋坐落地址', 377 label: '租赁房屋坐落地址',
378 mode: 'region', 378 mode: 'region',
379 isrequre: true, 379 isrequre: true,
380 - isrequre: true, 380 + maxWidth: 375,
381 bindtype: 'rent_house_locate', 381 bindtype: 'rent_house_locate',
382 isblack: 'true', 382 isblack: 'true',
383 address_code: ['', '', ''], 383 address_code: ['', '', ''],
@@ -65,6 +65,7 @@ Page({ @@ -65,6 +65,7 @@ Page({
65 bankInfo: { 65 bankInfo: {
66 label: '开户银行', 66 label: '开户银行',
67 bindtype: 'bank', 67 bindtype: 'bank',
  68 + maxWidth:490,
68 placeholder: '请选择开户银行', 69 placeholder: '请选择开户银行',
69 selected: '', 70 selected: '',
70 onChange: 'onPickerSelect' 71 onChange: 'onPickerSelect'
@@ -197,6 +198,7 @@ Page({ @@ -197,6 +198,7 @@ Page({
197 }, 198 },
198 currentaddressInfo: { 199 currentaddressInfo: {
199 label: '经常居住地址', 200 label: '经常居住地址',
  201 + maxWidth: 430,
200 mode: 'region', 202 mode: 'region',
201 address_code: ['', '', ''], 203 address_code: ['', '', ''],
202 address_value: ['', '', ''], 204 address_value: ['', '', ''],
@@ -207,6 +209,7 @@ Page({ @@ -207,6 +209,7 @@ Page({
207 birthaddressInfo: { 209 birthaddressInfo: {
208 label: '户籍地址', 210 label: '户籍地址',
209 mode: 'region', 211 mode: 'region',
  212 + maxWidth: 490,
210 address_code: ['', '', ''], 213 address_code: ['', '', ''],
211 address_value: ['', '', ''], 214 address_value: ['', '', ''],
212 selected: '', 215 selected: '',
@@ -153,7 +153,7 @@ @@ -153,7 +153,7 @@
153 <template is="picker_cell_normal" data="{{...disabilityInfo}}" /> 153 <template is="picker_cell_normal" data="{{...disabilityInfo}}" />
154 <view class="divide_line_30" hidden="{{disabilityInfo.selected!='是'}}"></view> 154 <view class="divide_line_30" hidden="{{disabilityInfo.selected!='是'}}"></view>
155 <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}"> 155 <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}">
156 - <text class='text_666_30 float_left'>残疾证号</text> 156 + <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>残疾证号</text>
157 <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_30' placeholder='请输入残疾证号' maxlength='24'></input> 157 <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_30' placeholder='请输入残疾证号' maxlength='24'></input>
158 </view> 158 </view>
159 <view class="divide_line_30"></view> 159 <view class="divide_line_30"></view>
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
161 <template is="picker_cell_normal" data="{{...lieshuInfo}}" /> 161 <template is="picker_cell_normal" data="{{...lieshuInfo}}" />
162 <view class="divide_line_30" hidden="{{lieshuInfo.selected!='是'}}"></view> 162 <view class="divide_line_30" hidden="{{lieshuInfo.selected!='是'}}"></view>
163 <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}"> 163 <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}">
164 - <text class='text_666_30 float_left'>烈属证号</text> 164 + <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>烈属证号</text>
165 <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> 165 <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>
166 </view> 166 </view>
167 <view class="divide_line_30"></view> 167 <view class="divide_line_30"></view>
请 注册 或 登录 后发表评论