diff --git a/src/apps/AppEpidemicSituation/UserDetail.vue b/src/apps/AppEpidemicSituation/UserDetail.vue index b7c43973..970732e0 100644 --- a/src/apps/AppEpidemicSituation/UserDetail.vue +++ b/src/apps/AppEpidemicSituation/UserDetail.vue @@ -110,7 +110,7 @@
异常解除时间
-
{{ userList.releaseTime && userList.releaseTime.substring(0, 10) }}
+
{{ userList.releaseTime }}
diff --git a/src/apps/AppEpidemicSituation/UserInfo.vue b/src/apps/AppEpidemicSituation/UserInfo.vue index 5cef6414..e41c8ab9 100644 --- a/src/apps/AppEpidemicSituation/UserInfo.vue +++ b/src/apps/AppEpidemicSituation/UserInfo.vue @@ -102,9 +102,9 @@
-
+
异常处理情况
-
+

{{item.content}}

{{item.createTime}} diff --git a/src/apps/AppMeetingNotice/detail.vue b/src/apps/AppMeetingNotice/detail.vue index 1cad7d21..86036e41 100644 --- a/src/apps/AppMeetingNotice/detail.vue +++ b/src/apps/AppMeetingNotice/detail.vue @@ -116,6 +116,7 @@ export default { }, onLoad(opt) { this.id = opt.id; + document.title = "会议详情"; }, computed: { ...mapState(["user"]), @@ -279,23 +280,13 @@ export default { justify-content: space-between; background-color: #ffffff; box-sizing: border-box; - padding: 0 50px; + padding: 112px 50px 0; border-bottom: 1px solid #E4E5E6; .left { display: flex; align-items: center; - &:after { - content: ""; - position: absolute; - right: 0; - bottom: 0; - width: 622px; - height: 2px; - background-color: rgba(216, 221, 230, 0.5); - } - .name { font-size: 30px; font-weight: 600; diff --git a/src/apps/AppSuperMarket/AppSuperMarket.vue b/src/apps/AppSuperMarket/AppSuperMarket.vue index db1712eb..c3339d80 100644 --- a/src/apps/AppSuperMarket/AppSuperMarket.vue +++ b/src/apps/AppSuperMarket/AppSuperMarket.vue @@ -121,7 +121,13 @@ export default { }, onLoad() { - // this.getList() + this.areaId = this.user.areaId + if(/[^0]0{0,2}$/.test(this.areaId)) { + this.isAreaId = true + this.getList() + }else { + this.isAreaId = false + } this.areaName = this.user.areaName || '' }, onShow() { diff --git a/src/apps/AppSuperMarket/Search.vue b/src/apps/AppSuperMarket/Search.vue index c7dd9bb6..9cca8c1d 100644 --- a/src/apps/AppSuperMarket/Search.vue +++ b/src/apps/AppSuperMarket/Search.vue @@ -1,7 +1,7 @@