From 20bc95ac41062b36454924a62520e7e97dbaf135 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 17 Mar 2022 16:06:49 +0800
Subject: [PATCH 1/2] 28322

---
 src/saas/AppResidentDocument/DetailCard.vue   |  2 +-
 src/saas/AppResidentDocument/DetailPeople.vue | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/saas/AppResidentDocument/DetailCard.vue b/src/saas/AppResidentDocument/DetailCard.vue
index 14e3d6c2..37b559d4 100644
--- a/src/saas/AppResidentDocument/DetailCard.vue
+++ b/src/saas/AppResidentDocument/DetailCard.vue
@@ -26,7 +26,7 @@
             <div class="rightTop">
               <div class="rightTop-lefts">
                 <span class="names">{{ item.name }}</span>
-                <span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span>
+                <span class="fileStatuss" v-if="item.fileStatus == 1">已注销</span>
                 <span class="householdNames" v-if="item.householdName == 1">户主</span>
                 <span class="householdNames" v-else>
                   {{ $dict.getLabel('householdRelation', item.householdRelation) }}
diff --git a/src/saas/AppResidentDocument/DetailPeople.vue b/src/saas/AppResidentDocument/DetailPeople.vue
index 94029f9b..5251a3ce 100644
--- a/src/saas/AppResidentDocument/DetailPeople.vue
+++ b/src/saas/AppResidentDocument/DetailPeople.vue
@@ -8,7 +8,7 @@
 
       <div class="right">
         <div class="rightTop">
-          <span class="names">{{ data.resident && data.resident.name }}</span>
+          <span class="names">{{ data.resident && data.resident.name }}<span class="fileStatuss" v-if="data.fileStatus == 1">已注销</span></span>
           <span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span>
           <span class="householdNames" v-else>
             {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
@@ -169,6 +169,19 @@ export default {
       .rightTop {
         display: flex;
         justify-content: space-between;
+        .fileStatuss {
+          display: inline-block;
+          margin-left: 30px;
+          color: #ff4466;
+          background: #ffecef;
+          border-radius: 8px;
+          width: 120px;
+          height: 40px;
+          line-height: 40px;
+          text-align: center;
+          font-weight: 400;
+          font-size: 28px;
+        }
         .names {
           font-size: 32px;
           font-weight: 600;

From 9211d66eb8de5a56273d8d2e2a6d9b630faa89ac Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 17 Mar 2022 16:08:16 +0800
Subject: [PATCH 2/2] 28328

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

diff --git a/src/apps/AppSuperMarket/AppSuperMarket.vue b/src/apps/AppSuperMarket/AppSuperMarket.vue
index c3339d80..7bbc82e8 100644
--- a/src/apps/AppSuperMarket/AppSuperMarket.vue
+++ b/src/apps/AppSuperMarket/AppSuperMarket.vue
@@ -46,7 +46,7 @@
         </div>
       </div>
     </div>
-    <AiEmpty description="此页面暂无数据，请选择区域到村级" v-if="!isAreaId && !numList.length"/>
+    <AiEmpty description="暂无数据，请选择到村/社区" v-if="!isAreaId && !numList.length"/>
     <AiEmpty description="暂无数据" v-if="isAreaId && !numList.length" />
     <div class="goods-footer" v-if="numList.length">
       <div class="goods-footer__bottom">