diff --git a/pages/management/HalfFinishedInStore.vue b/pages/management/HalfFinishedInStore.vue index 941d1aa..ae5bf3d 100644 --- a/pages/management/HalfFinishedInStore.vue +++ b/pages/management/HalfFinishedInStore.vue @@ -18,14 +18,14 @@ - - + + - - + + @@ -97,8 +97,9 @@ this.$store.dispatch('setPublicObj', '') }, toSearch () { + this.$store.dispatch('setPublicObj', '') uni.navigateTo({ - url: '/pages/management/searchMater?page=p2' + url: '/pages/management/searchMater' }) }, toSure () { diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue index 021988b..4875597 100644 --- a/pages/management/hcxcheck.vue +++ b/pages/management/hcxcheck.vue @@ -71,14 +71,14 @@ - - + + - - + + @@ -236,8 +236,9 @@ this.val7 = this.obj.weight }, searchMater () { + this.$store.dispatch('setPublicObj', '') uni.navigateTo({ - url: '/pages/management/searchMater?page=p1' + url: '/pages/management/searchMater' }) }, closePop () { diff --git a/pages/management/searchMater.vue b/pages/management/searchMater.vue index f7f2c70..0781dce 100644 --- a/pages/management/searchMater.vue +++ b/pages/management/searchMater.vue @@ -66,16 +66,8 @@ }, methods: { goIn () { - if (this.page === 'p1') { - uni.redirectTo({ - url: '/pages/management/hcxcheck' - }) - } - if (this.page === 'p2') { - uni.redirectTo({ - url: '/pages/management/HalfFinishedInStore' - }) - } + // 上一个页面hcxcheck、HalfFinishedInStore,只能用uni.navigateBack()上个页面才能缓存 + uni.navigateBack() }, async _materialQuery () { let res = await materialQuery(this.val1)