From 56911c18e6a84ad671ecc710ddce6bc41802157c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 26 May 2022 15:27:17 +0800
Subject: [PATCH] fx

---
 src/mods/conv/AppHealthReport/Detail.vue      | 27 +++++++++----------
 .../conv/AppReturnHomeRegister/Detail.vue     | 12 ++++-----
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/mods/conv/AppHealthReport/Detail.vue b/src/mods/conv/AppHealthReport/Detail.vue
index fe26297..5b510b1 100644
--- a/src/mods/conv/AppHealthReport/Detail.vue
+++ b/src/mods/conv/AppHealthReport/Detail.vue
@@ -3,7 +3,7 @@
     <div class="detail-header">
       <div class="name">
         <h2>张三<span>返乡人员</span></h2>
-        <p><u-icon name="phone" color="#4181FF" size="28"></u-icon>拨打电话</p>
+        <p @click="call(info.phone)"><u-icon name="phone" color="#4181FF" size="28"></u-icon>拨打电话</p>
       </div>
       <div class="idNumber">
         <span>身份证号：</span>
@@ -59,17 +59,16 @@
     data () {
       return {
         info: {},
-        pageShow: false,
         checked: true,
       }
     },
 
-    // onLoad (query) {
-    //   this.$loading()
-    //   this.$dict.load(['epidemicTouchInFourteen', 'epidemicRecentHealth', 'epidemicRecentTestResult', 'epidemicHealthCode', 'epidemicVaccineTime']).then(() => {
-    //     this.getInfo(query.id)
-    //   })
-    // },
+    onLoad (query) {
+      this.$dict.load(['epidemicTouchInFourteen', 'epidemicRecentHealth', 'epidemicRecentTestResult', 'epidemicHealthCode', 'epidemicVaccineTime']).then(() => {
+        this.getInfo(query.id)
+      })
+      this.getInfo(query.id)
+    },
 
     methods: {
       preview (url) {
@@ -84,6 +83,12 @@
         this.checked = !this.checked
       },
 
+      call(phone) {
+        uni.makePhoneCall({
+          phoneNumber: phone
+        })
+      },
+
       getInfo (id) {
         this.$instance.post(`/app/appepidemichealthreport/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
@@ -98,13 +103,7 @@
               healthName = healthName + this.$dict.getLabel('epidemicRecentHealth', v)
             })
             this.info.healthName = healthName
-
-            this.$nextTick(() => {
-              this.pageShow = true
-            })
           }
-
-          this.$hideLoading()
         })
       },
 
diff --git a/src/mods/conv/AppReturnHomeRegister/Detail.vue b/src/mods/conv/AppReturnHomeRegister/Detail.vue
index 4d88425..6492db2 100644
--- a/src/mods/conv/AppReturnHomeRegister/Detail.vue
+++ b/src/mods/conv/AppReturnHomeRegister/Detail.vue
@@ -3,16 +3,16 @@
     <div class="detail-header">
       <div class="user">
         <div class="header">
-          <h3>张三</h3>
-          <div style="color: #4181FF;" @click="call('110')"><u-icon name="phone" color="#4181FF" size="28"></u-icon>拨打电话</div>
+          <h3>{{ info.name }}</h3>
+          <div style="color: #4181FF;" @click="call(info.phone)"><u-icon name="phone" color="#4181FF" size="28"></u-icon>拨打电话</div>
         </div>
         <div class="idNumber">
           <span>身份证号：</span>
-          <span>220102200303078610</span>
+          <span>{{ info.idNumber }}</span>
         </div>
         <div class="phone">
           <span>手机号码：</span>
-          <span>13827263092</span>
+          <span>{{ info.phone }}</span>
         </div>
         <div class="picture">
           <div class="healthPic">
@@ -80,7 +80,7 @@
             <label>目的地</label>
           </div>
           <div class="right">
-            <span>{{ info.startAddress }}</span>
+            <span>{{ info.arriveAreaName }}</span>
           </div>
         </div>
 
@@ -89,7 +89,7 @@
             <label>居住地点</label>
           </div>
           <div class="right">
-            <span>{{ info.startAddress }}</span>
+            <span>{{ info.startAreaName }}</span>
           </div>
         </div>