From 135a662576d6521afcf4c13c29a3121f4819c72d Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 25 May 2022 15:24:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mods/conv/AppHealthReport/AddReport.vue   | 138 +++---------------
 src/mods/conv/AppHealthReport/AddUser.vue     |   6 +-
 .../conv/AppHealthReport/AppHealthReport.vue  |  73 +++++++--
 .../AppReturnHomeRegister.vue                 |  16 +-
 4 files changed, 103 insertions(+), 130 deletions(-)

diff --git a/src/mods/conv/AppHealthReport/AddReport.vue b/src/mods/conv/AppHealthReport/AddReport.vue
index 91d71af..bab9980 100644
--- a/src/mods/conv/AppHealthReport/AddReport.vue
+++ b/src/mods/conv/AppHealthReport/AddReport.vue
@@ -1,48 +1,13 @@
 <template>
   <div class="album">
     <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
+
     <div class="form-item__group">
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="form-item__title">
-            <i>*</i>
-            <h2>返乡人员姓名</h2>
-          </div>
-          <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.name" disabled :maxlength="20"/>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="form-item__title">
-            <i>*</i>
-            <h2>身份证号</h2>
-          </div>
-          <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.idNumber" disabled :maxlength="20"/>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="form-item__group">
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="form-item__title">
-            <i>*</i>
-            <h2>当前体温</h2>
-          </div>
-          <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.temperature" :maxlength="20"/>
-            <i>℃</i>
-          </div>
-        </div>
-      </div>
       <div class="form-item form-item__imgs">
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>14天内是否接触新冠确诊或疑似患者</h2>
+            <h2>个人健康状况（可多选）</h2>
           </div>
           <div class="form-item__right">
             <AiRadio style="width: 100%;" v-model="form.touchInFourteen" dict="epidemicTouchInFourteen"></AiRadio>
@@ -53,48 +18,7 @@
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>当前健康状况（可多选）</h2>
-          </div>
-          <div class="form-item__right">
-            <AiCheckbox style="width: 100%;" v-model="form.health" dict="epidemicRecentHealth"></AiCheckbox>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="form-item__group">
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="form-item__title">
-            <i>*</i>
-            <h2>核酸检测日期</h2>
-          </div>
-          <div class="form-item__right">
-            <div class="ai-area" @click="isShowDate = true">
-              <div class="ai-area__wrapper">
-                <span class="label" v-if="form.checkTime">{{ form.checkTime }}</span>
-                <i v-else>请选择</i>
-                <u-icon name="arrow-right" color="#ddd"/>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="form-item form-item__imgs">
-        <div class="form-item__wrapper">
-          <div class="form-item__title">
-            <i>*</i>
-            <h2>核酸检测结果</h2>
-          </div>
-          <div class="form-item__right">
-            <AiRadio style="width: 100%;" v-model="form.checkResult" dict="epidemicRecentTestResult"></AiRadio>
-          </div>
-        </div>
-      </div>
-      <div class="form-item form-item__imgs">
-        <div class="form-item__wrapper">
-          <div class="form-item__title">
-            <i>*</i>
-            <h2>健康码类型</h2>
+            <h2>当前状况</h2>
           </div>
           <div class="form-item__right">
             <AiRadio style="width: 100%;" v-model="form.healthCode" dict="epidemicHealthCode"></AiRadio>
@@ -105,26 +29,16 @@
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>已接种疫苗次数</h2>
+            <h2>备注说明</h2>
           </div>
           <div class="form-item__right">
-            <AiRadio style="width: 100%;" v-model="form.vaccine" dict="epidemicVaccineTime"></AiRadio>
-          </div>
-        </div>
-      </div>
-      <div class="form-item form-item__imgs">
-        <div class="form-item__wrapper">
-          <div class="form-item__title">
-            <i style="margin-right: 8px"></i>
-            <h2>本人健康码截图<span style="color: #999; font-size:14px;font-weight:normal;">(最多9张)</span></h2>
-          </div>
-          <div class="form-item__right" style="padding-left: 5px">
-            <AiUploader v-model="form.checkPhoto" :limit="9" multiple></AiUploader>
+            <textarea  placeholder="请补充说明健康监测情况" v-model="form.temperature"/>
           </div>
         </div>
       </div>
     </div>
-    <u-picker mode="time" :params="dataParams" v-model="isShowDate" @confirm="onDateChange"></u-picker>
+
+    <!-- <u-picker mode="time" :params="dataParams" v-model="isShowDate" @confirm="onDateChange"></u-picker> -->
     <div class="btn-wrapper">
       <div class="btn" hover-class="text-hover" @click="submit">提交</div>
     </div>
@@ -135,7 +49,7 @@
 import {mapState} from 'vuex'
 
 export default {
-  appName:"今日上报",
+  appName:"上报今日状态",
   data() {
     return {
       isShowDate: false,
@@ -220,10 +134,6 @@ export default {
         return this.$toast('请选择已接种疫苗次数')
       }
 
-      // if (!this.form.checkPhoto.length) {
-      //   return this.$toast('请上传健康码截图')
-      // }
-      this.$loading()
       this.$instance.post(`/app/appepidemichealthreport/addOrUpdate`, {
         ...this.form,
         openid: this.user.openid,
@@ -238,7 +148,6 @@ export default {
             uni.navigateBack()
           }, 400)
         }
-        this.$hideLoading()
       })
     }
   }
@@ -351,7 +260,7 @@ export default {
       input {
         flex: 1;
         height: 100%;
-        text-align: right;
+        text-align: left;
         color: #333;
         padding-right: 10px;
       }
@@ -361,22 +270,21 @@ export default {
         align-items: center;
         font-size: 32px;
 
-        span {
-          max-width: 400px;
-          margin-right: 8px;
-          color: #333333;
-          overflow: hidden;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-        }
-
-        i {
-          margin-right: 8px;
-          color: #999999;
-        }
+        // .u-input {
+        //   display: block;
+        //   width: 100%;
+        // }
+        
       }
     }
 
+    
+
+    .form-item__wrapper_input {
+      display: block;
+
+    }
+
     &:last-child {
       .form-item__wrapper {
         border-bottom: none;
@@ -401,11 +309,10 @@ export default {
         padding: 0 4px;
         font-weight: 600;
         font-size: 32px;
-        color: #333333;
+        color: #666666;
       }
     }
 
-
     &.form-item__imgs, &.form-item__textarea {
       .form-item__wrapper {
         display: block;
@@ -416,6 +323,7 @@ export default {
       textarea {
         width: 100%;
         height: 90px;
+
       }
 
       .form-item__title {
diff --git a/src/mods/conv/AppHealthReport/AddUser.vue b/src/mods/conv/AppHealthReport/AddUser.vue
index a3ee64a..c86ae41 100644
--- a/src/mods/conv/AppHealthReport/AddUser.vue
+++ b/src/mods/conv/AppHealthReport/AddUser.vue
@@ -27,7 +27,7 @@
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>手机号码</h2>
+            <h2>联系方式</h2>
           </div>
           <div class="form-item__right">
             <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11"/>
@@ -38,7 +38,7 @@
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>上报地区</h2>
+            <h2>所属地区</h2>
           </div>
           <div class="form-item__right">
             <AiAreaPicker class="ai-area" :areaId="$areaId" v-model="form.areaId" :fullName.sync="form.areaName">
@@ -58,7 +58,7 @@
             <h2>详细地址</h2>
           </div>
           <div class="form-item__right">
-            <textarea auto-height v-model="form.address" :maxlength="500" placeholder="请输入详细地址"
+            <textarea auto-height v-model="form.address" :maxlength="500" placeholder="如住所、酒店、单位等"
                       placeholder-style="font-size: 16px;"></textarea>
           </div>
         </div>
diff --git a/src/mods/conv/AppHealthReport/AppHealthReport.vue b/src/mods/conv/AppHealthReport/AppHealthReport.vue
index 4b2219b..bcf67ec 100644
--- a/src/mods/conv/AppHealthReport/AppHealthReport.vue
+++ b/src/mods/conv/AppHealthReport/AppHealthReport.vue
@@ -9,11 +9,15 @@
       </div>
     </div>
     <div class="home-list">
-      <div class="item" v-for="(item, index) in list" :key="index">
-        <div class="item-top">
+      <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__left">
-            <h2>{{ item.name }}</h2>
-            <p @click.stop="$linkTo('./UserInfo?id=' + item.id)" hover-class="text-hover">查看个人信息></p>
+            <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> -->
+            <div>
+              <p>登记于2021-10-15</p>
+              <span :class="item.status == 1? 'status0':'status1'">异常</span>
+            </div>
           </div>
           <span v-if="item.status === '0'">健康数据异常</span>
         </div>
@@ -38,7 +42,8 @@
       <AiEmpty v-if="list.length==0"/>
     </div>
     <div class="btn-wrapper">
-      <div class="btn" @click="toReport" hover-class="text-hover">添加上报人员</div>
+      <div class="share">分享</div>
+      <div class="addBtn" @click="toReport" hover-class="text-hover">添加上报人员</div>
     </div>
   </div>
 </template>
@@ -167,17 +172,43 @@ export default {
       border-bottom: 1px solid #DDDDDD;
 
       .item-top__left {
+        width: 100%;
         h2 {
           line-height: 44px;
           margin-bottom: 8px;
           color: #333;
           font-size: 32px;
           font-weight: 600;
+          span {
+            padding: 4px 8px;
+            font-size: 26px;
+            font-weight: normal;
+            margin-left: 24px;
+          }
         }
-
-        p {
-          color: #999999;
-          font-size: 26px;
+        div {
+          display: flex;
+          justify-content: space-between;
+          p {
+            color: #999999;
+            font-size: 26px;
+          }
+          span {
+            padding: 4px 8px;
+            font-size: 26px;
+          }
+        }
+        .status0 {
+          color: #FF4466;
+          background: #FFF5F7;
+        }
+        .status1 {
+          color: #1AAAFF;
+          background: #E8F6FF;
+        }
+        .status2 {
+          color: #42D784;
+          background: #ECFBF2;
         }
       }
 
@@ -219,5 +250,29 @@ export default {
       }
     }
   }
+
+  .btn-wrapper {
+    display: flex;
+    justify-content: space-between;
+    padding: 20px 32px !important;
+    box-sizing: border-box;
+    .addBtn,
+    .share {
+      height: 88px;
+      line-height: 88px;
+      text-align: center;
+    }
+    .share {
+      width: 35%;
+      border-radius: 16px;
+      border: 1px solid #A0C0FF;
+    }
+    .addBtn {
+      width: 60%;
+      background: #4181FF;
+      border-radius: 16px;
+      color: #fff;
+    }
+  }
 }
 </style>
diff --git a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
index cf7d001..ab3ca05 100644
--- a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
+++ b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -38,9 +38,17 @@
       <AiEmpty v-if="list.length==0"/>
     </div>
     <div class="btn-wrapper">
-      <div class="share" @click="shareBtn">分享</div>
+      <div class="share" @click="show = true">分享</div>
       <div class="addbtn" @click="toReport" hover-class="text-hover">添加返乡报备</div>
     </div>
+
+    <u-popup v-model="show" mode="center" border-radius="14" height="300px">
+			<view>出淤泥而不染，濯清涟而不妖</view>
+			<view>出淤泥而不染，濯清涟而不妖</view>
+			<view>出淤泥而不染，濯清涟而不妖</view>
+			<view>出淤泥而不染，濯清涟而不妖</view>
+
+		</u-popup>
   </div>
 </template>
 
@@ -54,7 +62,8 @@ export default {
     return {
       list: [],
       current: 1,
-      total: 0
+      total: 0,
+      show: false,
     }
   },
 
@@ -104,7 +113,8 @@ export default {
     },
 
     shareBtn() {
-      console.log('分享');
+      // console.log('分享');
+
     }
   },