From 3eb1d7d726e2001fccbc6375c178830e10adcd45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Wed, 12 Jan 2022 13:59:35 +0800
Subject: [PATCH] 26627

---
 src/apps/AppEpidemicSituation/HealthDetail.vue |  2 +-
 src/apps/AppEpidemicSituation/UserDetail.vue   | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppEpidemicSituation/HealthDetail.vue b/src/apps/AppEpidemicSituation/HealthDetail.vue
index 5684d1dd..aea57f82 100644
--- a/src/apps/AppEpidemicSituation/HealthDetail.vue
+++ b/src/apps/AppEpidemicSituation/HealthDetail.vue
@@ -130,7 +130,7 @@ export default {
 
     toUserDetail(item) {
       uni.navigateTo({
-        url: `./UserDetail?id=${item.id}&temperature=${item.temperature}&touchInFourteen=${item.touchInFourteen}&health=${item.health}&checkTime=${item.checkTime}&checkResult=${item.checkResult}&checkPhoto=${item.checkPhoto}&status=${item.status}&memberId=${this.id}`,
+        url: `./UserDetail?id=${item.id}&temperature=${item.temperature}&touchInFourteen=${item.touchInFourteen}&health=${item.health}&checkTime=${item.checkTime}&checkResult=${item.checkResult}&checkPhoto=${item.checkPhoto}&status=${item.status}&memberId=${this.id}&vaccine=${item.vaccine}&healthCode=${item.healthCode}`,
       })
     },
 
diff --git a/src/apps/AppEpidemicSituation/UserDetail.vue b/src/apps/AppEpidemicSituation/UserDetail.vue
index 3e89b1cd..cde89448 100644
--- a/src/apps/AppEpidemicSituation/UserDetail.vue
+++ b/src/apps/AppEpidemicSituation/UserDetail.vue
@@ -52,10 +52,22 @@
         <div class="label">核酸检测日期</div>
         <div class="value">{{ userList.checkTime }}</div>
       </div>
+
       <div class="item-flex">
         <div class="label">核酸检测结果</div>
         <div class="value" :style="userList.checkResult == 1 ? 'color:#f46;' : 'color:#42D784;'">{{ $dict.getLabel('epidemicRecentTestResult', userList.checkResult) }}</div>
       </div>
+
+      <div class="item-flex">
+        <div class="label">健康码</div>
+        <div class="value" :style="{ color: userList.healthCode == '3' ? '#FF4466 ' : '' }">{{ $dict.getLabel('epidemicHealthCode', userList.healthCode) }}</div>
+      </div>
+
+      <div class="item-flex">
+        <div class="label">已接种试剂</div>
+        <div class="value">{{ userList.vaccine }}次</div>
+      </div>
+
       <div class="item-flex">
         <div style="color: #999">本人健康码截图或核酸检测报告</div>
       </div>
@@ -82,7 +94,7 @@ export default {
   },
   onLoad(o) {
     console.log(o)
-    this.$dict.load('epidemicMemberType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth').then(() => {
+    this.$dict.load('epidemicMemberType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth', 'epidemicHealthCode').then(() => {
       this.id = o.id
       this.userList = o
       this.userList.checkPhoto = JSON.parse(o.checkPhoto)