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 @@
添加上报人员
- +

分享到:

@@ -59,6 +59,7 @@
微信邀请
+
取消
@@ -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 @@
添加返乡报备
- +

分享到:

@@ -55,6 +55,7 @@
微信邀请
+
取消
@@ -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 @@
- + +
{{ info.startAreaName }}
- + {{ info.arriveAreaName }}
@@ -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 0000000..06ef45e Binary files /dev/null and b/src/mods/conv/AppReturnHomeRegister/components/date.png differ