kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-03-17 16:14:44 +08:00
parent 7eaac9b228 9211d66eb8
commit d628c0a0b3
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/AppSuperMarket/AppSuperMarket.vue
View File

@@ -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">

2
src/saas/AppResidentDocument/DetailCard.vue
View File

@@ -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) }}

15
src/saas/AppResidentDocument/DetailPeople.vue
View File

@@ -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;