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

This commit is contained in:
aixianling
2022-03-17 17:07:04 +08:00

View File

@@ -41,9 +41,9 @@
<span>身份证号</span>
<span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
</div>
<div class="spacial" v-if="item.idNumber == data.resident.idNumber">
<!-- <div class="spacial" v-if="item.idNumber == data.resident.idNumber">
<span v-for="(e,index) in spacialList" :key="index">{{e.applicationName}}</span>
</div>
</div> -->
</div>
</div>
</div>
@@ -63,7 +63,7 @@ export default {
id: '',
data: [],
resident: {},
spacialList: [],
// spacialList: [],
}
},
computed: {},
@@ -85,7 +85,7 @@ export default {
this.$forceUpdate()
this.$nextTick(() => {
this.resident = res.data.resident
this.spacialList = res.data.resident.tsrqInfos
// this.spacialList = res.data.resident.tsrqInfos
this.$forceUpdate()
})
}
@@ -197,14 +197,14 @@ export default {
.rightBottom {
margin-top: 20px;
}
.spacial {
margin-top: 10px;
white-space: wrap;
span {
margin-right: 10px;
color: #ff4466;
}
}
// .spacial {
// margin-top: 10px;
// white-space: wrap;
// span {
// margin-right: 10px;
// color: #ff4466;
// }
// }
}
}
.card:nth-child(2n-1) {