From ef58ec52d2c1bba0b97d9a97d076e7993ff61c50 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 29 Sep 2022 11:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppGetewayRegister/getewayAdd.vue         |  9 +++++++--
 .../pingchang/AppHealthReport/AddReport.vue   | 19 ++++++++++++++++---
 .../pingchang/AppHealthReport/AddUser.vue     |  7 +++----
 .../AppHealthReport/AppHealthReport.vue       |  6 +++---
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
index 1e0c0da..534104d 100644
--- a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
+++ b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
@@ -301,6 +301,8 @@
     <div class="btn-wrapper">
       <div class="btn" hover-class="text-hover" @click="submit">提交</div>
     </div>
+
+    <AiLogin ref="login"/>
   </div>
 </template>
 
@@ -375,7 +377,7 @@ export default {
   },
 
   computed: {
-    ...mapState(['user'])
+    ...mapState(['user','token'])
   },
 
   onLoad(o) {
@@ -383,7 +385,6 @@ export default {
       this.form.id = o?.id
       this.getInfo(o.id)
     }
-    this.form.gatewayId = decodeURIComponent(o.scene) || ''
   },
   onShow() {
     this.$areaId = this.user.$areaId
@@ -391,6 +392,10 @@ export default {
       this.travelTypeDict = this.$dict.getDict('EP_travelType')
     })
     this.getewayList()
+    if(!this.token) {
+      this.$refs.login.show()
+      this.form.gatewayId = decodeURIComponent(o.scene) || ''
+    }
   },
 
   watch: {
diff --git a/src/project/pingchang/AppHealthReport/AddReport.vue b/src/project/pingchang/AppHealthReport/AddReport.vue
index 18adf99..7d14f4c 100644
--- a/src/project/pingchang/AppHealthReport/AddReport.vue
+++ b/src/project/pingchang/AppHealthReport/AddReport.vue
@@ -1,12 +1,13 @@
 <template>
   <div class="AddReport">
     <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
+    <div class="title">基本信息</div>
     <div class="form-item__group">
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>返乡人员姓名</h2>
+            <h2>姓名</h2>
           </div>
           <div class="form-item__right">
             <input placeholder="请输入" v-model="form.name" disabled :maxlength="20"/>
@@ -25,6 +26,8 @@
         </div>
       </div>
     </div>
+
+    <div class="title">健康状况</div>
     <div class="form-item__group">
       <div class="form-item">
         <div class="form-item__wrapper">
@@ -42,7 +45,7 @@
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>14天内是否接触新冠确诊或疑似患者</h2>
+            <h2>14天内是否接触新冠确诊或疑似患者？</h2>
           </div>
           <div class="form-item__right">
             <AiRadio style="width: 100%;" v-model="form.touchInFourteen" dict="epidemicTouchInFourteen"></AiRadio>
@@ -61,6 +64,8 @@
         </div>
       </div>
     </div>
+
+    <div class="title">核酸检测</div>
     <div class="form-item__group">
       <div class="form-item">
         <div class="form-item__wrapper">
@@ -265,6 +270,14 @@ export default {
 .AddReport {
   padding-bottom: 140px;
 
+  .title {
+    padding: 16px 32px 0 32px;
+    box-sizing: border-box;
+    background: #fff;
+    font-size: 36px;
+    font-weight: 600;
+  }
+
   .tips {
     line-height: 1.3;
     padding: 32px 32px;
@@ -415,7 +428,7 @@ export default {
 
       h2 {
         padding: 0 4px;
-        font-weight: 600;
+        font-weight: 400;
         font-size: 32px;
         color: #333333;
       }
diff --git a/src/project/pingchang/AppHealthReport/AddUser.vue b/src/project/pingchang/AppHealthReport/AddUser.vue
index 45f73c5..a925cc1 100644
--- a/src/project/pingchang/AppHealthReport/AddUser.vue
+++ b/src/project/pingchang/AppHealthReport/AddUser.vue
@@ -5,7 +5,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="请输入" v-model="form.name" :maxlength="20"/>
@@ -110,7 +110,7 @@ export default {
         return this.$toast('请选择上报人手机号码')
       }
 
-      if (!/^1[0-9]{10,10}$/.test(this.form.phone)) {
+      if (!this.form.phone) {
         return this.$toast('请输入正确的手机号码')
       }
 
@@ -129,9 +129,8 @@ export default {
       this.flag = true
 
       this.$loading()
-      this.$instance.post(`/app/appepidemicreportmember/addOrUpdate`, {
+      this.$instance.post(`/app/appepidemicpreventionhealthreportinfo/addReportUser`, {
         ...this.form,
-        openid: this.user.openid
       }).then(res => {
         this.$hideLoading()
         this.flag = false
diff --git a/src/project/pingchang/AppHealthReport/AppHealthReport.vue b/src/project/pingchang/AppHealthReport/AppHealthReport.vue
index 3b1bd97..426cd18 100644
--- a/src/project/pingchang/AppHealthReport/AppHealthReport.vue
+++ b/src/project/pingchang/AppHealthReport/AppHealthReport.vue
@@ -19,11 +19,11 @@
         </div>
         <div class="item-bottom">
           <div class="item-bottom__left">
-            <span>上报第</span>
-            <i>{{ item.diffNum || 0 }}</i>
+            <span>健康上报第</span>
+            <i>{{ item.searchCount || 0 }}</i>
             <span>天</span>
           </div>
-          <div class="item-bottom__right" hover-class="text-hover" v-if="item.today === '0'"
+          <div class="item-bottom__right" hover-class="text-hover" v-if="!item.todayReport"
                @click.stop="$linkTo('./AddReport?id=' + item.id)">
             <span style="color: #FF883C">今日未上报</span>
             <u-icon name="arrow-right" color="#ddd"/>