wangyu / naturalPersonTax · 提交

提交 77504d76fea7226a4b883d15d0e85efc43ff8478

作者 wangyu
2 个父辈 7967c557 d5a416b9
构建： 未知

Merge branch 'dev_无非居民' into dev2.0 

# Conflicts:
#	images/guide_bg.png
内嵌 并排对比
正在显示 6 个修改的文件 包含 60 行增加 和 62 行删除

8.4 KB | 宽: | 高:

5.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

10.1 KB | 宽: | 高:

7.3 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

9.5 KB | 宽: | 高:

7.1 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
... ... @@ -63,7 +63,7 @@
63 63 <text class='text_999_28 ' style='line-height:70rpx'>子女姓名：</text>
64 64 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text>
65 65 </view>
66   - <view style='height:70rpx'>
  66 + <view style='height:70rpx'>
67 67 <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
68 68 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
69 69 </view>
... ... @@ -249,7 +249,7 @@
249 249 <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
250 250 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text>
251 251 </view>
252   - <view class='float_right' wx:if="{{employee_status!='inactive'}}">
  252 + <view class='float_right' wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}">
253 253 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'co_supporter'+index}}" bindtap='godelete'>删除</text>
254 254 <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'co_supporter'+index}}" bindtap='goedit'>编辑</text>
255 255 </view>
... ... @@ -278,7 +278,7 @@
278 278 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text>
279 279 <text class='text_orange_28 float_right' style='line-height:100rpx'>￥{{remaining_amount}}</text>
280 280 </view>
281   - <view class='divide_line_f5f5f5' ></view>
  281 + <view class='divide_line_f5f5f5'></view>
282 282 <view wx:for="{{additionInfo}}">
283 283 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
284 284 <view style='height:110rpx'>
... ... @@ -339,7 +339,7 @@
339 339 <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
340 340 <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
341 341 </view>
342   - <view style='padding-right: 30rpx' >
  342 + <view style='padding-right: 30rpx'>
343 343 <view class='divide_line_f5f5f5' style="margin-bottom:6rpx"></view>
344 344 <view style='display:flex;flex-direction:row'>
345 345 <view wx:if="{{house_type=='house_fund_rent'}}">
... ... @@ -382,29 +382,29 @@
382 382 </view>
383 383
384 384 <!-- <view class='bottom_btn_wrap' hidden="{{additionInfo.length>0&&((cur_status=='support_duty'&&(additionInfo[0].co_supporters.length>0||additionInfo[0].support_duties.length>0))||(cur_status=='house_fund'&&house_type=='house_fund_loan'))}}"> -->
385   - <view class='bottom_btn_wrap' wx:if="{{btn_show&&employee_status!='inactive'}}" >
  385 + <view class='bottom_btn_wrap' wx:if="{{btn_show&&employee_status!='inactive'}}">
386 386 <view class='btn_blue_radius' bindtap="goadd">
387 387 <view class='text_white_34'>添加</view>
388 388 </view>
389 389 </view>
390 390
391 391 <view class="mask" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}" bindtap='closeModalImg'></view>
392   -<!-- 申报说明 -->
393   -<view style='top:200rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
394   - <image wx:if="{{cur_status!='house_fund'}}" class='modal_img' src="{{modal_images[cur_status]}}"></image>
395   - <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_rent'}}" class='modal_img02' src="/images/house_declare_rent.png"></image>
396   - <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_loan'}}" class='modal_img' src="/images/house_declare_loan.png"></image>
397   - <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
398   - <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
399   - <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
  392 + <!-- 申报说明 -->
  393 + <view style='top:200rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
  394 + <image wx:if="{{cur_status!='house_fund'}}" class='modal_img' src="{{modal_images[cur_status]}}"></image>
  395 + <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_rent'}}" class='modal_img02' src="/images/house_declare_rent.png"></image>
  396 + <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_loan'}}" class='modal_img' src="/images/house_declare_loan.png"></image>
  397 + <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
  398 + <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
  399 + <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
  400 + </view>
400 401 </view>
401   -</view>
402 402
403   -<!-- 扣除类型 -->
404   -<view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
405   - <text class='text_modal_title'>请选择扣除方式</text>
406   - <view class='divide_line_f5f5f5'></view>
407   - <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
  403 + <!-- 扣除类型 -->
  404 + <view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
  405 + <text class='text_modal_title'>请选择扣除方式</text>
  406 + <view class='divide_line_f5f5f5'></view>
  407 + <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
408 408 <view wx:for="{{reducetypeData}}" wx:for-index="idx">
409 409 <view wx:if="{{selected_reduceindex==idx}}">
410 410 <text class='text_item_blue float_left'>{{item}}</text>
... ... @@ -416,32 +416,32 @@
416 416 <view class='divide_line_f5f5f5'></view>
417 417 </view>
418 418 </view> -->
419   - <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
420   - <view wx:for="{{reducetypeData}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
421   - <view wx:if="{{idx==selected_reduceindex}}" style='display:flex;flex-direction:row;'>
422   - <view class='text_item_blue float_left'>{{item}}</view>
423   - <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
424   - </view>
425   - <view wx:else style='display:flex'>
426   - <text class='text_item_black float_left'>{{item}}</text>
  419 + <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
  420 + <view wx:for="{{reducetypeData}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
  421 + <view wx:if="{{idx==selected_reduceindex}}" style='display:flex;flex-direction:row;'>
  422 + <view class='text_item_blue float_left'>{{item}}</view>
  423 + <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
  424 + </view>
  425 + <view wx:else style='display:flex'>
  426 + <text class='text_item_black float_left'>{{item}}</text>
  427 + </view>
  428 + <view class='divide_line_f5f5f5'></view>
427 429 </view>
428   - <view class='divide_line_f5f5f5'></view>
429 430 </view>
430   - </view>
431   - <view class='divide_line_f5f5f5'></view>
  431 + <view class='divide_line_f5f5f5'></view>
432 432
433   - <view style='width:100%;display: flex;'>
434   - <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
435   - <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
436   - <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
  433 + <view style='width:100%;display: flex;'>
  434 + <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
  435 + <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
  436 + <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
  437 + </view>
437 438 </view>
438   -</view>
439 439
440   -<!-- 添加子女 老人 大病-->
441   -<view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
442   - <text class='text_modal_title'>{{modalData.title}}</text>
443   - <view class='divide_line_f5f5f5'></view>
444   - <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
  440 + <!-- 添加子女 老人 大病-->
  441 + <view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
  442 + <text class='text_modal_title'>{{modalData.title}}</text>
  443 + <view class='divide_line_f5f5f5'></view>
  444 + <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
445 445 <block wx:for="{{modalData.datas}}" wx:for-index="idx">
446 446 <view wx:if="{{idx==selected_addindex}}">
447 447 <text class='text_item_blue float_left'>{{item.name}}</text>
... ... @@ -453,26 +453,24 @@
453 453 <view class='divide_line_f5f5f5'></view>
454 454 </block>
455 455 </view> -->
456   - <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
457   - <view wx:for="{{modalData.datas}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
458   - <view wx:if="{{idx==selected_addindex}}" style='display:flex;flex-direction:row;'>
459   - <text class='text_item_blue float_left'>{{item.name}}</text>
460   - <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
461   - </view>
462   - <view wx:else style='display:flex'>
463   - <text class='text_item_black float_left'>{{item.name}}</text>
  456 + <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
  457 + <view wx:for="{{modalData.datas}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
  458 + <view wx:if="{{idx==selected_addindex}}" style='display:flex;flex-direction:row;'>
  459 + <text class='text_item_blue float_left'>{{item.name}}</text>
  460 + <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
  461 + </view>
  462 + <view wx:else style='display:flex'>
  463 + <text class='text_item_black float_left'>{{item.name}}</text>
  464 + </view>
  465 + <view class='divide_line_f5f5f5'></view>
464 466 </view>
465   - <view class='divide_line_f5f5f5'></view>
  467 + </view>
  468 + <view class='divide_line_f5f5f5'></view>
  469 + <view style='width:100%;display: flex;'>
  470 + <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
  471 + <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
  472 + <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
466 473 </view>
467 474 </view>
468   - <view class='divide_line_f5f5f5'></view>
469   - <view style='width:100%;display: flex;'>
470   - <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
471   - <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
472   - <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
473   - </view>
474   -</view>
475   -
476   -</view>
477   -
478 475
  476 +</view>
\ No newline at end of file
... ...
... ... @@ -60,4 +60,4 @@
60 60
61 61 <image class='chat-img' bindtap='gochat' src='/images/icon_chat.png'></image>
62 62
63   -</view>
\ No newline at end of file
  63 +</view>
... ...
... ... @@ -33,8 +33,8 @@
33 33 }
34 34
35 35 .icon_wrap {
36   - width: 112rpx;
37   - height: 102rpx;
  36 + width: 102rpx;
  37 + height: 96rpx;
38 38 align-self: center;
39 39 }
40 40
... ...
请 注册 或 登录 后发表评论