Merge branch 'develop' of...

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

public/index.html

@@ -29,20 +29,20 @@
     <script src="<%= VUE_APP_OSS_URL %>static/js/vconsole-3.3.4.js"></script>
     <script src="<%= VUE_APP_OSS_URL %>static/js/lodash-4.17.15.js"></script>
     <script>
-			!(function(c,b,d,a){c[a]||(c[a]={});c[a].config=
-				{
-					pid:"bj53rb58f5@29641a9002f6545",
-					appType:"web",
-					imgUrl:"https://arms-retcode.aliyuncs.com/r.png?",
-					sendResource:true,
-					enableLinkTrace:true,
-					behavior:true,
-					useFmp:true,
-					enableSPA:true,
-					enableConsole:true
-				};
-				with(b)with(body)with(insertBefore(createElement("script"),firstChild))setAttribute("crossorigin","",src=d)
-			})(window,document,"https://retcode.alicdn.com/retcode/bl.js","__bl");
+			// !(function(c,b,d,a){c[a]||(c[a]={});c[a].config=
+			// 	{
+			// 		pid:"bj53rb58f5@29641a9002f6545",
+			// 		appType:"web",
+			// 		imgUrl:"https://arms-retcode.aliyuncs.com/r.png?",
+			// 		sendResource:true,
+			// 		enableLinkTrace:true,
+			// 		behavior:true,
+			// 		useFmp:true,
+			// 		enableSPA:true,
+			// 		enableConsole:true
+			// 	};
+			// 	with(b)with(body)with(insertBefore(createElement("script"),firstChild))setAttribute("crossorigin","",src=d)
+			// })(window,document,"https://retcode.alicdn.com/retcode/bl.js","__bl");
     </script>
   </body>
 </html>

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

@@ -222,7 +222,8 @@
       color: #FF4B33;
       font-size: 12px;
       font-weight: lighter;
-      margin-top: 5px;
+      margin-top: 10px;
+      margin-left: 20px;
     }
   }
   .flex-wrap{

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

@@ -28,7 +28,7 @@
           class="p30"
         >
           <div
-            v-if="[2, 21, 22, 25].includes(Number(dataDetail.status|| 0))"
+            v-if="[2, 21, 22, 25, 27].includes(Number(dataDetail.status|| 0))"
             class="flex-wrap"
           >
             <div>
@@ -71,7 +71,7 @@
               >
                 <img
                   class="step-pg"
-                  src="https://files.yunqueyi.com/image/png/common/2022081612011851.png"
+                  :src="item.status == 5 ? 'https://files.yunqueyi.com/image/png/common/20220817141140460.png' : 'https://files.yunqueyi.com/image/png/common/2022081612011851.png'"
                 >
               </div>
               <div
@@ -85,12 +85,6 @@
                   <p>
                     {{ item.nodeName }}
                   </p>
-                  <p
-                    v-if="dataDetail.status == 6"
-                    class="tips"
-                  >
-                    温馨提示:可联系医生重新采样
-                  </p>
                 </div>
                 <div
                   class="step-time"
@@ -100,6 +94,12 @@
               </div>
             </div>
           </div>
+          <p
+            v-if="dataDetail.status == 5"
+            class="tips"
+          >
+            温馨提示:可联系医生重新采样
+          </p>
         </div>
       </div>
     </div>
@@ -207,7 +207,7 @@ export default {
         27: '已上机',
         22: '已签收',
         3: '已完成',
-        5: '样本失效',
+        5: '样本异常',
         6: '待支付',
 
       };