From 7b334a022411c293673284b8f3b91f386500efb2 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Thu, 3 Nov 2022 17:43:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ability/IntegratedServices.vue | 3 ++- front/src/views/home/detailBack.vue | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/back/src/views/modules/ability/IntegratedServices.vue b/back/src/views/modules/ability/IntegratedServices.vue index e18a939b..bb6e0d1d 100644 --- a/back/src/views/modules/ability/IntegratedServices.vue +++ b/back/src/views/modules/ability/IntegratedServices.vue @@ -140,7 +140,8 @@ export default { }, // 详情 showDetail(val) { - window.open(window.SITE_CONFIG.previewUrl + '#/packagingDetails?id=' + val.id) + // window.open(window.SITE_CONFIG.previewUrl + '#/packagingDetails?id=' + val.id) + window.open(window.SITE_CONFIG.previewUrl + '#/integrationServicesDetails?id=' + val.id) }, // showDocument(val) { // console.log(val); diff --git a/front/src/views/home/detailBack.vue b/front/src/views/home/detailBack.vue index 25baec9b..501ac261 100644 --- a/front/src/views/home/detailBack.vue +++ b/front/src/views/home/detailBack.vue @@ -21,16 +21,16 @@ const previousPage = () => { // this.$router.push({name: this.$store.state.previousRouter.name}); // } // // let val = router.go(-1) - - window.history.go(-1) +debugger +let current= router.currentRoute.value.path +if(current==='/integrationServicesDetails'){ + router.push({ + path: '/integrationServices', + }) +}else{ + window.history.go(-1) +} } -// router.beforeEach((to, from, next) => { -// debugger -// // console.log('跳转路由=========>', to, from, next) -// document.documentElement.scrollTop = 0 -// document.body.scrollTop = 0 -// next() -// })