Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppEpidemicSituation/Health.vue

@@ -115,6 +115,7 @@ export default {
     this.getUserList()
   },
   onShow() {
+    this.areaId = this.user.areaId
     document.title = '健康上报'
   },
   methods: {
@@ -165,7 +166,7 @@ export default {
 
     change(index) {
       this.data = []
-      this.areaId = this.user.areaId
+      // this.areaId = this.user.areaId
       this.keyword = ''
       this.currentTabs = index
       this.current = 1

src/apps/AppEpidemicSituation/HealthDetail.vue

@@ -117,7 +117,7 @@ export default {
 
     toUserDetail(item) {
       uni.navigateTo({
-        url: `./UserDetail?id=${item.id}&temperature=${item.temperature}&touchInFourteen=${item.touchInFourteen}&health=${item.health}&checkTime=${item.checkTime}&checkResult=${item.checkResult}&checkPhoto=${item.checkPhoto}&status=${item.status}&memberId=${this.id}&vaccine=${item.vaccine}&healthCode=${item.healthCode}&releaseName=${this.userList.releaseName ? this.userList.releaseName : ''}&releaseTime=${this.userList.releaseTime ? this.userList.releaseTime : ''}`,
+        url: `./UserDetail?id=${item.id}&temperature=${item.temperature}&touchInFourteen=${item.touchInFourteen}&health=${item.health}&checkTime=${item.checkTime}&checkResult=${item.checkResult}&checkPhoto=${item.checkPhoto}&status=${item.status}&memberId=${this.id}&vaccine=${item.vaccine}&healthCode=${item.healthCode}&releaseName=${this.userList.releaseName ? this.userList.releaseName : ''}&releaseTime=${this.userList.releaseTime ? this.userList.releaseTime : ''}&statuses=${this.userList.status}`,
       })
     },
 

src/apps/AppEpidemicSituation/UserDetail.vue

@@ -83,8 +83,8 @@
       </div>
     </div>
 
-    <div class="line-bg" v-if="userList.status == 0"></div>
-    <div class="info" v-if="userList.status == 0">
+    <div class="line-bg" v-if="userList.status == 0 && userList.statuses == 1"></div>
+    <div class="info" v-if="userList.status == 0 && userList.statuses == 1">
       <div class="title">异常处理情况</div>
 
       <div class="item-record">