Merge branch 'feature/GFRS-2215【待完成】重新投保' into dev

# Conflicts:
#	src/router/ebiz/insureAgain.js
#	src/views/ebiz/insureAgain/notification.vue
#	src/views/ebiz/insureAgain/uncommitInsureDetail.vue

src/components/ebiz/insureAgain/Order.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: PangXingYue
+ * @Date: 2021-03-22 09:46:16
+ * @LastEditTime: 2021-03-22 14:02:35
+ * @LastEditors: PangXingYue
+ * @Description: 
+ * @FilePath: \ebiz-h5\src\components\ebiz\insureAgain\Order.vue
+-->
 <template>
   <div class="order">
     <slot name="header">
@@ -6,12 +14,12 @@
     <div class="content p15">
       <p class="name mb8">
         <van-tag plain color="#5CA7DE">投保</van-tag>
-        <span class="ml5">{{ order.appntDTO.name }}</span>
+        <span class="ml5">{{ order.appntName }}</span>
       </p>
-      <p class="name mb8" v-for="(insured, insuredIndex) in order.insuredDTOs" :key="insuredIndex">
+      <p class="name mb8">
         <van-tag plain color="#DD9C56">被保</van-tag>
-        <span class="ml5">{{ insured.name }}</span>
-         <span v-for="(main, mainIndex) in insured.mainRisk" :key="mainIndex">
+        <span class="ml5">{{ order.insuredName }}</span>
+         <!-- <span v-for="(main, mainIndex) in insured.mainRisk" :key="mainIndex">
           <div class="mv10">
             <span class="w45 inline-b">
               <van-tag plain type="danger">主险</van-tag>
@@ -24,11 +32,11 @@
             </span>
             <span class="fs13">{{ addtional.riskName }}</span>
           </div>
-        </span>
+        </span> -->
       </p>    
       <p class="prem mb10">
         <span>首期总保费(元)</span>
-        <span>{{ order.firstPrem == 0 ? '0.00' : order.firstPrem | moneyFormat }}</span>
+        <span>{{ order.prem == 0 ? '0.00' : order.prem | moneyFormat }}</span>
       </p>
       <div class="divider mb10" />
       <slot></slot>

src/components/ebiz/insureAgain/ProgressBar.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: PangXingYue
+ * @Date: 2021-03-23 17:07:03
+ * @LastEditTime: 2021-03-24 18:23:20
+ * @LastEditors: PangXingYue
+ * @Description: 
+ * @FilePath: \ebiz-h5\src\components\ebiz\insureAgain\ProgressBar.vue
+-->
 <template>
   <div class="prgoress-bar">
     <template v-for="(item, index) in items">
@@ -41,7 +49,7 @@ export default {
      var url;      
      switch (index) {
        case 0:
-         url = 'insureInformation';
+         url = 'InsureInformation';
          break;
        case 1:
          url = 'productInformation';
@@ -53,7 +61,7 @@ export default {
          url = 'signConfirmation';
          break;
        default:
-         url = 'insureInformation';
+         url = 'InsureInformation';
          break;
      }   
       this.$jump({

src/components/ebiz/insureAgain/ReadingAgreement.vue

@@ -143,6 +143,11 @@ export default {
 .agreement {
   height: 100vh;
   overflow: auto;
+  .agreement-content{
+    padding: 10px;
+    box-sizing: border-box;
+    margin-bottom: 120px;
+  }
   .agreement-title {
     font-size: 20px;
     font-weight: bold;