From f6f667a0f69bccf6a9bbd8aef2fe84547783ace6 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 25 May 2022 17:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conv/AppHealthReport/AppHealthReport.vue  |   2 +-
 src/mods/conv/AppHealthReport/Detail.vue      | 258 ++++++++----------
 src/mods/conv/AppHealthReport/UserInfo.vue    | 134 ---------
 .../AppReturnHomeRegister.vue                 |   2 +-
 4 files changed, 117 insertions(+), 279 deletions(-)
 delete mode 100644 src/mods/conv/AppHealthReport/UserInfo.vue

diff --git a/src/mods/conv/AppHealthReport/AppHealthReport.vue b/src/mods/conv/AppHealthReport/AppHealthReport.vue
index bcf67ec..80c56dc 100644
--- a/src/mods/conv/AppHealthReport/AppHealthReport.vue
+++ b/src/mods/conv/AppHealthReport/AppHealthReport.vue
@@ -10,7 +10,7 @@
     </div>
     <div class="home-list">
       <div class="item" v-for="(item, index) in list" :key="index" >
-        <div class="item-top" @click.stop="$linkTo('./UserInfo?id=' + item.id)">
+        <div class="item-top" @click.stop="$linkTo('./Detail?id=' + item.id)">
           <div class="item-top__left">
             <h2>{{ item.name }}<span :class="item.status == 1? 'status0':'status1'">返乡人员</span></h2>
             <!-- <p @click.stop="$linkTo('./UserInfo?id=' + item.id)" hover-class="text-hover">查看个人信息></p> -->
diff --git a/src/mods/conv/AppHealthReport/Detail.vue b/src/mods/conv/AppHealthReport/Detail.vue
index c5b3632..18adfb6 100644
--- a/src/mods/conv/AppHealthReport/Detail.vue
+++ b/src/mods/conv/AppHealthReport/Detail.vue
@@ -1,72 +1,48 @@
 <template>
   <div class="detail">
-    <div class="detail-info">
-      <h2>健康状况</h2>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>当前体温</label>
-        </div>
-        <div class="right">
-          <span :style="{color: info.temperature >= 37.3 ? '#FF4466' : '#42D784'}">{{ info.temperature }}℃</span>
-        </div>
+    <div class="detail-header">
+      <div class="name">
+        <h2>张三<span>返乡人员</span></h2>
+        <p><u-icon name="phone" color="#4181FF" size="28"></u-icon>拨打电话</p>
       </div>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>14天内是否接触新冠确诊或疑似患者</label>
-        </div>
-        <div class="right">
-          <span :style="{color: info.touchInFourteen === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen) }}</span>
-        </div>
+      <div class="idNumber">
+        <span>身份证号：</span>
+        <span>420107197309172837</span>
       </div>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>当前健康状况</label>
-        </div>
-        <div class="right">
-          <span :style="{color: !info.isHealth ? '#42D784' : '#FF4466'}">{{ info.healthName }}</span>
-        </div>
+      <div class="phone">
+        <span>手机号码：</span>
+        <span>13827263092</span>
+      </div>
+      <div class="address">
+        <span>详细地址：</span>
+        <span>辛店镇北靳楼-北靳楼大学学生宿舍560</span>
       </div>
     </div>
+
     <div class="detail-info">
-      <h2>核酸检测信息</h2>
-      <div class="detail-info__item">
+      <div class="title">
         <div class="left">
-          <label>核酸检测日期</label>
+          <h2>上报记录</h2>
+          <p>个人连续无异常上报<span>7</span>>天后自动解除风险</p>
         </div>
         <div class="right">
-          <span>{{ info.checkTime.split(' ')[0] }}</span>
+          <span>3</span>/<span>7</span>天
         </div>
       </div>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>核酸检测结果</label>
-        </div>
-        <div class="right">
-          <span :style="{color: info.checkResult === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicRecentTestResult', info.checkResult) }}</span>
-        </div>
-      </div>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>健康码状态</label>
-        </div>
-        <div class="right">
-          <span :style="{color: info.healthCode === '0' || info.healthCode === '1' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicHealthCode', info.healthCode) }}</span>
-        </div>
-      </div>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>已接种疫苗次数</label>
-        </div>
-        <div class="right">
-          <span>{{ $dict.getLabel('epidemicVaccineTime', info.vaccine) }}</span>
-        </div>
-      </div>
-      <div class="detail-info__item detail-info__item--img">
-        <div class="left">
-          <label>本人健康码截图</label>
-        </div>
-        <div class="right">
-          <image :src="item.url" @click="preview(item.url)" v-for="(item, index) in info.checkPhoto" :key="index" />
+      <div class="list">
+        <div class="item">
+          <div class="item_card">
+            <div class="left">
+              <span></span><span>2020-07-20</span><span>（自主上报）</span>
+            </div>
+            <div class="right">
+              <span>异常</span>
+              <u-icon name="arrow-down" color="#999" size="28"></u-icon>
+            </div>
+          </div>
+          <div class="item_info">
+            
+          </div>
         </div>
       </div>
     </div>
@@ -75,7 +51,7 @@
 
 <script>
   export default {
-    appName:"上报详情",
+    appName:"上报记录",
     data () {
       return {
         info: {},
@@ -83,12 +59,12 @@
       }
     },
 
-    onLoad (query) {
-      this.$loading()
-      this.$dict.load(['epidemicTouchInFourteen', 'epidemicRecentHealth', 'epidemicRecentTestResult', 'epidemicHealthCode', 'epidemicVaccineTime']).then(() => {
-        this.getInfo(query.id)
-      })
-    },
+    // onLoad (query) {
+    //   this.$loading()
+    //   this.$dict.load(['epidemicTouchInFourteen', 'epidemicRecentHealth', 'epidemicRecentTestResult', 'epidemicHealthCode', 'epidemicVaccineTime']).then(() => {
+    //     this.getInfo(query.id)
+    //   })
+    // },
 
     methods: {
       preview (url) {
@@ -137,108 +113,104 @@
 
     .detail-header {
       padding: 32px;
-      background: #fff;
-
-      h2 {
-        margin-bottom: 32px;
-        color: #333333;
-        font-size: 40px;
-        font-weight: 600;
-      }
-
-      .item-info {
-        .item-info__item {
-          display: flex;
-          align-items: center;
-          margin-bottom: 8px;
-
-          &:last-child {
-            margin-bottom: 0;
-          }
-
-          image {
-            width: 32px;
-            height: 32px;
-            margin-right: 16px;
-          }
+      box-sizing: border-box;
+      background: #FFF;
 
+      .name {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        h2 {
+          font-weight: 600;
+          font-size: 40px;
           span {
-            color: #333;
-            font-size: 28px;
+            font-weight: normal;
+            font-size: 26px;
+            padding: 4px 8px;
+            margin-left: 16px;
+            background: #FFF5F7;
+            color: #FF4466;
           }
         }
+        p {
+          font-size: 26px;
+          color: #4181FF;
+        }
+      }
+
+      .idNumber, 
+      .phone,
+      .address {
+        color: #999999;
+        font-size: 26px;
+        margin-top: 8px;
+        
+        span:first-child {
+          display: inline-block;
+          width: 130px;
+          vertical-align: top;
+        }
+        span:last-child {
+          display: inline-block;
+          width: calc(100% - 130px);
+          vertical-align: top;
+        }
+      }
+      .idNumber {
+        margin-top: 16px;
       }
     }
 
     .detail-info {
       margin-top: 24px;
-      padding: 0 32px;
-      background: #fff;
+      background: #FFF;
+      padding: 32px;
+      box-sizing: border-box;
 
-      & > h2 {
-        height: 116px;
-        line-height: 116px;
-        font-size: 38px;
-        font-weight: 600;
-        color: #333;
-      }
-
-      .detail-info__item {
+      .title {
         display: flex;
         justify-content: space-between;
-        padding: 34px 0;
-        border-bottom: 1px solid #DDDDDD;
-
-        &:last-child {
-          border: none;
-        }
-
+        align-items: center;
         .left {
-          display: flex;
-          line-height: 1.3;
-          max-width: 360px;
-
-          label {
-            position: relative;
+          h2 {
+            font-size: 38px;
+            color: #333333;
+            font-weight: 600;
+          }
+          p {
+            font-size: 26px;
             color: #999999;
-            font-size: 32px;
+            margin-top: 8px;
           }
         }
-
         .right {
-          display: flex;
-          max-width: 450px;
-
-          span {
-            color: #333333;
-            font-size: 32px;
-            text-align: right;
-          }
-
-          image {
-            width: 40px;
-            height: 40px;
+          color: #999999;
+          font-size: 28px;
+          span:first-child {
+            color: #4181FF;
           }
         }
       }
 
-      .detail-info__item--img {
-        display: block;
-
-        .right {
-          flex-wrap: wrap;
-          max-width: 100%;
-          margin-top: 34px;
-
-          image {
-            width: 226px;
-            height: 226px;
-            margin: 0 9px 9px 0;
-
-            &:nth-of-type(3n) {
-              margin-right: 0;
+      .list {
+        .item {
+          .item_card {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 26px 0;
+            .left {
+              span:first-child {
+                display: inline-block;
+                width: 4px;
+                height: 24px;
+                background: #1365DD;
+                vertical-align: center;
+                margin-right: 12px;
+              }
             }
           }
+          
         }
       }
     }
diff --git a/src/mods/conv/AppHealthReport/UserInfo.vue b/src/mods/conv/AppHealthReport/UserInfo.vue
deleted file mode 100644
index f7a4cb0..0000000
--- a/src/mods/conv/AppHealthReport/UserInfo.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <div class="userinfo" v-if="pageShow">
-    <div class="cell-group">
-      <div class="cell-item">
-        <div class="cell-item__wrapper">
-          <div class="left">
-            <span>上报人姓名</span>
-          </div>
-          <div class="right">
-            <span>{{ info.name }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="cell-item">
-        <div class="cell-item__wrapper">
-          <div class="left">
-            <span>身份证号</span>
-          </div>
-          <div class="right">
-            <span>{{ info.idNumber }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="cell-item">
-        <div class="cell-item__wrapper">
-          <div class="left">
-            <span>手机号码</span>
-          </div>
-          <div class="right">
-            <span>{{ info.phone }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="cell-item">
-        <div class="cell-item__wrapper">
-          <div class="left">
-            <span>上报地区</span>
-          </div>
-          <div class="right">
-            <span>{{ info.areaName }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="cell-item">
-        <div class="cell-item__wrapper">
-          <div class="left">
-            <span>详细地址</span>
-          </div>
-          <div class="right">
-            <span>{{ info.address }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    appName:"个人信息",
-    data () {
-      return {
-        info: {},
-        pageShow: false
-      }
-    },
-
-    onLoad (query) {
-      this.$loading()
-      this.getInfo(query.id)
-    },
-
-    methods: {
-      getInfo (id) {
-        this.$instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-            if (res.data.eventStatus > 1) {
-              this.result = res.data.processList[0]
-            }
-            this.$nextTick(() => {
-              this.pageShow = true
-            })
-          }
-
-          this.$hideLoading()
-        }).catch(() => {
-          this.$hideLoading()
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  .userinfo {
-    .cell-group {
-      background: #fff;
-
-      .cell-item {
-        padding-left: 32px;
-
-        .cell-item__wrapper {
-          display: flex;
-          justify-content: space-between;
-          padding: 34px 32px 34px 0;
-          border-bottom: 1px solid #DDDDDD;
-
-          .left {
-            span {
-              color: #999999;
-              font-size: 32px;
-            }
-          }
-
-          .right {
-            max-width: 450px;
-            text-align: right;
-            span {
-              color: #333333;
-              font-size: 32px;
-            }
-          }
-        }
-
-        &:last-child {
-          .cell-item__wrapper {
-            border-bottom: none;
-          }
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
index ab3ca05..c894595 100644
--- a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
+++ b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -42,7 +42,7 @@
       <div class="addbtn" @click="toReport" hover-class="text-hover">添加返乡报备</div>
     </div>
 
-    <u-popup v-model="show" mode="center" border-radius="14" height="300px">
+    <u-popup v-model="show" mode="center" border-radius="14" width="90%" height="150px">
 			<view>出淤泥而不染，濯清涟而不妖</view>
 			<view>出淤泥而不染，濯清涟而不妖</view>
 			<view>出淤泥而不染，濯清涟而不妖</view>