From bace5b529b28815c639518b886d19cc241410e29 Mon Sep 17 00:00:00 2001 From: lisl <1223762861@qq.com> Date: Mon, 18 Oct 2021 00:19:18 +0800 Subject: [PATCH] =?UTF-8?q?update:=E5=8D=8F=E8=AE=AE=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontCode2/sunshine_levy/src/App.vue | 26 +- .../src/assets/img/menu_yhxy.png | Bin 207 -> 0 bytes .../sunshine_levy/src/assets/img/yhxy.png | Bin 0 -> 894 bytes FrontCode2/sunshine_levy/src/views/index.vue | 141 +++++----- .../sunshine_levy/src/views/project/index.vue | 260 ++++++++---------- .../src/views/report/agreement.vue | 14 +- .../src/views/report/evaluatePage.vue | 12 + .../src/views/report/evalute.vue | 29 +- 8 files changed, 234 insertions(+), 248 deletions(-) delete mode 100644 FrontCode2/sunshine_levy/src/assets/img/menu_yhxy.png create mode 100644 FrontCode2/sunshine_levy/src/assets/img/yhxy.png diff --git a/FrontCode2/sunshine_levy/src/App.vue b/FrontCode2/sunshine_levy/src/App.vue index f58ebfc..afd0362 100644 --- a/FrontCode2/sunshine_levy/src/App.vue +++ b/FrontCode2/sunshine_levy/src/App.vue @@ -2,6 +2,7 @@
@@ -26,10 +27,7 @@ export default { name: "App", data() { return { - startValue: "", - endValue: "", mode: false, - count: 0, isLoading: true }; }, @@ -40,24 +38,11 @@ export default { this.mode = false; } }, - mounted() { - document.body.ontouchstart = e => { - this.startValue = e.changedTouches[0].pageY; - }; - document.body.ontouchend = e => { - this.endValue = e.changedTouches[0].pageY; - if ( - this.endValue - this.startValue > 50 && - e.changedTouches[0].pageY === e.changedTouches[0].clientY - ) { - } - }; - }, + mounted() {}, methods: { logout() { sessionStorage.setItem("mode", "normal"); $(".container").removeClass("old_container"); - // $(".logout").css("display", "none"); this.mode = false; $(".bottomContent").removeClass("old_bottomContent"); $("#app").removeClass("old_app2"); @@ -66,18 +51,15 @@ export default { toOlderMode() { sessionStorage.setItem("mode", "older"); $(".container").addClass("old_container"); - // $(".logout").css("display", "none"); this.mode = true; $(".bottomContent").addClass("old_bottomContent"); $("#app").addClass("old_app2"); - // $("#app").removeClass("old_app"); }, onRefresh() { + this.$children[0].$children[0].onInit(); setTimeout(() => { - this.$toast("刷新成功"); this.isLoading = false; - this.$children[0].$children[0].onInit(); - }, 2000); + }, 1000); } } }; diff --git a/FrontCode2/sunshine_levy/src/assets/img/menu_yhxy.png b/FrontCode2/sunshine_levy/src/assets/img/menu_yhxy.png deleted file mode 100644 index 10b8de82e1badfe29ee642ec6fae1a72853505cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJX`U{QArbCx!=kww9609ejGU`u z6?ylJ#)|%?2>B;M@3t>~yyCFX$^MgHFY+@APSn4uP-#-H`9NWVR0n?|%Q=^|DlRFE z0W6P17$)pyUb}h!aocGZW}WDMeX2t(-(1S(q~)m&lhXA!43wD+v?Skn9iN+MnfQxi z%IEsnLwAg~ls!6H`n2V%sPx&I7vi7RA@u(n$1rWK^VrLZ7FSO3kapu5pJ7yM2G*H+n-LMTi$98u6>yzhw z=bd+kJN@=4L6!|J30-E+L%G=s9mlEeFC+-TWQ50bWJO|=plb_?(0;5APLqj#q&jGT zz#omGbJzp#;yk!>y*=dS@j6^`mV;BF%1H$YA$aAV#N8nexYlp-;HcSeymWp#VAt8KB3P!x&fyAp!ZxM$d7$=qQ6N$FS=-p}*SC3f(i~ z!@UtNVq!uzfLX6ccf)y9Jh-BHrISs_k)zXX zs2h&Q(K|bhClkNmTj62a>rKG3>2cg28N_8*Ij&Y5fzyDns%4ky&t7qtQ2*z(S*+0 zGpMrIwloqm^ccT{8v}iqrO*luhtY(t`X*Fc^Y=0ID8Gd3Uq2wU8dFGTpg7lv2Pd0x zI8#bfFF&90fd-^frltXS#Z?LF?X3p0r)d{nOqQNXrH}OzH`U_B46T?a7+%Z_9T5eo z2#Pbbc^P=5sRo@M)m9tK`kc(zV=d+NV=fk9WsyC<#ArrWed9h)d0Dx*{N}^bia4j> zideF~A|A44Xc?yk{rjLFQBhPXO-oy|vvw!)4Y`>KMA^}#;KWTS?{ literal 0 HcmV?d00001 diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index 722e8cb..e7a9c45 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -45,17 +45,14 @@
- +
{{ item.name }}
- +
{{ item.currentState }}
@@ -89,7 +86,6 @@ 征收决定号:
-
{{ item.zsjdh }}
@@ -185,7 +181,7 @@ -
+
{{ item.title }}
发布时间:{{ item.publicTime }} @@ -209,7 +205,7 @@ export default { return { mode: false, data: { - idCard: "52212112345678910", + idCard: "522121123456789102223", userName: "加载中...", policiesRegulationsLists: { totalCount: 0, @@ -226,8 +222,8 @@ export default { prjList: [ { name: "请求出错暂时没有可用数据", - currentState: "无数据", - area: "宁波市房屋建设管理办公室九号楼", + currentState: "处于什么阶段", + area: "宁波市房屋建设管理办公室九号楼项目办公室", zsbm: "无数据", year: "无数据", zsjdh: "无数据", @@ -505,40 +501,37 @@ export default { } // 最上面盒子 .topBox { - background: url(../assets/img/bg.png); - background-size: 100% auto; - background-repeat: no-repeat; + background: url(../assets/img/bg.png) no-repeat; + background-size: 100% 96%; .olderVersion { display: flex; justify-content: space-between; align-items: center; padding: 15px 0; + .titleBox { + width: 173px; + height: 36px; + line-height: 36px; + text-align: center; + border-radius: 0 22px 22px 0; + background: #2576ca; + font-size: 16px; + font-weight: 600; + color: #ffffff; + } :nth-child(2) { + margin-right: 5px; background: #f82b36; width: 124px; - height: 33px; + height: 25px; text-align: center; - vertical-align: middle; - line-height: 33px; + line-height: 25px; border-radius: 2px; font-size: 18px; font-weight: 600; color: #ffffff; } } - .titleBox { - display: flex; - align-items: center; - justify-content: center; - width: 173px; - height: 36px; - - border-radius: 0 22px 22px 0; - background: rgba(6, 63, 142, 0.66); - font-size: 16px; - font-weight: 600; - color: #ffffff; - } .baseInfo { display: flex; margin: 5px 0; @@ -549,17 +542,15 @@ export default { padding-right: 10px; padding-left: 31px; } - > span:nth-child(2) { + span:nth-child(2) { white-space: nowrap; } } .gridBg { display: flex; - align-items: center; justify-content: space-around; margin: 10px 12px 0 10px; - border-radius: 3px; background: rgba(255, 255, 255, 0.28); > div { @@ -594,11 +585,8 @@ export default { align-items: center; justify-content: space-between; height: 41px; - padding: unset 0; - background: url(../assets/img/project_bg.png) no-repeat; - background-position: 0 -2px; - background-size: 100% 120%; - > div:nth-child(1) { + background: url(../assets/img/project_bg.png) no-repeat 0 -2px/101% 120%; + > :nth-child(1) { display: flex; align-items: center; width: 50%; @@ -612,6 +600,10 @@ export default { margin-right: 10px; border-radius: 5px 0 0; background: #3284cd; + img { + width: 25px; + height: 25px; + } } span { white-space: nowrap; @@ -628,13 +620,12 @@ export default { height: 27px; display: flex; align-items: center; - border-radius: 13px 0 0 17px; - } - img { - width: 17px; - height: 17px; - margin-right: 3px; - margin-left: 8px; + border-radius: 13px 0 0 13px; + img { + width: 17px; + margin-right: 3px; + margin-left: 10px; + } } span { font-size: 12px; @@ -662,6 +653,7 @@ export default { display: flex; align-items: flex-start; padding-top: 15px; + line-height: 20px; > :nth-child(1) { display: flex; align-items: center; @@ -677,7 +669,7 @@ export default { } > :last-child { color: #363a44; - width: 55%; + // width: 55%; } .blue { color: #3883f1; @@ -711,6 +703,7 @@ export default { align-items: flex-start; justify-content: space-between; padding-left: 12px; + line-height: 20px; :nth-child(1) { white-space: nowrap; color: #b3b5b9; @@ -727,7 +720,7 @@ export default { display: flex; align-items: center; height: 25px; - padding: 0px 10px 0px; + padding: 0 10px; .van-image { width: 24px; height: 24px; @@ -749,6 +742,7 @@ export default { align-items: flex-start; justify-content: space-between; padding-left: 12px; + line-height: 20px; :nth-child(1) { white-space: nowrap; color: #b3b5b9; @@ -771,7 +765,7 @@ export default { color: #202020; display: block; } - > span:nth-child(2) { + :nth-child(2) { margin: 10px 0; color: #2c2b2b; font-size: 12px; @@ -785,29 +779,24 @@ export default { .protocolList { padding: 0 20px; > div { - > div:nth-child(1) { + > :nth-child(1) { font-size: 14px; font-weight: 400; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - // width: 294px; - font-family: PingFangSC-Regular, PingFang SC; color: #202020; padding-top: 20px; } - > div:nth-child(2) { - padding: unset 5px; + > :nth-child(2) { display: flex; justify-content: space-between; align-items: center; - padding: 20px 0; + padding: 18px 0; span { font-size: 12px; color: #9da2a3; font-weight: 400; - line-height: 11px; - height: 11px; } } } @@ -815,23 +804,28 @@ export default { } // 老年化 .old_container { - .titleBox { - font-size: 24px; - width: 228px; - height: 41px; + .olderVersion { + .titleBox { + font-size: 24px; + width: 228px; + height: 41px; + line-height: 41px; + } } .baseInfo { + align-items: flex-start; font-size: 22px; img { height: 30px; padding-left: 15px; } > div:nth-child(3) { - overflow: hidden; - text-overflow: ellipsis; + word-break: break-all; } } .gridBg { + margin-left: 4px; + margin-right: 4px; font-size: 20px; > div { width: 110px; @@ -846,21 +840,21 @@ export default { .projectTitle { font-size: 24px; } - > div:nth-child(1) { + > :nth-child(1) { display: flex; align-items: center; height: 41px; padding: unset 0; width: 100%; background: url(../assets/img/project_bg.png); - background-position: 0 -2px; background-size: 100% 120%; } - > div:nth-child(2) { + > :nth-child(2) { margin-top: 10px; > :nth-child(1) { border-radius: unset !important; + padding-right: 5px; } > span { font-size: 20px; @@ -871,6 +865,7 @@ export default { .projectCenterBox { font-size: 20px; > div { + line-height: 28px; > :nth-child(1) { :nth-child(2) { width: unset !important; @@ -882,24 +877,18 @@ export default { } } } - .assess { - span { - font-size: 22px; - } - } - .assessCenter1 { - font-size: 20px; - .projectTitle { - font-size: 20px; - } - } + .assess, .assess2 { span { font-size: 22px; } } + .assessCenter1, .assessCenter2 { font-size: 20px; + > div { + line-height: 28px; + } .projectTitle { font-size: 20px; } @@ -919,6 +908,7 @@ export default { > div { > :nth-child(1) { font-size: 20px !important; + line-height: 28px; padding-top: 15px !important; white-space: unset !important; } @@ -929,7 +919,6 @@ export default { font-size: 18px !important; display: block; height: unset !important; - line-height: 25px !important; } > span:nth-child(2) { padding-top: 5px; diff --git a/FrontCode2/sunshine_levy/src/views/project/index.vue b/FrontCode2/sunshine_levy/src/views/project/index.vue index 58bea03..5ff4a4b 100644 --- a/FrontCode2/sunshine_levy/src/views/project/index.vue +++ b/FrontCode2/sunshine_levy/src/views/project/index.vue @@ -10,20 +10,16 @@ />
- 被征收人姓名: - {{ - info.userName - }} + 被征收人姓名: + {{ info.userName }}
- 身份证号: - {{ - setIdCard(info.idCard) - }} + 身份证号: + {{ setIdCard(info.idCard) }}
-
+
请选择您的征收项目
@@ -41,15 +37,10 @@ >
{{ item.area }}
-
- · {{ item.currentState }} -
-
+
· {{ item.currentState }}
+
· {{ item.currentState }}
{{ item.name }}
@@ -76,7 +67,7 @@ export default { // 初始数据 info: { userName: "无数据", - idCard: "无数据", + idCard: "522121123456789102223", prjList: [ { area: "无数据", @@ -168,25 +159,19 @@ export default { diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue index 3b3b7df..12f857c 100644 --- a/FrontCode2/sunshine_levy/src/views/report/agreement.vue +++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue @@ -13,28 +13,28 @@
- 协议编号: + 协议编号 {{ item.xyNo }}
- 被征收人姓名: + 被征收人姓名 {{ info.userName }}
- 协议类型: + 协议类型 {{ item.switchProductionWay }}
- 评估总金额: + 评估总金额 {{ item.countValue }}
- 合计补偿金额: + 合计补偿金额 {{ item.summationShouldCompensateMoney }}
@@ -139,7 +139,6 @@ export default { .image { padding-top: 10px; text-align: center; - // height: 500px; img { width: 95%; } @@ -221,7 +220,8 @@ export default { } > div { > span { - width: unset !important; + width: 109px !important; + margin-right: 20px; } } } diff --git a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue index aa57481..bc4d412 100644 --- a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue +++ b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue @@ -240,8 +240,20 @@ export default { } .old_container { font-size: 20px; + .top { + padding: 10px 15px 10px 10px; + > div { + line-height: 34px; + > div { + img { + margin-right: 5px; + } + } + } + } .el-card__body { > div { + line-height: 34px; > span:nth-child(2) { font-size: 20px !important; } diff --git a/FrontCode2/sunshine_levy/src/views/report/evalute.vue b/FrontCode2/sunshine_levy/src/views/report/evalute.vue index e1c8320..82e2bdb 100644 --- a/FrontCode2/sunshine_levy/src/views/report/evalute.vue +++ b/FrontCode2/sunshine_levy/src/views/report/evalute.vue @@ -31,13 +31,13 @@
- 被征收人房屋地址 + 被征收房屋坐落 {{ item.houseAddress }}
评估总金额 - {{ item.countValue }}{{ item.countValue }}
@@ -83,13 +83,13 @@
- 被征收人房屋地址 + 被征收房屋坐落 {{ item.houseAddress }}
评估总金额 - {{ item.countValue }}{{ item.countValue }}
@@ -257,8 +257,11 @@ export default { color: #363a44; max-width: 57%; } + .red { + color: red; + font-size: 18px; + } } - .absolute { background-color: #f7be24; position: absolute; @@ -304,9 +307,25 @@ export default { } .old_container { font-size: 18px; + .title { + span { + font-size: 20px; + } + } .el-card__body { > div { font-size: 18px !important; + line-height: 25px !important; + > img:nth-child(1) { + padding-top: 3px; + } + > span:nth-child(2) { + width: unset !important; + white-space: nowrap; + } + > :nth-child(3) { + max-width: unset !important; + } } .content { display: block !important;