diff --git a/src/views/caseList/caseAuditList.vue b/src/views/caseList/caseAuditList.vue index 051d8812..a23f795e 100644 --- a/src/views/caseList/caseAuditList.vue +++ b/src/views/caseList/caseAuditList.vue @@ -8,7 +8,7 @@ :border="false" :fixed="true" :safe-area-inset-top="true" - @click-left="h5GoBack" + @click-left="goPrePage" />
@@ -68,12 +68,16 @@ export default { }, async mounted() { + // console.log("this.$route.params.batchCode",this.$route.params.batchCode) this.id = this.$route.params.id || this.$route.params.batchCode; - // this.activeIndex=this.$route.params?.activeIndex || 0 + this.activeIndex=this.$route.params?.activeIndex || 0 await this.batchOrderCount(); await this.getList() }, methods:{ + goPrePage(){ + this.$router.push({ name: 'caseList', }); + }, onRefresh() { this.getList() setTimeout(() => { @@ -115,7 +119,7 @@ export default { name: 'caseDetail', // 目标路由的名称 params: { id:id, - // index:this.activeIndex, + index:this.activeIndex, batchCode:this.id, } }); @@ -181,7 +185,7 @@ export default { @include fontWeightSize(500, 14px); @include flexColAround(); padding: 2px 0 10px 0; - background: #354683; + background: #2C395F; div { padding-top: 8px; color: #FFFFFF; @@ -217,9 +221,13 @@ export default { transform: translateX(-50%); } } +::v-deep .van-pull-refresh{ + height: calc(100% - 86px) ; +} .listWrap{ width: 100%; - height: calc(100% - 86px); + //height: calc(100% - 86px); + height: 100%; overflow-y: auto; .listItem{ diff --git a/src/views/caseList/caseDetail.vue b/src/views/caseList/caseDetail.vue index 181d7364..8681435f 100644 --- a/src/views/caseList/caseDetail.vue +++ b/src/views/caseList/caseDetail.vue @@ -148,9 +148,9 @@ export default { }, created() { this.id = this.$route.params.id; - // this.activeIndex=this.$route.params.index; + this.activeIndex=this.$route.params.index; this.batchCode=this.$route.params.batchCode - console.log(" this.batchCode", this.batchCode) + console.log(" this.batchCode", this.batchCode,this.activeIndex) }, async mounted(){ await this.getOrderDetail() @@ -159,12 +159,11 @@ export default { }); }, methods:{ - goPrePage(){ this.$router.push({ name: 'caseAuditList', // 目标路由的名称 params: { - // activeIndex:this.activeIndex, + activeIndex:this.activeIndex, batchCode:this.batchCode, } }); diff --git a/src/views/caseList/caseList.vue b/src/views/caseList/caseList.vue index 5eb39aa7..d1c083bd 100644 --- a/src/views/caseList/caseList.vue +++ b/src/views/caseList/caseList.vue @@ -57,10 +57,10 @@ export default { } }, async mounted() { - let token = localStorage.getItem('token'); + /*let token = localStorage.getItem('token'); this.$dialog.alert({ message: token - }); + });*/ await this.getCount(); await this.getList() }, @@ -134,11 +134,14 @@ export default { /*::v-deep .van-nav-bar__content{ background-color: #354683 !important; }*/ +::v-deep .van-pull-refresh{ + height: calc(100% - 86px) ; +} .tab_wrap { @include fontWeightSize(500, 14px); @include flexColAround(); padding: 2px 0 10px 0; - background: #354683; + background: #2C395F; div { padding-top: 8px; color: #FFFFFF; @@ -176,7 +179,8 @@ export default { } .listWrap{ width: 100%; - height: calc(100% - 86px); + //height: calc(100% - 86px); + height: 100%; overflow-y: auto; background-color: #F4F5F7; .listItem{