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/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..ab3ca05 100644 --- a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue +++ b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue @@ -1,7 +1,11 @@ @@ -49,7 +62,8 @@ export default { return { list: [], current: 1, - total: 0 + total: 0, + show: false, } }, @@ -73,6 +87,9 @@ export default { toReport() { this.$linkTo('./Add') }, + // policyDetail() { + + // } getList() { this.$instance.post(`/app/appepidemicbackhomerecord/list`, null, { params: { @@ -93,9 +110,16 @@ export default { }).catch(() => { uni.hideLoading() }) + }, + + shareBtn() { + // console.log('分享'); + } }, + + onReachBottom() { this.current++ this.getList() @@ -104,9 +128,28 @@ export default { diff --git a/src/mods/conv/AppReturnHomeRegister/Detail.vue b/src/mods/conv/AppReturnHomeRegister/Detail.vue index e039891..dfac15e 100644 --- a/src/mods/conv/AppReturnHomeRegister/Detail.vue +++ b/src/mods/conv/AppReturnHomeRegister/Detail.vue @@ -1,184 +1,126 @@ @@ -189,7 +131,8 @@ export default { data() { return { info: {}, - pageShow: false + pageShow: false, + files: [], } }, @@ -208,6 +151,13 @@ export default { }) }, + // previewImg(images, img) { + // uni.previewImage({ + // urls: images.map((v) => v.url), + // current: img, + // }) + // }, + getInfo(id) { this.$instance.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${id}`).then(res => { if (res.code === 0) { @@ -247,110 +197,180 @@ export default { .detail-header { padding: 32px; - background: #fff; + height: 680px; + background: linear-gradient(135deg, #6496FF 0%, #4F75FF 100%); + position: relative; - h2 { - margin-bottom: 32px; - color: #333333; - font-size: 40px; - font-weight: 600; - } - - .item-info { - .item-info__item { + .user { + width: 100%; + background: #FFFFFF; + box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.02); + border-radius: 16px; + padding: 32px; + box-sizing: border-box; + .header { display: flex; + justify-content: space-between; align-items: center; - margin-bottom: 8px; - - &:last-child { - margin-bottom: 0; - } - - image { - width: 32px; - height: 32px; - margin-right: 16px; - } - - span { - color: #333; - font-size: 28px; - } - } - } - } - - .detail-info { - margin-top: 24px; - padding: 0 32px; - background: #fff; - - & > 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; - } - - .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 { + h3 { + font-size: 40px; color: #333333; - font-size: 32px; - text-align: right; + font-weight: 600; } - - image { - width: 40px; - height: 40px; + + } + .idNumber, + .phone { + color: #999999; + font-size: 26px; + margin-top: 8px; + } + .picture { + display: flex; + margin-top: 24px; + .healthPic, + .nucleinPic { + width: 192px; + height: 192px; + border-radius: 8px; + position: relative; + img { + width: 100%; + height: 100%; + } + span { + position: absolute; + bottom: 0; + left: 0; + width: 100%; + height: 40px; + line-height: 40px; + background: rgb(27, 27, 27, 0.85); + color: #fff; + font-size: 22px; + text-align: center; + border-radius: 0 0 8px 8px; + } } + .healthPic { + margin-right: 24px; + } + } } - .detail-info__item--img { - display: block; + .card { + margin-top: 32px; + background: rgba(70, 106, 233); + border-radius: 16px; + padding: 32px; + box-sizing: border-box; + .item-info { + .item-info__item { + display: flex; + align-items: center; + margin-bottom: 8px; - .right { - flex-wrap: wrap; - max-width: 100%; - margin-top: 34px; + &:last-child { + margin-bottom: 0; + } - image { - width: 226px; - height: 226px; - margin: 0 9px 9px 0; + image { + width: 32px; + height: 32px; + margin-right: 16px; + } - &:nth-of-type(3n) { - margin-right: 0; + span { + color: #fff; + font-size: 28px; } } } } + } + + .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; + span { + float: right; + font-size: 28px; + color: #FF4466; + font-weight: normal; + } + } + + .detail-info__item { + display: flex; + justify-content: space-between; + padding: 34px 0; + border-bottom: 1px solid #DDDDDD; + + &: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 { + margin-top: 20px; + } + } + } + } + } diff --git a/src/mods/conv/AppReturnHomeRegister/components/resultPic.png b/src/mods/conv/AppReturnHomeRegister/components/resultPic.png new file mode 100644 index 0000000..e1a43af Binary files /dev/null and b/src/mods/conv/AppReturnHomeRegister/components/resultPic.png differ diff --git a/src/mods/conv/AppReturnHomeRegister/policyDetail.vue b/src/mods/conv/AppReturnHomeRegister/policyDetail.vue new file mode 100644 index 0000000..8ecd25f --- /dev/null +++ b/src/mods/conv/AppReturnHomeRegister/policyDetail.vue @@ -0,0 +1,43 @@ + + + + + \ No newline at end of file diff --git a/src/mods/conv/AppReturnHomeRegister/result.vue b/src/mods/conv/AppReturnHomeRegister/result.vue new file mode 100644 index 0000000..5364bac --- /dev/null +++ b/src/mods/conv/AppReturnHomeRegister/result.vue @@ -0,0 +1,85 @@ + + + + + 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"/>