|
|
@@ -3,17 +3,18 @@ import { Search } from '@element-plus/icons-vue'
|
|
|
import DownloadKLNPortal from './components/DownloadKLNPortal.vue'
|
|
|
import ChangePasswordDialog from './components/ChangePasswordDialog.vue'
|
|
|
import LogoutDialog from './components/LogoutDialog.vue'
|
|
|
-import { useRouter } from 'vue-router'
|
|
|
+import { useRouter, useRoute } from 'vue-router'
|
|
|
import { useUserStore } from '@/stores/modules/user'
|
|
|
import { useHeaderSearch } from '@/stores/modules/headerSearch'
|
|
|
import { onBeforeRouteUpdate } from 'vue-router'
|
|
|
-import { head } from 'lodash'
|
|
|
|
|
|
const userStore = useUserStore()
|
|
|
+const route = useRoute()
|
|
|
const router = useRouter()
|
|
|
const headerSearch = useHeaderSearch()
|
|
|
|
|
|
const searchValue = ref('')
|
|
|
+// 用于判断是否在搜索后跳转页面,跳转后清空搜索框的值
|
|
|
const isJumpPageBySearch = ref(false)
|
|
|
const handleSearch = () => {
|
|
|
if (!searchValue.value) {
|
|
|
@@ -25,7 +26,11 @@ const handleSearch = () => {
|
|
|
$api.getPublicTrackingDetail({ reference_number: searchValue.value }).then((res) => {
|
|
|
if (res.code === 200) {
|
|
|
const { data } = res
|
|
|
- isJumpPageBySearch.value = true
|
|
|
+ if (route.path === '/public-tracking') {
|
|
|
+ isJumpPageBySearch.value = false
|
|
|
+ } else {
|
|
|
+ isJumpPageBySearch.value = true
|
|
|
+ }
|
|
|
if (data.msg === 'No matches') {
|
|
|
headerSearch.setSearchData({
|
|
|
searchValue: searchValue.value,
|
|
|
@@ -57,7 +62,12 @@ const handleSearch = () => {
|
|
|
.then((res) => {
|
|
|
if (res.code === 200) {
|
|
|
const { searchData } = res.data
|
|
|
- isJumpPageBySearch.value = true
|
|
|
+ // 如果是在tracking页面搜索,那么isJumpPageBySearch不用置为true,跳转路由后直接清空搜索框
|
|
|
+ if (route.path === '/tracking') {
|
|
|
+ isJumpPageBySearch.value = false
|
|
|
+ } else {
|
|
|
+ isJumpPageBySearch.value = true
|
|
|
+ }
|
|
|
if (searchData.length === 1) {
|
|
|
router.push({
|
|
|
name: 'Tracking Detail',
|
|
|
@@ -86,7 +96,6 @@ onBeforeRouteUpdate((to, from, next) => {
|
|
|
// if (to.name === 'Tracking') {
|
|
|
// headerSearch.setChangeByLogin(false)
|
|
|
// }
|
|
|
- console.log(isJumpPageBySearch.value)
|
|
|
if (isJumpPageBySearch.value) {
|
|
|
isJumpPageBySearch.value = false
|
|
|
} else {
|