From 7ae0d6bfb5ae0903900d9bb8ea91db9a133a1e9b Mon Sep 17 00:00:00 2001
From: changjinpeng <185154740@qq.com>
Date: Tue, 8 Mar 2022 16:01:05 +0800
Subject: [PATCH 1/2] 28135

---
 src/apps/AppResidentActivitie/AppResidentActivities.vue | 2 +-
 src/apps/AppWorkonline/Detail.vue                       | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue
index fe5e8b19..63dbaa49 100644
--- a/src/apps/AppResidentActivitie/AppResidentActivities.vue
+++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue
@@ -93,7 +93,7 @@ export default {
   methods: {
     getList() {
       this.$http
-        .post('/app/appvillageactivityinfo/list', null, {
+        .post('/app/appvillageactivityinfo/listUp', null, {
           params: {
             size: this.size,
             current: this.current,
diff --git a/src/apps/AppWorkonline/Detail.vue b/src/apps/AppWorkonline/Detail.vue
index b447c041..3801a8d7 100644
--- a/src/apps/AppWorkonline/Detail.vue
+++ b/src/apps/AppWorkonline/Detail.vue
@@ -97,13 +97,10 @@
 
                   <!-- 右 字典值 items.dictionaryCode -->
                   <!-- 单下拉框 -->
-                  <span class="msg_lright" v-if="items.fieldDataType == 9">
-                    {{ $dict.getDict(items.dictionaryCode, items.fieldValue)[$dict.getLabel(items.dictionaryCode, items.fieldValue)].dictName }}
-                  </span>
 
-                  <span class="msg_lright" v-if="items.fieldDataType != 5 && items.fieldDataType != 9">{{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }}</span>
+                  <span class="msg_lright" v-if="items.fieldDataType != 5">{{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }}</span>
 
-                  <span class="msg_lright" v-if="items.fieldDataType == 5 && items.fieldDataType != 9">
+                  <span class="msg_lright" v-if="items.fieldDataType == 5">
                     <span v-for="(itemL, indexL) in items.fieldValue" :key="indexL">{{ $dict.getLabel(items.dictionaryCode, itemL) }} </span>
                   </span>
                 </div>

From 5b1a0500013027017e694662ae4ff574766e9f20 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 8 Mar 2022 16:19:43 +0800
Subject: [PATCH 2/2] arriveTime

---
 src/apps/AppEpidemicSituation/UserInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppEpidemicSituation/UserInfo.vue b/src/apps/AppEpidemicSituation/UserInfo.vue
index 54345f26..5cef6414 100644
--- a/src/apps/AppEpidemicSituation/UserInfo.vue
+++ b/src/apps/AppEpidemicSituation/UserInfo.vue
@@ -5,7 +5,7 @@
         <h2 class="name">{{info.name}}的返乡登记信息</h2>
         <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{info.startAreaName}}</span></p>
         <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{info.arriveAreaName}}</span></p>
-        <p><img src="./components/img/time-icon.png" alt="">{{info.createTime}}</p>
+        <p><img src="./components/img/time-icon.png" alt="">{{info.arriveTime}}</p>
       </div>
     </div>
     <div class="info">