ct

src/apps/AppEpidemicSituation/ErrorDetail.vue

@@ -43,6 +43,8 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   components: {},
   props: {},

src/apps/AppEpidemicSituation/Health.vue

@@ -207,7 +207,7 @@ export default {
 
   .line1 {
     height: 4px;
-    background: #f5f5f5;
+    background: #f3f6f9;
   }
 
   .middle {
@@ -228,13 +228,13 @@ export default {
 
   .line2 {
     height: 8px;
-    background: #f5f5f5;
+    background: #f3f6f9;
   }
 
   .bottom {
     .line3 {
       height: 4px;
-      background: #f5f5f5;
+      background: #f3f6f9;
     }
 
     .templates {

src/apps/AppEpidemicSituation/HealthDetail.vue

@@ -35,7 +35,7 @@
 
       <template>
         <!-- v-if="data.length" -->
-        <div class="templatess" v-for="(item, i) in 12" :key="i" @click="goHealthDetail()">
+        <div class="templatess" v-for="(item, i) in 12" :key="i">
           <div class="left">
             <div class="recordType recordType1">正常</div>
             <!-- <div class="recordType recordType2">异常</div> -->
@@ -57,6 +57,8 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: 'HealthDetail',
   components: {},
@@ -66,14 +68,16 @@ export default {
       data: [],
     }
   },
-  computed: {},
+  computed: {
+    ...mapState(['user']),
+  },
   watch: {},
   onLoad() {},
   onShow() {},
   methods: {
     toUserDetail() {
       uni.navigateTo({
-        url: `./ErrorDetail`,
+        url: `./UserDetail`,
       })
     },
 
@@ -89,7 +93,7 @@ export default {
 <style scoped lang="scss">
 .HealthDetail {
   padding-bottom: 120px;
-  background: #f5f5f5;
+  background: #f3f6f9;
   .top {
     .templates {
       display: flex;

src/apps/AppEpidemicSituation/UserDetail.vue

@@ -1,8 +1,79 @@
 <template>
-  <div class="UserDetail">UserDetail</div>
+  <div class="UserDetail">
+    <div class="user-list">
+      <div class="item">
+        <h2 class="name">林益丰</h2>
+        <p class="color-999">420107********3274</p>
+        <p><img src="./components/img/blue-icon.png" alt="" />湖北省武汉市洪山区</p>
+        <p><img src="./components/img/org-icon.png" alt="" />重庆市荣昌区</p>
+        <p><img src="./components/img/time-icon.png" alt="" />2021-12-06 13:23</p>
+      </div>
+    </div>
+
+    <div class="info">
+      <div class="title">基本信息</div>
+      <div class="item-flex">
+        <div class="label">姓名</div>
+        <div class="value">陈晨</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">身份证号</div>
+        <div class="value">422132199412038273</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">联系方式</div>
+        <div class="value" style="color: #4181ff">
+          <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone('112')" class="phone-icon" />
+          152738193323
+        </div>
+      </div>
+      <div class="item-flex">
+        <div class="label">人员类别</div>
+        <div class="value" style="color: #42d784">跨省返乡人员</div>
+      </div>
+    </div>
+
+    <div class="line-bg"></div>
+    <div class="info">
+      <div class="title">健康状况</div>
+      <div class="item-flex">
+        <div class="label">当前体温</div>
+        <div class="value temperature">36℃</div>
+      </div>
+      <div class="item-flex">
+        <div class="label" style="width: 360px">14天内是否接触新冠确诊或疑似患者</div>
+        <div class="value" style="color: #42d784">否</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">当前健康状况</div>
+        <div class="value" style="color: #ff4466">感冒症状;乏力、咳嗽、发烧、肌肉痛、头痛</div>
+      </div>
+    </div>
+
+    <div class="line-bg"></div>
+    <div class="info">
+      <div class="title">核酸检测信息</div>
+      <div class="item-flex">
+        <div class="label">核酸检测日期</div>
+        <div class="value">2021-10-19</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">核酸检测结果</div>
+        <div class="value" style="color: #42d784">阴性</div>
+      </div>
+      <div class="item-flex">
+        <div style="color: #999">本人健康码截图或核酸检测报告</div>
+      </div>
+      <div class="img-list">
+        <img src="./components/img/time-icon.png" alt="" />
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: 'UserDetail',
   components: {},
@@ -16,6 +87,112 @@ export default {
 
 <style scoped lang="scss">
 .UserDetail {
-  height: 100%;
+  background: #f3f6f9;
+  .user-list {
+    margin-bottom: 24px;
+    .item {
+      padding: 32px;
+      background-color: #fff;
+      .name {
+        font-size: 36px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 50px;
+        margin-bottom: 8px;
+        .status {
+          float: right;
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #ff4466;
+          line-height: 40px;
+        }
+      }
+      p {
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #333;
+        line-height: 40px;
+        margin-bottom: 8px;
+        img {
+          width: 32px;
+          height: 32px;
+          margin-right: 18px;
+          vertical-align: middle;
+        }
+      }
+      .color-999 {
+        margin-bottom: 24px;
+        color: #999;
+      }
+    }
+  }
+  .info {
+    background-color: #fff;
+    padding: 0 32px;
+    .title {
+      line-height: 116px;
+      background: #fff;
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+    }
+    .item-flex {
+      padding: 34px 0;
+      border-bottom: 1px solid #ddd;
+      display: flex;
+      justify-content: space-between;
+      line-height: 44px;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      .label {
+        width: 206px;
+        color: #999;
+      }
+      .value {
+        width: calc(100% - 206px);
+        word-break: break-all;
+        color: #333;
+        text-align: right;
+        .phone-icon {
+          width: 40px;
+          height: 40px;
+          vertical-align: middle;
+          margin-right: 8px;
+        }
+      }
+      .temperature {
+        color: #ff4466;
+      }
+    }
+    .img-list {
+      padding-bottom: 48px;
+      img {
+        width: 320px;
+        height: 320px;
+      }
+    }
+    .item-flex:nth-last-of-type(1) {
+      border-bottom: 0;
+    }
+  }
+  .line-bg {
+    width: 100%;
+    height: 24px;
+    background-color: #f3f6f9;
+  }
+  .footer {
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #1365dd;
+    box-shadow: inset 0px 1px 0px 0px #eeeeee;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #fff;
+    text-align: center;
+  }
 }
 </style>

src/apps/AppVillageDiscuss/Detail.vue

@@ -83,9 +83,9 @@
       <div class="leftInput" @click="showBottomInput = true">我来说两句...</div>
     </div>
 
-    <u-popup v-model="showBottomInput" height="auto" mode="bottom">
+    <u-popup v-model="showBottomInput" height="auto" mode="bottom" @close="close">
       <div class="comments-wrapper">
-        <u-input v-model="content" placeholder="写下你的想法" type="textarea" auto-height height="180" maxlength="140"> </u-input>
+        <u-input v-model="content" placeholder="写下你的想法" type="textarea" auto-height :clearable="false" height="180" maxlength="140"> </u-input>
         <div class="words">字数{{ content.length }}/140</div>
 
         <div class="bottombtn">
@@ -275,6 +275,10 @@ export default {
       })
     },
 
+    close() {
+      this.content = ''
+    },
+
     previewImage(images, img) {
       uni.previewImage({
         urls: images.map((v) => v.url),