From 2c704a7d42f7ab549a09da92af7c2bd24529c92d Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 6 Apr 2024 17:21:58 +0800 Subject: [PATCH] update code --- src/components/header.vue | 2 -- src/pages/index.vue | 5 ++--- src/pages/photography.vue | 6 +++++- src/pages/projectDetail.vue | 6 +++++- src/pages/projectEngin copy.vue | 6 +++++- src/pages/projectEngin.vue | 6 +++++- src/pages/projectProgress.vue | 6 +++++- src/pages/projectSafety.vue | 6 +++++- 8 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/components/header.vue b/src/components/header.vue index 3734fc7..da60a08 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -170,8 +170,6 @@ export default { } }, created(){ - debugger - window.xaap=this let obj=localStorage.getItem("project_category"); let type=localStorage.getItem("proType"); if(obj &&obj.length>0){ diff --git a/src/pages/index.vue b/src/pages/index.vue index 6f2ca11..682aea3 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -40,9 +40,8 @@ - - - + + diff --git a/src/pages/photography.vue b/src/pages/photography.vue index 8047d4e..ab3d7b5 100644 --- a/src/pages/photography.vue +++ b/src/pages/photography.vue @@ -119,7 +119,11 @@ export default { if (!this.prjs || this.prjs.length == 0) { setTimeout(func, 100); } else { - cb && cb(this.prjs[1].id); + if(this.prjs.length>1){ + cb && cb(this.prjs[1].id); + }else{ + cb(0); + } } } else { cb && cb(prjId); diff --git a/src/pages/projectDetail.vue b/src/pages/projectDetail.vue index 4688a0e..84d028b 100644 --- a/src/pages/projectDetail.vue +++ b/src/pages/projectDetail.vue @@ -878,7 +878,11 @@ export default { if (!this.prjs || this.prjs.length == 0) { setTimeout(func, 100); } else { - cb && cb(this.prjs[1].id); + if(this.prjs.length>1){ + cb && cb(this.prjs[1].id); + }else{ + cb(0); + } } } else { cb && cb(prjId); diff --git a/src/pages/projectEngin copy.vue b/src/pages/projectEngin copy.vue index ffce62b..dbaa3ea 100644 --- a/src/pages/projectEngin copy.vue +++ b/src/pages/projectEngin copy.vue @@ -205,7 +205,11 @@ export default { if (!this.prjs||this.prjs.length == 0) { setTimeout(func, 100); } else { - cb && cb(this.prjs[1].id); + if(this.prjs.length>1){ + cb && cb(this.prjs[1].id); + }else{ + cb(0); + } } } else { cb && cb(prjId); diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue index b2c07da..3385d53 100644 --- a/src/pages/projectEngin.vue +++ b/src/pages/projectEngin.vue @@ -231,7 +231,11 @@ export default { if (!this.prjs || this.prjs.length == 0) { setTimeout(func, 100); } else { - cb && cb(this.prjs[1].id); + if(this.prjs.length>1){ + cb && cb(this.prjs[1].id); + }else{ + cb(0); + } } } else { cb && cb(prjId); diff --git a/src/pages/projectProgress.vue b/src/pages/projectProgress.vue index 1d93c08..84c98c6 100644 --- a/src/pages/projectProgress.vue +++ b/src/pages/projectProgress.vue @@ -599,7 +599,11 @@ export default { if (this.projects.length == 0) { setTimeout(func, 100); } else { - cb && cb(this.projects[1].id); + if(this.projects.length>1){ + cb && cb(this.projects[1].id); + }else{ + cb(0); + } } } else { cb && cb(prjId); diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue index 54a411a..a465745 100644 --- a/src/pages/projectSafety.vue +++ b/src/pages/projectSafety.vue @@ -628,7 +628,11 @@ export default { if (!this.projects||this.projects.length == 0) { setTimeout(func, 100); } else { - cb && cb(this.projects[1].id); + if(this.projects.length>1){ + cb && cb(this.projects[1].id); + }else{ + cb(0); + } } } else { cb && cb(prjId);