wangyu / naturalPersonTax · 提交

提交 94e5716364184f99d1e8c195a0405cecef182be2

作者 pangy
2 个父辈 482816c0 27b34946
构建： 未知

Merge branch 'dev2.0' into dev_py

内嵌 并排对比
正在显示 3 个修改的文件 包含 20 行增加 和 7 行删除
@@ -170,7 +170,7 @@ Page({ @@ -170,7 +170,7 @@ Page({
170 } 170 }
171 if(this.data.house_type==''){ 171 if(this.data.house_type==''){
172 this.setData({ 172 this.setData({
173 - house_type: newdata[0].type ? newdata[0].type:"" 173 + house_type: newdata.length>0&&newdata[0].type ? newdata[0].type:""
174 }) 174 })
175 } 175 }
176 176
@@ -384,7 +384,7 @@ Page({ @@ -384,7 +384,7 @@ Page({
384 }) 384 })
385 var senddata = "" 385 var senddata = ""
386 if (this.data.cur_status == 'support_duty' ){ 386 if (this.data.cur_status == 'support_duty' ){
387 - senddata = JSON.stringify(this.data.additionInfo[0]); 387 + // senddata = JSON.stringify(this.data.additionInfo[0]);
388 } 388 }
389 wx.navigateTo({ 389 wx.navigateTo({
390 url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex], 390 url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
@@ -145,7 +145,7 @@ @@ -145,7 +145,7 @@
145 </view> 145 </view>
146 146
147 <view wx:if="{{cur_status=='support_duty'}}"> 147 <view wx:if="{{cur_status=='support_duty'}}">
148 - <view wx:for="{{additionInfo}}" > 148 + <view wx:if="{{additionInfo.length>0}}" wx:for="{{additionInfo}}" >
149 <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'> 149 <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
150 <view style='height:110rpx'> 150 <view style='height:110rpx'>
151 <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text> 151 <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
@@ -215,11 +215,11 @@ @@ -215,11 +215,11 @@
215 </view> 215 </view>
216 </view> 216 </view>
217 <view> 217 <view>
218 - <view style='background:#FFF;padding:30rpx' wx:if="{{idx==additionInfo.length-1}}"> 218 + <!-- <view style='background:#FFF;padding:30rpx' wx:if="{{idx==additionInfo.length-1}}">
219 <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id='{{index}}' bindtap='goadd'> 219 <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id='{{index}}' bindtap='goadd'>
220 添加 220 添加
221 </view> 221 </view>
222 - </view> 222 + </view> -->
223 <view style='margin-left:30rpx' wx:if="{{!item.co_supporters||item.co_supporters.length<1}}"> 223 <view style='margin-left:30rpx' wx:if="{{!item.co_supporters||item.co_supporters.length<1}}">
224 <text class='text_999_28'>您还没有添加继续共同赡养人，</text> 224 <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
225 <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text> 225 <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text>
@@ -338,7 +338,7 @@ @@ -338,7 +338,7 @@
338 338
339 </view> 339 </view>
340 340
341 - <view class='bottom_btn_wrap' hidden="{{additionInfo&&additionInfo.length>0&&cur_status=='support_duty'}}"> 341 + <view class='bottom_btn_wrap'>
342 <view class='btn_blue_radius' bindtap="goadd"> 342 <view class='btn_blue_radius' bindtap="goadd">
343 <view class='text_white_34'>添加</view> 343 <view class='text_white_34'>添加</view>
344 </view> 344 </view>
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <view class='modal_lg' hidden="{{!showModal}}"> 29 <view class='modal_lg' hidden="{{!showModal}}">
30 <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text> 30 <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text>
31 <view class='divide_line_f5f5f5'></view> 31 <view class='divide_line_f5f5f5'></view>
32 - <view style='width:100%;display:flex;flex-direction:column;align-items:center;max-height:450rpx'> 32 + <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;max-height:450rpx'>
33 <block wx:for="{{comlist}}" wx:for-index="idx"> 33 <block wx:for="{{comlist}}" wx:for-index="idx">
34 <view wx:if="{{idx==choosed_index}}" bindtap='goselect' id="{{idx}}"> 34 <view wx:if="{{idx==choosed_index}}" bindtap='goselect' id="{{idx}}">
35 <text class='text_item_blue float_left'>{{item.name}}</text> 35 <text class='text_item_blue float_left'>{{item.name}}</text>
@@ -40,6 +40,19 @@ @@ -40,6 +40,19 @@
40 </view> 40 </view>
41 <view class='divide_line_f5f5f5'></view> 41 <view class='divide_line_f5f5f5'></view>
42 </block> 42 </block>
  43 + </view> -->
  44 +
  45 + <view style='width:100%;display:flex;flex-direction:column;max-height:450rpx;align-items:center;'>
  46 + <view wx:for="{{comlist}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
  47 + <view wx:if="{{idx==choosed_index}}" >
  48 + <text class='text_item_blue float_left'>{{item.name}}</text>
  49 + <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
  50 + </view>
  51 + <view wx:else >
  52 + <view class='text_item_black float_left'>{{item.name}}</view>
  53 + </view>
  54 + <view class='divide_line_f5f5f5'></view>
  55 + </view>
43 </view> 56 </view>
44 57
45 <view class='divide_line_f5f5f5'></view> 58 <view class='divide_line_f5f5f5'></view>
请 注册 或 登录 后发表评论