提交 69a0b928e4c425f8f1bd8c6d9cae3f09cd7c831d

作者 wangyu
2 个父辈 1c16fa2d 46603d18

Merge branch 'dev_wy' into dev2.0

... ... @@ -92,8 +92,8 @@
92 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   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
96   - <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
  95 + <view wx:if="{{additionInfo[0].title_items[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
  96 + <view wx:elif="{{additionInfo[0].title_items[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
97 97 <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
98 98 </view>
99 99 <view wx:for="{{additionInfo[0].title_items}}">
... ... @@ -133,8 +133,8 @@
133 133 <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
134 134 <view style='height:110rpx'>
135 135 <text class='text_gray_36' style='line-height:110rpx'>职业资格继续教育</text>
136   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
137   - <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
  136 + <view wx:if="{{additionInfo[0].profession_items[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
  137 + <view wx:elif="{{additionInfo[0].profession_items[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
138 138 <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
139 139 </view>
140 140 <view wx:for="{{additionInfo[0].profession_items}}">
... ... @@ -186,8 +186,8 @@
186 186 <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
187 187 <view style='height:110rpx'>
188 188 <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
189   - <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
190   - <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
  189 + <view wx:if="{{additionInfo[0].support_duties[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
  190 + <view wx:elif="{{additionInfo[0].support_duties[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
191 191 <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
192 192 </view>
193 193 <view wx:for="{{additionInfo[0].support_duties}}">
... ...
注册登录 后发表评论