From 249fdcf4ff09f9200494979a463d205a31bb8903 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 26 May 2022 14:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conv/AppHealthReport/AppHealthReport.vue  |  20 ++++++--
 .../AppReturnHomeRegister.vue                 |  21 ++++++--
 .../conv/AppReturnHomeRegister/Detail.vue     |  45 +++++++++++++++---
 .../AppReturnHomeRegister/components/date.png | Bin 0 -> 502 bytes
 4 files changed, 71 insertions(+), 15 deletions(-)
 create mode 100644 src/mods/conv/AppReturnHomeRegister/components/date.png

diff --git a/src/mods/conv/AppHealthReport/AppHealthReport.vue b/src/mods/conv/AppHealthReport/AppHealthReport.vue
index bd283c4..bee3799 100644
--- a/src/mods/conv/AppHealthReport/AppHealthReport.vue
+++ b/src/mods/conv/AppHealthReport/AppHealthReport.vue
@@ -46,7 +46,7 @@
       <div class="addBtn" @click="toReport" hover-class="text-hover">添加上报人员</div>
     </div>
 
-    <u-popup  v-model="show" mode="bottom" border-radius="30" height="200px">
+    <u-popup  v-model="show" mode="bottom" border-radius="30">
 			<div class="shareBox">
         <h2>分享到：</h2>
         <div class="card">
@@ -59,6 +59,7 @@
             <div class="names">微信邀请</div>
           </div>
         </div>
+        <div class="close" @click="show = false">取消</div>
       </div>
 		</u-popup>
 
@@ -320,11 +321,15 @@ export default {
   }
 
   .shareBox {
-    padding: 32px;
+    padding-top: 32px;
     box-sizing: border-box;
+    h2 {
+      padding: 0 32px;
+      font-weight: 600;
+    }
     .card {
       display: flex;
-      margin-top: 60px;
+      padding: 60px 32px 32px 32px;
       .itemCard {
         flex: 1;
         text-align: center;
@@ -335,6 +340,15 @@ export default {
         }
       }
     }
+    // ::v-deep .u-popup .u-drawer .u-drawer-bottom {
+    //   bottom: 50px;
+    // }
+    .close {
+      height: 112px;
+      line-height: 112px;
+      text-align: center;
+      border-top: 2px solid #EEEEEE;
+    }
   }
 
   .showCode {
diff --git a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
index 7b59c79..29b42f2 100644
--- a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
+++ b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -42,7 +42,7 @@
       <div class="addbtn" @click="toReport" hover-class="text-hover">添加返乡报备</div>
     </div>
 
-    <u-popup  v-model="show" mode="bottom" border-radius="30" height="200px">
+    <u-popup  v-model="show" mode="bottom" border-radius="30">
 			<div class="shareBox">
         <h2>分享到：</h2>
         <div class="card">
@@ -55,6 +55,7 @@
             <div class="names">微信邀请</div>
           </div>
         </div>
+        <div class="close" @click="show = false">取消</div>
       </div>
 		</u-popup>
 
@@ -110,7 +111,7 @@ export default {
     toReport() {
       this.$linkTo('./Add')
     },
-    
+
     // 扫码登记
     registerCode() {
       this.show = false;
@@ -289,21 +290,31 @@ export default {
   }
 
   .shareBox {
-    padding: 32px;
+    padding-top: 32px;
     box-sizing: border-box;
+    h2 {
+      padding: 0 32px;
+      font-weight: 600;
+    }
     .card {
       display: flex;
-      margin-top: 60px;
+      padding: 60px 32px 32px 32px;
       .itemCard {
         flex: 1;
         text-align: center;
-        // width: 25%;
         img {
           width: 96px;
           height: 96px;
         }
       }
     }
+
+    .close {
+      height: 112px;
+      line-height: 112px;
+      text-align: center;
+      border-top: 2px solid #EEEEEE;
+    }
   }
 
   .showCode {
diff --git a/src/mods/conv/AppReturnHomeRegister/Detail.vue b/src/mods/conv/AppReturnHomeRegister/Detail.vue
index dfac15e..4d88425 100644
--- a/src/mods/conv/AppReturnHomeRegister/Detail.vue
+++ b/src/mods/conv/AppReturnHomeRegister/Detail.vue
@@ -28,11 +28,12 @@
       <div class="card">
         <div class="item-info">
           <div class="item-info__item">
-            <image src="/static/img/from-icon.png"/>
+            <span class="from"></span>
+            <div class="lines"></div>
             <span>{{ info.startAreaName }}</span>
           </div>
           <div class="item-info__item">
-            <image src="/static/img/to-icon.png"/>
+            <span class="to"></span>
             <span>{{ info.arriveAreaName }}</span>
           </div>
           <div class="item-info__item">
@@ -196,8 +197,8 @@ export default {
   padding-bottom: 40px;
 
   .detail-header {
-    padding: 32px;
-    height: 680px;
+    padding: 32px 32px 100px 32px;
+    // height: 680px;
     background: linear-gradient(135deg, #6496FF 0%, #4F75FF 100%);
     position: relative;
 
@@ -270,6 +271,7 @@ export default {
           display: flex;
           align-items: center;
           margin-bottom: 8px;
+          position: relative;
 
           &:last-child {
             margin-bottom: 0;
@@ -281,9 +283,39 @@ export default {
             margin-right: 16px;
           }
 
-          span {
+          .from,
+          .to {
+            display: inline-block;
+            width: 12px;
+            height: 12px;
+            border: 2px solid #FFFFFF;
+            border-radius: 50%;
+          }
+
+          .from {
+            background: #FFBB3B;
+            z-index: 9;
+            
+          }
+
+          .to {
+            background: #2BD6C0;
+            z-index: 9;
+          }
+
+          .lines {
+            position: absolute;
+            top: 35px;
+            left: 6px;
+            width: 4px;
+            height: 80%;
+            border-left: 4px dotted #CCCCCC;
+          }
+
+          span:last-child {
             color: #fff;
             font-size: 28px;
+            margin-left: 16px;
           }
         }
       }
@@ -293,13 +325,12 @@ export default {
 
   .info {
     position: absolute;
-    top: 657px;
+    top: 60%;
     left: 50%;
     width: 100%;
     transform: translate(-50%, 1%);
     
     .detail-info {
-      margin-top: 24px;
       padding: 0 32px;
       background: #fff;
       border-radius: 16px 16px 0 0;
diff --git a/src/mods/conv/AppReturnHomeRegister/components/date.png b/src/mods/conv/AppReturnHomeRegister/components/date.png
new file mode 100644
index 0000000000000000000000000000000000000000..06ef45e246a00d0cc4f8f83954ed85eb2e7b1148
GIT binary patch
literal 502
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfEWy*oF~oy+
z>onWELk=P>kr~BIE`puPPb54FIIUFHP0(_kqNnS+%A`cINM?yhM_b<#o}zsl_nx}N
zwL9PSo9E-N=l4jy@4tVGS1B;`YRhqM1Lj}@wl3xyjpZMn&AEN~7V|^H8x8prxC)Pa
zeO9R4QCz^ZbK#uI5ZOagbBd=j?<=}qKkI`-eqHa5?-Sj&tKYdWBf9OW;JgW3nSal5
ziqBe-@?)KPCvT$izQ-}%ADMd`Od|UHSf09fo;_@Q_U(k`Yn4HJPM);#Dpq8!by=FE
z#$3B_Y0@goA1;57J(^(2KIu;oe^(n%$d01NM`sjFXk4{OQ{vq6X*-tGnyS3rvMgLd
zT~5X45J!%1r?#N_fuL#5YkyyR(l>khtLY|R1+V8PYl$voet!PJjospL*OnfVj_8in
z5U_qPwtJiS(^I8)d(&2&%C%_htV+5m{mXgDoOf=IU4QEyslWZ@^{;#8AFfNp{=NN)
YdC3MlFFQurTu_*My85}Sb4q9e01wT?S^xk5

literal 0
HcmV?d00001