优化

@@ -1246,9 +1246,15 @@ Page({
         } else if (!formdata.total_amount || formdata.total_amount < 0) {
         } else if (!formdata.total_amount || formdata.total_amount < 0) {
           this.showToast('请填写医疗支出总金额')
           this.showToast('请填写医疗支出总金额')
           return
           return
+        } else if (formdata.total_amount > 60000) {
+          this.showToast('大病医疗支出扣除额度不得超过6万')
+          return
         } else if (!formdata.amount_by_person || formdata.amount_by_person < 0) {
         } else if (!formdata.amount_by_person || formdata.amount_by_person < 0) {
           this.showToast('请填写个人负担金额')
           this.showToast('请填写个人负担金额')
           return
           return
+        }else if (formdata.amount_by_person >60000) {
+          this.showToast('个人负担金额不得超过6万')
+          return
         }
         }
 
 
         newdata.total_amount = parseFloat(formdata.total_amount)
         newdata.total_amount = parseFloat(formdata.total_amount)

@@ -256,17 +256,41 @@
           <text class='text_left'>贷款类型</text>
           <text class='text_left'>贷款类型</text>
           <text class='text_right_333'>{{datas.loan_type}}</text>
           <text class='text_right_333'>{{datas.loan_type}}</text>
         </view>
         </view>
-        <view style='height:90rpx;width:100%;clear:both;'>
-          <text class='text_left'>贷款合同编号</text>
-          <text class='text_right_333'>{{datas.loan_contract_no}}</text>
-        </view>
-        <view style='height:90rpx;width:100%;clear:both;'>
-          <text class='text_left'>首次还款日期</text>
-          <text class='text_right_333'>{{datas.loan_start}}</text>
+        <view wx:if="{{datas.loan_type=='商业贷款'||datas.loan_type=='组合贷款'}}">
+          <view style='height:90rpx;width:100%;clear:both;'>
+            <text class='text_left'>商业贷款合同编号</text>
+            <text class='text_right_333'>{{datas.sec_loan_contract_no}}</text>
+          </view>
+          <view style='height:90rpx;width:100%;clear:both;'>
+            <text class='text_left'>商业贷款银行</text>
+            <text class='text_right_333'>{{datas.sec_loan_bank}}</text>
+          </view>
+          <view style='height:90rpx;width:100%;clear:both;'>
+            <text class='text_left'>首次还款日期</text>
+            <text class='text_right_333'>{{datas.loan_start}}</text>
+          </view>
+          <view style='height:90rpx;width:100%;clear:both;'>
+            <text class='text_left'>商业贷款期限(月数)</text>
+            <text class='text_right_333'>{{datas.sec_loan_months}}</text>
+          </view>
         </view>
         </view>
-        <view style='height:90rpx;width:100%;clear:both;'>
-          <text class='text_left'>贷款期限(月数)</text>
-          <text class='text_right_333'>{{datas.loan_months}}</text>
+        <view wx:if="{{datas.loan_type=='公积金贷款'||datas.loan_type=='组合贷款'}}">
+          <view style='height:90rpx;width:100%;clear:both;'>
+            <text class='text_left'>公积金贷款合同编号</text>
+            <text class='text_right_333'>{{datas.loan_contract_no}}</text>
+          </view>
+          <view style='height:90rpx;width:100%;clear:both;'>
+            <text class='text_left'>公积金贷款银行</text>
+            <text class='text_right_333'>{{datas.loan_bank}}</text>
+          </view>
+          <view style='height:90rpx;width:100%;clear:both;'>
+            <text class='text_left'>首次还款日期</text>
+            <text class='text_right_333'>{{datas.loan_start}}</text>
+          </view>
+          <view style='height:90rpx;width:100%;clear:both;'>
+            <text class='text_left'>公积金贷款期限(月数)</text>
+            <text class='text_right_333'>{{datas.loan_months}}</text>
+          </view>
         </view>
         </view>
         <view style='height:90rpx;width:100%;clear:both;'>
         <view style='height:90rpx;width:100%;clear:both;'>
           <text class='text_left'>扣除方式</text>
           <text class='text_left'>扣除方式</text>

@@ -211,9 +211,12 @@ Page({
       if (newdata[i].rent_end) {
       if (newdata[i].rent_end) {
         newdata[i].rent_end = this.formatDate(newdata[i].rent_end)
         newdata[i].rent_end = this.formatDate(newdata[i].rent_end)
       } 
       } 
-      if (newdata[i].loan_start) {
+      if (newdata[i].loan_start) {//公积金
         newdata[i].loan_start = this.formatDate(newdata[i].loan_start)
         newdata[i].loan_start = this.formatDate(newdata[i].loan_start)
       } 
       } 
+      if (newdata[i].sec_loan_start) {//商业
+        newdata[i].sec_loan_start = this.formatDate(newdata[i].sec_loan_start)
+      } 
 
 
       newdata[i].children_id_card_no = this.formatIdNum(newdata[i].children_id_card_no)
       newdata[i].children_id_card_no = this.formatIdNum(newdata[i].children_id_card_no)
       newdata[i].spouse_id_card_no = this.formatIdNum(newdata[i].spouse_id_card_no)
       newdata[i].spouse_id_card_no = this.formatIdNum(newdata[i].spouse_id_card_no)