From 1f0d57c808c2bffb9ede0433610f59bad75fceb5 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 12 Oct 2022 10:09:10 +0800
Subject: [PATCH] bug

---
 .../pingchang/AppReturnHomeRegister/Add.vue   | 24 +++++++++----------
 .../AppReturnHomeRegister.vue                 | 18 ++++++++++----
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/project/pingchang/AppReturnHomeRegister/Add.vue b/src/project/pingchang/AppReturnHomeRegister/Add.vue
index 7dd57dd..2d587a6 100644
--- a/src/project/pingchang/AppReturnHomeRegister/Add.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/Add.vue
@@ -11,7 +11,7 @@
             <h2>身份证号</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="20" @blur="idNumberChange" />
+            <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="18" @blur="idNumberChange" />
           </div>
         </div>
       </div>
@@ -84,7 +84,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="startAreaId" :fullName.sync="startAreaName" all>
@@ -100,11 +100,11 @@
       <div class="form-item form-item__textarea">
         <div class="form-item__wrapper">
           <div class="form-item__title">
-            <i>*</i>
-            <h2>出发地址</h2>
+            <i style="margin-right: 8px;"></i>
+            <h2>出发地详址</h2>
           </div>
           <div class="form-item__right">
-            <textarea auto-height v-model="form.startAddress" :maxlength="500" placeholder="请输入详细的出发地址"
+            <textarea auto-height v-model="form.startAddress" :maxlength="500" placeholder="请尽量详细填写至街道、小区"
                       placeholder-style="font-size: 16px"></textarea>
           </div>
         </div>
@@ -177,7 +177,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">
@@ -193,11 +193,11 @@
       <div class="form-item form-item__textarea">
         <div class="form-item__wrapper">
           <div class="form-item__title">
-            <i style="margin-righgt: 8px;"></i>
-            <h2>返乡地址</h2>
+            <i style="margin-right: 8px;"></i>
+            <h2>目的地详址</h2>
           </div>
           <div class="form-item__right">
-            <textarea auto-height v-model="form.arriveAddress" :maxlength="500" placeholder="请输入详细的返乡地址"
+            <textarea auto-height v-model="form.arriveAddress" :maxlength="500" placeholder="请尽量详细填写至小区、楼栋号"
                       placeholder-style="font-size: 16px"></textarea>
           </div>
         </div>
@@ -485,8 +485,8 @@ export default {
         return this.$toast('请选择出发地')
       }
 
-      if (this.startAreaId.substr(this.startAreaId.length - 3, 3) === '000') {
-        return this.$toast('出发地必须选到村或社区')
+      if (this.startAreaId.substr(4,this.startAreaId.length - 4) === '00000000') {
+        return this.$toast('出发地必须选至县级及以下')
       }
 
       // if (!this.form.startAddress) {
@@ -502,7 +502,7 @@ export default {
       }
 
       if (new Date(this.form.startTime.replace(/-/g, '/')).getTime() >= new Date(this.form.arriveTime.replace(/-/g, '/')).getTime()) {
-        return this.$toast('到达时间不得早于出发时间')
+        return this.$toast('抵平时间不得早于出发时间')
       }
 
       if (!this.form.gatewayId) {
diff --git a/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
index 7fc2184..1525073 100644
--- a/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -12,7 +12,10 @@
       <div class="item" hover-class="bg-hover" @click="$linkTo(`./Detail?id=${item.id}`)"
            v-for="(item, index) in list" :key="index">
         <div class="item-top">
-          <h2>{{ item.name }}</h2>
+          <h2>
+            <span>{{ item.name }}</span>
+            <span>{{ item.phone }}</span>
+          </h2>
           <span v-if="item.status === '0'">有异常情况</span>
         </div>
         <p>{{ item.idNumber.replace(/^(\d{6})\d{8}(.{4}$)/g, `$1${Array(9).join('*')}$2`) }}</p>
@@ -173,9 +176,16 @@ export default {
       height: 50px;
 
       h2 {
-        color: #333333;
-        font-size: 36px;
-        font-weight: 600;
+        span:first-child {
+          color: #333333;
+          font-size: 36px;
+          font-weight: 600;
+        }
+        span:last-child {
+          font-size: 28px;
+          color: #999999;
+          margin-left: 16px;
+        }
       }
 
       span {