diff --git a/src/project/pingchang/AppGetwayRegister/AddGetway.vue b/src/project/pingchang/AppGetwayRegister/AddGetway.vue
index cf0d530..05f07c6 100644
--- a/src/project/pingchang/AppGetwayRegister/AddGetway.vue
+++ b/src/project/pingchang/AppGetwayRegister/AddGetway.vue
@@ -159,7 +159,7 @@
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>到达时间</h2>
+            <h2>抵平时间</h2>
           </div>
           <div class="form-item__right">
             <div class="ai-area" @click="isShowEndTime = true">
@@ -284,13 +284,12 @@
           </div>
         </div>
       </div>
-      <div style="padding: 16px 16px">同行人信息</div>
-      <div class="form">
+      <div style="padding: 16px 16px" v-if="form.companionCount > 0"><span style="color: #FF4466">*</span>同行人信息</div>
+      <div class="form" v-if="form.companionCount > 0">
         <NamePhone v-for="(item, index) in people" :key="index" :name.sync="item.name"
          :phone.sync="item.phone" :index="index" @delCountHandle="delCountHandle"/>
       </div>
-      <div class="addCount" @click="addCountHandle">添加同行人</div>
-      
+      <div class="addCount" @click="addCountHandle" v-if="form.companionCount > 0">添加同行人</div>
     </div>
 
     <u-picker mode="time" :params="params" v-model="isShowStartTime" @confirm="onStartChange"></u-picker>
@@ -494,7 +493,7 @@ export default {
       }
       
       if (!this.form.arriveTime) {
-        return this.$toast('请选择到达时间')
+        return this.$toast('请选择抵平时间')
       }
     
       if (new Date(this.form.startTime.replace(/-/g, '/')).getTime() >= new Date(this.form.arriveTime.replace(/-/g, '/')).getTime()) {
diff --git a/src/project/pingchang/AppGetwayRegister/AppGetwayRegister.vue b/src/project/pingchang/AppGetwayRegister/AppGetwayRegister.vue
index 525a5e3..c763ac5 100644
--- a/src/project/pingchang/AppGetwayRegister/AppGetwayRegister.vue
+++ b/src/project/pingchang/AppGetwayRegister/AppGetwayRegister.vue
@@ -13,7 +13,7 @@
            v-for="(item, index) in list" :key="index">
         <div class="item-top">
           <h2>{{ item.name }}</h2>
-          <span v-if="item.status === '0'">有异常情况</span>
+          <span>{{ item.phone }}</span>
         </div>
         <p>{{ item.idNumber.replace(/^(\d{6})\d{8}(.{4}$)/g, `$1${Array(9).join('*')}$2`) }}</p>
         <div class="item-info">
@@ -171,7 +171,6 @@ export default {
     .item-top {
       display: flex;
       align-items: center;
-      justify-content: space-between;
       height: 50px;
 
       h2 {
@@ -182,7 +181,8 @@ export default {
 
       span {
         font-size: 28px;
-        color: #FF4466;
+        color: #999999;
+        margin-left: 16px;
       }
     }
 
diff --git a/src/project/pingchang/AppGetwayRegister/DetailGetway.vue b/src/project/pingchang/AppGetwayRegister/DetailGetway.vue
index 3dadb63..d27b571 100644
--- a/src/project/pingchang/AppGetwayRegister/DetailGetway.vue
+++ b/src/project/pingchang/AppGetwayRegister/DetailGetway.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="DetailGetway" v-if="pageShow">
+<!--  v-if="pageShow" -->
+  <div class="DetailGetway">
     <div class="detail-header">
       <h2>{{ info.name }}的返乡登记信息</h2>
       <div class="item-info">
@@ -15,6 +16,10 @@
           <image src="/static/img/to-date.png"/>
           <span>{{ info.arriveTime && info.arriveTime.substr(0, info.arriveTime.length - 3) }} 到达</span>
         </div>
+        <div class="item-info__item">
+          <image src="/static/img/kakou.png"/>
+          <span>{{ info.gatewayName }}</span>
+        </div>
       </div>
     </div>
     <div class="detail-info">
@@ -37,7 +42,7 @@
       </div>
       <div class="detail-info__item">
         <div class="left">
-          <label>手机号码</label>
+          <label>联系方式</label>
         </div>
         <div class="right" @click="call(info.phone)" hover-class="text-hover">
           <image src="https://cdn.cunwuyun.cn/dvcp/h5/common/phone.png"/>
@@ -49,9 +54,7 @@
           <label>人员类别</label>
         </div>
         <div class="right">
-          <span :style="{color: /[03]/.test(info.type) ? '#42D784' : '#FF4466'}">{{
-              $dict.getLabel('epidemicMemberType', info.type)
-            }}</span>
+          <span>{{ $dict.getLabel('EP_registerPersonType', info.type) }}</span>
         </div>
       </div>
     </div>
@@ -65,6 +68,14 @@
           <span>{{ $dict.getLabel('epidemicRecentTravel', info.travelType) }}</span>
         </div>
       </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>车次/航班</label>
+        </div>
+        <div class="right">
+          <span>{{ info.trainNo }}</span>
+        </div>
+      </div>
       <div class="detail-info__item">
         <div class="left">
           <label>出发时间</label>
@@ -91,7 +102,15 @@
       </div>
       <div class="detail-info__item">
         <div class="left">
-          <label>到达时间</label>
+          <label>行程描述</label>
+        </div>
+        <div class="right">
+          <span>{{ info.description }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>抵平时间</label>
         </div>
         <div class="right">
           <span>{{ info.arriveTime && info.arriveTime.substr(0, info.arriveTime.length - 3) }}</span>
@@ -113,62 +132,23 @@
           <span>{{ info.arriveAddress }}</span>
         </div>
       </div>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>行程描述</label>
-        </div>
-        <div class="right">
-          <span>{{ info.description }}</span>
-        </div>
-      </div>
-    </div>
-    <div class="detail-info">
-      <h2>核酸检测信息</h2>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>核酸检测日期</label>
-        </div>
-        <div class="right">
-          <span>{{ info.checkTime.split(' ')[0] }}</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 detail-info__item--img">
-        <div class="left" style="max-width: 100%;">
-          <label>本人健康码截图或核酸检测报告</label>
-        </div>
-        <div class="right">
-          <image :src="item.url" @click="preview(item.url)" v-for="(item, index) in info.checkPhoto" :key="index"/>
-        </div>
-      </div>
     </div>
     <div class="detail-info">
       <h2>健康状况</h2>
       <div class="detail-info__item">
         <div class="left">
-          <label>当前体温</label>
+          <label>是否有风险旅居史？</label>
         </div>
         <div class="right">
-          <span :style="{color: info.temperature >= 37.3 ? '#FF4466' : '#42D784'}">{{ info.temperature }}℃</span>
+          <span :style="{ color: info.fromHighRiskArea==1? '#FF4466' : '#42D784'}">{{ $dict.getLabel('yesOrNo',info.fromHighRiskArea) }}</span>
         </div>
       </div>
       <div class="detail-info__item">
         <div class="left">
-          <label>14天内是否接触新冠确诊或疑似患者</label>
+          <label>7天内是否接触新冠确诊或疑似患者？</label>
         </div>
         <div class="right">
-          <span :style="{color: info.touchInFourteen === '0' ? '#42D784' : '#FF4466'}">{{
-              $dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen)
-            }}</span>
+          <span :style="{ color: info.contactPatients==1? '#FF4466' : info.contactPatients==2? '': '#42D784'}">{{ $dict.getLabel('epidemicTouchInFourteen', info.contactPatients) }}</span>
         </div>
       </div>
       <div class="detail-info__item">
@@ -176,10 +156,27 @@
           <label>当前健康状况</label>
         </div>
         <div class="right">
-          <span :style="{color: !info.isHealth ? '#42D784' : '#FF4466'}">{{ info.healthName }}</span>
+          <span>{{ $dict.getLabel('EP_abnormalType',info.abnormalType) || '没有出现症状' }}</span>
         </div>
       </div>
     </div>
+    <div class="detail-info" v-if="info.companionCount > 0">
+      <h2>同行情况</h2>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>同行人数</label>
+        </div>
+        <div class="right">
+          <span>{{ info.companionCount }}</span>
+        </div>
+      </div>
+      <div class="companionList">
+        小伙伴表格
+      </div>
+    </div>
+    <div class="btn-wrapper" v-if="info.handleType == 0">
+      <div class="btn" @click="toEdit" hover-class="text-hover">编辑</div>
+    </div>
   </div>
 </template>
 
@@ -189,7 +186,7 @@ export default {
   data() {
     return {
       info: {},
-      pageShow: false
+      // pageShow: false
     }
   },
 
@@ -209,29 +206,19 @@ export default {
     },
 
     getInfo(id) {
-      this.$instance.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${id}`).then(res => {
-        if (res.code === 0) {
+      this.$instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
+        if (res?.data) {
           this.info = res.data
-          this.info.checkPhoto = JSON.parse(res.data.checkPhoto)
-          let healthName = ''
-          this.info.isHealth = false
-          res.data.health.split(',').forEach(v => {
-            if (v > 0) {
-              this.info.isHealth = true
-            }
-            healthName = healthName + this.$dict.getLabel('epidemicRecentHealth', v)
-          })
-          this.info.healthName = healthName
-
-          this.$nextTick(() => {
-            this.pageShow = true
-          })
         }
 
         this.$hideLoading()
       })
     },
 
+    toEdit() {
+      console.log('编辑');
+    },
+
     call(phone) {
       uni.makePhoneCall({
         phoneNumber: phone
@@ -243,7 +230,7 @@ export default {
 
 <style lang="scss">
 .DetailGetway {
-  padding-bottom: 40px;
+  padding-bottom: 140px;
 
   .detail-header {
     padding: 32px;
diff --git a/src/project/pingchang/AppGetwayRegister/components/namePhone.vue b/src/project/pingchang/AppGetwayRegister/components/namePhone.vue
index 7ab6de2..5c488e6 100644
--- a/src/project/pingchang/AppGetwayRegister/components/namePhone.vue
+++ b/src/project/pingchang/AppGetwayRegister/components/namePhone.vue
@@ -4,10 +4,8 @@
       <div class="uName">
         <u-input v-model="username" type="text" placeholder="姓名" :maxlength="10" />
         <u-input v-model="userphone" type="number" placeholder="手机号" :maxlength="11" />
-
         <div class="line"></div>
       </div>
-      
     </div>
     <div class="btn" @click="removeMe">
       <img src="../../../../static/img/del.png" alt="">