From 2240f89f78d784013cb9a2daffe4b653905a392d Mon Sep 17 00:00:00 2001 From: zhaochengke Date: Thu, 16 Jun 2022 15:51:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 35 +- src/views/onlineHome/done.vue | 19 +- .../homestead/certificate/certificateList.vue | 263 ++++++--- .../homestead/certificate/certificateSee.vue | 513 +++++++++++------- .../licensePermitEdit.vue | 12 +- .../licenseRatificationEdit.vue | 11 +- .../homeApplication/houseAnnounce.vue | 251 --------- .../homeApplication/houseLicense.vue | 193 ------- .../homeApplication/houseLicenseDetail.vue | 395 -------------- 9 files changed, 540 insertions(+), 1152 deletions(-) rename src/views/onlineHome/homestead/{homeApplication => certificate}/licensePermitEdit.vue (94%) rename src/views/onlineHome/homestead/{homeApplication => certificate}/licenseRatificationEdit.vue (96%) delete mode 100644 src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue delete mode 100644 src/views/onlineHome/homestead/homeApplication/houseLicense.vue delete mode 100644 src/views/onlineHome/homestead/homeApplication/houseLicenseDetail.vue diff --git a/src/router/index.js b/src/router/index.js index 28d234cc..abb259af 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2375,49 +2375,22 @@ export const constantRoutes = [ component: (resolve) => require(['@/views/homesteadSurvey/settle'], resolve) }, { - path: '/houseAnnounce', - name: 'houseAnnounce', - meta: { - title: '公示查询', - hidden: true, - }, - component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/houseAnnounce'], resolve) - }, - { - path: '/houseLicense', - name: 'houseLicense', - meta: { - title: '证书查看', - hidden: true, - }, - component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/houseLicense'], resolve) - }, - { - path: '/houseLicenseDetail', - name: 'houseLicenseDetail', - meta: { - title: '证书查看', - hidden: true, - }, - component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/houseLicenseDetail'], resolve) - }, - { - path: '/licensePermitEdit', + path: '/onlineHome/licensePermitEdit', name: 'licensePermitEdit', meta: { title: '修改许可证', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/licensePermitEdit'], resolve) + component: (resolve) => require(['@/views/onlineHome/homestead/certificate/licensePermitEdit'], resolve) }, { - path: '/licenseRatificationEdit', + path: '/onlineHome/licenseRatificationEdit', name: 'licenseRatificationEdit', meta: { title: '修改批准书', hidden: true, }, - component: (resolve) => require(['@/views/onlineHome/homestead/homeApplication/licenseRatificationEdit'], resolve) + component: (resolve) => require(['@/views/onlineHome/homestead/certificate/licenseRatificationEdit'], resolve) }, { path: '/proposerLite', diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue index 2f52fccd..d4f75635 100644 --- a/src/views/onlineHome/done.vue +++ b/src/views/onlineHome/done.vue @@ -8,9 +8,9 @@ @click-left="goOnlineHomeIndex" /> - + - + @@ -91,6 +91,17 @@ this.getList(); }); + this.$nextTick(() => this.activeName = (location.hash || '#1').substr(1)); + /*let self = this; + window.onpopstate = function (event) { + console.log(event, location); + let state = event.state; + if(state) + { + let activeName = state.type || '1'; + self.$nextTick(() => self.activeName = activeName); + } + };*/ }, methods: { goOnlineHomeIndex(){ @@ -173,6 +184,7 @@ goDetail(item){ console.log(item) let type = item.formData.processKey; + //history.pushState({ type: this.activeName}, null); switch (type) { case 'baseApply': case 'landscope': @@ -207,6 +219,9 @@ this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}}) break; } + default: + console.log("Unknown processKey: " + type); + break; } } }, diff --git a/src/views/onlineHome/homestead/certificate/certificateList.vue b/src/views/onlineHome/homestead/certificate/certificateList.vue index 5bc274f7..c3130acc 100644 --- a/src/views/onlineHome/homestead/certificate/certificateList.vue +++ b/src/views/onlineHome/homestead/certificate/certificateList.vue @@ -1,114 +1,213 @@ @@ -137,5 +137,13 @@ export default { diff --git a/src/views/onlineHome/homestead/homeApplication/licenseRatificationEdit.vue b/src/views/onlineHome/homestead/certificate/licenseRatificationEdit.vue similarity index 96% rename from src/views/onlineHome/homestead/homeApplication/licenseRatificationEdit.vue rename to src/views/onlineHome/homestead/certificate/licenseRatificationEdit.vue index 41b40542..f5c881cf 100644 --- a/src/views/onlineHome/homestead/homeApplication/licenseRatificationEdit.vue +++ b/src/views/onlineHome/homestead/certificate/licenseRatificationEdit.vue @@ -76,7 +76,7 @@ - + @@ -186,4 +186,13 @@ export default { border-color: #1989fa; background-color: #FFFFFF; } +.van-goods-action-button--first { + border-radius: 0.053333rem; +} +.van-goods-action-button--last { + border-radius: 0.053333rem; +} +.van-goods-action-button { + margin-left: 0.1rem; +} diff --git a/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue b/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue deleted file mode 100644 index fa490a87..00000000 --- a/src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue +++ /dev/null @@ -1,251 +0,0 @@ - - - - - diff --git a/src/views/onlineHome/homestead/homeApplication/houseLicense.vue b/src/views/onlineHome/homestead/homeApplication/houseLicense.vue deleted file mode 100644 index 922eaf79..00000000 --- a/src/views/onlineHome/homestead/homeApplication/houseLicense.vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - - diff --git a/src/views/onlineHome/homestead/homeApplication/houseLicenseDetail.vue b/src/views/onlineHome/homestead/homeApplication/houseLicenseDetail.vue deleted file mode 100644 index ef68b3c1..00000000 --- a/src/views/onlineHome/homestead/homeApplication/houseLicenseDetail.vue +++ /dev/null @@ -1,395 +0,0 @@ - - - - -