From faa7a42ed12122f7531a1f9e11fedc56c310d115 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, 19 Jan 2022 16:17:02 +0800
Subject: [PATCH 1/3] bug

---
 packages/3.0.0/AppReturnHomeRegister/components/Detail.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
index 140aa016..b52c20f3 100644
--- a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
@@ -24,7 +24,9 @@
             <ai-wrapper
               label-width="120px">
               <ai-info-item label="出发时间" :value="info.startTime"></ai-info-item>
-              <ai-info-item label="出发地区" :value="info.startAreaName"></ai-info-item>
+              <ai-info-item label="出发地区" >
+                <span  :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span>
+              </ai-info-item>
               <ai-info-item label="出发地址" isLine :value="info.startAddress"></ai-info-item>
               <ai-info-item label="出行方式" :value="dict.getLabel('epidemicRecentTravel', info.travelType)"></ai-info-item>
               <ai-info-item label="行程描述" isLine :value="info.description"></ai-info-item>

From 91441487edf0480f14ebf6a7a94a500651fcb3cc Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 19 Jan 2022 18:04:57 +0800
Subject: [PATCH 2/3] 26889

---
 .../components/Detail.vue                     | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
index b52c20f3..fbddb253 100644
--- a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
@@ -15,7 +15,9 @@
               <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
               <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
               <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
-              <ai-info-item label="人员类别" isLine :value="dict.getLabel('epidemicMemberType', info.type)"></ai-info-item>
+              <ai-info-item label="人员类别" isLine>
+                <span :style="info.type == 0 ? 'color:#42D784;' : 'color:#f46;'">{{dict.getLabel('epidemicMemberType', info.type)}}</span>
+              </ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
@@ -40,12 +42,15 @@
           <template #content>
             <ai-wrapper
               label-width="120px">
-              <ai-info-item label="当前体温" :value="info.temperature + '℃'"></ai-info-item>
-              <ai-info-item label="14天内是否接触新冠确诊或疑似患者">
-                <span>{{ dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen) }}</span>
+              <ai-info-item label="当前体温">
+                <span :style="info.temperature >= 37.3 ? 'color:#f46;' : ''">{{ info.temperature + '℃' }}</span>
               </ai-info-item>
-              <ai-info-item label="当前健康状况" :value="info.status === '0' ? '异常' : '正常'">
-                <span>{{ info.healthName }}</span>
+              <ai-info-item label="14天内是否接触新冠确诊或疑似患者">
+                <span :class="'color-'+info.touchInFourteen">{{$dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen)}}</span> 
+              </ai-info-item>
+              <ai-info-item label="当前健康状况"> 
+                <span></span>
+                <span v-for="(item, index) in info.health" :key="index" :style="item != 0 ? 'color:#FF4466;' : ''"><span v-if="index>0">;</span>{{$dict.getLabel('epidemicRecentHealth', item)}}</span>
               </ai-info-item>
             </ai-wrapper>
           </template>
@@ -55,7 +60,9 @@
             <ai-wrapper
               label-width="120px">
               <ai-info-item label="检测日期" :value="info.checkTime && info.checkTime.split(' ')[0]"></ai-info-item>
-              <ai-info-item label="检测结果" :value="dict.getLabel('epidemicRecentTestResult', info.checkResult)"></ai-info-item>
+              <ai-info-item label="检测结果">
+                <span :style="info.checkResult == 1 ? 'color:#f46;' : 'color:#42D784;'">{{$dict.getLabel('epidemicRecentTestResult', info.checkResult)}}</span>
+              </ai-info-item>
               <ai-info-item label="本人健康码截图" isLine>
                 <ai-uploader
                   :instance="instance"
@@ -188,6 +195,7 @@
               healthName = healthName + this.$dict.getLabel('epidemicRecentHealth', v)
             })
             this.info.healthName = healthName
+            this.info.health = this.info.health.split(',')
           }
         })
       },
@@ -259,4 +267,13 @@
 </script>
 
 <style scoped lang="scss">
+  .color-0{
+    color: #42D784;
+  }
+  .color-1{
+    color: #f46;
+  }
+  .color-2{
+    color: #1365DD;
+  }
 </style>

From 6e8e9dfe5286971ffe0f7ecaa47908f7ad3615d2 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 19 Jan 2022 18:08:02 +0800
Subject: [PATCH 3/3] 26883

---
 packages/creditScore/scoreSupermarket/orderManagement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/creditScore/scoreSupermarket/orderManagement.vue b/packages/creditScore/scoreSupermarket/orderManagement.vue
index fe9df41d..7322d071 100644
--- a/packages/creditScore/scoreSupermarket/orderManagement.vue
+++ b/packages/creditScore/scoreSupermarket/orderManagement.vue
@@ -65,7 +65,7 @@
         </ai-search-bar>
         <ai-search-bar>
           <template slot="left">
-            <el-button type="primary" icon="iconfont iconAdd" @click="add()">添加</el-button>
+            <!-- <el-button type="primary" icon="iconfont iconAdd" @click="add()">添加</el-button> -->
             <ai-download
               :instance="instance"
               url="/app/appvillagerintegralshoporder/listExport"