继续教育展示修改

@@ -1147,11 +1147,11 @@ Page({
             return
           }
           if (this.data.studystartdate.selected.length < 1) {
-            this.showToast('请选择受入学时间')
+            this.showToast('请选择入学时间')
             return
           }
           if (this.data.studyenddate.selected.length < 1) {
-            this.showToast('请选择受毕业时间')
+            this.showToast('请选择毕业时间')
             return
           } else {
             var activedDate = (Date.parse(new Date('2019-01-01')) / 1000)

@@ -101,7 +101,7 @@ Page({
         if (res && res.data) {
           console.log("res", res)
           that.setData({
-            additionlist: res.data.items
+            additionlist: that.handleData(res.data.items) 
           })
         }
         wx.hideLoading()
@@ -114,7 +114,30 @@ Page({
       }
     })
   },
-
+  handleData: function (items) {
+    for (var i = 0; i < items.length ; i++){
+      var bigItem = items[i]
+      for (var j = 0; j < bigItem.addition_items.length; j++) {
+        var midItem = bigItem.addition_items[j]
+        if (midItem.addition_category == 'continuing_education'){
+          var majors = [], professions = []
+          for (var k = 0; k < midItem.detail_items.length; k++) {
+            var smallItem = midItem.detail_items[k]
+            if (smallItem.continue_education_type == 'major'){
+              majors.push(smallItem)
+            } else if (smallItem.continue_education_type == 'nomajor'){
+              professions.push(smallItem)
+            }
+          }
+          items[i].addition_items[j].majors = majors
+          items[i].addition_items[j].professions = professions
+          break;
+        }
+      } 
+    }
+    console.log('ddddd', items)
+    return items
+  },
   /**
    * Lifecycle function--Called when page hide
    */

@@ -22,7 +22,40 @@
                 <text class='text_999_28' style='margin-bottom:8rpx;float:right'>查看</text>
               </view>
               <view wx:if="{{itemData.addition_category=='continuing_education'&&itemData.detail_items.length>0}}" style='padding:20rpx'>
-                <view wx:for="{{itemData.detail_items}}" wx:key="" wx:for-item="itemtypedetail">
+                <view wx:for="{{itemData.majors}}" wx:key="" wx:for-item="major">
+                  <view wx:if="{{index==0}}">
+                    <text wx:if='{{itemData.majors.length>1}}' style='font-size:28rpx;color:#666'>学历教育 ({{itemData.majors.length}})</text>
+                    <text wx:else style='font-size:28rpx;color:#666'>学历教育</text>
+                    <view style='width:100%;display:flex;flex-direction:row '>
+                      <view class='float_left' style='flex:1'>
+                        <text class='text_999_24 '>扣除方式</text>
+                        <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[major.deduction_type]}}度</text>
+                      </view>
+                      <view class='float_right' style='flex:1'>
+                        <text class='text_999_24 '>可扣除金额</text>
+                        <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{major.deduction_amount}}/{{reducetype[major.deduction_type]}}</text>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <view wx:for="{{itemData.professions}}" wx:key="" wx:for-item="profession">  
+                  <view wx:if="{{index==0}}">
+                    <text wx:if='{{itemData.professions.length>1}}' style='font-size:28rpx;color:#666'>非学历教育 ({{itemData.professions.length}})</text>
+                    <text wx:else style='font-size:28rpx;color:#666'>非学历教育</text>
+                    <text style='font-size:28rpx;color:#666' hidden='{{profession.detail_count<2}}'>（{{profession.detail_count}}）</text>
+                    <view style='width:100%;display:flex;flex-direction:row '>
+                      <view class='float_left' style='flex:1'>
+                        <text class='text_999_24 '>扣除方式</text>
+                        <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[profession.deduction_type]}}度</text>
+                      </view>
+                      <view class='float_right' style='flex:1'>
+                        <text class='text_999_24 '>可扣除金额</text>
+                        <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{profession.deduction_amount}}/{{reducetype[profession.deduction_type]}}</text>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <!-- <view wx:for="{{itemData.detail_items}}" wx:key="" wx:for-item="itemtypedetail">
                   <view wx:if="{{itemtypedetail.continue_education_type=='major'}}">
                     <text style='font-size:28rpx;color:#666'>学历教育</text>
                     <view style='width:100%;display:flex;flex-direction:row '>
@@ -50,7 +83,7 @@
                       </view>
                     </view>
                   </view>
-                </view>
+                </view> -->
 
               </view>
               <view wx:else style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>