From 44f9a8a5e8a80221847d12371f8e2a49dc8e9160 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 25 May 2022 10:47:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=BF=94=E4=B9=A1=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mods/conv/AppReturnHomeRegister/Add.vue | 218 +++++++----------- .../AppReturnHomeRegister.vue | 66 +++++- .../conv/AppReturnHomeRegister/Detail.vue | 170 +++++++++++--- .../components/resultPic.png | Bin 0 -> 26655 bytes .../AppReturnHomeRegister/policyDetail.vue | 13 ++ .../conv/AppReturnHomeRegister/result.vue | 85 +++++++ 6 files changed, 373 insertions(+), 179 deletions(-) create mode 100644 src/mods/conv/AppReturnHomeRegister/components/resultPic.png create mode 100644 src/mods/conv/AppReturnHomeRegister/policyDetail.vue create mode 100644 src/mods/conv/AppReturnHomeRegister/result.vue diff --git a/src/mods/conv/AppReturnHomeRegister/Add.vue b/src/mods/conv/AppReturnHomeRegister/Add.vue index bcf5c45..58298c2 100644 --- a/src/mods/conv/AppReturnHomeRegister/Add.vue +++ b/src/mods/conv/AppReturnHomeRegister/Add.vue @@ -35,44 +35,76 @@ -
+
+ +
+
* -

人员类别

+ +

健康码截图

-
- +
+
+ +
+
+
+
+ * + +

48小时核酸证明

+
+
+ +
+
+
+
+
* -

出行方式

+

出发地

+
+
+ +
+ {{ form.startAreaName }} + 请选择 + +
+ +
+
+
+
+
+
+ * +

交通工具

-
+
* -

出发时间

+

火车车次/航班号/客运站

-
-
- {{ form.startTime }} - 请选择 - -
-
+
@@ -80,7 +112,7 @@
* -

出发地区

+

目的地

@@ -97,19 +129,39 @@
* -

出发地址

+

居住地点

-
+ + + +
+
+
+ * +

预计/实际抵达时间

+
+
+
+
+ {{ form.startTime }} + 请选择 + +
+
+
+
+
* -

到达时间

+

预计离开时间

@@ -122,125 +174,8 @@
-
-
-
- * -

到达地区

-
-
- -
- {{ form.arriveAreaName }} - 请选择 - -
- -
-
-
-
-
-
- * -

返乡地址

-
-
- -
-
-
-
-
-
- * -

行程描述

-
-
- -
-
-
-
-
-
-
-
- * -

核酸检测日期

-
-
-
-
- {{ form.checkTime }} - 请选择 - -
-
-
-
-
-
-
-
- * -

本人健康码截图或核酸检测报告(最多9张)

-
-
- -
-
-
-
-
-
- * -

核酸检测结果

-
-
- -
-
-
-
-
-
-
-
- * -

当前体温

-
-
- - ℃ -
-
-
-
-
-
- * -

14天内是否接触新冠确诊或疑似患者

-
-
- -
-
-
-
-
-
- * -

当前健康状况（可多选）

-
-
- -
-
-
+ @@ -431,11 +366,12 @@ export default { this.$hideLoading() this.flag = false if (res.code == 0) { - uni.$emit('update') - this.$toast('提交成功') - setTimeout(() => { - uni.navigateBack() - }, 400) + // uni.$emit('update') + // this.$toast('提交成功') + // setTimeout(() => { + // uni.navigateBack() + // }, 400) + this.$linkTo('./result') } }) } diff --git a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue index a783973..cf7d001 100644 --- a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue +++ b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue @@ -1,7 +1,11 @@ @@ -73,6 +78,9 @@ export default { toReport() { this.$linkTo('./Add') }, + // policyDetail() { + + // } getList() { this.$instance.post(`/app/appepidemicbackhomerecord/list`, null, { params: { @@ -93,9 +101,15 @@ export default { }).catch(() => { uni.hideLoading() }) + }, + + shareBtn() { + console.log('分享'); } }, + + onReachBottom() { this.current++ this.getList() @@ -104,9 +118,28 @@ export default { diff --git a/src/mods/conv/AppReturnHomeRegister/Detail.vue b/src/mods/conv/AppReturnHomeRegister/Detail.vue index e039891..c332ddf 100644 --- a/src/mods/conv/AppReturnHomeRegister/Detail.vue +++ b/src/mods/conv/AppReturnHomeRegister/Detail.vue @@ -1,19 +1,45 @@ @@ -281,8 +197,9 @@ export default { .detail-header { padding: 32px; - height: 860px; + height: 680px; background: linear-gradient(135deg, #6496FF 0%, #4F75FF 100%); + position: relative; .user { width: 100%; @@ -328,8 +245,7 @@ export default { width: 100%; height: 40px; line-height: 40px; - background: #000000; - opacity: 0.8; + background: rgb(27, 27, 27, 0.85); color: #fff; font-size: 22px; text-align: center; @@ -349,13 +265,6 @@ export default { border-radius: 16px; padding: 32px; box-sizing: border-box; - // h2 { - // margin-bottom: 32px; - // color: #fff; - // font-size: 40px; - // font-weight: 600; - // } - .item-info { .item-info__item { display: flex; @@ -382,77 +291,86 @@ export default { } - .detail-info { - margin-top: 24px; - padding: 0 32px; - background: #fff; + .info { + position: absolute; + top: 657px; + left: 50%; + width: 100%; + transform: translate(-50%, 1%); + + .detail-info { + margin-top: 24px; + padding: 0 32px; + background: #fff; + border-radius: 16px 16px 0 0; - & > h2 { - height: 116px; - line-height: 116px; - font-size: 38px; - font-weight: 600; - color: #333; - } - - .detail-info__item { - display: flex; - justify-content: space-between; - padding: 34px 0; - border-bottom: 1px solid #DDDDDD; - - &:last-child { - border: none; + & > h2 { + height: 116px; + line-height: 116px; + font-size: 38px; + font-weight: 600; + color: #333; + span { + float: right; + font-size: 28px; + color: #FF4466; + font-weight: normal; + } } - .left { + .detail-info__item { display: flex; - line-height: 1.3; - max-width: 360px; + justify-content: space-between; + padding: 34px 0; + border-bottom: 1px solid #DDDDDD; - label { - position: relative; + &:last-child { + border: none; + } + + .left { + display: flex; + line-height: 1.3; + max-width: 360px; + + label { + position: relative; + color: #999999; + font-size: 32px; + } + } + + .right { + display: flex; + max-width: 450px; + + span { + color: #333333; + font-size: 32px; + text-align: right; + } + + image { + width: 40px; + height: 40px; + } + } + } + + .detail-info__item_wrap { + display: block; + border-bottom: 1px solid #DDDDDD; + padding: 34px 0; + .left { color: #999999; font-size: 32px; } - } - - .right { - display: flex; - max-width: 450px; - - span { - color: #333333; - font-size: 32px; - text-align: right; - } - - image { - width: 40px; - height: 40px; - } - } - } - - .detail-info__item--img { - display: block; - - .right { - flex-wrap: wrap; - max-width: 100%; - margin-top: 34px; - - image { - width: 226px; - height: 226px; - margin: 0 9px 9px 0; - - &:nth-of-type(3n) { - margin-right: 0; - } + .right { + margin-top: 20px; } } } } + } diff --git a/src/mods/conv/AppReturnHomeRegister/policyDetail.vue b/src/mods/conv/AppReturnHomeRegister/policyDetail.vue index b5810e7..8ecd25f 100644 --- a/src/mods/conv/AppReturnHomeRegister/policyDetail.vue +++ b/src/mods/conv/AppReturnHomeRegister/policyDetail.vue @@ -1,13 +1,43 @@ - \ No newline at end of file From 135a662576d6521afcf4c13c29a3121f4819c72d Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 25 May 2022 15:24:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mods/conv/AppHealthReport/AddReport.vue | 138 +++--------------- src/mods/conv/AppHealthReport/AddUser.vue | 6 +- .../conv/AppHealthReport/AppHealthReport.vue | 73 +++++++-- .../AppReturnHomeRegister.vue | 16 +- 4 files changed, 103 insertions(+), 130 deletions(-) diff --git a/src/mods/conv/AppHealthReport/AddReport.vue b/src/mods/conv/AppHealthReport/AddReport.vue index 91d71af..bab9980 100644 --- a/src/mods/conv/AppHealthReport/AddReport.vue +++ b/src/mods/conv/AppHealthReport/AddReport.vue @@ -1,48 +1,13 @@ @@ -167,17 +172,43 @@ export default { border-bottom: 1px solid #DDDDDD; .item-top__left { + width: 100%; h2 { line-height: 44px; margin-bottom: 8px; color: #333; font-size: 32px; font-weight: 600; + span { + padding: 4px 8px; + font-size: 26px; + font-weight: normal; + margin-left: 24px; + } } - - p { - color: #999999; - font-size: 26px; + div { + display: flex; + justify-content: space-between; + p { + color: #999999; + font-size: 26px; + } + span { + padding: 4px 8px; + font-size: 26px; + } + } + .status0 { + color: #FF4466; + background: #FFF5F7; + } + .status1 { + color: #1AAAFF; + background: #E8F6FF; + } + .status2 { + color: #42D784; + background: #ECFBF2; } } @@ -219,5 +250,29 @@ export default { } } } + + .btn-wrapper { + display: flex; + justify-content: space-between; + padding: 20px 32px !important; + box-sizing: border-box; + .addBtn, + .share { + height: 88px; + line-height: 88px; + text-align: center; + } + .share { + width: 35%; + border-radius: 16px; + border: 1px solid #A0C0FF; + } + .addBtn { + width: 60%; + background: #4181FF; + border-radius: 16px; + color: #fff; + } + } } diff --git a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue index cf7d001..ab3ca05 100644 --- a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue +++ b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue @@ -38,9 +38,17 @@
- +
添加返乡报备
+ + + 出淤泥而不染，濯清涟而不妖 + 出淤泥而不染，濯清涟而不妖 + 出淤泥而不染，濯清涟而不妖 + 出淤泥而不染，濯清涟而不妖 + +
@@ -54,7 +62,8 @@ export default { return { list: [], current: 1, - total: 0 + total: 0, + show: false, } }, @@ -104,7 +113,8 @@ export default { }, shareBtn() { - console.log('分享'); + // console.log('分享'); + } }, From d18312c6d1a661ead73262d1e4c761e5303add4f Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 25 May 2022 16:45:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mods/extra/AppAuth/authApply.vue | 4 ++-- src/mods/work/AppHelpDeclaration/add.vue | 2 +- src/mods/work/AppProgress/progressDetail.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mods/extra/AppAuth/authApply.vue b/src/mods/extra/AppAuth/authApply.vue index 5328604..e8a3bcf 100644 --- a/src/mods/extra/AppAuth/authApply.vue +++ b/src/mods/extra/AppAuth/authApply.vue @@ -43,7 +43,7 @@ + :fullName.sync="form.householdAreaName" valueLevel="5" isForm :selectRoot="false"/>