From 3a77cda79aa16d05b52796fc83b7bcee7c51f2f6 Mon Sep 17 00:00:00 2001 From: lisl <1223762861@qq.com> Date: Wed, 15 Sep 2021 09:34:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update:=E5=A2=9E=E5=8A=A0=E6=94=BF=E7=AD=96?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontCode2/sunshine_levy/src/router/index.js | 7 + FrontCode2/sunshine_levy/src/views/index.vue | 236 +++++++++++------- .../src/views/policyInfo/policyInfo.vue | 41 +++ 3 files changed, 193 insertions(+), 91 deletions(-) create mode 100644 FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue diff --git a/FrontCode2/sunshine_levy/src/router/index.js b/FrontCode2/sunshine_levy/src/router/index.js index 4d22a8b..400f3d8 100644 --- a/FrontCode2/sunshine_levy/src/router/index.js +++ b/FrontCode2/sunshine_levy/src/router/index.js @@ -51,6 +51,13 @@ export default new Router({ name: "evaluteResult", component: () => import ("../views/pdf/evaluteResult") + }, + // 政策详情页面 + { + path: "/policyInfo", + name: "policyInfo", + component: () => + import ("../views/policyInfo/policyInfo") } ] }); \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index cdd69c1..6adaf41 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -7,19 +7,28 @@
- + 被征收人姓名: {{ data.userName }}
- + 身份证号码: {{ data.idCard }}
- +
- +
-
+
- - {{item.name}} + + {{ item.name }}
- + {{ item.currentState }}
@@ -89,14 +107,19 @@ class="projectCenterImg" /> 征收决定号: - {{ item.zsjdh }} + {{ + item.zsjdh + }}
- + 分户评估结果
-
+
评估报告编号: - {{ - assess.assessmentNo - }} + {{ assess.assessmentNo }}
- 被征收房屋地址: - {{ assess.houseAddress }} + 被征收房屋地址: + {{ + assess.houseAddress + }}
评估总金额: - ¥{{ assess.countValue }} + ¥{{ assess.countValue }}
- + 补偿协议
-
+
协议编号: {{ protocol.xyNo }}
- 被征收房屋地址: - {{ protocol.houseAddress }} + 被征收房屋地址: + {{ + protocol.houseAddress + }}
补偿方式: - {{ protocol.switchProductionWay }} + {{ + protocol.switchProductionWay + }}
合计补偿资金: - ¥{{ protocol.summationShouldCompensateMoney }} + ¥{{ protocol.summationShouldCompensateMoney }}
@@ -160,7 +203,10 @@
- +
征收政策 @@ -173,12 +219,15 @@
-
+
{{ item.title }}
-
+
发布时间: {{ item.publish_date }} @@ -191,7 +240,10 @@
{{ item.title }}
-
+
发布时间: {{ item.publish_date }} @@ -211,14 +263,14 @@ - - diff --git a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue new file mode 100644 index 0000000..17bb03a --- /dev/null +++ b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue @@ -0,0 +1,41 @@ + + + From bd91d66cf3f8e3c88b361b754468002c0751206d Mon Sep 17 00:00:00 2001 From: lisl <1223762861@qq.com> Date: Wed, 15 Sep 2021 09:50:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=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 | 67 +------------------- 1 file changed, 1 insertion(+), 66 deletions(-) diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index 2d1086b..cc39cf7 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -314,33 +314,20 @@ export default { id: 11, area: "全大市", title: "宁波市住房和城乡建设委员会开展关于住房的政策", -<<<<<<< HEAD publish_date: "2021年09月05日" -======= - publish_date: "2021年09月05日", ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f }, { id: 22, area: "全大市", title: "宁波市住房和城乡建设委员会开展关于住房的政策", -<<<<<<< HEAD publish_date: "2021年09月05日" -======= - publish_date: "2021年09月05日", ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f }, { id: 33, area: "全大市", title: "宁波市住房和城乡建设委员会开展关于住房的政策", -<<<<<<< HEAD publish_date: "2021年09月05日" } -======= - publish_date: "2021年09月05日", - }, ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f ], loading: false, finished: true, @@ -362,17 +349,10 @@ export default { dataType: "JSON", type: "GET", data: { -<<<<<<< HEAD - ticket: "1234567" + ticket: this.$route.query.ticket }, appKey: "es4b8zmz+2001833218+dehllx", // 必须 onSuccess: data => { -======= - ticket: this.$route.query.ticket, - }, - appKey: "es4b8zmz+2001833218+dehllx", // 必须 - onSuccess: (data) => { ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f console.log("data", data); if (data.data && data.data.success == true) { this.data = data.data; @@ -380,11 +360,7 @@ export default { console.log("用户无数据,不展示"); } }, -<<<<<<< HEAD onFail: err => { -======= - onFail: (err) => { ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f console.log(err, "err"); }, onFail: err => { @@ -446,7 +422,6 @@ export default { }, gotoProject(type) { this.$router.push({ name: "projectSelect", params: { type: type } }); -<<<<<<< HEAD }, onLogin() { // this.loading = true; @@ -489,8 +464,6 @@ export default { if (len <= 0) return num; if (!tbl[len]) tbl[len] = new Array(len + 1).join("0"); return tbl[len] + num; -======= ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f }, // 页面跳转 pageJump() { @@ -500,7 +473,6 @@ export default { // 设置用户信息埋点 aplus_queue.push({ action: "aplus.setMetaInfo", -<<<<<<< HEAD arguments: ["_hold", "BLOCK"] }); aplus_queue.push({ @@ -514,21 +486,6 @@ export default { aplus_queue.push({ action: "aplus.setMetaInfo", arguments: ["_hold", "START"] -======= - arguments: ["_hold", "BLOCK"], - }); - aplus_queue.push({ - action: "aplus.setMetaInfo", - arguments: ["_user_nick", this.userInfoData.username], - }); - aplus_queue.push({ - action: "aplus.setMetaInfo", - arguments: ["_user_id", Userid], - }); - aplus_queue.push({ - action: "aplus.setMetaInfo", - arguments: ["_hold", "START"], ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f }); }, // 基础信息埋点配置 @@ -544,37 +501,21 @@ export default { })(window, document, "script", "aplus_queue"); aplus_queue.push({ action: "aplus.setMetaInfo", -<<<<<<< HEAD arguments: ["aplus-rhost-v", "alog.zjzwfw.gov.cn"] }); aplus_queue.push({ action: "aplus.setMetaInfo", arguments: ["aplus-rhost-g", "alog.zjzwfw.gov.cn"] -======= - arguments: ["aplus-rhost-v", "alog.zjzwfw.gov.cn"], - }); - aplus_queue.push({ - action: "aplus.setMetaInfo", - arguments: ["aplus-rhost-g", "alog.zjzwfw.gov.cn"], ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f }); // 这个会落到 app_key 字段上 aplus_queue.push({ action: "aplus.setMetaInfo", -<<<<<<< HEAD arguments: ["appId", "60506758"] -======= - arguments: ["appId", "60506758"], ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f }); // 单页应用 或 “单个页面”需异步补充 PV 日志参数还需进行如下埋点: aplus_queue.push({ action: "aplus.setMetaInfo", -<<<<<<< HEAD arguments: ["aplus-waiting", "MAN"] -======= - arguments: ["aplus-waiting", "MAN"], ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f }); // 单页应用路由切换后 或 在异步获取到 pv 日志所需的参数后再执行 sendPV: aplus_queue.push({ @@ -585,15 +526,9 @@ export default { }, { miniAppId: "2001833218", //'应用开发管理平台-应用 ID -<<<<<<< HEAD miniAppName: "房屋征收" } ] -======= - miniAppName: "房屋征收", - }, - ], ->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f }); } }