diff --git a/FrontCode2/sunshine_levy/src/App.vue b/FrontCode2/sunshine_levy/src/App.vue index 767f6ca..7f64a07 100644 --- a/FrontCode2/sunshine_levy/src/App.vue +++ b/FrontCode2/sunshine_levy/src/App.vue @@ -1,17 +1,52 @@ diff --git a/FrontCode2/sunshine_levy/src/assets/css/global.css b/FrontCode2/sunshine_levy/src/assets/css/global.css new file mode 100644 index 0000000..74f5094 --- /dev/null +++ b/FrontCode2/sunshine_levy/src/assets/css/global.css @@ -0,0 +1,4 @@ +html, +body { + height: 100%; +} \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/src/main.js b/FrontCode2/sunshine_levy/src/main.js index dac0876..3a27527 100644 --- a/FrontCode2/sunshine_levy/src/main.js +++ b/FrontCode2/sunshine_levy/src/main.js @@ -11,6 +11,7 @@ import Vue from "vue"; import App from "./App"; import router from "./router"; import store from "./store"; +import "@/assets/css/global.css"; import { Button, NavBar, Cell, CellGroup, Notify } from "vant"; Vue.use(Button) diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index c6848cf..bad08a7 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -60,19 +60,19 @@
- + 项目所在区域:{{ item.area }}
- + 征收部门:{{ item.zsbm }}
- + 所属年份:{{ item.year }}
- + 征收决定号: {{ item.zsjdh }} @@ -96,7 +96,7 @@
被征收房屋地址: - + {{ assess.houseAddress }}
@@ -124,7 +124,7 @@
被征收房屋地址: - + {{ protocol.houseAddress }}
@@ -187,6 +187,7 @@ import { apis } from "@/common/apis"; import { mgop } from "@aligov/jssdk-mgop"; import { SetTicket } from "@/common/util//tools"; +import $ from "jquery"; export default { name: "home", data() { @@ -207,21 +208,21 @@ export default { { name: "请求出错暂时没有可用数据", currentState: "无数据", - area: "无数据", + area: "宁波市房屋建设和建筑管理局办公室", zsbm: "无数据", year: "无数据", zsjdh: "无数据", fhpgList: [ { - assessmentNo: "无数据", - houseAddress: "无数据", + assessmentNo: "宁波市房屋建设和建筑管理局办公室", + houseAddress: "宁波市房屋建设和建筑管理局办公室", countValue: "无数据" } ], bcxyList: [ { xyNo: "无数据", - houseAddress: "无数据", + houseAddress: "宁波市房屋建设和建筑管理局办公室", switchProductionWay: "无数据", summationShouldCompensateMoney: "无数据" } @@ -259,7 +260,10 @@ export default { console.log("this", this); this.setLocationAplus(); SetTicket(this.$route.query.ticket); + $(".bottomContent").addClass("display"); + $("#app").addClass("padding"); }, + methods: { // 获取数据 onInit() { @@ -278,7 +282,7 @@ export default { onSuccess: data => { console.log("首页数据", data); window.sessionStorage.setItem("homeData", JSON.stringify(data)); - if (data.data && data.data.success == true) { + if (data.data.success) { this.loading = false; this.data = data.data.data; // 埋点 @@ -287,10 +291,25 @@ export default { var errorCodes = [6001, 6501]; // 跳转到政务系统; if (errorCodes.indexOf(data.data.bizCode) > -1) { - window.location.replace( - "https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs" - ); - } else console.log("用户无数据,不展示"); + this.$message({ + message: "登录超时,请重新登录", + duration: 3000, + type: "info", + center: true + }); + setTimeout(() => { + window.location.replace( + "https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs" + ); + }, 3000); + } else { + this.$message({ + message: "请求出错", + duration: 3000, + type: "error", + center: true + }); + } } }, onFail: err => { @@ -305,6 +324,9 @@ export default { }, // 跳转项目详情 gotoProject(type) { + $(".bottomContent").removeClass("display"); + $("#app").removeClass("padding"); + this.$router.push({ name: "projectSelect", params: { @@ -314,6 +336,8 @@ export default { }, // 直接跳转分户评估结果页面 toEvaluate(id, type) { + $(".bottomContent").removeClass("display"); + $("#app").removeClass("padding"); this.$router.push({ name: "evaluatePage", params: { @@ -324,6 +348,8 @@ export default { }, // 直接跳转协议结果pdf toAgreement(id) { + $(".bottomContent").removeClass("display"); + $("#app").removeClass("padding"); this.$router.push({ name: "showPdf", params: { @@ -339,6 +365,8 @@ export default { }, // 政策信息页面跳转 pageJump(id) { + $(".bottomContent").removeClass("display"); + $("#app").removeClass("padding"); this.$router.push({ name: "policyInfo", params: { id } @@ -513,12 +541,7 @@ export default { border-radius: 5px 0 0; background: #3284cd; } - .projectTitle { - font-family: PingFangSC-Semibold, PingFang SC; - font-size: 16px; - font-weight: 600; - color: #fff; - } + span { white-space: nowrap; overflow: hidden; @@ -547,6 +570,12 @@ export default { } } } +.projectTitle { + font-family: PingFangSC-Semibold, PingFang SC; + font-size: 16px; + font-weight: 600; + color: #fff; +} .projectCenter { padding-bottom: 25px; background: #fff; @@ -557,8 +586,7 @@ export default { align-items: center; padding-top: 15px; width: 100%; - overflow: hidden; - .van-image { + img { width: 15px; height: 15px; padding: 0 10px; @@ -568,6 +596,9 @@ export default { font-size: 14px; font-weight: 400; color: #2c2b2b; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } } } @@ -598,9 +629,13 @@ export default { align-items: center; justify-content: space-between; padding-left: 12px; - > span:nth-child(1) { + span { white-space: nowrap; } + > span:nth-child(2) { + overflow: hidden; + text-overflow: ellipsis; + } } > div:nth-child(2) { margin: 15px 0; @@ -615,9 +650,13 @@ export default { align-items: center; justify-content: space-between; padding-left: 12px; - > span:nth-child(1) { + span { white-space: nowrap; } + > span:nth-child(2) { + overflow: hidden; + text-overflow: ellipsis; + } } > div:nth-child(n + 2) { margin: 15px 0; @@ -625,11 +664,6 @@ export default { } } -.protocolTitle { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; -} // 征收政策部分 .zszc { span { diff --git a/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue index 2c450d4..96027c9 100644 --- a/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue +++ b/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue @@ -15,10 +15,6 @@ class="baseImg" /> -
-

本服务由浙江政务服务网、宁波市住房保障和房屋征收管理中心提供

-

服务咨询热线:0574-88086606

-
@@ -41,11 +37,40 @@ export default { methods: { onInit() { let result = JSON.parse(window.sessionStorage.getItem("evaluateData")); - if (result.data && result.data.success == true) { + if (result.data.success) { this.apidata = result.data.data; this.pic_width = "100%"; this.pic_height = "100%"; this.isloading = false; + } else { + let code = [6001, 6501]; + if (code.indexOf(result.data.bizCode) != "-1") { + this.$message({ + message: "登录超时,请重新登录", + duration: 3000, + type: "info", + center: true + }); + setTimeout(() => { + window.location.replace( + "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: "请求出错", + duration: 3000, + type: "error", + center: true + }); + } } }, saveImages() { @@ -109,17 +134,4 @@ export default { position: absolute; bottom: 0px; } -.bottomContent { - margin-top: 20px; - margin-bottom: 10px; - text-align: center; - width: 100%; - font-size: 10px; - p { - margin: 0; - } - b { - color: #5d8cbc; - } -} diff --git a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue index eab7bf4..3d8c80b 100644 --- a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue +++ b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue @@ -15,10 +15,6 @@ class="baseImg" /> -
-

本服务由浙江政务服务网、宁波市住房保障和房屋征收管理中心提供

-

服务咨询热线:0574-88086606

-
@@ -56,12 +52,41 @@ export default { }, appKey: "es4b8zmz+2001833218+dehllx", onSuccess: result => { - if (result.data && result.data.success == true) { + if (result.data.success) { console.log("result.data.data:", result.data.data); this.apidata = result.data.data; this.pic_width = "100%"; this.pic_height = "100%"; this.isloading = false; + } else { + let code = [6001, 6501]; + if (code.indexOf(result.data.bizCode) != "-1") { + this.$message({ + message: "登录超时,请重新登录", + duration: 3000, + type: "info", + center: true + }); + setTimeout(() => { + window.location.replace( + "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: "请求出错", + duration: 3000, + type: "error", + center: true + }); + } } }, onFail: err => { @@ -130,17 +155,4 @@ export default { position: absolute; bottom: 0px; } -.bottomContent { - margin-top: 20px; - margin-bottom: 10px; - text-align: center; - width: 100%; - font-size: 10px; - p { - margin: 0; - } - b { - color: #5d8cbc; - } -} diff --git a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue index 97fe612..5d540f0 100644 --- a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue +++ b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue @@ -4,10 +4,6 @@
{{ modifyDate(info.publicTime) }}

-
-

本服务由浙江政务服务网、宁波市住房保障和房屋征收管理中心提供

-

服务咨询热线:0574-88086606

-
- diff --git a/FrontCode2/sunshine_levy/src/views/project/project.css b/FrontCode2/sunshine_levy/src/views/project/project.css index ad24b9f..e4f4509 100644 --- a/FrontCode2/sunshine_levy/src/views/project/project.css +++ b/FrontCode2/sunshine_levy/src/views/project/project.css @@ -2,9 +2,7 @@ /* position: absolute; */ display: flex; justify-content: space-around; - width: 94%; height: 220px; - margin: 10px; background: url(../../assets/img/zspg.png); background-repeat: no-repeat; background-size: 100% 90px; @@ -14,9 +12,7 @@ /* position: absolute; */ display: flex; justify-content: space-around; - width: 94%; height: 220px; - margin: 10px; background: url(../../assets/img/zsxy.png); background-repeat: no-repeat; background-size: 100% 90px; diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue index a75383c..e42d926 100644 --- a/FrontCode2/sunshine_levy/src/views/report/agreement.vue +++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue @@ -26,15 +26,19 @@ 协议类型: {{ item.switchProductionWay }} -
+
评估总金额: - {{ item.countValue }} + {{ item.countValue }}
合计补偿金额: - {{ item.summationShouldCompensateMoney }} + {{ + item.summationShouldCompensateMoney + }}
@@ -47,15 +51,10 @@
-
-

本服务由浙江政务服务网、宁波市住房保障和房屋征收管理中心提供

-

服务咨询热线:0574-88086606

-