wangyu / naturalPersonTax · 提交

提交 30e56ed12ea14e7c2fe2e108448d0c8ce8ca7331

作者 wangyu
1 个父辈 439d7bdf
构建： 未知

优化

内嵌 并排对比
正在显示 4 个修改的文件 包含 20 行增加 和 10 行删除
1 <!--pages/main/addtionalreduce/home.wxml--> 1 <!--pages/main/addtionalreduce/home.wxml-->
2 <view class='page'> 2 <view class='page'>
3 3
4 - <view style='margin-bottom:30rpxbackground:#fff'>  
5 - <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01" wx:for-item="item"> 4 + <view wx:if="{{additionlist.length>0}}" style='margin-bottom:30rpx;background:#fff'>
  5 + <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01" wx:for-item="item">
6 <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'> 6 <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'>
7 <text class=' text_333_40 float_left'>{{item.legal_entity}}</text> 7 <text class=' text_333_40 float_left'>{{item.legal_entity}}</text>
8 <view wx:if="{{item.status=='to_declare'&&item.addition_items.length<1}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'> 8 <view wx:if="{{item.status=='to_declare'&&item.addition_items.length<1}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'>
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 </view> 12 </view>
13 <view wx:if="{{item.addition_items&&item.addition_items.length>0}}"> 13 <view wx:if="{{item.addition_items&&item.addition_items.length>0}}">
14 <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02"> 14 <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">
15 - <view > 15 + <view>
16 <view class='divide_line' style='margin:0 50rpx'></view> 16 <view class='divide_line' style='margin:0 50rpx'></view>
17 <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '> 17 <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
18 <view style='height:40rpx'> 18 <view style='height:40rpx'>
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 </view> 23 </view>
24 <view wx:if="{{itemData.addition_category=='continuing_education'&&itemData.detail_items.length>0}}" style='padding:20rpx'> 24 <view wx:if="{{itemData.addition_category=='continuing_education'&&itemData.detail_items.length>0}}" style='padding:20rpx'>
25 <view wx:for="{{itemData.detail_items}}" wx:key="" wx:for-item="itemtypedetail"> 25 <view wx:for="{{itemData.detail_items}}" wx:key="" wx:for-item="itemtypedetail">
26 - <view wx:if="{{itemtypedetail.continue_education_type=='title'}}"> 26 + <view wx:if="{{itemtypedetail.continue_education_type=='major'}}">
27 <text style='font-size:28rpx;color:#666'>学历教育</text> 27 <text style='font-size:28rpx;color:#666'>学历教育</text>
28 <view style='width:100%;display:flex;flex-direction:row '> 28 <view style='width:100%;display:flex;flex-direction:row '>
29 <view class='float_left' style='flex:1'> 29 <view class='float_left' style='flex:1'>
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 </view> 36 </view>
37 </view> 37 </view>
38 </view> 38 </view>
39 - <view wx:if="{{itemtypedetail.continue_education_type=='major'||itemdetail.continue_education_type=='profession'}}"> 39 + <view wx:else>
40 <text style='font-size:28rpx;color:#666'>非学历教育</text> 40 <text style='font-size:28rpx;color:#666'>非学历教育</text>
41 <text style='font-size:28rpx;color:#666' hidden='{{itemtypedetail.detail_count<2}}'>（{{itemtypedetail.detail_count}}）</text> 41 <text style='font-size:28rpx;color:#666' hidden='{{itemtypedetail.detail_count<2}}'>（{{itemtypedetail.detail_count}}）</text>
42 <view style='width:100%;display:flex;flex-direction:row '> 42 <view style='width:100%;display:flex;flex-direction:row '>
@@ -69,5 +69,12 @@ @@ -69,5 +69,12 @@
69 </view> 69 </view>
70 <view style='width:100%;height:20rpx;background:#F5F5F5'></view> 70 <view style='width:100%;height:20rpx;background:#F5F5F5'></view>
71 </view> 71 </view>
  72 + <!-- <view wx:else>
  73 + <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
  74 + </view> -->
  75 +
72 </view> 76 </view>
  77 + <view wx:else>
  78 + <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/noreduce_img.png'></image>
  79 + </view>
73 </view> 80 </view>
@@ -146,6 +146,9 @@ Page({ @@ -146,6 +146,9 @@ Page({
146 if (newdata[i].education_end && newdata[i].education_end > 0) { 146 if (newdata[i].education_end && newdata[i].education_end > 0) {
147 newdata[i].education_end = format.formatTime_date(newdata[i].education_end) 147 newdata[i].education_end = format.formatTime_date(newdata[i].education_end)
148 } 148 }
  149 + if (newdata[i].approval_date && newdata[i].approval_date > 0) {
  150 + newdata[i].approval_date = format.formatTime_date(newdata[i].approval_date)
  151 + }
149 if (newdata[i].patient_birthday && newdata[i].patient_birthday > 0) { 152 if (newdata[i].patient_birthday && newdata[i].patient_birthday > 0) {
150 newdata[i].patient_birthday = format.formatTime_date(newdata[i].patient_birthday) 153 newdata[i].patient_birthday = format.formatTime_date(newdata[i].patient_birthday)
151 } 154 }
@@ -71,11 +71,11 @@ @@ -71,11 +71,11 @@
71 </view> 71 </view>
72 <view style='height:70rpx'> 72 <view style='height:70rpx'>
73 <text class='text_999_28 ' style='line-height:70rpx'>入学时间起：</text> 73 <text class='text_999_28 ' style='line-height:70rpx'>入学时间起：</text>
74 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> 74 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_start}}</text>
75 </view> 75 </view>
76 <view style='height:70rpx'> 76 <view style='height:70rpx'>
77 <text class='text_999_28 ' style='line-height:70rpx'>(预计)毕业时间</text> 77 <text class='text_999_28 ' style='line-height:70rpx'>(预计)毕业时间</text>
78 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> 78 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_end}}</text>
79 </view> 79 </view>
80 <view style='height:70rpx'> 80 <view style='height:70rpx'>
81 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 81 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 </view> 107 </view>
108 <view style='height:70rpx'> 108 <view style='height:70rpx'>
109 <text class='text_999_28 ' style='line-height:70rpx'>发证(批准)日期</text> 109 <text class='text_999_28 ' style='line-height:70rpx'>发证(批准)日期</text>
110 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{2018-09-09}}</text> 110 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.approval_date}}</text>
111 </view> 111 </view>
112 <view style='height:70rpx'> 112 <view style='height:70rpx'>
113 <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text> 113 <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text>
@@ -244,7 +244,7 @@ @@ -244,7 +244,7 @@
244 <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text> 244 <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
245 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.amount_by_person}}元</text> 245 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.amount_by_person}}元</text>
246 </view> 246 </view>
247 - <view class='float_right' wx:if="{{item.status!='failed'}}"> 247 + <view class='float_right' wx:if="{{item.status=='failed'}}">
248 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text> 248 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
249 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text> 249 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
250 </view> 250 </view>
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <!-- 自定义弹窗 --> 27 <!-- 自定义弹窗 -->
28 <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view> 28 <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
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">
请 注册 或 登录 后发表评论