diff --git a/src/project/pingchang/AppGetwayRegister/AddGetway.vue b/src/project/pingchang/AppGetwayRegister/AddGetway.vue
index 1161479..8181701 100644
--- a/src/project/pingchang/AppGetwayRegister/AddGetway.vue
+++ b/src/project/pingchang/AppGetwayRegister/AddGetway.vue
@@ -1,8 +1,32 @@
 <template>
   <div class="AddGetway">
-    <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
+    <!-- <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>
+          </div>
+          <div class="form-item__right">
+            <AiSelect v-model="form.type" dict="epidemicRecentPersonType" class="select"></AiSelect>
+          </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="请输入" type="number" v-model="form.phone" :maxlength="11"/>
+          </div>
+        </div>
+      </div>
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="form-item__title">
@@ -25,17 +49,6 @@
           </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="请输入" type="number" v-model="form.phone" :maxlength="11"/>
-          </div>
-        </div>
-      </div>
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="form-item__title">
@@ -59,19 +72,10 @@
         </div>
       </div>
     </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>
-          </div>
-          <div class="form-item__right">
-            <AiSelect dict="epidemicRecentTravel" v-model="form.travelType" class="select"></AiSelect>
-          </div>
-        </div>
-      </div>
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="form-item__title">
@@ -118,11 +122,46 @@
           </div>
         </div>
       </div>
+    
       <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">
+            <AiSelect dict="epidemicRecentTravel" v-model="form.travelType" class="select"></AiSelect>
+          </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.name" :maxlength="20"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__textarea">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>行程描述</h2>
+          </div>
+          <div class="form-item__right">
+            <textarea auto-height style="height: 90px" v-model="form.description" :maxlength="500" placeholder="请输入行程描述"
+                      placeholder-style="font-size: 16px"></textarea>
+          </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">
             <div class="ai-area" @click="isShowEndTime = true">
@@ -139,7 +178,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" v-model="form.arriveAreaId" :fullName.sync="form.arriveAreaName" :areaId="$areaId">
@@ -164,34 +203,36 @@
           </div>
         </div>
       </div>
-      <div class="form-item form-item__textarea">
+    </div>
+
+    <!-- 健康状况 -->
+    <div class="title">健康状况</div>
+    <div class="form-item__group">
+      <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">
-            <textarea auto-height style="height: 90px" v-model="form.description" :maxlength="500" placeholder="请输入行程描述"
-                      placeholder-style="font-size: 16px"></textarea>
+            <AiRadio style="width: 100%;" v-model="form.checkResult" dict="yesOrNo"/>
           </div>
         </div>
       </div>
-    </div>
-    <div class="form-item__group">
-      <div class="form-item">
+      <div class="form-item" v-show="form.checkResult == 1">
         <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="isShowDate = true">
+            <AiAreaPicker class="ai-area" v-model="form.startAreaId" :fullName.sync="form.startAreaName" all>
               <div class="ai-area__wrapper">
-                <span class="label" v-if="form.checkTime">{{ form.checkTime }}</span>
+                <span class="label" v-if="form.startAreaName">{{ form.startAreaName }}</span>
                 <i v-else>请选择</i>
                 <u-icon name="arrow-right" color="#ddd"/>
               </div>
-            </div>
+            </AiAreaPicker>
           </div>
         </div>
       </div>
@@ -199,35 +240,49 @@
         <div class="form-item__wrapper">
           <div class="form-item__title">
             <i>*</i>
-            <h2>本人健康码截图或核酸检测报告<span style="color:#999; fontSize: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>
-          </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.checkResult" dict="epidemicRecentTestResult"/>
+            <AiRadio style="width: 100%;" v-model="form.checkResult" dict="epidemicTouchInFourteen"/>
+          </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="yesOrNo"/>
+          </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">
+            <AiSelect dict="epidemicRecentTravel" v-model="form.travelType" class="select"></AiSelect>
           </div>
         </div>
       </div>
     </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.temperature" :maxlength="20"/>
-            <i>℃</i>
+            <i>人</i>
           </div>
         </div>
       </div>
@@ -242,21 +297,17 @@
           </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">
-            <AiCheckbox style="width: 100%;" v-model="form.health" dict="epidemicRecentHealth"></AiCheckbox>
-          </div>
-        </div>
-      </div> -->
+      
     </div>
+
     <u-picker mode="time" :params="dataParams" v-model="isShowDate" @confirm="onDateChange"></u-picker>
     <u-picker mode="time" :params="params" v-model="isShowStartTime" @confirm="onStartChange"></u-picker>
     <u-picker mode="time" :params="params" v-model="isShowEndTime" @confirm="onEndChange"></u-picker>
+
+    <div class="agree">
+      <u-checkbox v-model="isAgree"></u-checkbox>
+      <span class="deal">以上信息是我本人填写，本人对信息内容的真实性和完整性负责。</span>
+    </div>
     <div class="btn-wrapper">
       <div class="btn" hover-class="text-hover" @click="submit">提交</div>
     </div>
@@ -460,14 +511,14 @@ export default {
 .AddGetway {
   padding-bottom: 140px;
 
-  .tips {
-    line-height: 1.3;
-    padding: 32px 32px;
-    color: #FF883C;
-    font-size: 30px;
-    text-align: justify;
-    background: #FFF8F3;
-  }
+  // .tips {
+  //   line-height: 1.3;
+  //   padding: 32px 32px;
+  //   color: #FF883C;
+  //   font-size: 30px;
+  //   text-align: justify;
+  //   background: #FFF8F3;
+  // }
 
   .title {
     padding: 16px 32px 0 32px;
@@ -652,5 +703,10 @@ export default {
       }
     }
   }
+
+  .agree {
+    padding: 0 32px;
+    display: flex;
+  } 
 }
 </style>