wangyu / naturalPersonTax · 提交

提交 fe5d961a147980de6df4b506a570207e23e84e91

作者 wangyu
2 个父辈 48cbd555 ac1127e1
构建： 未知

Merge branch 'dev_wy' into dev2.0

内嵌 并排对比
正在显示 1 个修改的文件 包含 15 行增加 和 15 行删除
... ... @@ -22,9 +22,9 @@
22 22 <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'>
23 23 <template is="picker_cell_normal" data="{{...issinglechildData}}" />
24 24 <view wx:if="{{issinglechildData.selected=='否'}}">
25   - <view class='divide_line_f5f5f5'></view>
  25 + <view style='background:#f5f5f5;height:2rpx;margin-left:30rpx;'></view>
26 26 <template is="picker_cell_normal" data="{{...shareMethodData}}" />
27   - <view class='divide_line_f5f5f5'></view>
  27 + <view style='background:#f5f5f5;height:2rpx;margin-left:30rpx;'></view>
28 28 <view wx:if="{{!input_disable}}" style='height:90rpx'>
29 29 <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:26rpx'>本年度月扣除金额</text>
30 30 <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:20rpx' name='country'>/月</text>
... ... @@ -36,7 +36,7 @@
36 36 </view>
37 37 </view>
38 38 <view wx:elif="{{issinglechildData.selected=='是'}}">
39   - <view class='divide_line_f5f5f5'></view>
  39 + <view style='background:#f5f5f5;height:2rpx;margin-left:30rpx;'></view>
40 40 <view style='height:90rpx'>
41 41 <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:26rpx'>本年度月扣除金额</text>
42 42 <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #ff9f00;' name='country'>¥2000/月</text>
... ... @@ -89,13 +89,13 @@
89 89 <view wx:if="{{cur_status=='continuing_education'}}">
90 90 <!-- 学历 -->
91 91 <view wx:if="{{additionInfo[0].title_items&&additionInfo[0].title_items.length>0}}">
92   - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
  92 + <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
93 93 <view style='height:110rpx'>
94 94 <text class='text_gray_36' style='line-height:110rpx'>学历(学位)继续教育</text>
95 95 </view>
96 96 <view wx:for="{{additionInfo[0].title_items}}">
97 97 <view style='padding-right:right'>
98   - <view style="background:#f5f5f5;height:2rpx;width:94%;margin:20rpx 0"></view>
  98 + <view style="background:#f5f5f5;height:2rpx;width:94%"></view>
99 99 <view>
100 100 <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;'>{{item.education_period}}</text>
101 101 <view wx:if="{{item.status=='failed'}}" class='declare_style_new red_bg'> {{declareStatus[item.status]}}</view>
... ... @@ -112,7 +112,7 @@
112 112 </view>
113 113 </view>
114 114 </view>
115   - <view style="background:#f5f5f5;height:2rpx;width:94%;margin:20rpx 0"></view>
  115 + <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
116 116 <view style='height:70rpx'>
117 117 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
118 118 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[additionInfo[0].title_items[0].deduction_type]}}度</text>
... ... @@ -121,21 +121,21 @@
121 121 <text class='text_999_28' style='line-height:70rpx'>扣除金额：</text>
122 122 <text class='text_orange_28' style='line-height:70rpx;margin-left:20rpx'>￥{{additionInfo[0].title_items[0].deduction_amount}}/{{reducetype[additionInfo[0].title_items[0].deduction_type]}}</text>
123 123 </view>
124   - <view class='float_right' wx:if="{{item.status=='failed'}}">
125   - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
126   - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  124 + <view wx:if="{{item.status=='failed'}}">
  125 + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='goedit'>编辑</text>
  126 + <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
127 127 </view>
128 128 </view>
129 129 </view>
130 130 <!-- 非学历 -->
131 131 <view wx:if="{{additionInfo[0].profession_items&&additionInfo[0].profession_items.length>0}}">
132   - <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
  132 + <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
133 133 <view style='height:110rpx'>
134 134 <text class='text_gray_36' style='line-height:110rpx'>职业资格继续教育</text>
135 135 </view>
136 136 <view wx:for="{{additionInfo[0].profession_items}}">
137 137 <view style='padding-right:right'>
138   - <view style="background:#f5f5f5;height:2rpx;width:94%;margin:10rpx 0"></view>
  138 + <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
139 139 <view>
140 140 <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='profession'}}">技能人员职业资格</text>
141 141 <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='major'}}">专业人员职业资格</text>
... ... @@ -161,7 +161,7 @@
161 161 </view>
162 162 </view>
163 163 </view>
164   - <view style="background:#f5f5f5;height:2rpx;width:94%;margin:10rpx 0"></view>
  164 + <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
165 165 <view style='height:70rpx'>
166 166 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
167 167 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[additionInfo[0].profession_items[0].deduction_type]}}度</text>
... ... @@ -170,9 +170,9 @@
170 170 <text class='text_999_28' style='line-height:70rpx'>扣除金额：</text>
171 171 <text class='text_orange_28' style='line-height:70rpx;margin-left:20rpx'>￥{{additionInfo[0].profession_items[0].deduction_amount}}/{{reducetype[additionInfo[0].profession_items[0].deduction_type]}}</text>
172 172 </view>
173   - <view class='float_right' wx:if="{{item.status=='failed'}}">
174   - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
175   - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  173 + <view wx:if="{{item.status=='failed'}}">
  174 + <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='goedit'>编辑</text>
  175 + <text class='text_999_28 float_right' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
176 176 </view>
177 177 </view>
178 178 </view>
... ...
请 注册 或 登录 后发表评论