From 31acca95b5a66b38ea09e1d8abc5e2ff246b7ddb Mon Sep 17 00:00:00 2001 From: lisl <1223762861@qq.com> Date: Fri, 15 Oct 2021 16:12:01 +0800 Subject: [PATCH] =?UTF-8?q?update:bug=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 | 7 +-- FrontCode2/sunshine_levy/src/main.js | 2 + FrontCode2/sunshine_levy/src/olderMode/1.js | 1 + FrontCode2/sunshine_levy/src/router/index.js | 4 +- FrontCode2/sunshine_levy/src/store/index.js | 9 +++- FrontCode2/sunshine_levy/src/views/index.vue | 46 ++++++++++--------- .../src/views/pdf/evaluateResultPdf.vue | 11 ++--- .../sunshine_levy/src/views/pdf/pdf.vue | 2 + .../src/views/policyInfo/policyInfo.vue | 10 +++- .../sunshine_levy/src/views/project/index.vue | 8 +++- .../src/views/report/agreement.vue | 4 +- .../src/views/report/evaluatePage.vue | 5 +- .../src/views/report/evalute.vue | 7 ++- 13 files changed, 71 insertions(+), 45 deletions(-) diff --git a/FrontCode2/sunshine_levy/src/App.vue b/FrontCode2/sunshine_levy/src/App.vue index fc43252..fadc83e 100644 --- a/FrontCode2/sunshine_levy/src/App.vue +++ b/FrontCode2/sunshine_levy/src/App.vue @@ -19,17 +19,18 @@ export default { endValue: "" }; }, + created() {}, mounted() { - document.body.ontouchstart = function(e) { + document.body.ontouchstart = e => { this.startValue = e.changedTouches[0].pageY; }; - document.body.ontouchend = function(e) { + document.body.ontouchend = e => { this.endValue = e.changedTouches[0].pageY; if ( this.endValue - this.startValue > 50 && e.changedTouches[0].pageY === e.changedTouches[0].clientY ) { - window.location.reload(); + this.$children[0].onInit(); } }; }, diff --git a/FrontCode2/sunshine_levy/src/main.js b/FrontCode2/sunshine_levy/src/main.js index e289b25..0ea6b0e 100644 --- a/FrontCode2/sunshine_levy/src/main.js +++ b/FrontCode2/sunshine_levy/src/main.js @@ -53,6 +53,8 @@ Vue.use(Divider); Vue.config.productionTip = false; import md5 from "js-md5"; Vue.prototype.$md5 = md5; + +Vue.prototype.$bus = new Vue(); /* eslint-disable no-new */ const vm = new Vue({ el: "#app", diff --git a/FrontCode2/sunshine_levy/src/olderMode/1.js b/FrontCode2/sunshine_levy/src/olderMode/1.js index b85175b..b629f12 100644 --- a/FrontCode2/sunshine_levy/src/olderMode/1.js +++ b/FrontCode2/sunshine_levy/src/olderMode/1.js @@ -3,6 +3,7 @@ import $ from "jquery"; export const changeStyle = function() { $(".bottomContent").addClass("old_bottomContent"); $("#app").addClass("old_app"); + $("#app").removeClass("old_app2"); }; export const changeBottomStyle = function() { diff --git a/FrontCode2/sunshine_levy/src/router/index.js b/FrontCode2/sunshine_levy/src/router/index.js index af878bb..0022af8 100644 --- a/FrontCode2/sunshine_levy/src/router/index.js +++ b/FrontCode2/sunshine_levy/src/router/index.js @@ -14,9 +14,7 @@ const router = new Router({ }, { path: "/", - name: "index", - component: () => - import ("../views") + redirect: "/index" }, // 选择项目页面 { diff --git a/FrontCode2/sunshine_levy/src/store/index.js b/FrontCode2/sunshine_levy/src/store/index.js index 19806cd..476d686 100644 --- a/FrontCode2/sunshine_levy/src/store/index.js +++ b/FrontCode2/sunshine_levy/src/store/index.js @@ -11,7 +11,8 @@ const store = new Vuex.Store({ // 评估详情页面类型 type: "", //分户评估id - id: "" + id: "", + isConfirmReload: false }, mutations: { getData: (state, data) => { @@ -27,6 +28,9 @@ const store = new Vuex.Store({ // 设置分户评估id setFhpgId: (state, id) => { state.id = id; + }, + aa: (state, data) => { + state.isConfirmReload = data; } }, actions: { @@ -45,6 +49,9 @@ const store = new Vuex.Store({ // 设置分户评估id SET_FHPGID: ({ commit }, id) => { commit("setFhpgId", id); + }, + AA: ({ commit }, val) => { + commit("aa", val); } } }); diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index 3ac2e5c..e3717d4 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -5,7 +5,10 @@
被征收人信息查询
-
进入老年模式
+
+ 进入老年模式 +
+
退出老年模式
@@ -164,7 +167,7 @@
{ console.log("首页数据", data); - window.sessionStorage.setItem("homeData", JSON.stringify(data)); if (data.data.success) { this.data = data.data.data; @@ -349,14 +356,14 @@ export default { toOlderMode() { if (sessionStorage.getItem("mode") == "older") { sessionStorage.setItem("mode", "normal"); - $(".mode").text("进入老年模式"); + this.mode = false; $(".container").removeClass("old_container"); $(".bottomContent").removeClass("old_bottomContent"); $("#app").removeClass("old_app"); } else { sessionStorage.setItem("mode", "older"); + this.mode = true; changeStyle(); - $(".mode").text("退出老年模式"); $(".container").addClass("old_container"); } }, @@ -606,9 +613,6 @@ export default { display: flex; align-items: center; height: 27px; - opacity: 0.82; - - // background: #24bca3; > div { background: #24bca3; height: 27px; @@ -653,21 +657,18 @@ export default { align-items: center; img { height: 22px; - padding: 0 10px; + padding: 0 7px; } :nth-child(2) { font-weight: 400; color: #b3b5b9; - width: 106px; } } - > :last-child { color: #363a44; width: 55%; } - .blue { color: #3883f1; } @@ -692,7 +693,7 @@ export default { } } .assessCenter1 { - margin: 25px 22px 22px; + margin: 25px 16px 22px; border-left: 2px solid #24bca3; font-weight: 400; > div { @@ -705,8 +706,6 @@ export default { color: #b3b5b9; } :nth-child(2) { - overflow: hidden; - text-overflow: ellipsis; color: #363a44; } } @@ -732,7 +731,7 @@ export default { } } .assessCenter2 { - margin: 25px 22px 22px; + margin: 25px 16px 22px; border-left: 2px solid #ff5959; font-weight: 400; > div { @@ -745,8 +744,6 @@ export default { color: #b3b5b9; } :nth-child(2) { - overflow: hidden; - text-overflow: ellipsis; color: #363a44; } } @@ -784,7 +781,7 @@ export default { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - width: 294px; + // width: 294px; font-family: PingFangSC-Regular, PingFang SC; color: #202020; padding-top: 20px; @@ -907,16 +904,21 @@ export default { > div { > :nth-child(1) { font-size: 20px !important; + padding-top: 15px !important; + white-space: unset !important; } > :nth-child(2) { display: block !important; - padding-top: 10px !important; + padding: 15px 0 5px !important; span { 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/pdf/evaluateResultPdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue index f06bc00..e08b888 100644 --- a/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue +++ b/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue @@ -35,6 +35,8 @@ export default { created() { if (sessionStorage.getItem("mode") == "older") { projectSelectChangeStyle(); + } else { + $(".logout").css("display", "none"); } this.onInit(); }, @@ -66,16 +68,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/pdf/pdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue index 3e1cfd1..648aa55 100644 --- a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue +++ b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue @@ -36,6 +36,8 @@ export default { created() { if (sessionStorage.getItem("mode") == "older") { projectSelectChangeStyle(); + } else { + $(".logout").css("display", "none"); } this.onInit(); }, diff --git a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue index 7bd7d59..3ec9842 100644 --- a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue +++ b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue @@ -20,11 +20,17 @@ export default { }; }, created() { - projectSelectChangeStyle(); + if (sessionStorage.getItem("mode") == "older") { + projectSelectChangeStyle(); + } else { + $(".logout").css("display", "none"); + } this.onInit(); }, mounted() { - $(".container").addClass("old_container"); + if (sessionStorage.getItem("mode") == "older") { + $(".container").addClass("old_container"); + } }, methods: { // 获取数据 diff --git a/FrontCode2/sunshine_levy/src/views/project/index.vue b/FrontCode2/sunshine_levy/src/views/project/index.vue index 4dcbc21..fb80f66 100644 --- a/FrontCode2/sunshine_levy/src/views/project/index.vue +++ b/FrontCode2/sunshine_levy/src/views/project/index.vue @@ -93,6 +93,8 @@ export default { created() { if (sessionStorage.getItem("mode") == "older") { projectSelectChangeStyle(); + } else { + $(".logout").css("display", "none"); } this.onInit(); }, @@ -104,6 +106,7 @@ export default { methods: { // 获取数据 onInit() { + console.log("项目"); this.type = this.$route.params.type || window.sessionStorage.getItem("type"); if (this.$route.params.type) { @@ -258,7 +261,6 @@ export default { } .proListBox { - height: 127px; margin: 15px 20px; border-radius: 3px; background-color: #fff; @@ -323,6 +325,10 @@ export default { .proTitleBox { font-size: 22px !important; } + .proTitleBox { + height: unset !important; + line-height: unset; + } .proAreaBox { > :nth-child(2) { font-size: 18px !important; diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue index 4a2c31d..dbf4b34 100644 --- a/FrontCode2/sunshine_levy/src/views/report/agreement.vue +++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue @@ -81,6 +81,8 @@ export default { created() { if (sessionStorage.getItem("mode") == "older") { projectSelectChangeStyle(); + } else { + $(".logout").css("display", "none"); } this.onInit(); }, @@ -104,7 +106,7 @@ export default { this.prjListLength = prjList.bcxyList.length; } else { let code = [6001, 6501]; - if (code.indexOf(result.data.bizCode) != "-1") { + if (code.indexOf(data.data.bizCode) != "-1") { this.$message({ message: "登录超时，请重新登录", duration: 3000, diff --git a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue index 013b44d..93a3fb9 100644 --- a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue +++ b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue @@ -88,6 +88,8 @@ export default { created() { if (sessionStorage.getItem("mode") == "older") { projectSelectChangeStyle(); + } else { + $(".logout").css("display", "none"); } this.onInit(); }, @@ -117,14 +119,13 @@ export default { onSuccess: data => { console.log("分户评估", data); this.isLoading = false; - window.sessionStorage.setItem("evaluateData", JSON.stringify(data)); if (data.data.success) { const { data: res } = data.data; this.info = res; } else { let code = [6001, 6501]; - if (code.indexOf(result.data.bizCode) != "-1") { + if (code.indexOf(data.data.bizCode) != "-1") { this.$message({ message: "登录超时，请重新登录", duration: 3000, diff --git a/FrontCode2/sunshine_levy/src/views/report/evalute.vue b/FrontCode2/sunshine_levy/src/views/report/evalute.vue index 5fa9399..d315bf7 100644 --- a/FrontCode2/sunshine_levy/src/views/report/evalute.vue +++ b/FrontCode2/sunshine_levy/src/views/report/evalute.vue @@ -62,7 +62,7 @@ 非住宅
@@ -146,6 +146,8 @@ export default { created() { if (sessionStorage.getItem("mode") == "older") { projectSelectChangeStyle(); + } else { + $(".logout").css("display", "none"); } this.onInit(); }, @@ -170,7 +172,7 @@ export default { this.prjListLength = prjList.fhpgList.length; } else { let code = [6001, 6501]; - if (code.indexOf(result.data.bizCode) != "-1") { + if (code.indexOf(data.data.bizCode) != "-1") { this.$message({ message: "登录超时，请重新登录", duration: 3000, @@ -303,6 +305,7 @@ export default { } } .old_container { + font-size: 18px; .el-card__body { > div { font-size: 18px !important;