Merge branch 'develop' of...

Merge branch 'develop' of http://192.168.110.53/com.pica.cloud.frontend/pica-insurance into feature/zjx

src/views/insurance-bind-code/insurance-bind-code.vue

@@ -598,15 +598,16 @@ export default {
   }
   .protocol-content{
     width: 100%;
-    height: 500PX;
     background-color: #ffffff;
-    font-size: 12px;
     color: #676869;
+    font-size: 14px;
+    padding: 15px;
+    box-sizing: border-box;
     .block70{
       height: 40px;
       line-height: 30px;
       text-align: center;
-      font-size: 15px;
+      font-size: 18px;
       font-weight: bold;
     }
     .protocol-text{
@@ -614,7 +615,6 @@ export default {
       overflow-y: scroll;
       -webkit-overflow-scrolling: touch;
       line-height: 2;
-      padding: 0 4px;
       &>p{
         -webkit-overflow-scrolling: touch;
         min-height: 1000px;
@@ -631,11 +631,13 @@ export default {
       justify-content: center;
       font-weight: 500;
       margin: 0 auto;
-      margin-top: 10px;
+      position: absolute;
+      bottom: 10px;
+      left: calc(50% - 150px);
     }
   }
   .binding-code-showInfo{
-    padding: 24px 24px 0 24px;
+    padding: 12px 12px 0 12px;
     .title{
       height: 27px;
       font-size: 18px;
@@ -660,8 +662,7 @@ export default {
       border-radius: 6px;
       border: 1px solid #ADE9E1;
       .name{
-        width: 45px;
-        min-width: 45px;
+        min-width: 60px;
         height: 50px;
         line-height: 50px;
         font-size: 15px;
@@ -682,10 +683,12 @@ export default {
       .name{
         width: 60px;
         font-size: 15px;
+        white-space: nowrap;
       }
       .user-info{
         font-weight: 700;
         font-size: 15px;
+        white-space: nowrap;
       }
       .space{
         margin-right: 10px;

src/views/insurance-bindCode-success/index.scss

@@ -46,10 +46,8 @@
           padding-bottom: 14px;
         }
         .blue-wrap{
-          width: 321px;
-          background: #F7FFFE;
+          //background: #F7FFFE;
           border-radius: 22px;
-          border: 1px solid #ADE9E1;
           margin: 0 auto;
           padding-top: 15px;
         }

src/views/insurance-bindCode-success/insurance-bindCode-success.vue

@@ -15,9 +15,9 @@
       </div>
       <div class="content">
         <div class="info">
-          <div class="success-title">
-            请将以下信息展示给采样医生
-          </div>
+<!--          <div class="success-title">-->
+<!--            请将以下信息展示给采样医生-->
+<!--          </div>-->
           <div class="blue-wrap">
             <div class="list">
               <p class="l-left">

src/views/insurance-detection-detail/index.scss

@@ -63,7 +63,7 @@
           width: auto;
           height: auto;
           font-size: 14px;
-          font-weight: 500;
+          font-weight: 600;
           color: #212121;
           flex: 1;
           line-height: 20px;
@@ -283,6 +283,11 @@
     background: #00bda5;
     justify-content: center;
   }
+  .submit-button-empty{
+    background: #ffffff;
+    border: 1px solid #00bda5;
+    color: #00bda5;
+  }
 }
 .multi-sub-wrap{
   flex-direction: row;

src/views/insurance-detection-detail/insurance-detection-detail.vue

@@ -156,8 +156,7 @@
       class="submit-container multi-sub-wrap"
     >
       <div
-        class="submit-button"
-        :class="[3].includes(dataDetail.status) && 'multi-sub-wrap'"
+        class="submit-button submit-button-empty"
         @click="bottomBtnFun(dataDetail.reportUrl)"
       >
         查看报告