From 30892a757ecc1ce9b8c399c3476ee5cdded28b0e Mon Sep 17 00:00:00 2001 From: lisl <1223762861@qq.com> Date: Tue, 12 Oct 2021 13:26:36 +0800 Subject: [PATCH] =?UTF-8?q?update:=E6=A0=B7=E5=BC=8F=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/views/index.vue | 134 ++++++++++-------- .../sunshine_levy/src/views/pdf/pdf.vue | 9 +- .../src/views/policyInfo/policyInfo.vue | 7 +- .../src/views/report/agreement.vue | 47 +++--- .../src/views/report/evaluatePage.vue | 19 ++- .../src/views/report/evalute.vue | 43 +++--- 6 files changed, 148 insertions(+), 111 deletions(-) diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index 13d6be9..3f1341f 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -7,36 +7,38 @@ element-loading-background=" rgba(118,118,118)" >
-
- 被征收人信息查询 +
+
+ 被征收人信息查询 +
- + 被征收人姓名：{{ data.userName }}
- + 身份证号码：{{ setIdCard(data.idCard) }}
- + 扫一扫
- + 查评估结果
- + 查补偿协议
-
- +
+
@@ -61,26 +63,33 @@
- - 项目所在区域： +
+ + 项目所在区域： +
{{ item.area }}
- - 征收部门： +
+ + 征收部门： +
{{ item.zsbm }}
- - 所属年份： +
+ + 所属年份： +
{{ item.year }}
- - 征收决定号： - - {{ item.zsjdh }} - +
+ + 征收决定号： +
+ +
{{ item.zsjdh }}
@@ -212,7 +221,7 @@ export default { { name: "请求出错暂时没有可用数据", currentState: "无数据", - area: "宁波市房屋建设和建筑管理局办公室", + area: "宁波市房屋建设管理办公室九号楼", zsbm: "无数据", year: "无数据", zsjdh: "无数据", @@ -459,25 +468,21 @@ export default { background: #f6f7f8; padding-bottom: 20px; > div:nth-child(n + 2) { - margin-top: 10px; - margin-right: 12px; - margin-left: 10px; + margin: 10px 12px 0 10px; } } // 最上面盒子 .topBox { - overflow: hidden; - width: 100%; - height: 225px; background: url(../assets/img/bg.png); - background-size: 100% 225px; + background-size: 100% auto; + background-repeat: no-repeat; .titleBox { display: flex; align-items: center; justify-content: center; width: 173px; height: 36px; - margin: 15px 0 15px 0; + border-radius: 0 22px 22px 0; background: rgba(6, 63, 142, 0.66); font-size: 16px; @@ -487,7 +492,8 @@ export default { .baseInfo { display: flex; margin: 5px 0; - .van-image { + align-items: center; + img { height: 21px; padding-right: 10px; padding-left: 31px; @@ -498,11 +504,11 @@ export default { } .gridBg { display: flex; - overflow: hidden; + align-items: center; justify-content: space-around; margin: 10px 12px 0 10px; - height: 120px; + border-radius: 3px; background: rgba(255, 255, 255, 0.28); > div { @@ -512,24 +518,25 @@ export default { justify-content: center; width: 90px; height: 80px; - margin: 12px 6px; - padding-top: 5px; + margin: 20px 0 10px; border-radius: 10px; - .van-image { - width: 38px; + img { height: 35px; } span { padding-top: 5px; - font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; - line-height: 20px; - height: 20px; color: #fff; } } } } +// 大背景图 +.bigImage { + img { + width: 100%; + } +} // 项目部分 .project { display: flex; @@ -597,22 +604,30 @@ export default { .projectCenterBox { > div { display: flex; - align-items: center; + align-items: flex-start; padding-top: 15px; - img { - height: 15px; - padding: 0 10px; + > :nth-child(1) { + display: flex; + align-items: center; + img { + height: 15px; + padding: 0 10px; + } + :nth-child(2) { + font-weight: 400; + color: #b3b5b9; + + width: 106px; + } } - span { - font-weight: 400; - color: #b3b5b9; - white-space: nowrap; - } - div { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + + > :last-child { color: #363a44; + width: 55%; + } + + .blue { + color: #3883f1; } } } @@ -640,20 +655,20 @@ export default { font-weight: 400; > div { display: flex; - align-items: center; + align-items: flex-start; justify-content: space-between; padding-left: 12px; - span { + :nth-child(1) { white-space: nowrap; color: #b3b5b9; } - > span:nth-child(2) { + :nth-child(2) { overflow: hidden; text-overflow: ellipsis; color: #363a44; } } - > div:nth-child(2) { + > :nth-child(2) { margin: 15px 0; } } @@ -669,7 +684,6 @@ export default { background: #2468f2; } span { - font-family: PingFangSC-Regular, PingFang SC; font-size: 16px; font-weight: 400; color: #2468f2; @@ -681,14 +695,14 @@ export default { font-weight: 400; > div { display: flex; - align-items: center; + align-items: flex-start; justify-content: space-between; padding-left: 12px; - span { + :nth-child(1) { white-space: nowrap; color: #b3b5b9; } - > span:nth-child(2) { + :nth-child(2) { overflow: hidden; text-overflow: ellipsis; color: #363a44; diff --git a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue index 66e30b7..dcb8bb3 100644 --- a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue +++ b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue @@ -73,16 +73,9 @@ export default { "https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs" ); }, 3000); - } else if (result.data.message == "未上传附件") { - this.$message({ - message: "无附件", - duration: 3000, - type: "info", - center: true - }); } else { this.$message({ - message: "请求出错", + message: result.data.message, duration: 3000, type: "error", center: true diff --git a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue index 5d540f0..35b41a2 100644 --- a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue +++ b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue @@ -65,7 +65,12 @@ export default { } }, onFail: function(err) { - console.log("错误信息", err); + this.$notify({ + title: "错误", + message: "请求失败", + type: "error", + duration: 3000 + }); } }); }, diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue index e42d926..c861530 100644 --- a/FrontCode2/sunshine_levy/src/views/report/agreement.vue +++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue @@ -13,32 +13,30 @@
- 协议编号： + 协议编号： {{ item.xyNo }}
- 被征收人姓名： + 被征收人姓名： {{ info.userName }}
- 协议类型： + 协议类型： {{ item.switchProductionWay }}
-
- - 评估总金额： - {{ item.countValue }}元 -
- 合计补偿金额： - {{ - item.summationShouldCompensateMoney - }}元 + 评估总金额： + {{ item.countValue }} + 元 +
+
+ + 合计补偿金额： + {{ item.summationShouldCompensateMoney }} + 元
@@ -146,15 +144,30 @@ export default { .el-card { margin: 0 10px 10px; .el-card__body { + .blue { + color: #3c70dd; + font-size: 16px; + } + .red { + color: #e55454; + font-size: 16px; + } > div { margin: 14px 0; display: flex; align-items: center; height: 20px; - img { + color: #b3b5b9; + > img { margin-right: 6px; height: 100%; } + > span { + width: 106px; + } + b { + color: #363a44; + } } .line { opacity: 1; @@ -170,9 +183,7 @@ export default { align-items: center; justify-content: center; overflow: hidden; - > div { - height: 100%; - } + height: 20px; img { margin-right: 10px; height: 100%; diff --git a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue index ba5c1ef..a3ac640 100644 --- a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue +++ b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue @@ -4,6 +4,7 @@ v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" + element-loading-background=" rgba(118,118,118)" >
@@ -11,14 +12,14 @@ 被征收房屋座落:
- {{ info.houseAddress }} + ({{ info.houseAddress }})
评估方式:
- {{ info.valuationMethodText }} + ({{ info.valuationMethodText }})
@@ -48,15 +49,15 @@
超容积率土地补偿费: - {{ info.exceedLandMoney }} +
({{ info.exceedLandMoney }})
阁楼补偿费: - {{ info.atticAssessedValue }} +
({{ info.atticAssessedValue }})
备注: - {{ info.remark }} +
({{ info.remark }})
@@ -192,6 +193,7 @@ export default { > div { display: flex; align-items: center; + color: #b3b5b9; img { height: 20px; margin-right: 10px; @@ -201,6 +203,9 @@ export default { margin-right: 10px; } } + > span { + color: #363a44; + } } } .el-card { @@ -211,9 +216,13 @@ export default { display: flex; justify-content: space-between; align-items: center; + color: #b3b6b9; > span:nth-child(2) { color: red; } + > div { + color: #363a44; + } } } } diff --git a/FrontCode2/sunshine_levy/src/views/report/evalute.vue b/FrontCode2/sunshine_levy/src/views/report/evalute.vue index 8058a43..3cce8c3 100644 --- a/FrontCode2/sunshine_levy/src/views/report/evalute.vue +++ b/FrontCode2/sunshine_levy/src/views/report/evalute.vue @@ -21,24 +21,24 @@
- 评估报告编号： + 评估报告编号 {{ item.assessmentNo }}
- 被征收人姓名： + 被征收人姓名 {{ info.userName }}
-
+
- 被征收人房屋地址： + 被征收人房屋地址 {{ item.houseAddress }}
- 评估总金额： + 评估总金额 {{ item.countValue }}元 + >元
@@ -68,29 +68,29 @@ >
-
+
商业
- 评估报告编号： + 评估报告编号 {{ item.assessmentNo }}
- 被征收人姓名： + 被征收人姓名 {{ info.userName }}
-
+
- 被征收人房屋地址： + 被征收人房屋地址 {{ item.houseAddress }}
- 评估总金额： + 评估总金额 {{ item.countValue }}元 + >元
@@ -233,19 +233,23 @@ export default { > div { margin: 14px 0; display: flex; - align-items: center; + align-items: flex-start; line-height: 20px; + color: #b3b5b9; img { margin-right: 6px; width: 20px; } - span { - white-space: nowrap; + > span:nth-child(2) { + margin-right: 16px; + width: 97px; + } + > :nth-child(n + 3) { + color: #363a44; + max-width: 57%; } } - .address { - align-items: flex-start; - } + .absolute { background-color: #f7be24; position: absolute; @@ -282,6 +286,7 @@ export default { span { padding-right: 10px; font-size: 12px; + color: #3876f3; } } }