Merge branch 'dev_wy' into dev2.0

@@ -92,8 +92,8 @@
           <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
           <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
             <view style='height:110rpx'>
               <text class='text_gray_36' style='line-height:110rpx'>学历(学位)继续教育</text>
               <text class='text_gray_36' style='line-height:110rpx'>学历(学位)继续教育</text>
-              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
-              <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
+              <view wx:if="{{additionInfo[0].title_items[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
+              <view wx:elif="{{additionInfo[0].title_items[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].title_items[0].status]}}</view>
             </view>
             </view>
             <view wx:for="{{additionInfo[0].title_items}}">
             <view wx:for="{{additionInfo[0].title_items}}">
@@ -133,8 +133,8 @@
           <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
           <view style='margin:30rpx;padding-left: 30rpx;padding-bottom: 20rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
             <view style='height:110rpx'>
               <text class='text_gray_36' style='line-height:110rpx'>职业资格继续教育</text>
               <text class='text_gray_36' style='line-height:110rpx'>职业资格继续教育</text>
-              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
-              <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
+              <view wx:if="{{additionInfo[0].profession_items[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
+              <view wx:elif="{{additionInfo[0].profession_items[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].profession_items[0].status]}}</view>
             </view>
             </view>
             <view wx:for="{{additionInfo[0].profession_items}}">
             <view wx:for="{{additionInfo[0].profession_items}}">
@@ -186,8 +186,8 @@
           <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
           <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
             <view style='height:110rpx'>
               <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
               <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
-              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
-              <view wx:elif="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
+              <view wx:if="{{additionInfo[0].support_duties[0].status=='failed'}}" class='declare_style red_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
+              <view wx:elif="{{additionInfo[0].support_duties[0].status=='success'}}" class='declare_style blue_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[additionInfo[0].support_duties[0].status]}}</view>
             </view>
             </view>
             <view wx:for="{{additionInfo[0].support_duties}}">
             <view wx:for="{{additionInfo[0].support_duties}}">